Infrastructure/Cloudreve
0
Fork 0
Code Issues Pull requests Activity

Fix: ignore requiring SharePoint site ID after edit / nil pointer in user setting routers

Browse source
This commit is contained in:
HFO4 2021-03-14 10:26:45 +08:00
parent c9acf7e64e
commit d1377262e3
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
routers/controllers/user.go
View file

@ -349,6 +349,8 @@ func UpdateOption(c *gin.Context) {
subService = &user.DeleteWebAuthn{} subService = &user.DeleteWebAuthn{}
case "theme": case "theme":
subService = &user.ThemeChose{} subService = &user.ThemeChose{}
default:
subService = &user.ChangerNick{}
} }
subErr = c.ShouldBindJSON(subService) subErr = c.ShouldBindJSON(subService)

3
service/callback/oauth.go
View file

@ -10,6 +10,7 @@ import (
"github.com/cloudreve/Cloudreve/v3/pkg/serializer" "github.com/cloudreve/Cloudreve/v3/pkg/serializer"
"github.com/cloudreve/Cloudreve/v3/pkg/util" "github.com/cloudreve/Cloudreve/v3/pkg/util"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"strings"
) )
// OneDriveOauthService OneDrive 授权回调服务 // OneDriveOauthService OneDrive 授权回调服务
@ -54,7 +55,7 @@ func (service *OneDriveOauthService) Auth(c *gin.Context) serializer.Response {
} }
cache.Deletes([]string{client.Policy.AccessKey}, "onedrive_") 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 { if err := querySharePointSiteID(c, client.Policy); err != nil {
return serializer.Err(serializer.CodeInternalSetting, "无法查询 SharePoint 站点 ID", err) return serializer.Err(serializer.CodeInternalSetting, "无法查询 SharePoint 站点 ID", err)
} }