# HG changeset patch
# User Mikael Berthe <mikael@lilotux.net>
# Date 1547380730 -3600
# Node ID 910f00ab279966535a4e5cef449d91f33c95c1f9
# Parent  a01bc98ae01a05f0c4c7ea4d877ad7917efa6f40
Fix oauth2 not displaying the new token

If the configuration file contains an old token, this token was
displayed after an oauth2 renewal instead of the new one.

diff -r a01bc98ae01a -r 910f00ab2799 cmd/config.go
--- a/cmd/config.go	Sun Jan 13 12:33:24 2019 +0100
+++ b/cmd/config.go	Sun Jan 13 12:58:50 2019 +0100
@@ -84,20 +84,23 @@
 ...
 `
 
-func configDump(force bool) error {
-	if !force && viper.GetBool("safe_mode") {
-		errPrint("Cannot dump: disabled by configuration (safe_mode)")
-		return nil
-	}
+func configDump(oauth2 bool) error {
+	if !oauth2 {
+		if viper.GetBool("safe_mode") {
+			errPrint("Cannot dump: disabled by configuration (safe_mode)")
+			return nil
+		}
 
-	if err := madonInitClient(); err != nil {
-		return err
-	}
-	// Try to sign in if a login was provided
-	if viper.GetString("token") != "" || viper.GetString("login") != "" {
-		if err := madonLogin(); err != nil {
-			errPrint("Error: could not log in: %v", err)
-			os.Exit(-1)
+		if err := madonInitClient(); err != nil {
+			return err
+		}
+
+		// Try to sign in if a login was provided
+		if viper.GetString("token") != "" || viper.GetString("login") != "" {
+			if err := madonLogin(); err != nil {
+				errPrint("Error: could not log in: %v", err)
+				os.Exit(-1)
+			}
 		}
 	}
 
diff -r a01bc98ae01a -r 910f00ab2799 cmd/oauth2.go
--- a/cmd/oauth2.go	Sun Jan 13 12:33:24 2019 +0100
+++ b/cmd/oauth2.go	Sun Jan 13 12:58:50 2019 +0100
@@ -88,6 +88,7 @@
 
 	if gClient.UserToken != nil {
 		errPrint("Login successful.\n")
+		errPrint("The new token is %s.\n", gClient.UserToken.AccessToken)
 		configDump(true)
 	}
 	return nil