From a13d7ec5a1ee2253401f40885d21530138f9c619 Mon Sep 17 00:00:00 2001
From: Matt Moyer <moyerm@vmware.com>
Date: Tue, 6 Oct 2020 15:59:14 -0500
Subject: [PATCH] Remove temporary --debug-auth-code-exchange flag for OIDC
 client CLI.

Signed-off-by: Matt Moyer <moyerm@vmware.com>
---
 cmd/pinniped/cmd/login_oidc.go | 34 ++++++----------------------------
 1 file changed, 6 insertions(+), 28 deletions(-)

diff --git a/cmd/pinniped/cmd/login_oidc.go b/cmd/pinniped/cmd/login_oidc.go
index e9287d43..41602714 100644
--- a/cmd/pinniped/cmd/login_oidc.go
+++ b/cmd/pinniped/cmd/login_oidc.go
@@ -11,7 +11,6 @@ import (
 	"github.com/spf13/cobra"
 	"golang.org/x/oauth2"
 
-	"go.pinniped.dev/internal/here"
 	"go.pinniped.dev/internal/oidc/pkce"
 	"go.pinniped.dev/internal/oidc/state"
 )
@@ -27,13 +26,12 @@ func init() {
 
 type oidcLoginParams struct {
 	// These parameters capture CLI flags.
-	issuer        string
-	clientID      string
-	listenPort    uint16
-	scopes        []string
-	skipBrowser   bool
-	usePKCE       bool
-	debugAuthCode bool
+	issuer      string
+	clientID    string
+	listenPort  uint16
+	scopes      []string
+	skipBrowser bool
+	usePKCE     bool
 
 	// These parameters capture dependencies that we want to mock during testing.
 	generateState func() (state.State, error)
@@ -56,11 +54,6 @@ func (o *oidcLoginParams) cmd() *cobra.Command {
 	cmd.Flags().BoolVar(&o.skipBrowser, "skip-browser", false, "Skip opening the browser (just print the URL).")
 	cmd.Flags().BoolVar(&o.usePKCE, "use-pkce", true, "Use Proof Key for Code Exchange (RFC 7636) during login.")
 	mustMarkRequired(&cmd, "issuer", "client-id")
-
-	// TODO: temporary
-	cmd.Flags().BoolVar(&o.debugAuthCode, "debug-auth-code-exchange", true, "Debug the authorization code exchange (temporary).")
-	_ = cmd.Flags().MarkHidden("debug-auth-code-exchange")
-
 	return &cmd
 }
 
@@ -107,20 +100,5 @@ func (o *oidcLoginParams) runE(cmd *cobra.Command, args []string) error {
 		return fmt.Errorf("could not open browser (run again with --skip-browser?): %w", err)
 	}
 
-	// TODO: this temporary so we can complete the auth code exchange manually
-
-	if o.debugAuthCode {
-		cmd.PrintErr(here.Docf(`
-			DEBUG INFO:
-				Token URL: %s
-					State: %s
-				     PKCE: %s
-			`,
-			cfg.Endpoint.TokenURL,
-			stateParam,
-			pkceCode.Verifier(),
-		))
-	}
-
 	return nil
 }