refactor: update Userregister request field. (#2650)

openimsdk · Sep 23, 2024 · 79bf214 · 79bf214
1 parent 5b2b2c1
commit 79bf214
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 15 deletions.
diff --git 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.24
+	github.com/openimsdk/protocol v0.0.72-alpha.25
 	github.com/openimsdk/tools v0.0.50-alpha.12
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/prometheus/client_golang v1.18.0

diff --git a/go.sum b/go.sum
@@ -322,8 +322,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.24 h1:1Dl8TEZVXhdmve+ewoLkJa2wbFBIHqPgjvr9u/J66JM=
-github.com/openimsdk/protocol v0.0.72-alpha.24/go.mod h1:OZQA9FR55lseYoN2Ql1XAHYKHJGu7OMNkUbuekrKCM8=
+github.com/openimsdk/protocol v0.0.72-alpha.25 h1:W8E6gnwt5V6anr/8lYOf5v/Lcsggf7gIAzJbw7YU6So=
+github.com/openimsdk/protocol v0.0.72-alpha.25/go.mod h1:OZQA9FR55lseYoN2Ql1XAHYKHJGu7OMNkUbuekrKCM8=
 github.com/openimsdk/tools v0.0.50-alpha.12 h1:rV3BxgqN+F79vZvdoQ+97Eob8ScsRVEM8D+Wrcl23uo=
 github.com/openimsdk/tools v0.0.50-alpha.12/go.mod h1:h1cYmfyaVtgFbKmb1Cfsl8XwUOMTt8ubVUQrdGtsUh4=
 github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=

diff --git a/internal/rpc/user/callback.go b/internal/rpc/user/callback.go
@@ -16,6 +16,7 @@ package user
 
 import (
 	"context"
+
 	"github.com/openimsdk/open-im-server/v3/pkg/common/webhook"
 	"github.com/openimsdk/tools/utils/datautil"
 
@@ -88,7 +89,6 @@ func (s *userServer) webhookBeforeUserRegister(ctx context.Context, before *conf
 	return webhook.WithCondition(ctx, before, func(ctx context.Context) error {
 		cbReq := &cbapi.CallbackBeforeUserRegisterReq{
 			CallbackCommand: cbapi.CallbackBeforeUserRegisterCommand,
-			Secret:          req.Secret,
 			Users:           req.Users,
 		}
 
@@ -108,7 +108,6 @@ func (s *userServer) webhookBeforeUserRegister(ctx context.Context, before *conf
 func (s *userServer) webhookAfterUserRegister(ctx context.Context, after *config.AfterConfig, req *pbuser.UserRegisterReq) {
 	cbReq := &cbapi.CallbackAfterUserRegisterReq{
 		CallbackCommand: cbapi.CallbackAfterUserRegisterCommand,
-		Secret:          req.Secret,
 		Users:           req.Users,
 	}
 

diff --git a/internal/rpc/user/user.go b/internal/rpc/user/user.go
@@ -47,7 +47,6 @@ import (
 	"github.com/openimsdk/tools/db/pagination"
 	registry "github.com/openimsdk/tools/discovery"
 	"github.com/openimsdk/tools/errs"
-	"github.com/openimsdk/tools/log"
 	"github.com/openimsdk/tools/utils/datautil"
 	"google.golang.org/grpc"
 )
@@ -263,10 +262,11 @@ func (s *userServer) UserRegister(ctx context.Context, req *pbuser.UserRegisterR
 	if len(req.Users) == 0 {
 		return nil, errs.ErrArgs.WrapMsg("users is empty")
 	}
-	if req.Secret != s.config.Share.Secret {
-		log.ZDebug(ctx, "UserRegister", s.config.Share.Secret, req.Secret)
-		return nil, errs.ErrNoPermission.WrapMsg("secret invalid")
+
+	if err = authverify.CheckAdmin(ctx, s.config.Share.IMAdminUserID); err != nil {
+		return nil, err
 	}
+
 	if datautil.DuplicateAny(req.Users, func(e *sdkws.UserInfo) string { return e.UserID }) {
 		return nil, errs.ErrArgs.WrapMsg("userID repeated")
 	}

diff --git a/pkg/callbackstruct/user.go b/pkg/callbackstruct/user.go
@@ -72,7 +72,6 @@ type CallbackAfterUpdateUserInfoExResp struct {
 
 type CallbackBeforeUserRegisterReq struct {
 	CallbackCommand `json:"callbackCommand"`
-	Secret          string            `json:"secret"`
 	Users           []*sdkws.UserInfo `json:"users"`
 }
 
@@ -83,7 +82,6 @@ type CallbackBeforeUserRegisterResp struct {
 
 type CallbackAfterUserRegisterReq struct {
 	CallbackCommand `json:"callbackCommand"`
-	Secret          string            `json:"secret"`
 	Users           []*sdkws.UserInfo `json:"users"`
 }
 

diff --git a/test/e2e/api/token/token.go b/test/e2e/api/token/token.go
@@ -53,8 +53,7 @@ type User struct {
 
 // UserRegisterRequest represents a request to register a user.
 type UserRegisterRequest struct {
-	Secret string `json:"secret"`
-	Users  []User `json:"users"`
+	Users []User `json:"users"`
 }
 
 /* func main() {
@@ -109,8 +108,7 @@ func RegisterUser(token, userID, nickname, faceURL string) error {
 		FaceURL:  faceURL,
 	}
 	reqBody := UserRegisterRequest{
-		Secret: SecretKey,
-		Users:  []User{user},
+		Users: []User{user},
 	}
 	reqBytes, err := json.Marshal(reqBody)
 	if err != nil {