IM/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-05-08 02:55:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

black bug

Browse Source
This commit is contained in:
wangchuxiao
2023-03-16 19:00:17 +08:00
parent 92d941b747
commit 73e6fbbe91
8 changed files with 84 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/common/db/relation/black_model.go
+3
View File
@@ -2,6 +2,7 @@ package relation
import (
"context"
"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
"github.com/OpenIMSDK/Open-IM-Server/pkg/utils"
"gorm.io/gorm"
@@ -50,6 +51,8 @@ func (b *BlackGorm) FindOwnerBlacks(ctx context.Context, ownerUserID string, pag
return nil, 0, utils.Wrap(err, "")
}
err = utils.Wrap(b.db(ctx).Limit(int(showNumber)).Offset(int(pageNumber*showNumber)).Find(&blacks).Error, "")
totalUint32, blacks, err := gormPage[relation.BlackModel](b.db(ctx), pageNumber, showNumber)
total = int64(totalUint32)
return
}
pkg/common/db/relation/group_request_model.go
+1
View File
@@ -2,6 +2,7 @@ package relation
import (
"context"
"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
"github.com/OpenIMSDK/Open-IM-Server/pkg/utils"
"gorm.io/gorm"
pkg/common/db/relation/meta_db.go
+4
View File
@@ -20,3 +20,7 @@ func NewMetaDB(db *gorm.DB, table any) *MetaDB {
func (g *MetaDB) db(ctx context.Context) *gorm.DB {
return g.DB.WithContext(ctx).Model(g.table)
}
func (g *MetaDB) page(pageNumber, showNumber int32) *gorm.DB {
return g.DB.Limit(int(showNumber)).Offset(int(pageNumber*showNumber-1))
}
pkg/common/db/relation/utils.go
+1 -1
View File
@@ -7,7 +7,7 @@ import (
func gormPage[E any](db *gorm.DB, pageNumber, showNumber int32) (uint32, []*E, error) {
var count int64
if err := db.Model(new(E)).Count(&count).Error; err != nil {
if err := db.Count(&count).Error; err != nil {
return 0, nil, utils.Wrap(err, "")
}
var es []*E
pkg/utils/jwt_token_test.go
-87
View File
@@ -1,87 +0,0 @@
package utils
import (
"github.com/OpenIMSDK/Open-IM-Server/pkg/common/tokenverify"
"testing"
"time"
"github.com/stretchr/testify/assert"
)
func Test_BuildClaims(t *testing.T) {
uid := "1"
platform := "PC"
ttl := int64(-1)
claim := tokenverify.BuildClaims(uid, platform, ttl)
now := time.Now().Unix()
assert.Equal(t, claim.UID, uid, "uid should equal")
assert.Equal(t, claim.Platform, platform, "platform should equal")
assert.Equal(t, claim.RegisteredClaims.ExpiresAt, int64(-1), "StandardClaims.ExpiresAt should be equal")
// time difference within 1s
assert.Equal(t, claim.RegisteredClaims.IssuedAt, now, "StandardClaims.IssuedAt should be equal")
assert.Equal(t, claim.RegisteredClaims.NotBefore, now, "StandardClaims.NotBefore should be equal")
ttl = int64(60)
now = time.Now().Unix()
claim = tokenverify.BuildClaims(uid, platform, ttl)
// time difference within 1s
assert.Equal(t, claim.RegisteredClaims.ExpiresAt, int64(60)+now, "StandardClaims.ExpiresAt should be equal")
assert.Equal(t, claim.RegisteredClaims.IssuedAt, now, "StandardClaims.IssuedAt should be equal")
assert.Equal(t, claim.RegisteredClaims.NotBefore, now, "StandardClaims.NotBefore should be equal")
}
func Test_CreateToken(t *testing.T) {
//uid := "1"
//platform := int32(1)
//now := time.Now().Unix()
//
//tokenString, expiresAt, err := tokenverify.CreateToken(uid, int(platform))
//
//assert.NotEmpty(t, tokenString)
//assert.Equal(t, expiresAt, 604800+now)
//assert.Nil(t, err)
}
func Test_VerifyToken(t *testing.T) {
//uid := "1"
//platform := int32(1)
//tokenString, _, _ := tokenverify.CreateToken(uid, int(platform))
//result, _ := tokenverify.VerifyToken(tokenString, uid)
//assert.True(t, result)
//result, _ = tokenverify.VerifyToken(tokenString, "2")
//assert.False(t, result)
}
func Test_ParseRedisInterfaceToken(t *testing.T) {
//uid := "1"
//platform := int32(1)
//tokenString, _, _ := tokenverify.CreateToken(uid, int(platform))
//
//claims, err := tokenverify.ParseRedisInterfaceToken([]uint8(tokenString))
//assert.Nil(t, err)
//assert.Equal(t, claims.UID, uid)
//
//// timeout
//config.Config.TokenPolicy.AccessExpire = -80
//tokenString, _, _ = tokenverify.CreateToken(uid, int(platform))
//claims, err = tokenverify.ParseRedisInterfaceToken([]uint8(tokenString))
//assert.Equal(t, err, constant.ExpiredToken)
//assert.Nil(t, claims)
}
func Test_ParseToken(t *testing.T) {
//uid := "1"
//platform := int32(1)
//tokenString, _, _ := tokenverify.CreateToken(uid, int(platform))
//claims, err := tokenverify.ParseToken(tokenString, "")
//if err == nil {
// assert.Equal(t, claims.UID, uid)
//}
}
func Test_GetClaimFromToken(t *testing.T) {
token := "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJVSUQiOiJvcGVuSU0xMjM0NTYiLCJQbGF0Zm9ybSI6IiIsImV4cCI6MTYzODg0NjQ3NiwibmJmIjoxNjM4MjQxNjc2LCJpYXQiOjE2MzgyNDE2NzZ9.W8RZB7ec5ySFj-rGE2Aho2z32g3MprQMdCyPiQu_C2I"
c, err := tokenverify.GetClaimFromToken(token)
assert.Nil(t, c)
assert.Nil(t, err)
}