Merge pull request #42 from NJUPT-SAST/dev-windpo

Dev windpo
NJUPT-SAST · Sep 24, 2023 · 405e3c6 · 405e3c6
2 parents 9ce95cb + 7901bba
commit 405e3c6
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -22,4 +22,5 @@ go.work
 
 # Config
 dev-*.toml
+Dockerfile
 .idea/
diff --git a/api/v1/user.go b/api/v1/user.go
@@ -217,7 +217,7 @@ func Login(ctx *gin.Context) {
 		return
 	}
 	// Set Token with expire time and return
-	token, err := util.GenerateTokenWithExp(model.LoginJWTSubKey(username), model.LOGIN_TOKEN_EXP)
+	token, err := util.GenerateTokenWithExp(ctx, model.LoginJWTSubKey(username), model.LOGIN_TOKEN_EXP)
 	if err != nil {
 		ctx.JSON(http.StatusOK, result.Failed(result.GenerateToken))
 	}

diff --git a/service/user.go b/service/user.go
@@ -93,7 +93,7 @@ func VerifyAccountRegister(ctx *gin.Context, username string) (string, error) {
 		return "", result.UserIsExist
 	} else { // user is not exist and can register
 		// generate token and set expire time
-		ticket, err := util.GenerateTokenWithExp(model.RegisterJWTSubKey(username), model.REGISTER_TICKET_EXP)
+		ticket, err := util.GenerateTokenWithExp(ctx, model.RegisterJWTSubKey(username), model.REGISTER_TICKET_EXP)
 		if err != nil {
 			return "", err
 		}
@@ -111,7 +111,7 @@ func VerifyAccountLogin(ctx *gin.Context, username string) (string, error) {
 	}
 	// user is existed and can login
 	if exist {
-		ticket, err := util.GenerateTokenWithExp(model.LoginTicketJWTSubKey(username), model.LOGIN_TICKET_EXP)
+		ticket, err := util.GenerateTokenWithExp(ctx, model.LoginTicketJWTSubKey(username), model.LOGIN_TICKET_EXP)
 		if err != nil {
 			return "", err
 		}
@@ -125,7 +125,7 @@ func VerifyAccountLogin(ctx *gin.Context, username string) (string, error) {
 			return "", err
 		}
 		if uidExist {
-			ticket, err := util.GenerateTokenWithExp(model.LoginTicketJWTSubKey(username), model.LOGIN_TICKET_EXP)
+			ticket, err := util.GenerateTokenWithExp(ctx, model.LoginTicketJWTSubKey(username), model.LOGIN_TICKET_EXP)
 			if err != nil {
 				return "", err
 			}

diff --git a/util/jwt.go b/util/jwt.go
@@ -37,10 +37,10 @@ func GenerateToken(username string) (string, error) {
 }
 
 // GenerateToken with expireTime
-func GenerateTokenWithExp(username string, expireTime time.Duration) (string, error) {
+func GenerateTokenWithExp(ctx context.Context, username string, expireTime time.Duration) (string, error) {
 	signingKey := []byte(jwtSigningKey)
 	gen := NewJWTAccessGenerate("", signingKey, jwt.SigningMethodHS256)
-	access, _, err := gen.Token(context.Background(), username, expireTime, false)
+	access, _, err := gen.Token(ctx, username, expireTime, false)
 	return access, err
 }
 

diff --git a/util/jwt_test.go b/util/jwt_test.go
@@ -10,7 +10,7 @@ import (
 
 func TestJWT(t *testing.T) {
 	Convey("Test JWT Access Generate", t, func() {
-		token, err := GenerateTokenWithExp("[email protected]", time.Minute*3)
+		token, err := GenerateTokenWithExp(nil, "[email protected]", time.Minute*3)
 		So(err, ShouldBeNil)
 		fmt.Println("token:", token)
 		So(token, ShouldNotBeEmpty)