Refactor: Generate JWT token

authmdl/jwtmdl/jwtmdl.go

@@ -64,24 +64,24 @@ type jwtCustomClaim struct {
 
 // GenerateToken generates JWT token from Login object
 func GenerateToken(loginID string, groups []string, clientIP string, metadata gjson.Result, expirationTime time.Duration) (string, error) {
-	claims := jwtCustomClaim{
-		UserID:   loginID,
-		Groups:   groups,
-		ClientIP: clientIP,
-		Metadata: metadata.String(),
-		StandardClaims: jwt.StandardClaims{
-			ExpiresAt: time.Now().Add(expirationTime).Unix(),
-		},
-	}
-	// Create token with claims
-	token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
-	// Generate encoded token and send it as response.
-	t, err := token.SignedString([]byte(GlobalJWTKey))
-	if errormdl.CheckErr(err) != nil {
-		loggermdl.LogError(err)
-		return t, errormdl.CheckErr(err)
-	}
-	return t, nil
+	// claims := jwtCustomClaim{
+	// 	UserID:   loginID,
+	// 	Groups:   groups,
+	// 	ClientIP: clientIP,
+	// 	Metadata: metadata.String(),
+	// 	StandardClaims: jwt.StandardClaims{
+	// 		ExpiresAt: time.Now().Add(expirationTime).Unix(),
+	// 	},
+	// }
+	// // Create token with claims
+	// token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
+	// // Generate encoded token and send it as response.
+	// t, err := token.SignedString([]byte(GlobalJWTKey))
+	// if errormdl.CheckErr(err) != nil {
+	// 	loggermdl.LogError(err)
+	// 	return t, errormdl.CheckErr(err)
+	// }
+	return GenerateTokenWithJWTKey(loginID, groups, clientIP, metadata, expirationTime, GlobalJWTKey)
 }
 
 // GenerateTokenWithJWTKey generates JWT token from Login object