@@ -129,14 +129,14 @@ func (self *Token) RefreshAccessToken(refreshToken string) (string, error) {
|
||||
// read refresh token bind data
|
||||
dataMap, err := data.Redis.HGetAll(ctx, key).Result()
|
||||
if err != nil || len(dataMap) == 0 {
|
||||
return "", errors.New("invalid refresh token")
|
||||
return "", errors.New("[Auth Token] invalid refresh token")
|
||||
}
|
||||
|
||||
userIdStr := dataMap["user_id"]
|
||||
clientId := dataMap["client_id"]
|
||||
|
||||
if userIdStr == "" || clientId == "" {
|
||||
return "", errors.New("refresh token corrupted")
|
||||
return "", errors.New("[Auth Token] refresh token corrupted")
|
||||
}
|
||||
|
||||
userId, err := uuid.Parse(userIdStr)
|
||||
@@ -157,14 +157,14 @@ func (self *Token) RenewRefreshToken(refreshToken string) (string, error) {
|
||||
// read old refresh token bind data
|
||||
dataMap, err := data.Redis.HGetAll(ctx, oldKey).Result()
|
||||
if err != nil || len(dataMap) == 0 {
|
||||
return "", errors.New("invalid refresh token")
|
||||
return "", errors.New("[Auth Token] invalid refresh token")
|
||||
}
|
||||
|
||||
userIdStr := dataMap["user_id"]
|
||||
clientId := dataMap["client_id"]
|
||||
|
||||
if userIdStr == "" || clientId == "" {
|
||||
return "", errors.New("refresh token corrupted")
|
||||
return "", errors.New("[Auth Token] refresh token corrupted")
|
||||
}
|
||||
|
||||
// generate new refresh token
|
||||
@@ -254,7 +254,7 @@ func (self *Token) HeaderVerify(header string) (string, error) {
|
||||
// Split header to 2
|
||||
parts := strings.SplitN(header, " ", 2)
|
||||
if len(parts) != 2 || parts[0] != "Bearer" {
|
||||
return "", errors.New("invalid Authorization header format")
|
||||
return "", errors.New("[Auth Token] invalid Authorization header format")
|
||||
}
|
||||
|
||||
tokenStr := parts[1]
|
||||
@@ -266,11 +266,11 @@ func (self *Token) HeaderVerify(header string) (string, error) {
|
||||
claims,
|
||||
func(token *jwt.Token) (any, error) {
|
||||
if _, ok := token.Method.(*jwt.SigningMethodHMAC); !ok {
|
||||
return nil, errors.New("unexpected signing method")
|
||||
return nil, errors.New("[Auth Token] unexpected signing method")
|
||||
}
|
||||
|
||||
if claims.ClientId == "" {
|
||||
return nil, errors.New("client_id missing in token")
|
||||
return nil, errors.New("[Auth Token] client_id missing in token")
|
||||
}
|
||||
|
||||
clientData, err := new(data.Client).GetClientByClientId(claims.ClientId)
|
||||
@@ -289,7 +289,7 @@ func (self *Token) HeaderVerify(header string) (string, error) {
|
||||
|
||||
if err != nil || !token.Valid {
|
||||
fmt.Println(err)
|
||||
return "", errors.New("invalid or expired token")
|
||||
return "", errors.New("[Auth Token] invalid or expired token")
|
||||
}
|
||||
|
||||
return claims.UserID.String(), nil
|
||||
|
||||
Reference in New Issue
Block a user