add token (#60)

* fix: args check * fix/searchUserInfo Signed-off-by: hanzhixiao <[email protected]> * fix search normal user Signed-off-by: hanzhixiao <[email protected]> * fix: bug * fix: bug * feat token Signed-off-by: hanzhixiao <[email protected]> * compile Signed-off-by: hanzhixiao <[email protected]> --------- Signed-off-by: hanzhixiao <[email protected]> Co-authored-by: withchao <[email protected]>
openimsdk · Jul 27, 2023 · 1939145 · 1939145
1 parent f4346c3
commit 1939145
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/chatci.yml b/.github/workflows/chatci.yml
@@ -18,6 +18,7 @@ on:
   push:
     branches:
         - main
+        - develop
     paths-ignore:
         - "docs/**"
         - "README.md"
@@ -26,6 +27,7 @@ on:
   pull_request:
     branches:
         - main
+        - develop
     paths-ignore:
         - "README.md"
         - "README_zh-CN.md"

diff --git a/internal/api/chat.go b/internal/api/chat.go
@@ -161,7 +161,7 @@ func (o *ChatApi) Login(c *gin.Context) {
 		apiresp.GinError(c, err)
 		return
 	}
-	imToken, err := o.imApiCaller.UserToken(c, resp1.UserID, constant2.NormalUser)
+	imToken, err := o.imApiCaller.UserToken(c, resp1.UserID, req.Platform)
 	if err != nil {
 		return
 	}

diff --git a/pkg/common/constant/constant.go b/pkg/common/constant/constant.go
@@ -169,8 +169,8 @@ const (
 )
 
 const (
+	FinDAllUser    = 0
 	FindNormalUser = 1
-	FinDAllUser    = 2
 )
 
 const DefaultPlatform = 1

diff --git a/pkg/common/db/database/chat.go b/pkg/common/db/database/chat.go
@@ -16,6 +16,7 @@ package database
 
 import (
 	"context"
+	constant2 "github.com/OpenIMSDK/chat/pkg/common/constant"
 	admin2 "github.com/OpenIMSDK/chat/pkg/common/db/model/admin"
 	"github.com/OpenIMSDK/chat/pkg/common/db/model/chat"
 	"github.com/OpenIMSDK/chat/pkg/common/db/table/admin"
@@ -114,7 +115,7 @@ func (o *ChatDatabase) TakeAttributeByUserID(ctx context.Context, userID string)
 
 func (o *ChatDatabase) Search(ctx context.Context, normalUser int32, keyword string, genders int32, pageNumber int32, showNumber int32) (total uint32, attributes []*table.Attribute, err error) {
 	var forbiddenIDs []string
-	if normalUser == 1 {
+	if normalUser == constant2.NormalUser {
 		forbiddenIDs, err = o.forbiddenAccount.FindAllIDs(ctx)
 		if err != nil {
 			return 0, nil, err

diff --git a/pkg/common/db/model/chat/attribute.go b/pkg/common/db/model/chat/attribute.go
@@ -87,8 +87,9 @@ func (o *Attribute) SearchNormalUser(ctx context.Context, keyword string, forbid
 	}
 	if len(forbiddenIDs) == 0 {
 		db = db.Where("gender in ?", genders)
-	} else {
-		db = db.Where("gender in ? and user_id not in ?", genders, forbiddenIDs)
+	}
+	if len(forbiddenIDs) > 0 {
+		db = db.Where("user_id not in ?", forbiddenIDs)
 	}
 	return ormutil.GormSearch[chat.Attribute](db, []string{"user_id", "account", "nickname", "phone_number"}, keyword, page, size)
 }