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

oauthutil: don't show "save failed" error when setting up new remote – fixes #1466

Browse Source
This commit is contained in:
Stefan Breunig 2017-08-05 12:04:42 +02:00
parent 38dabcf6b2
commit b523cfc01d
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
oauthutil/oauthutil.go
View File

@ -78,7 +78,7 @@ func getToken(name string) (*oauth2.Token, error) {
token.RefreshToken = oldtoken.RefreshToken token.RefreshToken = oldtoken.RefreshToken
token.Expiry = oldtoken.Expiry token.Expiry = oldtoken.Expiry
// Save new format in config file // Save new format in config file
err = putToken(name, token) err = putToken(name, token, false)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -88,7 +88,7 @@ func getToken(name string) (*oauth2.Token, error) {
// putToken stores the token in the config file // putToken stores the token in the config file
// //
// This saves the config file if it changes // This saves the config file if it changes
func putToken(name string, token *oauth2.Token) error { func putToken(name string, token *oauth2.Token, newSection bool) error {
tokenBytes, err := json.Marshal(token) tokenBytes, err := json.Marshal(token)
if err != nil { if err != nil {
return err return err
@ -97,7 +97,9 @@ func putToken(name string, token *oauth2.Token) error {
old := fs.ConfigFileGet(name, fs.ConfigToken) old := fs.ConfigFileGet(name, fs.ConfigToken)
if tokenString != old { if tokenString != old {
err = fs.ConfigSetValueAndSave(name, fs.ConfigToken, tokenString) err = fs.ConfigSetValueAndSave(name, fs.ConfigToken, tokenString)
if err != nil { if newSection && err != nil {
fs.Debugf(name, "Added new token to config, still needs to be saved")
} else if err != nil {
fs.Errorf(nil, "Failed to save new token in config file: %v", err) fs.Errorf(nil, "Failed to save new token in config file: %v", err)
} else { } else {
fs.Debugf(name, "Saved new token in config file") fs.Debugf(name, "Saved new token in config file")
@ -142,7 +144,7 @@ func (ts *TokenSource) Token() (*oauth2.Token, error) {
if ts.expiryTimer != nil { if ts.expiryTimer != nil {
ts.expiryTimer.Reset(ts.timeToExpiry()) ts.expiryTimer.Reset(ts.timeToExpiry())
} }
err = putToken(ts.name, token) err = putToken(ts.name, token, false)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -307,7 +309,7 @@ func doConfig(id, name string, config *oauth2.Config, offline bool, opts []oauth
if err != nil { if err != nil {
return err return err
} }
return putToken(name, token) return putToken(name, token, false)
} }
case TitleBarRedirectURL: case TitleBarRedirectURL:
useWebServer = automatic useWebServer = automatic
@ -383,7 +385,7 @@ func doConfig(id, name string, config *oauth2.Config, offline bool, opts []oauth
} }
fmt.Printf("Paste the following into your remote machine --->\n%s\n<---End paste", result) fmt.Printf("Paste the following into your remote machine --->\n%s\n<---End paste", result)
} }
return putToken(name, token) return putToken(name, token, true)
} }
// Local web server for collecting auth // Local web server for collecting auth