Fix redirect links when session errors (#681)

* fix redirect links when session errors * fix set roles bug
OpenCSGs · Sep 26, 2024 · 8e2fe44 · 8e2fe44
1 parent 34861d6
commit 8e2fe44
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/internal/handlers/render/session.go b/internal/handlers/render/session.go
@@ -57,7 +57,7 @@ func (i *SessionHandlerImpl) Create(ctx *gin.Context) {
 	jwtToken := ctx.Query("jwt")
 	if jwtToken == "" {
 		slog.Error("Login Error", "error", "jwt is blank")
-		ctx.Redirect(http.StatusFound, "/error/login-failed?error_msg='invalid jwt token'")
+		ctx.Redirect(http.StatusFound, "/errors/login-failed?error_msg='invalid jwt token'")
 		return
 	}
 	userResp, _, err := i.Server.VerifyJWTToken(jwtToken)
@@ -70,7 +70,7 @@ func (i *SessionHandlerImpl) Create(ctx *gin.Context) {
 
 	if userResp == nil {
 		slog.Error("Login Error", "error", "verify jwt token failed", "jwt", jwtToken)
-		ctx.Redirect(http.StatusFound, "/error/login-failed?error_msg='invalid jwt token'")
+		ctx.Redirect(http.StatusFound, "/errors/login-failed?error_msg='invalid jwt token'")
 		return
 	}
 
@@ -89,8 +89,6 @@ func (i *SessionHandlerImpl) Create(ctx *gin.Context) {
 				LoginIdentity: userResp.UUID,
 			}
 
-			user.SetRoles(userResp.Roles...)
-
 			err = i.userModel.Create(ctx, user)
 			if err != nil {
 				stackTrace := string(debug.Stack())
@@ -99,11 +97,13 @@ func (i *SessionHandlerImpl) Create(ctx *gin.Context) {
 				return
 			}
 		} else {
-			ctx.Redirect(http.StatusFound, "/error/login-failed?error_msg='invalid jwt token'")
+			ctx.Redirect(http.StatusFound, "/errors/login-failed?error_msg='invalid jwt token'")
 			return
 		}
 	}
 
+	user.SetRoles(userResp.Roles...)
+
 	ctx.SetCookie("login_identity", user.LoginIdentity, cookieMaxAge, "/", "", false, false)
 	ctx.SetCookie("current_user", user.Name, cookieMaxAge, "/", "", false, false)
 	ctx.SetCookie("admin_user", fmt.Sprintf("%t", user.IsAdmin()), cookieMaxAge, "/", "", false, false)