Merge pull request #651 from exercism/no-base-url

Ensure welcome message has full link to settings

Author: Katrina Owen

cmd/configure.go

@@ -60,14 +60,8 @@ func runConfigure(configuration config.Configuration, flags *pflag.FlagSet) erro
 	// If the command is run 'bare' and we have no token,
 	// explain how to set the token.
 	if flags.NFlag() == 0 && cfg.GetString("token") == "" {
-		baseURL := cfg.GetString("apibaseurl")
-		if baseURL != "" {
-			// If we have a base URL, then give the exact link.
-			tokenURL := config.InferSiteURL(baseURL) + "/my/settings"
-			return fmt.Errorf("There is no token configured. Find your token on %s, and call this command again with --token=<your-token>.", tokenURL)
-		}
-		// If we don't, then do our best.
-		return fmt.Errorf("There is no token configured. Find your token in your settings on the website, and call this command again with --token=<your-token>.")
+		tokenURL := config.SettingsURL(cfg.GetString("apibaseurl"))
+		return fmt.Errorf("There is no token configured. Find your token on %s, and call this command again with --token=<your-token>.", tokenURL)
 	}
 
 	// Determine the base API URL.
@@ -114,8 +108,7 @@ func runConfigure(configuration config.Configuration, flags *pflag.FlagSet) erro
 		token = cfg.GetString("token")
 	}
 
-	// Infer the URL where the token can be found.
-	tokenURL := config.InferSiteURL(cfg.GetString("apibaseurl")) + "/my/settings"
+	tokenURL := config.SettingsURL(cfg.GetString("apibaseurl"))
 
 	// If we don't have a token then explain how to set it and bail.
 	if token == "" {

cmd/download.go

@@ -49,8 +49,7 @@ Download other people's solutions by providing the UUID.
 func runDownload(cfg config.Configuration, flags *pflag.FlagSet, args []string) error {
 	usrCfg := cfg.UserViperConfig
 	if usrCfg.GetString("token") == "" {
-		tokenURL := config.InferSiteURL(usrCfg.GetString("apibaseurl")) + "/my/settings"
-		return fmt.Errorf(msgWelcomePleaseConfigure, tokenURL, BinaryName)
+		return fmt.Errorf(msgWelcomePleaseConfigure, config.SettingsURL(usrCfg.GetString("apibaseurl")), BinaryName)
 	}
 	if usrCfg.GetString("workspace") == "" || usrCfg.GetString("apibaseurl") == "" {
 		return fmt.Errorf(msgRerunConfigure, BinaryName)

cmd/download_test.go

@@ -23,6 +23,8 @@ func TestDownloadWithoutToken(t *testing.T) {
 	err := runDownload(cfg, pflag.NewFlagSet("fake", pflag.PanicOnError), []string{})
 	if assert.Error(t, err) {
 		assert.Regexp(t, "Welcome to Exercism", err.Error())
+		// It uses the default base API url to infer the host
+		assert.Regexp(t, "exercism.io/my/settings", err.Error())
 	}
 }
 

cmd/submit.go

@@ -53,8 +53,7 @@ func runSubmit(cfg config.Configuration, flags *pflag.FlagSet, args []string) er
 	usrCfg := cfg.UserViperConfig
 
 	if usrCfg.GetString("token") == "" {
-		tokenURL := config.InferSiteURL(usrCfg.GetString("apibaseurl")) + "/my/settings"
-		return fmt.Errorf(msgWelcomePleaseConfigure, tokenURL, BinaryName)
+		return fmt.Errorf(msgWelcomePleaseConfigure, config.SettingsURL(usrCfg.GetString("apibaseurl")), BinaryName)
 	}
 
 	if usrCfg.GetString("workspace") == "" {

cmd/submit_test.go

@@ -19,11 +19,11 @@ func TestSubmitWithoutToken(t *testing.T) {
 	cfg := config.Configuration{
 		Persister:       config.InMemoryPersister{},
 		UserViperConfig: viper.New(),
-		DefaultBaseURL:  "http://example.com",
 	}
 
 	err := runSubmit(cfg, pflag.NewFlagSet("fake", pflag.PanicOnError), []string{})
 	assert.Regexp(t, "Welcome to Exercism", err.Error())
+	assert.Regexp(t, "exercism.io/my/settings", err.Error())
 }
 
 func TestSubmitWithoutWorkspace(t *testing.T) {

config/config.go

@@ -69,9 +69,17 @@ func ensureDir(f filer) error {
 // InferSiteURL guesses what the website URL is.
 // The basis for the guess is which API we're submitting to.
 func InferSiteURL(apiURL string) string {
+	if apiURL == "" {
+		apiURL = defaultBaseURL
+	}
 	if apiURL == "https://api.exercism.io/v1" {
 		return "https://exercism.io"
 	}
 	re := regexp.MustCompile("^(https?://[^/]*).*")
 	return re.ReplaceAllString(apiURL, "$1")
 }
+
+// SettingsURL provides a link to where the user can find their API token.
+func SettingsURL(apiURL string) string {
+	return fmt.Sprintf("%s%s", InferSiteURL(apiURL), "/my/settings")
+}

config/config_test.go

@@ -104,6 +104,7 @@ func TestInferSiteURL(t *testing.T) {
 		{"https://v2.exercism.io/api/v1", "https://v2.exercism.io"},
 		{"https://mentors-beta.exercism.io/api/v1", "https://mentors-beta.exercism.io"},
 		{"http://localhost:3000/api/v1", "http://localhost:3000"},
+		{"", "https://exercism.io"},            // use the default
 		{"http://whatever", "http://whatever"}, // you're on your own, pal
 	}