Merge pull request #369 from secrethub/feature/remove-unauthenticated-client

Remove unauthenticated client

Author: SimonBarendse

internals/secrethub/app.go

@@ -175,7 +175,7 @@ func (app *App) registerCommands() {
 	NewEnvCommand(app.io, app.clientFactory.NewClient).Register(app.cli)
 
 	// Commands
-	NewInitCommand(app.io, app.clientFactory.NewUnauthenticatedClient, app.clientFactory.NewClientWithCredentials, app.credentialStore).Register(app.cli)
+	NewInitCommand(app.io, app.clientFactory.NewClientWithCredentials, app.credentialStore).Register(app.cli)
 	NewSignUpCommand(app.io).Register(app.cli)
 	NewWriteCommand(app.io, app.clientFactory.NewClient).Register(app.cli)
 	NewReadCommand(app.io, app.clientFactory.NewClient).Register(app.cli)

internals/secrethub/client_factory.go

@@ -20,7 +20,6 @@ type ClientFactory interface {
 	// NewClient returns a new SecretHub client.
 	NewClient() (secrethub.ClientInterface, error)
 	NewClientWithCredentials(credentials.Provider) (secrethub.ClientInterface, error)
-	NewUnauthenticatedClient() (secrethub.ClientInterface, error)
 	Register(FlagRegisterer)
 }
 
@@ -89,17 +88,6 @@ func (f *clientFactory) NewClientWithCredentials(provider credentials.Provider)
 	return client, nil
 }
 
-func (f *clientFactory) NewUnauthenticatedClient() (secrethub.ClientInterface, error) {
-	options := f.baseClientOptions()
-
-	client, err := secrethub.NewClient(options...)
-	if err != nil {
-		return nil, err
-	}
-
-	return client, nil
-}
-
 func (f *clientFactory) baseClientOptions() []secrethub.ClientOption {
 	options := []secrethub.ClientOption{
 		secrethub.WithConfigDir(f.store.ConfigDir()),

internals/secrethub/client_factory_test.go

@@ -6,8 +6,11 @@ import (
 	"os"
 	"testing"
 
+	"github.com/secrethub/secrethub-go/internals/api"
 	"github.com/secrethub/secrethub-go/internals/assert"
+	"github.com/secrethub/secrethub-go/internals/auth"
 	"github.com/secrethub/secrethub-go/pkg/secrethub/credentials"
+	httpclient "github.com/secrethub/secrethub-go/pkg/secrethub/internals/http"
 
 	"github.com/secrethub/secrethub-cli/internals/cli/ui"
 )
@@ -42,10 +45,24 @@ func TestNewClientFactory_ProxyAddress(t *testing.T) {
 		proxyAddress:     proxyAddress,
 	}
 
-	client, err := factory.NewUnauthenticatedClient()
+	client, err := factory.NewClientWithCredentials(dummyCredential{})
 	assert.OK(t, err)
 
-	_, _ = client.Users().Create("test", "test@test.test", "test", credentials.CreateKey())
+	_, _ = client.Me().GetUser()
 	assert.OK(t, err)
 	assert.Equal(t, proxyReceivedRequest, true)
 }
+
+type dummyCredential struct {
+}
+
+type nopDecrypter struct {
+}
+
+func (n nopDecrypter) Unwrap(ciphertext *api.EncryptedData) ([]byte, error) {
+	return nil, nil
+}
+
+func (d dummyCredential) Provide(client *httpclient.Client) (auth.Authenticator, credentials.Decrypter, error) {
+	return auth.NopAuthenticator{}, nopDecrypter{}, nil
+}

internals/secrethub/init.go

@@ -25,17 +25,15 @@ type InitCommand struct {
 	setupCode                string
 	force                    bool
 	io                       ui.IO
-	newUnauthenticatedClient newClientFunc
 	newClientWithCredentials func(credentials.Provider) (secrethub.ClientInterface, error)
 	credentialStore          CredentialConfig
 	progressPrinter          progress.Printer
 }
 
 // NewInitCommand creates a new InitCommand.
-func NewInitCommand(io ui.IO, newUnauthenticatedClient newClientFunc, newClientWithCredentials func(credentials.Provider) (secrethub.ClientInterface, error), credentialStore CredentialConfig) *InitCommand {
+func NewInitCommand(io ui.IO, newClientWithCredentials func(credentials.Provider) (secrethub.ClientInterface, error), credentialStore CredentialConfig) *InitCommand {
 	return &InitCommand{
 		io:                       io,
-		newUnauthenticatedClient: newUnauthenticatedClient,
 		newClientWithCredentials: newClientWithCredentials,
 		credentialStore:          credentialStore,
 		progressPrinter:          progress.NewPrinter(io.Output(), 500*time.Millisecond),