Merge pull request #368 from secrethub/feature/drop-signup

Drop signup command in favor of web-signup

Author: SimonBarendse

internals/secrethub/app.go

@@ -176,7 +176,7 @@ func (app *App) registerCommands() {
 
 	// Commands
 	NewInitCommand(app.io, app.clientFactory.NewUnauthenticatedClient, app.clientFactory.NewClientWithCredentials, app.credentialStore).Register(app.cli)
-	NewSignUpCommand(app.io, app.clientFactory.NewUnauthenticatedClient, 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)
 	NewGenerateSecretCommand(app.io, app.clientFactory.NewClient).Register(app.cli)

internals/secrethub/init.go

@@ -9,11 +9,16 @@ import (
 	"github.com/secrethub/secrethub-cli/internals/cli/progress"
 	"github.com/secrethub/secrethub-cli/internals/cli/ui"
 	"github.com/secrethub/secrethub-cli/internals/secrethub/command"
+	"github.com/secrethub/secrethub-go/internals/api"
 	"github.com/secrethub/secrethub-go/internals/errio"
 	"github.com/secrethub/secrethub-go/pkg/secrethub"
+	"github.com/secrethub/secrethub-go/pkg/secrethub/configdir"
 	"github.com/secrethub/secrethub-go/pkg/secrethub/credentials"
+	"github.com/secrethub/secrethub-go/pkg/secretpath"
 )
 
+const signupMessage = "Go to https://signup.secrethub.io/ and follow the steps to create an account and get it set up on this machine."
+
 // InitCommand configures the user's SecretHub account for use on this machine.
 type InitCommand struct {
 	backupCode               string
@@ -50,8 +55,7 @@ func (cmd *InitCommand) Register(r command.Registerer) {
 type InitMode int
 
 const (
-	InitModeSignup InitMode = iota + 1
-	InitModeBackupCode
+	InitModeBackupCode InitMode = iota + 1
 	InitModeSetupCode
 )
 
@@ -105,23 +109,14 @@ func (cmd *InitCommand) Run() error {
 
 		switch option {
 		case 0:
-			fmt.Fprintln(cmd.io.Output(), "Go to https://signup.secrethub.io/ and follow the steps to create an account and get it set up on this machine.")
+			fmt.Fprintln(cmd.io.Output(), signupMessage)
 			return nil
 		case 1:
 			mode = InitModeBackupCode
 		}
 	}
 
 	switch mode {
-	case InitModeSignup:
-		signupCommand := SignUpCommand{
-			io:              cmd.io,
-			newClient:       cmd.newUnauthenticatedClient,
-			credentialStore: cmd.credentialStore,
-			progressPrinter: cmd.progressPrinter,
-			force:           cmd.force,
-		}
-		return signupCommand.Run()
 	case InitModeSetupCode:
 		setupCode := cmd.setupCode
 
@@ -287,3 +282,86 @@ func promptForDeviceName(io ui.IO) (string, error) {
 	}
 	return deviceName, nil
 }
+
+// createStartRepo creates a start repository and writes a fist secret to it, so that
+// the user can start by reading their first secret. It returns the secret's path.
+// This is intended to smoothen onboarding.
+func createStartRepo(client secrethub.ClientInterface, username string, fullName string) (string, error) {
+	repoPath := secretpath.Join(username, "start")
+	_, err := client.Repos().Create(secretpath.Join(repoPath))
+	if err != nil {
+		return "", err
+	}
+
+	secretPath := secretpath.Join(repoPath, "hello")
+	message := fmt.Sprintf("Welcome %s! This is your first secret. To write a new version of this secret, run:\n\n    secrethub write %s", fullName, secretPath)
+
+	_, err = client.Secrets().Write(secretPath, []byte(message))
+	if err != nil {
+		return "", err
+	}
+	return secretPath, nil
+}
+
+// createWorkspace creates a new org with the given name and description.
+func createWorkspace(client secrethub.ClientInterface, io ui.IO, org string, orgDescription string, progressPrinter progress.Printer) error {
+	if org == "" {
+		createWorkspace, err := ui.AskYesNo(io, "Do you want to create a shared workspace for your team?", ui.DefaultYes)
+		if err != nil {
+			return err
+		}
+		fmt.Fprintln(io.Output())
+		if !createWorkspace {
+			fmt.Fprint(io.Output(), "You can create a shared workspace later using `secrethub org init`.\n\n")
+			return nil
+		}
+	}
+
+	var err error
+	if org == "" {
+		org, err = ui.AskAndValidate(io, "Workspace name (e.g. your company name): ", 2, api.ValidateOrgName)
+		if err != nil {
+			return err
+		}
+	}
+	if orgDescription == "" {
+		orgDescription, err = ui.AskAndValidate(io, "A description (max 144 chars) for your team workspace so others will recognize it:\n", 2, api.ValidateOrgDescription)
+		if err != nil {
+			return err
+		}
+	}
+
+	fmt.Fprint(io.Output(), "Creating your shared workspace...")
+	progressPrinter.Start()
+
+	_, err = client.Orgs().Create(org, orgDescription)
+	progressPrinter.Stop()
+	if err == api.ErrOrgAlreadyExists {
+		fmt.Fprintf(io.Output(), "The workspace %s already exists. If it is your organization, ask a colleague to invite you to the workspace. You can also create a new one using `secrethub org init`.\n", org)
+	} else if err != nil {
+		return err
+	} else {
+		fmt.Fprint(io.Output(), "Created your shared workspace.\n\n")
+	}
+	return nil
+}
+
+// writeCredential writes the given credential to the configuration directory.
+func writeNewCredential(credential *credentials.KeyCreator, passphrase string, credentialFile *configdir.CredentialFile) error {
+	exportKey := credential.Key
+	if passphrase != "" {
+		exportKey = exportKey.Passphrase(credentials.FromString(passphrase))
+	}
+
+	encodedCredential, err := credential.Export()
+	if err != nil {
+		return err
+	}
+
+	return credentialFile.Write(encodedCredential)
+}
+
+// askCredentialPassphrase prompts the user for a passphrase to protect the local credential.
+func askCredentialPassphrase(io ui.IO) (string, error) {
+	return ui.AskPassphrase(io, "Please enter a passphrase to protect your local credential (leave empty for no passphrase): ", "Enter the same passphrase again: ", 3)
+}