From d44c286ff3505e99a7615b857b127e0dd0f9d7e6 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Tue, 31 Jan 2023 20:41:45 +0800 Subject: [PATCH] Error code standardization --- internal/rpc/auth/auth.go | 6 +++--- pkg/common/db/controller/auth.go | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/internal/rpc/auth/auth.go b/internal/rpc/auth/auth.go index 16237256b..55ff7819b 100644 --- a/internal/rpc/auth/auth.go +++ b/internal/rpc/auth/auth.go @@ -29,12 +29,12 @@ func (s *rpcAuth) UserToken(ctx context.Context, req *pbAuth.UserTokenReq) (*pbA if _, err := check.GetUsersInfo(ctx, req.UserID); err != nil { return nil, err } - token, expTime, err := token_verify.CreateToken(req.UserID, int(req.PlatformID)) + token, err := s.CreateToken(ctx, req.UserID, int(req.PlatformID), config.Config.TokenPolicy.AccessExpire) if err != nil { return nil, err } resp.Token = token - resp.ExpireTimeSeconds = expTime + resp.ExpireTimeSeconds = config.Config.TokenPolicy.AccessExpire return &resp, nil } @@ -75,7 +75,7 @@ func (s *rpcAuth) ParseToken(ctx context.Context, req *pbAuth.ParseTokenReq) (*p func (s *rpcAuth) ForceLogout(ctx context.Context, req *pbAuth.ForceLogoutReq) (*pbAuth.ForceLogoutResp, error) { resp := pbAuth.ForceLogoutResp{} - if err := token_verify.CheckManagerUserID(ctx, tracelog.GetOpUserID(ctx)); err != nil { + if err := token_verify.CheckAdmin(ctx); err != nil { return nil, err } if err := s.forceKickOff(ctx, req.UserID, req.PlatformID, tracelog.GetOperationID(ctx)); err != nil { diff --git a/pkg/common/db/controller/auth.go b/pkg/common/db/controller/auth.go index b6f604a84..9c9bcf6df 100644 --- a/pkg/common/db/controller/auth.go +++ b/pkg/common/db/controller/auth.go @@ -5,4 +5,5 @@ import "context" type AuthInterface interface { GetTokens(ctx context.Context, userID, platform string) (map[string]int, error) DeleteToken(ctx context.Context, userID, platform string) error + CreateToken(ctx context.Context, userID string, platformID int, ttl int64) (string, error) }