f-denkena/rclone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

onedrive: fix 403 Forbidden for configuration personal onedrive

Browse Source
This commit is contained in:
machsix
2026-08-25 09:32:52 +01:00
committed by Nick Craig-Wood
parent d3a71eea36
commit 8869a848f2
1 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/onedrive/onedrive.go
+22 -19
View File
@@ -549,31 +549,34 @@ func chooseDrive(ctx context.Context, name string, m configmap.Mapper, srv *rest
// We don't have the final ID yet?
// query Microsoft Graph
if opt.finalDriveID == "" {
_, err := srv.CallJSON(ctx, &opt.opts, nil, &drives)
if err != nil {
return fs.ConfigError("choose_type", fmt.Sprintf("Failed to query available drives: %v", err))
_, drivesErr := srv.CallJSON(ctx, &opt.opts, nil, &drives)
if drivesErr != nil {
fs.Debugf(nil, "Failed to query /me/drives: %v - trying /me/drive", drivesErr)
}
// Also call /me/drive as sometimes /me/drives doesn't return it #4068
if opt.opts.Path == "/me/drives" {
opt.opts.Path = "/me/drive"
meDriveOpts := opt.opts
meDriveOpts.Path = "/me/drive"
meDrive := api.DriveResource{}
_, err := srv.CallJSON(ctx, &opt.opts, nil, &meDrive)
if err != nil {
return fs.ConfigError("choose_type", fmt.Sprintf("Failed to query available drives: %v", err))
}
found := false
for _, drive := range drives.Drives {
if drive.DriveID == meDrive.DriveID {
found = true
break
_, meDriveErr := srv.CallJSON(ctx, &meDriveOpts, nil, &meDrive)
if meDriveErr == nil {
found := false
for _, drive := range drives.Drives {
if drive.DriveID == meDrive.DriveID {
found = true
break
}
}
// add the me drive if not found already
if !found {
fs.Debugf(nil, "Adding %v to drives list from /me/drive", meDrive)
drives.Drives = append(drives.Drives, meDrive)
}
} else if drivesErr != nil {
return fs.ConfigError("choose_type", fmt.Sprintf("Failed to query available drives: /me/drives: %v; /me/drive: %v", drivesErr, meDriveErr))
}
// add the me drive if not found already
if !found {
fs.Debugf(nil, "Adding %v to drives list from /me/drive", meDrive)
drives.Drives = append(drives.Drives, meDrive)
}
} else if drivesErr != nil {
return fs.ConfigError("choose_type", fmt.Sprintf("Failed to query available drives: %v", drivesErr))
}
} else {
drives.Drives = append(drives.Drives, api.DriveResource{