OpenIMSDK
/
openim-server
mirror of https://github.com/OpenIMSDK/Open-IM-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix token (#2403) 

* fix:log config

* fix: token update expire time
This commit is contained in:
icey-yu 2024-07-09 18:17:44 +08:00 committed by GitHub
parent 407a117a05
commit 213613cf54
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/log.yml
View File

@ -1,7 +1,7 @@
# Log storage path, default is acceptable, change to a full path if modification is needed # Log storage path, default is acceptable, change to a full path if modification is needed
storageLocation: ../../../../logs/ storageLocation: ../../../../logs/
# Log rotation period (in hours), default is acceptable # Log rotation period (in hours), default is acceptable
rotationTime: 1 rotationTime: 24
# Maximum size of each log file (in MB), default is acceptable, it means unlimited # Maximum size of each log file (in MB), default is acceptable, it means unlimited
maxSize: 0 maxSize: 0
# Number of log files to retain, default is acceptable, it means whenever the log file is rotated, the old log file will be deleted # Number of log files to retain, default is acceptable, it means whenever the log file is rotated, the old log file will be deleted

12
pkg/common/storage/controller/auth.go
View File

@ -55,7 +55,6 @@ func (a *authDatabase) SetTokenMapByUidPid(ctx context.Context, userID string, p
// Create Token. // Create Token.
func (a *authDatabase) CreateToken(ctx context.Context, userID string, platformID int) (string, error) { func (a *authDatabase) CreateToken(ctx context.Context, userID string, platformID int) (string, error) {
isCreate := true // flag is create or update
tokens, err := a.cache.GetTokensWithoutError(ctx, userID, platformID) tokens, err := a.cache.GetTokensWithoutError(ctx, userID, platformID)
if err != nil { if err != nil {
return "", err return "", err
@ -66,9 +65,6 @@ func (a *authDatabase) CreateToken(ctx context.Context, userID string, platformI
if err != nil || v != constant.NormalToken { if err != nil || v != constant.NormalToken {
deleteTokenKey = append(deleteTokenKey, k) deleteTokenKey = append(deleteTokenKey, k)
} }
if v == constant.NormalToken {
isCreate = false
}
} }
if len(deleteTokenKey) != 0 { if len(deleteTokenKey) != 0 {
err = a.cache.DeleteTokenByUidPid(ctx, userID, platformID, deleteTokenKey) err = a.cache.DeleteTokenByUidPid(ctx, userID, platformID, deleteTokenKey)
@ -84,16 +80,8 @@ func (a *authDatabase) CreateToken(ctx context.Context, userID string, platformI
return "", errs.WrapMsg(err, "token.SignedString") return "", errs.WrapMsg(err, "token.SignedString")
} }
if isCreate {
// should create,should specify expiration time
if err = a.cache.SetTokenFlagEx(ctx, userID, platformID, tokenString, constant.NormalToken); err != nil { if err = a.cache.SetTokenFlagEx(ctx, userID, platformID, tokenString, constant.NormalToken); err != nil {
return "", err return "", err
} }
} else {
// should update
if err = a.cache.SetTokenFlag(ctx, userID, platformID, tokenString, constant.NormalToken); err != nil {
return "", err
}
}
return tokenString, nil return tokenString, nil
} }