May 6, 2022 · May 4, 2022 · May 4, 2022 · May 5, 2022 · May 5, 2022 · May 5, 2022
diff --git a/coderd/users.go b/coderd/users.go
 return
 }

 // Check if the new password and the confirmation match
 if params.Password != params.ConfirmPassword {
 requestErrors := []httpapi.Error{
 {
 Field:  "confirm_new_password",
 Detail: "The value does not match the new password",
 },
 }
 httpapi.Write(rw, http.StatusBadRequest, httpapi.Response{
 Message: fmt.Sprintf("The new password and the new password confirmation don't match"),
 Errors:  requestErrors,
 })
 return
 }

 // Hash password and update it in the database
 hashedPassword, err := userpassword.Hash(params.Password)
 if err != nil {
 httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{
diff --git a/coderd/users_test.go b/coderd/users_test.go
 func TestUpdateUserPassword(t *testing.T) {
 t.Parallel()

 t.Run("DifferentPasswordConfirmation", func(t *testing.T) {
 t.Parallel()
 client := coderdtest.New(t, nil)
 coderdtest.CreateFirstUser(t, client)
 err := client.UpdateUserPassword(context.Background(), codersdk.Me, codersdk.UpdateUserPasswordRequest{
 Password:        "newpassword",
 ConfirmPassword: "wrongconfirmation",
 })
 var apiErr *codersdk.Error
 require.ErrorAs(t, err, &apiErr)
 require.Equal(t, http.StatusBadRequest, apiErr.StatusCode())
 })

 t.Run("Success", func(t *testing.T) {
 t.Parallel()
 client := coderdtest.New(t, nil)
 coderdtest.CreateFirstUser(t, client)
 err := client.UpdateUserPassword(context.Background(), codersdk.Me, codersdk.UpdateUserPasswordRequest{
 Password:        "newpassword",
 ConfirmPassword: "newpassword",
 Password: "newpassword",
 })
 require.NoError(t, err, "update password request should be successful")

diff --git a/codersdk/users.go b/codersdk/users.go
 }

 type UpdateUserPasswordRequest struct {
 Password        string `json:"password" validate:"required"`
 ConfirmPassword string `json:"confirm_new_password" validate:"required"`
 Password string `json:"password" validate:"required"`
 }

 type UpdateRoles struct {
diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts
  readonly private_key: string
 }

 // From codersdk/users.go:110:6
 // From codersdk/users.go:109:6
 export interface AuthMethods {
  readonly password: boolean
  readonly github: boolean
  readonly organization_id: string
 }

 // From codersdk/users.go:105:6
 // From codersdk/users.go:104:6
 export interface CreateOrganizationRequest {
  readonly name: string
 }
  readonly parameter_values: CreateParameterRequest[]
 }

 // From codersdk/users.go:101:6
 // From codersdk/users.go:100:6
 export interface GenerateAPIKeyResponse {
  readonly key: string
 }
  readonly json_web_token: string
 }

 // From codersdk/users.go:90:6
 // From codersdk/users.go:89:6
 export interface LoginWithPasswordRequest {
  readonly email: string
  readonly password: string
 }

 // From codersdk/users.go:96:6
 // From codersdk/users.go:95:6
 export interface LoginWithPasswordResponse {
  readonly session_token: string
 }
  readonly id: string
 }

 // From codersdk/users.go:80:6
 // From codersdk/users.go:79:6
 export interface UpdateRoles {
  readonly roles: string[]
 }

 // From codersdk/users.go:75:6
 export interface UpdateUserPasswordRequest {
  readonly password: string
  readonly confirm_new_password: string
 }

 // From codersdk/users.go:70:6
  readonly organization_ids: string[]
 }

 // From codersdk/users.go:84:6
 // From codersdk/users.go:83:6
 export interface UserRoles {
  readonly roles: string[]
  readonly organization_roles: Record<string, string[]>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -368,22 +368,6 @@ func (api api) putUserPassword(rw http.ResponseWriter, r http.Request) {
		return
		}

		// Check if the new password and the confirmation match
		if params.Password != params.ConfirmPassword {
		requestErrors := []httpapi.Error{
		{
		Field: "confirm_new_password",
		Detail: "The value does not match the new password",
		},
		}
		httpapi.Write(rw, http.StatusBadRequest, httpapi.Response{
		Message: fmt.Sprintf("The new password and the new password confirmation don't match"),
		Errors: requestErrors,
		})
		return
		}

		// Hash password and update it in the database
		hashedPassword, err := userpassword.Hash(params.Password)
		if err != nil {
		httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -290,26 +290,12 @@ func TestUpdateUserProfile(t *testing.T) {
		func TestUpdateUserPassword(t *testing.T) {
Copy link Contributor f0sselMay 5, 2022 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Let's also add some tests to make sure the rbac is working here, I'd like to ensure that the user itself cannot perform this action, and neither can other non-admin users. Copy link CollaboratorAuthor BrunoQuaresmaMay 5, 2022• edited Loading Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. So from what I'm understanding we want to test: A non-admin user can't update any password An admin can update another user's password Is that? Copy link CollaboratorAuthor BrunoQuaresmaMay 6, 2022 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Updated!
		t.Parallel()

		t.Run("DifferentPasswordConfirmation", func(t *testing.T) {
		t.Parallel()
		client := coderdtest.New(t, nil)
		coderdtest.CreateFirstUser(t, client)
		err := client.UpdateUserPassword(context.Background(), codersdk.Me, codersdk.UpdateUserPasswordRequest{
		Password: "newpassword",
		ConfirmPassword: "wrongconfirmation",
		})
		var apiErr *codersdk.Error
		require.ErrorAs(t, err, &apiErr)
		require.Equal(t, http.StatusBadRequest, apiErr.StatusCode())
		})

		t.Run("Success", func(t *testing.T) {
		t.Parallel()
		client := coderdtest.New(t, nil)
		coderdtest.CreateFirstUser(t, client)
		err := client.UpdateUserPassword(context.Background(), codersdk.Me, codersdk.UpdateUserPasswordRequest{
		Password: "newpassword",
		ConfirmPassword: "newpassword",
		Password: "newpassword",
		})
		require.NoError(t, err, "update password request should be successful")

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -73,8 +73,7 @@ type UpdateUserProfileRequest struct {
		}

		type UpdateUserPasswordRequest struct {
		Password string `json:"password" validate:"required"`
		ConfirmPassword string `json:"confirm_new_password" validate:"required"`
		Password string `json:"password" validate:"required"`
		}

		type UpdateRoles struct {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,7 +12,7 @@ export interface AgentGitSSHKey {
		readonly private_key: string
		}

		// From codersdk/users.go:110:6
		// From codersdk/users.go:109:6
		export interface AuthMethods {
		readonly password: boolean
		readonly github: boolean
Expand DownExpand Up		@@ -44,7 +44,7 @@ export interface CreateFirstUserResponse {
		readonly organization_id: string
		}

		// From codersdk/users.go:105:6
		// From codersdk/users.go:104:6
		export interface CreateOrganizationRequest {
		readonly name: string
		}
Expand DownExpand Up		@@ -101,7 +101,7 @@ export interface CreateWorkspaceRequest {
		readonly parameter_values: CreateParameterRequest[]
		}

		// From codersdk/users.go:101:6
		// From codersdk/users.go:100:6
		export interface GenerateAPIKeyResponse {
		readonly key: string
		}
Expand All		@@ -119,13 +119,13 @@ export interface GoogleInstanceIdentityToken {
		readonly json_web_token: string
		}

		// From codersdk/users.go:90:6
		// From codersdk/users.go:89:6
		export interface LoginWithPasswordRequest {
		readonly email: string
		readonly password: string
		}

		// From codersdk/users.go:96:6
		// From codersdk/users.go:95:6
		export interface LoginWithPasswordResponse {
		readonly session_token: string
		}
Expand DownExpand Up		@@ -255,15 +255,14 @@ export interface UpdateActiveTemplateVersion {
		readonly id: string
		}

		// From codersdk/users.go:80:6
		// From codersdk/users.go:79:6
		export interface UpdateRoles {
		readonly roles: string[]
		}

		// From codersdk/users.go:75:6
		export interface UpdateUserPasswordRequest {
		readonly password: string
		readonly confirm_new_password: string
		}

		// From codersdk/users.go:70:6
Expand DownExpand Up		@@ -297,7 +296,7 @@ export interface User {
		readonly organization_ids: string[]
		}

		// From codersdk/users.go:84:6
		// From codersdk/users.go:83:6
		export interface UserRoles {
		readonly roles: string[]
		readonly organization_roles: Record<string, string[]>
Expand Down