From d1377262e35a3c33bea5888ba801800941728945 Mon Sep 17 00:00:00 2001 From: HFO4 <912394456@qq.com> Date: Sun, 14 Mar 2021 10:26:45 +0800 Subject: [PATCH] Fix: ignore requiring SharePoint site ID after edit / nil pointer in user setting routers --- routers/controllers/user.go | 2 ++ service/callback/oauth.go | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/routers/controllers/user.go b/routers/controllers/user.go index 77a5426..7a10980 100644 --- a/routers/controllers/user.go +++ b/routers/controllers/user.go @@ -349,6 +349,8 @@ func UpdateOption(c *gin.Context) { subService = &user.DeleteWebAuthn{} case "theme": subService = &user.ThemeChose{} + default: + subService = &user.ChangerNick{} } subErr = c.ShouldBindJSON(subService) diff --git a/service/callback/oauth.go b/service/callback/oauth.go index cbbe6d2..7aae847 100644 --- a/service/callback/oauth.go +++ b/service/callback/oauth.go @@ -10,6 +10,7 @@ import ( "github.com/cloudreve/Cloudreve/v3/pkg/serializer" "github.com/cloudreve/Cloudreve/v3/pkg/util" "github.com/gin-gonic/gin" + "strings" ) // OneDriveOauthService OneDrive 授权回调服务 @@ -54,7 +55,7 @@ func (service *OneDriveOauthService) Auth(c *gin.Context) serializer.Response { } cache.Deletes([]string{client.Policy.AccessKey}, "onedrive_") - if client.Policy.OptionsSerialized.OdDriver != "" { + if client.Policy.OptionsSerialized.OdDriver != "" && strings.Contains(client.Policy.OptionsSerialized.OdDriver, "http") { if err := querySharePointSiteID(c, client.Policy); err != nil { return serializer.Err(serializer.CodeInternalSetting, "无法查询 SharePoint 站点 ID", err) }