extern/rclone
1
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2024-12-23 23:49:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

onedrive: Add option to choose resourceURL during setup of OneDrive Business account if more than one is avauilable for user

Browse Source
This commit is contained in:
Oliver Heyme 2017-10-28 18:48:39 +02:00 committed by Nick Craig-Wood
parent 245edd1b0e
commit 682b4d54c5
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
onedrive/onedrive.go
View File

@ -135,25 +135,31 @@ func init() {
return return
} }
foundService := "" var resourcesURL []string
var resourcesID []string
for _, service := range services.Services { for _, service := range services.Services {
if service.ServiceAPIVersion == "v2.0" { if service.ServiceAPIVersion == "v2.0" {
foundService = service.ServiceResourceID resourcesID = append(resourcesID, service.ServiceResourceID)
fs.ConfigFileSet(name, configResourceURL, foundService) resourcesURL = append(resourcesURL, service.ServiceEndpointURI)
oauthBusinessResource = oauth2.SetAuthURLParam("resource", foundService)
fs.Logf(nil, "Found API %s endpoint %s", service.ServiceAPIVersion, service.ServiceEndpointURI)
break
} }
// we only support 2.0 API // we only support 2.0 API
fs.Infof(nil, "Skipping API %s endpoint %s", service.ServiceAPIVersion, service.ServiceEndpointURI) fs.Infof(nil, "Skipping API %s endpoint %s", service.ServiceAPIVersion, service.ServiceEndpointURI)
} }
if foundService == "" { var foundService string
if len(resourcesID) == 0 {
fs.Errorf(nil, "No Service found") fs.Errorf(nil, "No Service found")
return return
} else if len(resourcesID) == 1 {
foundService = resourcesID[0]
} else {
foundService = fs.Choose("Choose resource URL", resourcesID, resourcesURL, false)
} }
fs.ConfigFileSet(name, configResourceURL, foundService)
oauthBusinessResource = oauth2.SetAuthURLParam("resource", foundService)
// get the token from the inital config // get the token from the inital config
// we need to update the token with a resource // we need to update the token with a resource
// specific token we will query now // specific token we will query now