@@ -54,30 +54,21 @@ func (h *AuthHandler) RegisterUser(w http.ResponseWriter, r *http.Request) {
5454 u , err := h .auth .Register (r .Context (), req .Username , req .Email , req .Password )
5555 if err != nil {
5656 switch {
57- case errors .Is (err , user .ErrEmailInvalid ),
58- errors .Is (err , user .ErrEmailRequired ):
59- WriteJSONError (w , http .StatusBadRequest , invalidEmail , err .Error ())
60- return
61-
6257 case errors .Is (err , user .ErrUsernameRequired ),
6358 errors .Is (err , user .ErrUsernameTooShort ),
6459 errors .Is (err , user .ErrUsernameTooLong ),
65- errors .Is (err , user .ErrUsernameInvalidChars ):
66- WriteJSONError (w , http .StatusBadRequest , invalidUsername , err .Error ())
67- return
68-
69- case errors .Is (err , user .ErrPasswordRequired ),
60+ errors .Is (err , user .ErrEmailInvalid ),
61+ errors .Is (err , user .ErrEmailRequired ),
62+ errors .Is (err , user .ErrPasswordRequired ),
7063 errors .Is (err , user .ErrPasswordTooShort ),
71- errors .Is (err , user .ErrPasswordTooWeak ):
72- WriteJSONError (w , http .StatusBadRequest , invalidPassword , err .Error ())
73- return
74-
75- case errors .Is (err , user .ErrEmailAlreadyExists ):
76- WriteJSONError (w , http .StatusConflict , emailExists , err .Error ())
64+ errors .Is (err , user .ErrPasswordTooWeak ),
65+ errors .Is (err , user .ErrUsernameInvalidChars ):
66+ WriteJSONError (w , http .StatusBadRequest , invalidRequest , err .Error ())
7767 return
7868
79- case errors .Is (err , user .ErrUsernameTaken ):
80- WriteJSONError (w , http .StatusConflict , usernameExists , err .Error ())
69+ case errors .Is (err , user .ErrEmailAlreadyExists ),
70+ errors .Is (err , user .ErrUsernameTaken ):
71+ WriteJSONError (w , http .StatusConflict , conflict , err .Error ())
8172 return
8273
8374 default :
@@ -116,7 +107,7 @@ func (h *AuthHandler) LoginUser(w http.ResponseWriter, r *http.Request) {
116107 accessToken , refreshToken , err := h .auth .Login (r .Context (), req .Email , req .Password )
117108 if err != nil {
118109 if errors .Is (err , user .ErrInvalidCredentials ) {
119- WriteJSONError (w , http .StatusUnauthorized , invalidCredentials , "Invalid credentials" )
110+ WriteJSONError (w , http .StatusUnauthorized , invalidRequest , "Invalid credentials" )
120111 return
121112 }
122113
@@ -155,7 +146,7 @@ func (h *AuthHandler) RefreshAccessToken(w http.ResponseWriter, r *http.Request)
155146 if err != nil {
156147 switch {
157148 case errors .Is (err , token .ErrTokenNotFound ):
158- WriteJSONError (w , http .StatusUnauthorized , invalidGrant , "Invalid or expired refresh token" )
149+ WriteJSONError (w , http .StatusUnauthorized , unauthorized , "Invalid or expired refresh token" )
159150 default :
160151 h .log .Error (fmt .Sprintf ("failed to refresh access token: %v" , err ))
161152 WriteInternalError (w )
0 commit comments