"rsync for cloud storage" - Google Drive, S3, Dropbox, Backblaze B2, One Drive, Swift, Hubic, Wasabi, Google Cloud Storage, Azure Blob, Azure Files, Yandex Files
Go azure-blobazure-blob-storageazure-filesbackblaze-b2cloud-storagedropboxencryptionftpfuse-filesystemgogolanggoogle-cloud-storagegoogle-driveonedriveopenstack-swiftrclones3sftpsyncwebdav
oauthutil: clarify token replacement prompt wording
KTibow7200e377dd40
diff --git a/backend/sugarsync/sugarsync.go b/backend/sugarsync/sugarsync.goindex 72a13710f..98b3d9581 100644--- a/backend/sugarsync/sugarsync.go+++ b/backend/sugarsync/sugarsync.go@@ -88,7 +88,7 @@ func init() {if opt.RefreshToken == "" {return fs.ConfigGoto("username")}- return fs.ConfigConfirm("refresh", true, "config_refresh", "Already have a token - refresh?")+ return fs.ConfigConfirm("refresh", true, "config_refresh", "Token already configured - replace it?")case "refresh":if config.Result == "false" {return nil, nildiff --git a/docs/content/box.md b/docs/content/box.mdindex 0be92db8f..613c750c2 100644--- a/docs/content/box.md+++ b/docs/content/box.md@@ -183,7 +183,7 @@ y) Yesn) Noy/n> nRemote config-Already have a token - refresh?+Token already configured - replace it?y) Yesn) Noy/n> ydiff --git a/docs/content/drive.md b/docs/content/drive.mdindex 39400783f..cfcea6ec7 100644--- a/docs/content/drive.md+++ b/docs/content/drive.md@@ -2009,7 +2009,7 @@ Scroll down and click "+ Add users". Add yourself as a test user and press save.10. Provide the noted client ID and client secret to rclone.11. Run the web-based authorization flow from within `rclone config`, by answering- "Y" when it asks "Already have a token - refresh?".+ "Y" when it asks "Token already configured - replace it?".Be aware that, due to the "enhanced security" recently introduced byGoogle, you are theoretically expected to "submit your app for verification"diff --git a/docs/content/onedrive.md b/docs/content/onedrive.mdindex a2f2dfa20..806e76d0b 100644--- a/docs/content/onedrive.md+++ b/docs/content/onedrive.md@@ -1243,7 +1243,7 @@ If you see the error above after enabling multi-factor authentication for youraccount, you can fix it by refreshing your OAuth refresh token. To do that, run`rclone config`, and choose to edit your OneDrive backend. Then, you don't needto actually make any changes until you reach this question:-`Already have a token - refresh?`. For this question, answer `y` and go through+`Token already configured - replace it?`. For this question, answer `y` and go throughthe process to refresh your token, just like the first time the backend isconfigured. After this, rclone should work again for this backend.diff --git a/lib/oauthutil/oauthutil.go b/lib/oauthutil/oauthutil.goindex d0a8edaae..347faea95 100644--- a/lib/oauthutil/oauthutil.go+++ b/lib/oauthutil/oauthutil.go@@ -624,7 +624,7 @@ func ConfigOAuth(ctx context.Context, name string, m configmap.Mapper, ri *fs.Re// See if already have a tokentokenString, ok := m.Get("token")if ok && tokenString != "" {- return fs.ConfigConfirm(newState("*oauth-confirm"), true, "config_refresh_token", "Already have a token - refresh?")+ return fs.ConfigConfirm(newState("*oauth-confirm"), true, "config_refresh_token", "Token already configured - replace it?")}return fs.ConfigGoto(newState("*oauth-confirm"))case "*oauth-confirm":