forgot to commit migration

Emyrk · Emyrk · commit f43212731487 · 2023-06-13T12:44:53.000-05:00
diff --git a/cli/usercreate.go b/cli/usercreate.go
@@ -14,9 +14,10 @@ import (
 
 func (r *RootCmd) userCreate() *clibase.Cmd {
 	var (
-		email    string
-		username string
-		password string
+		email        string
+		username     string
+		password     string
+		disableLogin bool
 	)
 	client := new(codersdk.Client)
 	cmd := &clibase.Cmd{
@@ -53,7 +54,7 @@ func (r *RootCmd) userCreate() *clibase.Cmd {
 					return err
 				}
 			}
-			if password == "" {
+			if password == "" && !disableLogin {
 				password, err = cryptorand.StringCharset(cryptorand.Human, 20)
 				if err != nil {
 					return err
@@ -65,10 +66,16 @@ func (r *RootCmd) userCreate() *clibase.Cmd {
 				Username:       username,
 				Password:       password,
 				OrganizationID: organization.ID,
+				DisableLogin:   disableLogin,
 			})
 			if err != nil {
 				return err
 			}
+			authenticationMethod := `Your password is: ` + cliui.DefaultStyles.Field.Render(password)
+			if disableLogin {
+				authenticationMethod = "Login has been disabled for this user. Contact your administrator to authenticate."
+			}
+
 			_, _ = fmt.Fprintln(inv.Stderr, `A new user has been created!
 Share the instructions below to get them started.
 `+cliui.DefaultStyles.Placeholder.Render("—————————————————————————————————————————————————")+`
@@ -78,7 +85,7 @@ https://github.com/coder/coder/releases
 Run `+cliui.DefaultStyles.Code.Render("coder login "+client.URL.String())+` to authenticate.
 
 Your email is: `+cliui.DefaultStyles.Field.Render(email)+`
-Your password is: `+cliui.DefaultStyles.Field.Render(password)+`
+`+authenticationMethod+`
 
 Create a workspace  `+cliui.DefaultStyles.Code.Render("coder create")+`!`)
 			return nil
@@ -103,6 +110,12 @@ Create a workspace  `+cliui.DefaultStyles.Code.Render("coder create")+`!`)
 			Description:   "Specifies a password for the new user.",
 			Value:         clibase.StringOf(&password),
 		},
+		{
+			Flag: "disable-login",
+			Description: "Disabling login for a user prevents the user from authenticating themselves via a login. Authentication would require an api keys/token. " +
+				"Be careful when using this flag as it can lock the user out of their account.",
+			Value: clibase.BoolOf(&disableLogin),
+		},
 	}
 	return cmd
 }
diff --git a/coderd/database/migrations/000126_login_type_none.down.sql b/coderd/database/migrations/000126_login_type_none.down.sql
@@ -0,0 +1,2 @@
+-- It's not possible to drop enum values from enum types, so the UP has "IF NOT
+-- EXISTS".
diff --git a/coderd/database/migrations/000126_login_type_none.up.sql b/coderd/database/migrations/000126_login_type_none.up.sql
@@ -0,0 +1,3 @@
+ALTER TYPE login_type ADD VALUE IF NOT EXISTS 'none';
+
+COMMENT ON TYPE login_type IS 'Specifies the method of authentication. "none" is a special case in which no authentication method is allowed.';
diff --git a/codersdk/users.go b/codersdk/users.go
@@ -68,7 +68,7 @@ type CreateFirstUserResponse struct {
 type CreateUserRequest struct {
 	Email    string `json:"email" validate:"required,email" format:"email"`
 	Username string `json:"username" validate:"required,username"`
-	Password string `json:"password" validate:"required"`
+	Password string `json:"password" validate:"required_if=DisableLogin false"`
 	// DisableLogin sets the user's login type to 'none'. This prevents the user
 	// from being able to use a password or any other authentication method to login.
 	DisableLogin   bool      `json:"disable_login"`
diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts
@@ -223,6 +223,7 @@ export interface CreateUserRequest {
   readonly email: string
   readonly username: string
   readonly password: string
+  readonly disable_login: boolean
   readonly organization_id: string
 }
 
diff --git a/site/src/components/CreateUserForm/CreateUserForm.tsx b/site/src/components/CreateUserForm/CreateUserForm.tsx
@@ -50,6 +50,7 @@ export const CreateUserForm: FC<
         password: "",
         username: "",
         organization_id: myOrgId,
+        disable_login: false,
       },
       validationSchema,
       onSubmit,

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+-- It's not possible to drop enum values from enum types, so the UP has "IF NOT`
	`2`	`+-- EXISTS".`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+ALTER TYPE login_type ADD VALUE IF NOT EXISTS 'none';`
	`2`	`+`
	`3`	`+COMMENT ON TYPE login_type IS 'Specifies the method of authentication. "none" is a special case in which no authentication method is allowed.';`
Original file line number	Diff line number	Diff line change
`@@ -223,6 +223,7 @@ export interface CreateUserRequest {`
`223`	`223`	`readonly email: string`
`224`	`224`	`readonly username: string`
`225`	`225`	`readonly password: string`
	`226`	`+ readonly disable_login: boolean`
`226`	`227`	`readonly organization_id: string`
`227`	`228`	`}`
`228`	`229`