fix: token update

Signed-off-by: Gordon <1432970085@qq.com>
This commit is contained in:
Gordon
2023-07-26 17:51:55 +08:00
parent ac14dd0249
commit 49220ccfbf
15 changed files with 46 additions and 39 deletions
+3 -3
View File
@@ -11,7 +11,7 @@ import (
"github.com/golang-jwt/jwt/v4"
)
func secret() jwt.Keyfunc {
func Secret() jwt.Keyfunc {
return func(token *jwt.Token) (interface{}, error) {
return []byte(config.Config.Secret), nil
}
@@ -40,7 +40,7 @@ func CheckAdmin(ctx context.Context) error {
}
func ParseRedisInterfaceToken(redisToken interface{}) (*tokenverify.Claims, error) {
return tokenverify.GetClaimFromToken(string(redisToken.([]uint8)), secret())
return tokenverify.GetClaimFromToken(string(redisToken.([]uint8)), Secret())
}
func IsManagerUserID(opUserID string) bool {
@@ -48,7 +48,7 @@ func IsManagerUserID(opUserID string) bool {
}
func WsVerifyToken(token, userID string, platformID int) error {
claim, err := tokenverify.GetClaimFromToken(token, secret())
claim, err := tokenverify.GetClaimFromToken(token, Secret())
if err != nil {
return err
}
+2 -1
View File
@@ -16,6 +16,7 @@ package controller
import (
"context"
"github.com/OpenIMSDK/Open-IM-Server/pkg/authverify"
"github.com/golang-jwt/jwt/v4"
@@ -60,7 +61,7 @@ func (a *authDatabase) CreateToken(ctx context.Context, userID string, platformI
}
var deleteTokenKey []string
for k, v := range tokens {
_, err = tokenverify.GetClaimFromToken(k)
_, err = tokenverify.GetClaimFromToken(k, authverify.Secret())
if err != nil || v != constant.NormalToken {
deleteTokenKey = append(deleteTokenKey, k)
}
+2 -2
View File
@@ -16,6 +16,7 @@ package rpcclient
import (
"context"
"github.com/OpenIMSDK/Open-IM-Server/pkg/authverify"
"strings"
"google.golang.org/grpc"
@@ -25,7 +26,6 @@ import (
"github.com/OpenIMSDK/protocol/user"
"github.com/OpenIMSDK/tools/discoveryregistry"
"github.com/OpenIMSDK/tools/errs"
"github.com/OpenIMSDK/tools/tokenverify"
"github.com/OpenIMSDK/tools/utils"
)
@@ -144,7 +144,7 @@ func (u *UserRpcClient) Access(ctx context.Context, ownerUserID string) error {
if err != nil {
return err
}
return tokenverify.CheckAccessV3(ctx, ownerUserID)
return authverify.CheckAccessV3(ctx, ownerUserID)
}
func (u *UserRpcClient) GetAllUserIDs(ctx context.Context, pageNumber, showNumber int32) ([]string, error) {