Call beforeCommand() at switch as well

dhuan · May 7, 2022 · 979db6b · 979db6b
1 parent 93be6f4
commit 979db6b
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/internal/cmd/edit.go b/internal/cmd/edit.go
@@ -14,7 +14,7 @@ var editCmd = &cobra.Command{
 	Short: "Edit pages",
 	Args:  cobra.ExactArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
-		wikiConfig, apiCredentials, hookOptions := beforeCommand()
+		wikiConfig, apiCredentials, hookOptions := beforeCommand(true)
 		pageName := args[0]
 
 		page, err := mw.GetPage(

diff --git a/internal/cmd/export.go b/internal/cmd/export.go
@@ -22,7 +22,7 @@ var exportCmd = &cobra.Command{
 			os.Exit(1)
 		}
 
-		wikiConfig, apiCredentials, hook := beforeCommand()
+		wikiConfig, apiCredentials, hook := beforeCommand(true)
 		exportTo := args[0]
 
 		exportCount := 0

diff --git a/internal/cmd/import.go b/internal/cmd/import.go
@@ -17,7 +17,7 @@ var importCmd = &cobra.Command{
 	Use:   "import",
 	Short: "Import pages and images",
 	Run: func(cmd *cobra.Command, filePaths []string) {
-		wikiConfig, apiCredentials, hook := beforeCommand()
+		wikiConfig, apiCredentials, hook := beforeCommand(true)
 		userConfig, err := config.Get()
 		if err != nil {
 			panic(err)

diff --git a/internal/cmd/switch.go b/internal/cmd/switch.go
@@ -14,6 +14,8 @@ var switchCmd = &cobra.Command{
 	Short: "Switch between your available Wikis.",
 	Args:  cobra.ExactArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
+		beforeCommand(false)
+
 		configRoot, err := config.GetAll()
 		if err != nil {
 			panic(err)

diff --git a/internal/cmd/utils.go b/internal/cmd/utils.go
@@ -19,7 +19,7 @@ func handleErrorGettingApiCredentials(err error, user string, wikiAddress string
 	fmt.Println("Failed to get API Credentials.")
 }
 
-func beforeCommand() (*mw.Config, *mw.ApiCredentials, *mw.HookOptions) {
+func beforeCommand(withApiCredentials bool) (*mw.Config, *mw.ApiCredentials, *mw.HookOptions) {
 	userConfig, err := config.Get()
 	if errors.Is(err, config.ErrConfigDoesNotExist) {
 		fmt.Println("You don't seem to have a configuration file. Try 'wikicmd config' to initialize a new configuration.")
@@ -57,11 +57,14 @@ func beforeCommand() (*mw.Config, *mw.ApiCredentials, *mw.HookOptions) {
 		Password:    userConfig.Password,
 	}
 
-	apiCredentials, err := mw.GetApiCredentials(wikiConfig, hook)
-	if err != nil {
-		handleErrorGettingApiCredentials(err, userConfig.User, userConfig.Address)
+	apiCredentials := &mw.ApiCredentials{}
+	if withApiCredentials {
+		apiCredentials, err = mw.GetApiCredentials(wikiConfig, hook)
+		if err != nil {
+			handleErrorGettingApiCredentials(err, userConfig.User, userConfig.Address)
 
-		os.Exit(1)
+			os.Exit(1)
+		}
 	}
 
 	return wikiConfig, apiCredentials, hook