From d6b711c7ed7a3757d5b119a7a5bd32a3e5868a75 Mon Sep 17 00:00:00 2001
From: Monet Lee <monet_lee@163.com>
Date: Fri, 27 Sep 2024 17:45:10 +0800
Subject: [PATCH] fix: usertoken auth. (#2677)

* refactor: update fields type in userStatus and check registered.

* fix: usertoken auth.

* update contents.

* update content.

* update

* fix

* update pb file.
---
 go.mod                    |  2 +-
 go.sum                    |  4 ++--
 internal/rpc/auth/auth.go | 10 ++++------
 tools/url2im/pkg/api.go   |  6 ++----
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/go.mod b/go.mod
index 9e35bca6a..10765aa86 100644
--- a/go.mod
+++ b/go.mod
@@ -12,7 +12,7 @@ require (
 	github.com/gorilla/websocket v1.5.1
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
 	github.com/mitchellh/mapstructure v1.5.0
-	github.com/openimsdk/protocol v0.0.72-alpha.36
+	github.com/openimsdk/protocol v0.0.72-alpha.38
 	github.com/openimsdk/tools v0.0.50-alpha.15
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/prometheus/client_golang v1.18.0
diff --git a/go.sum b/go.sum
index 05951b9e4..a2a062617 100644
--- a/go.sum
+++ b/go.sum
@@ -319,8 +319,8 @@ github.com/onsi/gomega v1.25.0 h1:Vw7br2PCDYijJHSfBOWhov+8cAnUf8MfMaIOV323l6Y=
 github.com/onsi/gomega v1.25.0/go.mod h1:r+zV744Re+DiYCIPRlYOTxn0YkOLcAnW8k1xXdMPGhM=
 github.com/openimsdk/gomake v0.0.14-alpha.5 h1:VY9c5x515lTfmdhhPjMvR3BBRrRquAUCFsz7t7vbv7Y=
 github.com/openimsdk/gomake v0.0.14-alpha.5/go.mod h1:PndCozNc2IsQIciyn9mvEblYWZwJmAI+06z94EY+csI=
-github.com/openimsdk/protocol v0.0.72-alpha.36 h1:j1hanJjvAgLfRZSGSdGoYkH3L0siBf5n6gFbvs2y5M0=
-github.com/openimsdk/protocol v0.0.72-alpha.36/go.mod h1:OZQA9FR55lseYoN2Ql1XAHYKHJGu7OMNkUbuekrKCM8=
+github.com/openimsdk/protocol v0.0.72-alpha.38 h1:v0GLgS9cNm627NSG3B2k2VF2AMoo90DSKixxiBMKPS4=
+github.com/openimsdk/protocol v0.0.72-alpha.38/go.mod h1:OZQA9FR55lseYoN2Ql1XAHYKHJGu7OMNkUbuekrKCM8=
 github.com/openimsdk/tools v0.0.50-alpha.15 h1:HV9aKZ4vvCZCGG4wFDsgUONkkdJeCcrFNn3BT52nUVQ=
 github.com/openimsdk/tools v0.0.50-alpha.15/go.mod h1:h1cYmfyaVtgFbKmb1Cfsl8XwUOMTt8ubVUQrdGtsUh4=
 github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=
diff --git a/internal/rpc/auth/auth.go b/internal/rpc/auth/auth.go
index 7834a92d7..7d33ef928 100644
--- a/internal/rpc/auth/auth.go
+++ b/internal/rpc/auth/auth.go
@@ -20,6 +20,7 @@ import (
 	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
 	redis2 "github.com/openimsdk/open-im-server/v3/pkg/common/storage/cache/redis"
 	"github.com/openimsdk/tools/db/redisutil"
+	"github.com/openimsdk/tools/utils/datautil"
 	"github.com/redis/go-redis/v9"
 
 	"github.com/openimsdk/open-im-server/v3/pkg/authverify"
@@ -77,19 +78,16 @@ func (s *authServer) UserToken(ctx context.Context, req *pbauth.UserTokenReq) (*
 		return nil, errs.ErrNoPermission.WrapMsg("secret invalid")
 	}
 
-	if err := authverify.CheckAdmin(ctx, s.config.Share.IMAdminUserID); err != nil {
-		return nil, err
-	}
+	if !datautil.Contain(req.UserID, s.config.Share.IMAdminUserID...) {
+		return nil, errs.ErrArgs.WrapMsg("userID is error.", "userID", req.UserID, "adminUserID", s.config.Share.IMAdminUserID)
 
-	if req.PlatformID != constant.AdminPlatformID {
-		return nil, errs.ErrNoPermission.WrapMsg("platformID invalid. platformID must be adminPlatformID")
 	}
 
 	if _, err := s.userRpcClient.GetUserInfo(ctx, req.UserID); err != nil {
 		return nil, err
 	}
 
-	token, err := s.authDatabase.CreateToken(ctx, req.UserID, int(req.PlatformID))
+	token, err := s.authDatabase.CreateToken(ctx, req.UserID, int(constant.AdminPlatformID))
 	if err != nil {
 		return nil, err
 	}
diff --git a/tools/url2im/pkg/api.go b/tools/url2im/pkg/api.go
index 5bf48c4ea..b76987299 100644
--- a/tools/url2im/pkg/api.go
+++ b/tools/url2im/pkg/api.go
@@ -23,7 +23,6 @@ import (
 	"net/http"
 
 	"github.com/openimsdk/protocol/auth"
-	"github.com/openimsdk/protocol/constant"
 	"github.com/openimsdk/protocol/third"
 	"github.com/openimsdk/tools/errs"
 )
@@ -90,9 +89,8 @@ func (a *Api) apiPost(ctx context.Context, path string, req any, resp any) error
 
 func (a *Api) GetToken(ctx context.Context) (string, error) {
 	req := auth.UserTokenReq{
-		UserID:     a.UserID,
-		Secret:     a.Secret,
-		PlatformID: constant.AdminPlatformID,
+		UserID: a.UserID,
+		Secret: a.Secret,
 	}
 	var resp auth.UserTokenResp
 	if err := a.apiPost(ctx, "/auth/user_token", &req, &resp); err != nil {