change to ownpassword

f0ssel · f0ssel · commit 13e4b220d62d · 2022-05-26T21:11:09.000Z
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -239,15 +239,19 @@ func New(options *Options) *API {
 =======
 					r.Get("/", a.userByName)
 					r.Put("/profile", a.putUserProfile)
+<<<<<<< HEAD
 					r.Put("/security", a.putUserSecurity)
 >>>>>>> fix: Add route for user to change own password
+=======
+>>>>>>> change to ownpassword
 					r.Route("/status", func(r chi.Router) {
 						r.Put("/suspend", api.putUserStatus(database.UserStatusSuspended))
 						r.Put("/active", api.putUserStatus(database.UserStatusActive))
 					})
 					r.Route("/password", func(r chi.Router) {
 						r.Put("/", api.putUserPassword)
 					})
+					r.Put("/ownpassword", a.putUserOwnPassword)
 					// These roles apply to the site wide permissions.
 					r.Put("/roles", api.putUserRoles)
 					r.Get("/roles", api.userRoles)
diff --git a/coderd/users.go b/coderd/users.go
@@ -311,7 +311,11 @@ func (api *API) putUserProfile(rw http.ResponseWriter, r *http.Request) {
 	httpapi.Write(rw, http.StatusOK, convertUser(updatedUserProfile, organizationIDs))
 }
 
+<<<<<<< HEAD
 func (api *API) putUserSecurity(rw http.ResponseWriter, r *http.Request) {
+=======
+func (api *api) putUserOwnPassword(rw http.ResponseWriter, r *http.Request) {
+>>>>>>> change to ownpassword
 	user := httpmw.UserParam(r)
 
 	// this route is for the owning user so we need to check the old password
@@ -320,7 +324,7 @@ func (api *API) putUserSecurity(rw http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	var params codersdk.UpdateUserSecurityRequest
+	var params codersdk.UpdateUserOwnPasswordRequest
 	if !httpapi.Read(rw, r, &params) {
 		return
 	}
diff --git a/codersdk/users.go b/codersdk/users.go
@@ -68,7 +68,7 @@ type UpdateUserPasswordRequest struct {
 	Password string `json:"password" validate:"required"`
 }
 
-type UpdateUserSecurityRequest struct {
+type UpdateUserOwnPasswordRequest struct {
 	OldPassword string `json:"old_password" validate:"required"`
 	Password    string `json:"password" validate:"required"`
 }

Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,11 @@ func (api API) putUserProfile(rw http.ResponseWriter, r http.Request) {`
`311`	`311`	`httpapi.Write(rw, http.StatusOK, convertUser(updatedUserProfile, organizationIDs))`
`312`	`312`	`}`
`313`	`313`
	`314`	`+<<<<<<< HEAD`
`314`	`315`	`func (api API) putUserSecurity(rw http.ResponseWriter, r http.Request) {`
	`316`	`+=======`
	`317`	`+func (api api) putUserOwnPassword(rw http.ResponseWriter, r http.Request) {`
	`318`	`+>>>>>>> change to ownpassword`
`315`	`319`	`user := httpmw.UserParam(r)`
`316`	`320`
`317`	`321`	`// this route is for the owning user so we need to check the old password`
`@@ -320,7 +324,7 @@ func (api API) putUserSecurity(rw http.ResponseWriter, r http.Request) {`
`320`	`324`	`return`
`321`	`325`	`}`
`322`	`326`
`323`		`- var params codersdk.UpdateUserSecurityRequest`
	`327`	`+ var params codersdk.UpdateUserOwnPasswordRequest`
`324`	`328`	`if !httpapi.Read(rw, r, &params) {`
`325`	`329`	`return`
`326`	`330`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ type UpdateUserPasswordRequest struct {`
`68`	`68`	Password string `json:"password" validate:"required"`
`69`	`69`	`}`
`70`	`70`
`71`		`-type UpdateUserSecurityRequest struct {`
	`71`	`+type UpdateUserOwnPasswordRequest struct {`
`72`	`72`	OldPassword string `json:"old_password" validate:"required"`
`73`	`73`	Password string `json:"password" validate:"required"`
`74`	`74`	`}`