github/rclone
1
Fork 0
mirror of https://github.com/rclone/rclone synced 2024-11-30 09:10:05 +01:00
Code Releases Activity

onedrive: fix failed to configure: empty token found error #3455

Browse Source 
This bug was caused as part of the config rework
This commit is contained in:
Nick Craig-Wood 2021-05-17 10:00:54 +01:00
parent 03229cf394
commit 6555d3eb33
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
backend/onedrive/onedrive.go
View File

@ -371,15 +371,9 @@ func chooseDrive(ctx context.Context, name string, m configmap.Mapper, srv *rest
// Config the backend // Config the backend
func Config(ctx context.Context, name string, m configmap.Mapper, config fs.ConfigIn) (*fs.ConfigOut, error) { func Config(ctx context.Context, name string, m configmap.Mapper, config fs.ConfigIn) (*fs.ConfigOut, error) {
oAuthClient, _, err := oauthutil.NewClient(ctx, name, m, oauthConfig)
if err != nil {
return nil, errors.Wrap(err, "failed to configure OneDrive")
}
srv := rest.NewClient(oAuthClient)
region, graphURL := getRegionURL(m) region, graphURL := getRegionURL(m)
switch config.State { if config.State == "" {
case "":
oauthConfig.Endpoint = oauth2.Endpoint{ oauthConfig.Endpoint = oauth2.Endpoint{
AuthURL: authEndpoint[region] + authPath, AuthURL: authEndpoint[region] + authPath,
TokenURL: authEndpoint[region] + tokenPath, TokenURL: authEndpoint[region] + tokenPath,
@ -387,6 +381,15 @@ func Config(ctx context.Context, name string, m configmap.Mapper, config fs.Conf
return oauthutil.ConfigOut("choose_type", &oauthutil.Options{ return oauthutil.ConfigOut("choose_type", &oauthutil.Options{
OAuth2Config: oauthConfig, OAuth2Config: oauthConfig,
}) })
}
oAuthClient, _, err := oauthutil.NewClient(ctx, name, m, oauthConfig)
if err != nil {
return nil, errors.Wrap(err, "failed to configure OneDrive")
}
srv := rest.NewClient(oAuthClient)
switch config.State {
case "choose_type": case "choose_type":
return fs.ConfigChooseFixed("choose_type_done", "config_type", "Type of connection", []fs.OptionExample{{ return fs.ConfigChooseFixed("choose_type_done", "config_type", "Type of connection", []fs.OptionExample{{
Value: "onedrive", Value: "onedrive",