Merge remote-tracking branch 'origin/main' into stevenmasley/suspende…

…d_users
coder · Emyrk · May 31, 2022 · May 27, 2022 · May 27, 2022 · May 27, 2022
commit cc9b573d3250b62b7b82e40d1b1ad1dba35cf337
diff --git a/cli/server.go b/cli/server.go
@@ -68,10 +68,8 @@ func server() *cobra.Command {
 		pprofAddress          string
 		cacheDir              string
 		dev                   bool
-		devFirstEmail         string
-		devFirstPassword      string
-		devMemberEmail        string
-		devMemberPassword     string
+		devUserEmail          string
+		devUserPassword       string
 		postgresURL           string
 		// provisionerDaemonCount is a uint8 to ensure a number > 0.
 		provisionerDaemonCount           uint8
@@ -332,30 +330,19 @@ func server() *cobra.Command {
 			config := createConfig(cmd)
 
 			if dev {
-				if devFirstPassword == "" {
-					devFirstPassword, err = cryptorand.String(10)
+				if devUserPassword == "" {
+					devUserPassword, err = cryptorand.String(10)
 					if err != nil {
 						return xerrors.Errorf("generate random admin password for dev: %w", err)
 					}
 				}
-				if devMemberPassword == "" {
-					devMemberPassword, err = cryptorand.String(10)
-					if err != nil {
-						return xerrors.Errorf("generate random member password for dev: %w", err)
-					}
-				}
-
-				// Create first user with 1 additional user as a member of the same org.
-				err = createFirstUser(cmd, client, config, devFirstEmail, devFirstPassword, extraUsers{
-					Username: "member",
-					Email:    devMemberEmail,
-					Password: devMemberPassword,
-				})
+				restorePreviousSession, err := createFirstUser(logger, cmd, client, config, devUserEmail, devUserPassword)
 				if err != nil {
 					return xerrors.Errorf("create first user: %w", err)
 				}
-				_, _ = fmt.Fprintf(cmd.ErrOrStderr(), "email: %s\n", devFirstEmail)
-				_, _ = fmt.Fprintf(cmd.ErrOrStderr(), "password: %s\n", devFirstPassword)
+				defer restorePreviousSession()
+				_, _ = fmt.Fprintf(cmd.ErrOrStderr(), "email: %s\n", devUserEmail)
+				_, _ = fmt.Fprintf(cmd.ErrOrStderr(), "password: %s\n", devUserPassword)
 				_, _ = fmt.Fprintln(cmd.ErrOrStderr())
 
 				_, _ = fmt.Fprintf(cmd.ErrOrStderr(), cliui.Styles.Wrap.Render(`Started in dev mode. All data is in-memory! `+cliui.Styles.Bold.Render("Do not use in production")+`. Press `+
@@ -488,10 +475,8 @@ func server() *cobra.Command {
 	// systemd uses the CACHE_DIRECTORY environment variable!
 	cliflag.StringVarP(root.Flags(), &cacheDir, "cache-dir", "", "CACHE_DIRECTORY", filepath.Join(os.TempDir(), "coder-cache"), "Specifies a directory to cache binaries for provision operations.")
 	cliflag.BoolVarP(root.Flags(), &dev, "dev", "", "CODER_DEV_MODE", false, "Serve Coder in dev mode for tinkering")
-	cliflag.StringVarP(root.Flags(), &devFirstEmail, "dev-admin-email", "", "CODER_DEV_ADMIN_EMAIL", "admin@coder.com", "Specifies the admin email to be used in dev mode (--dev)")
-	cliflag.StringVarP(root.Flags(), &devFirstPassword, "dev-admin-password", "", "CODER_DEV_ADMIN_PASSWORD", "", "Specifies the admin password to be used in dev mode (--dev) instead of a randomly generated one")
-	cliflag.StringVarP(root.Flags(), &devMemberEmail, "dev-member-email", "", "CODER_DEV_MEMBER_EMAIL", "member@coder.com", "Specifies the member email to be used in dev mode (--dev)")
-	cliflag.StringVarP(root.Flags(), &devMemberPassword, "dev-member-password", "", "CODER_DEV_MEMBER_PASSWORD", "", "Specifies the member password to be used in dev mode (--dev) instead of a randomly generated one")
+	cliflag.StringVarP(root.Flags(), &devUserEmail, "dev-admin-email", "", "CODER_DEV_ADMIN_EMAIL", "admin@coder.com", "Specifies the admin email to be used in dev mode (--dev)")
+	cliflag.StringVarP(root.Flags(), &devUserPassword, "dev-admin-password", "", "CODER_DEV_ADMIN_PASSWORD", "", "Specifies the admin password to be used in dev mode (--dev) instead of a randomly generated one")
 	cliflag.StringVarP(root.Flags(), &postgresURL, "postgres-url", "", "CODER_PG_CONNECTION_URL", "", "URL of a PostgreSQL database to connect to")
 	cliflag.Uint8VarP(root.Flags(), &provisionerDaemonCount, "provisioner-daemons", "", "CODER_PROVISIONER_DAEMONS", 3, "The amount of provisioner daemons to create on start.")
 	cliflag.StringVarP(root.Flags(), &oauth2GithubClientID, "oauth2-github-client-id", "", "CODER_OAUTH2_GITHUB_CLIENT_ID", "",
@@ -534,20 +519,16 @@ func server() *cobra.Command {
 	return root
 }
 
-type extraUsers struct {
-	Username string
-	Email    string
-	Password string
-}
-
-func createFirstUser(cmd *cobra.Command, client *codersdk.Client, cfg config.Root, email, password string, users ...extraUsers) error {
+// createFirstUser creates the first user and sets a valid session.
+// Caller must call restorePreviousSession on server exit.
+func createFirstUser(logger slog.Logger, cmd *cobra.Command, client *codersdk.Client, cfg config.Root, email, password string) (func(), error) {
 	if email == "" {
 		return nil, xerrors.New("email is empty")
 	}
 	if password == "" {
 		return nil, xerrors.New("password is empty")
 	}
-	first, err := client.CreateFirstUser(cmd.Context(), codersdk.CreateFirstUserRequest{
+	_, err := client.CreateFirstUser(cmd.Context(), codersdk.CreateFirstUserRequest{
 		Email:            email,
 		Username:         "developer",
 		Password:         password,
@@ -610,18 +591,7 @@ func createFirstUser(cmd *cobra.Command, client *codersdk.Client, cfg config.Roo
 		return nil, xerrors.Errorf("write session token: %w", err)
 	}
 
-	for _, user := range users {
-		_, err := client.CreateUser(cmd.Context(), codersdk.CreateUserRequest{
-			Email:          user.Email,
-			Username:       user.Username,
-			Password:       user.Password,
-			OrganizationID: first.OrganizationID,
-		})
-		if err != nil {
-			return xerrors.Errorf("create extra user %q: %w", user.Email, err)
-		}
-	}
-	return nil
+	return restorePreviousSession, nil
 }
 
 // nolint:revive
@@ -678,16 +648,16 @@ func newProvisionerDaemon(ctx context.Context, coderAPI *coderd.API,
 func printLogo(cmd *cobra.Command, spooky bool) {
 	if spooky {
 		_, _ = fmt.Fprintf(cmd.OutOrStdout(), `
-		▄████▄   ▒█████  ▓█████▄ ▓█████  ██▀███  
+		▄████▄   ▒█████  ▓█████▄ ▓█████  ██▀███
 		▒██▀ ▀█  ▒██▒  ██▒▒██▀ ██▌▓█   ▀ ▓██ ▒ ██▒
 		▒▓█    ▄ ▒██░  ██▒░██   █▌▒███   ▓██ ░▄█ ▒
-		▒▓▓▄ ▄██▒▒██   ██░░▓█▄   ▌▒▓█  ▄ ▒██▀▀█▄  
+		▒▓▓▄ ▄██▒▒██   ██░░▓█▄   ▌▒▓█  ▄ ▒██▀▀█▄
 		▒ ▓███▀ ░░ ████▓▒░░▒████▓ ░▒████▒░██▓ ▒██▒
 		░ ░▒ ▒  ░░ ▒░▒░▒░  ▒▒▓  ▒ ░░ ▒░ ░░ ▒▓ ░▒▓░
 		  ░  ▒     ░ ▒ ▒░  ░ ▒  ▒  ░ ░  ░  ░▒ ░ ▒░
-		░        ░ ░ ░ ▒   ░ ░  ░    ░     ░░   ░ 
-		░ ░          ░ ░     ░       ░  ░   ░     
-		░                  ░                      		
+		░        ░ ░ ░ ▒   ░ ░  ░    ░     ░░   ░
+		░ ░          ░ ░     ░       ░  ░   ░
+		░                  ░
 
 `)
 		return

diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -139,7 +139,6 @@ func New(options *Options) *API {
 		r.Route("/organizations", func(r chi.Router) {
 			r.Use(
 				apiKeyMiddleware,
-				httpmw.ExtractOrganizationParam(options.Database),
 			)
 			r.Post("/", api.postOrganizations)
 			r.Route("/{organization}", func(r chi.Router) {