1128 - introduce Prompter.Display method

pkg/prompter/pinentry.go

@@ -81,7 +81,10 @@ func (p *PinentryPrompter) String(pr string, defaultValue string) string {
 func (p *PinentryPrompter) Password(pr string) string {
 	return p.DefaultPrompter.Password(pr)
 }
-
+// Display is runniner the default Cli Display
+func (p *PinentryPrompter) Display(pr string) {
+	p.DefaultPrompter.Display(pr)
+}
 // Run wraps a pinentry run. It sends the query to pinentry via stdin and
 // reads its stdout to determine the user PIN.
 // Pinentry uses an Assuan protocol

pkg/prompter/pinentry_test.go

@@ -36,6 +36,7 @@ type FakeDefaultPrompter struct {
 	CalledString              bool
 	CalledStringRequired      bool
 	CalledPassword            bool
+	CalledDisplay             bool
 }
 
 // all the functions to implement the Prompter interface
@@ -63,7 +64,9 @@ func (f *FakeDefaultPrompter) Password(p string) string {
 	f.CalledPassword = true
 	return ""
 }
-
+func (f *FakeDefaultPrompter) Display(p string) {
+	f.CalledDisplay = true
+}
 func TestValidateAndSetPrompterShouldFailWithWrongInput(t *testing.T) {
 
 	// backing up the current prompters for the other tests
@@ -125,6 +128,9 @@ func TestChecksPinentryPrompterDefault(t *testing.T) {
 
 	_ = p.Password("random")
 	assert.True(t, fakeDefaultPrompter.CalledPassword)
+
+	p.Display("random")
+	assert.True(t, fakeDefaultPrompter.CalledDisplay)
 }
 
 func TestChecksPinentryPrompterCallsPinentryForRequestSecurityCode(t *testing.T) {

pkg/prompter/prompter.go

@@ -16,6 +16,7 @@ type Prompter interface {
 	StringRequired(string) string
 	String(string, string) string
 	Password(string) string
+	Display(string)
 }
 
 // SetPrompter configure an aternate prompter to the default one
@@ -79,3 +80,8 @@ func String(pr string, defaultValue string) string {
 func Password(pr string) string {
 	return ActivePrompter.Password(pr)
 }
+
+// Display prompt, no user input required
+func Display(pr string) {
+	ActivePrompter.Display(pr)
+}

pkg/prompter/survey.go

@@ -108,3 +108,7 @@ func (cli *CliPrompter) Password(pr string) string {
 	_ = survey.AskOne(prompt, &val, stdioOption())
 	return val
 }
+
+func (cli *CliPrompter) Display(pr string) {
+	_, _ = os.Stderr.WriteString(pr + "\n")
+}

pkg/provider/aad/aad.go

@@ -6,10 +6,8 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"log"
 	"net/http"
 	"net/url"
-	"os"
 	"strings"
 	"time"
 
@@ -464,12 +462,9 @@ func (ac *Client) processMfa(mfas []userProof, convergedResponse *ConvergedRespo
 		}
 		if mfaReq.AuthMethodID == "PhoneAppNotification" && i == 0 {
 			if mfaResp.Entropy == 0 {
-				log.Println("Phone approval required.")
+				prompter.Display("Phone approval required.")
 			} else {
-				prevWriter := log.Writer()
-				log.SetOutput(os.Stderr)
-				log.Printf("Phone approval required. Entropy is: %d", mfaResp.Entropy)
-				log.SetOutput(prevWriter)
+				prompter.Display(fmt.Sprintf("Phone approval required. Entropy is: %d", mfaResp.Entropy))
 			}
 		}
 

pkg/provider/aad/aad_test.go

@@ -8,6 +8,7 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
+	"github.com/stretchr/testify/mock"
 	"io"
 	"math"
 	mrand "math/rand"
@@ -412,6 +413,9 @@ func Test_Authenticate(t *testing.T) {
 		}))
 		defer ts.Close()
 
+		pr := prompter.NewCli()
+		prompter.SetPrompter(pr)
+
 		ac, loginDetails := setupTestClient(t, ts)
 
 		orig := os.Stderr
@@ -481,6 +485,7 @@ func Test_Authenticate(t *testing.T) {
 		pr := &mocks.Prompter{}
 		prompter.SetPrompter(pr)
 		pr.Mock.On("StringRequired", "Enter verification code").Return("000000")
+		pr.Mock.On("Display", mock.Anything).Return()
 
 		ac, loginDetails := setupTestClient(t, ts)
 		got, err := ac.Authenticate(loginDetails)