Improve game redirects

Author: colin969

database/postgresdal.go

@@ -1445,7 +1445,16 @@ func (d *postgresDAL) GetGameRedirects(dbs PGDBSession) ([]*types.GameRedirect,
 }
 
 func (d *postgresDAL) AddGameRedirect(dbs PGDBSession, srcId string, destId string) error {
-	// Validate dest id first
+	// Validate source id is not a live game
+	srcGame, err := d.GetGame(dbs, srcId)
+	if err != nil && err != pgx.ErrNoRows {
+		return err
+	}
+	if srcGame != nil && !srcGame.Deleted {
+		return fmt.Errorf("Source game is a live game")
+	}
+
+	// Validate dest id is a live game
 	game, err := d.GetGame(dbs, destId)
 
 	if err != nil {

service/siteservice.go

@@ -3654,7 +3654,7 @@ func (s *SiteService) UnfreezeGame(ctx context.Context, gameId string, uid int64
 	return err
 }
 
-func (s *SiteService) GetGameRedirects(ctx context.Context) ([]*types.GameRedirect, error) {
+func (s *SiteService) GetGameRedirectsPageData(ctx context.Context) (*types.GameRedirectsPageData, error) {
 	dbs, err := s.pgdal.NewSession(ctx)
 	if err != nil {
 		utils.LogCtx(ctx).Error(err)
@@ -3666,7 +3666,40 @@ func (s *SiteService) GetGameRedirects(ctx context.Context) ([]*types.GameRedire
 		utils.LogCtx(ctx).Error(err)
 		return nil, dberr(err)
 	}
-	return redirects, nil
+
+	bpd, err := s.GetBasePageData(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	pageData := &types.GameRedirectsPageData{
+		BasePageData:  *bpd,
+		GameRedirects: redirects,
+	}
+
+	return pageData, nil
+}
+
+func (s *SiteService) AddNewGameRedirect(ctx context.Context, srcId string, destId string) error {
+	dbs, err := s.pgdal.NewSession(ctx)
+	if err != nil {
+		utils.LogCtx(ctx).Error(err)
+		return dberr(err)
+	}
+
+	err = s.pgdal.AddGameRedirect(dbs, srcId, destId)
+	if err != nil {
+		utils.LogCtx(ctx).Error(err)
+		return dberr(err)
+	}
+
+	err = dbs.Commit()
+	if err != nil {
+		utils.LogCtx(ctx).Error(err)
+		return dberr(err)
+	}
+
+	return nil
 }
 
 // NukeSessionTable nukes the session table

static/styles.css

@@ -764,3 +764,8 @@ video {
 .session-field-name {
     font-weight: bold;
 }
+
+.monospaced {
+    font-family: monospace;
+    font-size: 1.25em;
+}

templates/game-redirects.gohtml

@@ -0,0 +1,58 @@
+{{define "main"}}
+    <div class="content">
+        <script>
+            function onAddNewRedirect() {
+                const s = document.getElementById("source").value;
+                const d = document.getElementById("dest").value;
+                if (s && d) {
+                    fetch("/api/game-redirects", {
+                        method: "POST",
+                        body: JSON.stringify({
+                            sourceId: s,
+                            destId: d,
+                        })
+                    })
+                    .then(res => {
+                        if (res.ok) {
+                            window.location.reload();
+                        } else {
+                            alert(`ERROR: ${res.status} - ${res.text()}`);
+                        }
+                    })
+                    .catch(err => {
+                        alert(err);
+                    })
+                }
+            }
+        </script>
+
+        <h1>Game Redirects</h1>
+        {{if isFreezer .UserRoles}}
+            <div>  
+                <label>Source</label>
+                <input id="source" type="text"></input>
+                <label>Destination</label>
+                <input id="dest" type="text"></input>
+                <button onclick="onAddNewRedirect()">Add New Redirect</button>
+            </div>
+            <br>
+        {{end}}
+
+        <table class="pure-table pure-table-striped submissions-table monospaced">
+            <thead>
+            <tr>
+                <th>Source</th>
+                <th>Destination</th>
+            </tr>
+            </thead>
+            <tbody>
+                {{range .GameRedirects}}
+                <tr>
+                    <td>{{.SourceId}}</td>
+                    <td>{{.DestId}}</td>
+                </tr>
+                {{end}}
+            </tbody>
+        </table>
+    </div>
+{{end}}

transport/handlers.go

@@ -1178,13 +1178,36 @@ func (a *App) HandleUnfreezeGame(w http.ResponseWriter, r *http.Request) {
 func (a *App) HandleGameRedirects(w http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
 
-	data, err := a.Service.GetGameRedirects(ctx)
+	pageData, err := a.Service.GetGameRedirectsPageData(ctx)
 	if err != nil {
 		writeError(ctx, w, err)
 		return
 	}
 
-	writeResponse(ctx, w, data, http.StatusOK)
+	if utils.RequestType(ctx) == constants.RequestJSON {
+		if r.Method == http.MethodGet {
+			writeResponse(ctx, w, pageData.GameRedirects, http.StatusOK)
+			return
+		} else {
+			// POST
+			var requestBody types.AddGameRedirectRequest
+			err = json.NewDecoder(r.Body).Decode(&requestBody)
+			if err != nil {
+				writeResponse(ctx, w, err, http.StatusBadRequest)
+				return
+			}
+			err := a.Service.AddNewGameRedirect(ctx, requestBody.SourceId, requestBody.DestId)
+			if err != nil {
+				writeError(ctx, w, err)
+				return
+			}
+			writeResponse(ctx, w, "success", http.StatusOK)
+			return
+		}
+	}
+
+	a.RenderTemplates(ctx, w, r, pageData,
+		"templates/game-redirects.gohtml")
 }
 
 func (a *App) HandleSubmissionsPage(w http.ResponseWriter, r *http.Request) {

transport/middlewares.go

@@ -87,6 +87,61 @@ func (a *App) AdminPassAuth(next func(http.ResponseWriter, *http.Request)) func(
 	}
 }
 
+// Loads user info into the context without any page authorization requirements
+func (a *App) OpenMux(next func(http.ResponseWriter, *http.Request)) func(http.ResponseWriter, *http.Request) {
+	return func(w http.ResponseWriter, r *http.Request) {
+		ctx := r.Context()
+
+		secret := ""
+		authHeader := r.Header.Get("Authorization")
+		if authHeader != "" {
+			checkAuth := func() *string {
+				// try bearer token
+				// split the header at the space character
+				authHeaderParts := strings.Split(authHeader, " ")
+				if len(authHeaderParts) != 2 || authHeaderParts[0] != "Bearer" {
+					return nil
+				}
+				decodedBytes, err := base64.StdEncoding.DecodeString(authHeaderParts[1])
+				if err != nil {
+					return nil
+				}
+				var tokenMap map[string]string
+				err = json.Unmarshal(decodedBytes, &tokenMap)
+				if err != nil {
+					return nil
+				}
+				token, err := service.ParseAuthToken(tokenMap)
+				if err != nil {
+					return nil
+				}
+				return &token.Secret
+			}
+			found := checkAuth()
+			if found != nil {
+				secret = *found
+			}
+		} else {
+			// try cookie
+			found, err := a.GetSecretFromCookie(ctx, r)
+			if err == nil {
+				secret = found
+			}
+		}
+
+		if secret != "" {
+			authInfo, ok, err := a.Service.GetSessionAuthInfo(ctx, secret)
+			if ok && err == nil {
+				r = r.WithContext(context.WithValue(ctx, utils.CtxKeys.UserID, authInfo.UID))
+				r = r.WithContext(context.WithValue(r.Context(), utils.CtxKeys.Scope, authInfo.Scope))
+			}
+		}
+
+		next(w, r)
+		return
+	}
+}
+
 // UserAuthMux takes many authorization middlewares and accepts if any of them does not return error
 func (a *App) UserAuthMux(next func(http.ResponseWriter, *http.Request), authorizers ...func(*http.Request, int64) (bool, error)) func(http.ResponseWriter, *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {

transport/router.go

@@ -435,11 +435,27 @@ func (a *App) handleRequests(l *logrus.Entry, srv *http.Server, router *mux.Rout
 
 	////////////////////////
 
+	f = a.OpenMux(a.HandleGameRedirects)
+
+	router.Handle(
+		"/web/game-redirects",
+		http.HandlerFunc(a.RequestWeb(f, true))).
+		Methods("GET")
+
 	router.Handle(
 		"/api/game-redirects",
-		http.HandlerFunc(a.RequestJSON(a.HandleGameRedirects, true))).
+		http.HandlerFunc(a.RequestJSON(f, true))).
 		Methods("GET")
 
+	f = a.UserAuthMux(
+		a.RequestScope(a.HandleGameRedirects, types.AuthScopeRedirectEdit),
+		muxAny(isFreezer))
+
+	router.Handle(
+		"/api/game-redirects",
+		http.HandlerFunc(a.RequestJSON(f, true))).
+		Methods("POST")
+
 	////////////////////////
 
 	f = a.UserAuthMux(

types/auth.go

@@ -77,6 +77,7 @@ const (
 	AuthScopeGameRead             = "game:read"
 	AuthScopeGameEdit             = "game:edit"
 	AuthScopeHashCheck            = "hash-check"
+	AuthScopeRedirectEdit         = "redirect:edit"
 )
 
 type ClientApplication struct {

types/pagedata.go

@@ -90,6 +90,11 @@ type GameDataIndexPageData struct {
 	Index *GameDataIndex
 }
 
+type GameRedirectsPageData struct {
+	BasePageData
+	GameRedirects []*GameRedirect
+}
+
 type SubmissionsPageData struct {
 	BasePageData
 	Submissions  []*ExtendedSubmission

types/types.go

@@ -945,3 +945,8 @@ type ActivityEventsFilter struct {
 	From   int64 `schema:"from"`
 	To     int64 `schema:"to"`
 }
+
+type AddGameRedirectRequest struct {
+	SourceId string `json:"sourceId"`
+	DestId   string `json:"destId"`
+}