llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-05-22 18:25:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: use user.UpdatedTime as scim.Meta.Version instead of user.Id (#2406)

Browse Source 
* 111

* fix: use user.UpdatedTime as scim.Meta.Version instead of user.Id

---------

Co-authored-by: hsluoyz <hsluoyz@qq.com>
This commit is contained in:
haiwu 2023-10-14 11:03:58 +08:00 committed by GitHub
parent 43d849086f
commit 3d80ec721f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scim/util.go
View File

@ -96,10 +96,13 @@ func buildExternalId(user *object.User) optional.String {
func buildMeta(user *object.User) scim.Meta { func buildMeta(user *object.User) scim.Meta {
createdTime := util.String2Time(user.CreatedTime) createdTime := util.String2Time(user.CreatedTime)
updatedTime := util.String2Time(user.UpdatedTime) updatedTime := util.String2Time(user.UpdatedTime)
if user.UpdatedTime == "" {
updatedTime = createdTime
}
return scim.Meta{ return scim.Meta{
Created: &createdTime, Created: &createdTime,
LastModified: &updatedTime, LastModified: &updatedTime,
Version: user.Id, Version: util.Time2String(updatedTime),
} }
} }

4
util/time.go
View File

@ -54,6 +54,10 @@ func String2Time(timestamp string) time.Time {
return parseTime return parseTime
} }
func Time2String(timestamp time.Time) string {
return timestamp.Format(time.RFC3339)
}
func IsTokenExpired(createdTime string, expiresIn int) bool { func IsTokenExpired(createdTime string, expiresIn int) bool {
createdTimeObj, _ := time.Parse(time.RFC3339, createdTime) createdTimeObj, _ := time.Parse(time.RFC3339, createdTime)
expiresAtObj := createdTimeObj.Add(time.Duration(expiresIn) * time.Second) expiresAtObj := createdTimeObj.Add(time.Duration(expiresIn) * time.Second)