Update update password request params

BrunoQuaresma · BrunoQuaresma · commit d85092b86fb6 · 2022-05-05T18:17:21.000Z
diff --git a/coderd/users.go b/coderd/users.go
@@ -369,7 +369,7 @@ func (api *api) putUserPassword(rw http.ResponseWriter, r *http.Request) {
 	}
 
 	// Check if the new password and the confirmation match
-	if params.NewPassword != params.ConfirmNewPassword {
+	if params.Password != params.ConfirmPassword {
 		requestErrors := []httpapi.Error{
 			{
 				Field:  "confirm_new_password",
@@ -384,7 +384,7 @@ func (api *api) putUserPassword(rw http.ResponseWriter, r *http.Request) {
 	}
 
 	// Hash password and update it in the database
-	hashedPassword, err := userpassword.Hash(params.NewPassword)
+	hashedPassword, err := userpassword.Hash(params.Password)
 	if err != nil {
 		httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{
 			Message: fmt.Sprintf("hash password: %s", err.Error()),
diff --git a/coderd/users_test.go b/coderd/users_test.go
@@ -295,9 +295,8 @@ func TestUpdateUserPassword(t *testing.T) {
 		client := coderdtest.New(t, nil)
 		coderdtest.CreateFirstUser(t, client)
 		err := client.UpdateUserPassword(context.Background(), codersdk.Me, codersdk.UpdateUserPasswordRequest{
-			Password:           coderdtest.FirstUserParams.Password,
-			NewPassword:        "newpassword",
-			ConfirmNewPassword: "wrongconfirmation",
+			Password:        "newpassword",
+			ConfirmPassword: "wrongconfirmation",
 		})
 		var apiErr *codersdk.Error
 		require.ErrorAs(t, err, &apiErr)
@@ -309,9 +308,8 @@ func TestUpdateUserPassword(t *testing.T) {
 		client := coderdtest.New(t, nil)
 		coderdtest.CreateFirstUser(t, client)
 		err := client.UpdateUserPassword(context.Background(), codersdk.Me, codersdk.UpdateUserPasswordRequest{
-			Password:           coderdtest.FirstUserParams.Password,
-			NewPassword:        "newpassword",
-			ConfirmNewPassword: "newpassword",
+			Password:        "newpassword",
+			ConfirmPassword: "newpassword",
 		})
 		require.NoError(t, err, "update password request should be successful")
 
diff --git a/codersdk/users.go b/codersdk/users.go
@@ -73,9 +73,8 @@ type UpdateUserProfileRequest struct {
 }
 
 type UpdateUserPasswordRequest struct {
-	Password           string `json:"password" validate:"required"`
-	NewPassword        string `json:"new_password" validate:"required"`
-	ConfirmNewPassword string `json:"confirm_new_password" validate:"required"`
+	Password        string `json:"password" validate:"required"`
+	ConfirmPassword string `json:"confirm_new_password" validate:"required"`
 }
 
 type UpdateRoles struct {
diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts
@@ -12,7 +12,7 @@ export interface AgentGitSSHKey {
   readonly private_key: string
 }
 
-// From codersdk/users.go:111:6
+// From codersdk/users.go:110:6
 export interface AuthMethods {
   readonly password: boolean
   readonly github: boolean
@@ -44,7 +44,7 @@ export interface CreateFirstUserResponse {
   readonly organization_id: string
 }
 
-// From codersdk/users.go:106:6
+// From codersdk/users.go:105:6
 export interface CreateOrganizationRequest {
   readonly name: string
 }
@@ -101,7 +101,7 @@ export interface CreateWorkspaceRequest {
   readonly parameter_values: CreateParameterRequest[]
 }
 
-// From codersdk/users.go:102:6
+// From codersdk/users.go:101:6
 export interface GenerateAPIKeyResponse {
   readonly key: string
 }
@@ -119,13 +119,13 @@ export interface GoogleInstanceIdentityToken {
   readonly json_web_token: string
 }
 
-// From codersdk/users.go:91:6
+// From codersdk/users.go:90:6
 export interface LoginWithPasswordRequest {
   readonly email: string
   readonly password: string
 }
 
-// From codersdk/users.go:97:6
+// From codersdk/users.go:96:6
 export interface LoginWithPasswordResponse {
   readonly session_token: string
 }
@@ -255,15 +255,14 @@ export interface UpdateActiveTemplateVersion {
   readonly id: string
 }
 
-// From codersdk/users.go:81:6
+// From codersdk/users.go:80:6
 export interface UpdateRoles {
   readonly roles: string[]
 }
 
 // From codersdk/users.go:75:6
 export interface UpdateUserPasswordRequest {
   readonly password: string
-  readonly new_password: string
   readonly confirm_new_password: string
 }
 
@@ -298,7 +297,7 @@ export interface User {
   readonly organization_ids: string[]
 }
 
-// From codersdk/users.go:85:6
+// From codersdk/users.go:84:6
 export interface UserRoles {
   readonly roles: string[]
   readonly organization_roles: Record<string, string[]>

Original file line number	Diff line number	Diff line change
`@@ -369,7 +369,7 @@ func (api api) putUserPassword(rw http.ResponseWriter, r http.Request) {`
`369`	`369`	`}`
`370`	`370`
`371`	`371`	`// Check if the new password and the confirmation match`
`372`		`- if params.NewPassword != params.ConfirmNewPassword {`
	`372`	`+ if params.Password != params.ConfirmPassword {`
`373`	`373`	`requestErrors := []httpapi.Error{`
`374`	`374`	`{`
`375`	`375`	`Field: "confirm_new_password",`
`@@ -384,7 +384,7 @@ func (api api) putUserPassword(rw http.ResponseWriter, r http.Request) {`
`384`	`384`	`}`
`385`	`385`
`386`	`386`	`// Hash password and update it in the database`
`387`		`- hashedPassword, err := userpassword.Hash(params.NewPassword)`
	`387`	`+ hashedPassword, err := userpassword.Hash(params.Password)`
`388`	`388`	`if err != nil {`
`389`	`389`	`httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{`
`390`	`390`	`Message: fmt.Sprintf("hash password: %s", err.Error()),`
Original file line number	Diff line number	Diff line change
`@@ -73,9 +73,8 @@ type UpdateUserProfileRequest struct {`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`type UpdateUserPasswordRequest struct {`
`76`		- Password string `json:"password" validate:"required"`
`77`		- NewPassword string `json:"new_password" validate:"required"`
`78`		- ConfirmNewPassword string `json:"confirm_new_password" validate:"required"`
	`76`	+ Password string `json:"password" validate:"required"`
	`77`	+ ConfirmPassword string `json:"confirm_new_password" validate:"required"`
`79`	`78`	`}`
`80`	`79`
`81`	`80`	`type UpdateRoles struct {`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ export interface AgentGitSSHKey {`
`12`	`12`	`readonly private_key: string`
`13`	`13`	`}`
`14`	`14`
`15`		`-// From codersdk/users.go:111:6`
	`15`	`+// From codersdk/users.go:110:6`
`16`	`16`	`export interface AuthMethods {`
`17`	`17`	`readonly password: boolean`
`18`	`18`	`readonly github: boolean`
`@@ -44,7 +44,7 @@ export interface CreateFirstUserResponse {`
`44`	`44`	`readonly organization_id: string`
`45`	`45`	`}`
`46`	`46`
`47`		`-// From codersdk/users.go:106:6`
	`47`	`+// From codersdk/users.go:105:6`
`48`	`48`	`export interface CreateOrganizationRequest {`
`49`	`49`	`readonly name: string`
`50`	`50`	`}`
`@@ -101,7 +101,7 @@ export interface CreateWorkspaceRequest {`
`101`	`101`	`readonly parameter_values: CreateParameterRequest[]`
`102`	`102`	`}`
`103`	`103`
`104`		`-// From codersdk/users.go:102:6`
	`104`	`+// From codersdk/users.go:101:6`
`105`	`105`	`export interface GenerateAPIKeyResponse {`
`106`	`106`	`readonly key: string`
`107`	`107`	`}`
`@@ -119,13 +119,13 @@ export interface GoogleInstanceIdentityToken {`
`119`	`119`	`readonly json_web_token: string`
`120`	`120`	`}`
`121`	`121`
`122`		`-// From codersdk/users.go:91:6`
	`122`	`+// From codersdk/users.go:90:6`
`123`	`123`	`export interface LoginWithPasswordRequest {`
`124`	`124`	`readonly email: string`
`125`	`125`	`readonly password: string`
`126`	`126`	`}`
`127`	`127`
`128`		`-// From codersdk/users.go:97:6`
	`128`	`+// From codersdk/users.go:96:6`
`129`	`129`	`export interface LoginWithPasswordResponse {`
`130`	`130`	`readonly session_token: string`
`131`	`131`	`}`
`@@ -255,15 +255,14 @@ export interface UpdateActiveTemplateVersion {`
`255`	`255`	`readonly id: string`
`256`	`256`	`}`
`257`	`257`
`258`		`-// From codersdk/users.go:81:6`
	`258`	`+// From codersdk/users.go:80:6`
`259`	`259`	`export interface UpdateRoles {`
`260`	`260`	`readonly roles: string[]`
`261`	`261`	`}`
`262`	`262`
`263`	`263`	`// From codersdk/users.go:75:6`
`264`	`264`	`export interface UpdateUserPasswordRequest {`
`265`	`265`	`readonly password: string`
`266`		`- readonly new_password: string`
`267`	`266`	`readonly confirm_new_password: string`
`268`	`267`	`}`
`269`	`268`
`@@ -298,7 +297,7 @@ export interface User {`
`298`	`297`	`readonly organization_ids: string[]`
`299`	`298`	`}`
`300`	`299`
`301`		`-// From codersdk/users.go:85:6`
	`300`	`+// From codersdk/users.go:84:6`
`302`	`301`	`export interface UserRoles {`
`303`	`302`	`readonly roles: string[]`
`304`	`303`	`readonly organization_roles: Record<string, string[]>`