Release v1.2.13

Merged Somnath Ghorpade requested to merge devbranch into staging
Compare and
7 files
+ 16
16
Preferences
File browser
Compare changes
+ 6
6
@@ -6,7 +6,7 @@ import (
"corelab.mkcl.org/MKCLOS/coredevelopmentplatform/corepkgv2/authmdl/sessionmdl"
"corelab.mkcl.org/MKCLOS/coredevelopmentplatform/corepkgv2/errormdl"
jwt "github.com/dgrijalva/jwt-go"
jwt "github.com/golang-jwt/jwt/v5"
"github.com/tidwall/gjson"
)
@@ -27,7 +27,7 @@ type jwtCustomClaim struct {
HitsCount int `json:"hitsCount"`
Token string `json:"token"`
Metadata string `json:"metadata"`
jwt.StandardClaims
jwt.RegisteredClaims
}
func generate(claims jwtCustomClaim, key string) (string, error) {
@@ -81,8 +81,8 @@ func GenerateTokenWithOptions(args ...Option) (string, error) {
Metadata: options.Metadata,
SessionId: options.Session.SessionId,
UserID: options.UserID,
StandardClaims: jwt.StandardClaims{
ExpiresAt: options.ExpiresAt,
RegisteredClaims: jwt.RegisteredClaims{
ExpiresAt: jwt.NewNumericDate(time.Unix(options.ExpiresAt, 0)),
},
}
@@ -110,8 +110,8 @@ func GenerateTokenWithJWTKey(loginID string, groups []string, clientIP string, m
Groups: groups,
ClientIP: clientIP,
Metadata: metadata.String(),
StandardClaims: jwt.StandardClaims{
ExpiresAt: time.Now().Add(expirationTime).Unix(),
RegisteredClaims: jwt.RegisteredClaims{
ExpiresAt: jwt.NewNumericDate(time.Now().Add(expirationTime)),
},
}