revert: login specific prompt logic

Author: zimeg

cmd/auth/login.go

@@ -18,8 +18,6 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/slackapi/slack-cli/internal/config"
-	"github.com/slackapi/slack-cli/internal/experiment"
 	"github.com/slackapi/slack-cli/internal/iostreams"
 	authpkg "github.com/slackapi/slack-cli/internal/pkg/auth"
 	"github.com/slackapi/slack-cli/internal/shared"
@@ -111,7 +109,7 @@ func RunLoginCommand(clients *shared.ClientFactory, cmd *cobra.Command) (types.S
 			return types.SlackAuth{}, err
 		}
 		if selectedAuth.Token != "" {
-			printAuthSuccess(cmd, clients.Config, clients.IO, credentialsPath, selectedAuth.Token)
+			printAuthSuccess(cmd, clients.IO, credentialsPath, selectedAuth.Token)
 			printAuthNextSteps(ctx, clients)
 		}
 		return selectedAuth, err
@@ -121,14 +119,14 @@ func RunLoginCommand(clients *shared.ClientFactory, cmd *cobra.Command) (types.S
 	if err != nil {
 		return types.SlackAuth{}, err
 	} else {
-		printAuthSuccess(cmd, clients.Config, clients.IO, credentialsPath, selectedAuth.Token)
+		printAuthSuccess(cmd, clients.IO, credentialsPath, selectedAuth.Token)
 		printAuthNextSteps(ctx, clients)
 	}
 
 	return selectedAuth, nil
 }
 
-func printAuthSuccess(cmd *cobra.Command, config *config.Config, IO iostreams.IOStreamer, credentialsPath string, token string) {
+func printAuthSuccess(cmd *cobra.Command, IO iostreams.IOStreamer, credentialsPath string, token string) {
 	ctx := cmd.Context()
 
 	var secondaryLog string
@@ -138,13 +136,7 @@ func printAuthSuccess(cmd *cobra.Command, config *config.Config, IO iostreams.IO
 		secondaryLog = fmt.Sprintf("Service token:\n\n  %s\n\nMake sure to copy the token now and save it safely.", token)
 	}
 
-	// The legacy prompt leaves no blank line before the success message, so
-	// print one here. The Charm-based prompt already handles spacing.
-	if !config.WithExperimentOn(experiment.Charm) {
-		IO.PrintInfo(ctx, false, "")
-	}
-
-	IO.PrintInfo(ctx, false, "%s", style.Sectionf(style.TextSection{
+	IO.PrintInfo(ctx, false, "\n%s", style.Sectionf(style.TextSection{
 		Emoji:     "key",
 		Text:      "You've successfully authenticated!",
 		Secondary: []string{secondaryLog},

internal/pkg/auth/login.go

@@ -20,12 +20,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/charmbracelet/huh"
 	"github.com/opentracing/opentracing-go"
 	"github.com/slackapi/slack-cli/internal/api"
 	"github.com/slackapi/slack-cli/internal/auth"
 	"github.com/slackapi/slack-cli/internal/config"
-	"github.com/slackapi/slack-cli/internal/experiment"
 	"github.com/slackapi/slack-cli/internal/iostreams"
 	"github.com/slackapi/slack-cli/internal/pkg/version"
 	"github.com/slackapi/slack-cli/internal/shared"
@@ -142,27 +140,11 @@ func createNewAuth(ctx context.Context, apiClient api.APIInterface, authClient a
 		return types.SlackAuth{}, "", err
 	}
 
-	challengeCode := ""
-	if !config.WithExperimentOn(experiment.Charm) {
-		challengeCode, err = io.InputPrompt(ctx, "Enter challenge code", iostreams.InputPromptConfig{
-			Required: true,
-		})
-		if err != nil {
-			return types.SlackAuth{}, "", err
-		}
-	} else {
-		form := huh.NewForm(
-			huh.NewGroup(
-				huh.NewInput().
-					Title("Enter challenge code").
-					Validate(huh.ValidateMinLength(1)).
-					Value(&challengeCode),
-			),
-		)
-		err := form.Run()
-		if err != nil {
-			return types.SlackAuth{}, "", err
-		}
+	challengeCode, err := io.InputPrompt(ctx, "Enter challenge code", iostreams.InputPromptConfig{
+		Required: true,
+	})
+	if err != nil {
+		return types.SlackAuth{}, "", err
 	}
 
 	authExchangeRes, err := apiClient.ExchangeAuthTicket(ctx, authTicket, challengeCode, version.Get())