github
/
alist
mirror of https://github.com/Xhofe/alist
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: incorrect key of oidc username (close #5670)

pull/5693/head
Andy Hsu 2023-12-10 13:17:56 +08:00
parent 026e944cbb
commit 296be88b5f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/aliyundrive_open/driver.go
View File

@ -80,7 +80,7 @@ func (d *AliyundriveOpen) link(ctx context.Context, file model.Obj) (*model.Link
req.SetBody(base.Json{ req.SetBody(base.Json{
"drive_id": d.DriveId, "drive_id": d.DriveId,
"file_id": file.GetID(), "file_id": file.GetID(),
"expire_sec": 900, "expire_sec": 14400,
}) })
}) })
if err != nil { if err != nil {
@ -207,7 +207,7 @@ func (d *AliyundriveOpen) Other(ctx context.Context, args model.OtherArgs) (inte
case "video_preview": case "video_preview":
uri = "/adrive/v1.0/openFile/getVideoPreviewPlayInfo" uri = "/adrive/v1.0/openFile/getVideoPreviewPlayInfo"
data["category"] = "live_transcoding" data["category"] = "live_transcoding"
data["url_expire_sec"] = 900 data["url_expire_sec"] = 14400
default: default:
return nil, errs.NotSupport return nil, errs.NotSupport
} }

2
server/handles/ssologin.go
View File

@ -231,7 +231,7 @@ func OIDCLoginCallback(c *gin.Context) {
common.ErrorResp(c, err, 400) common.ErrorResp(c, err, 400)
return return
} }
userID := utils.Json.Get(payload, conf.SSOOIDCUsernameKey).ToString() userID := utils.Json.Get(payload, setting.GetStr(conf.SSOOIDCUsernameKey, "name")).ToString()
if userID == "" { if userID == "" {
common.ErrorStrResp(c, "cannot get username from OIDC provider", 400) common.ErrorStrResp(c, "cannot get username from OIDC provider", 400)
return return