Improve readbility

BrunoQuaresma · BrunoQuaresma · commit 30b8f15172b5 · 2022-05-05T17:12:18.000Z
diff --git a/coderd/database/queries/users.sql b/coderd/database/queries/users.sql
@@ -70,7 +70,7 @@ WHERE
 -- name: GetUsers :many
 SELECT
 	*
-FROM	
+FROM
 	users
 WHERE
 	CASE
diff --git a/coderd/users.go b/coderd/users.go
@@ -384,19 +384,20 @@ func (api *api) putUserPassword(rw http.ResponseWriter, r *http.Request) {
 	}
 
 	// Hash password and update it in the database
-	hashedPassword, hashError := userpassword.Hash(params.NewPassword)
-	if hashError != nil {
+	hashedPassword, err := userpassword.Hash(params.NewPassword)
+	if err != nil {
 		httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{
-			Message: fmt.Sprintf("hash password: %s", hashError.Error()),
+			Message: fmt.Sprintf("hash password: %s", err.Error()),
 		})
+		return
 	}
-	databaseError := api.Database.UpdateUserHashedPassword(r.Context(), database.UpdateUserHashedPasswordParams{
+	err = api.Database.UpdateUserHashedPassword(r.Context(), database.UpdateUserHashedPasswordParams{
 		ID:             user.ID,
 		HashedPassword: []byte(hashedPassword),
 	})
-	if databaseError != nil {
+	if err != nil {
 		httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{
-			Message: fmt.Sprintf("put user password: %s", databaseError.Error()),
+			Message: fmt.Sprintf("put user password: %s", err.Error()),
 		})
 		return
 	}
diff --git a/codersdk/users.go b/codersdk/users.go
@@ -187,7 +187,8 @@ func (c *Client) SuspendUser(ctx context.Context, userID uuid.UUID) (User, error
 	return user, json.NewDecoder(res.Body).Decode(&user)
 }
 
-// Update user password
+// UpdateUserPassword updates a user password.
+// It calls PUT /users/{user}/password
 func (c *Client) UpdateUserPassword(ctx context.Context, userID uuid.UUID, req UpdateUserPasswordRequest) error {
 	res, err := c.request(ctx, http.MethodPut, fmt.Sprintf("/api/v2/users/%s/password", uuidOrMe(userID)), req)
 	if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ WHERE`
`70`	`70`	`-- name: GetUsers :many`
`71`	`71`	`SELECT`
`72`	`72`	`*`
`73`		`-FROM`
	`73`	`+FROM`
`74`	`74`	`users`
`75`	`75`	`WHERE`
`76`	`76`	`CASE`
Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,8 @@ func (c *Client) SuspendUser(ctx context.Context, userID uuid.UUID) (User, error`
`187`	`187`	`return user, json.NewDecoder(res.Body).Decode(&user)`
`188`	`188`	`}`
`189`	`189`
`190`		`-// Update user password`
	`190`	`+// UpdateUserPassword updates a user password.`
	`191`	`+// It calls PUT /users/{user}/password`
`191`	`192`	`func (c *Client) UpdateUserPassword(ctx context.Context, userID uuid.UUID, req UpdateUserPasswordRequest) error {`
`192`	`193`	`res, err := c.request(ctx, http.MethodPut, fmt.Sprintf("/api/v2/users/%s/password", uuidOrMe(userID)), req)`
`193`	`194`	`if err != nil {`