refactor: pass in passwordMinLength to invalidPasswordError instead o…

…f whole config (#1078) Co-authored-by: joel@joellee.org <joel@joellee.org>
supabase · Apr 14, 2023 · c2691e4 · c2691e4
1 parent 1aa8447
commit c2691e4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/internal/api/admin.go b/internal/api/admin.go
@@ -197,7 +197,7 @@ func (a *API) adminUserUpdate(w http.ResponseWriter, r *http.Request) error {
 
 		if params.Password != nil {
 			if len(*params.Password) < config.PasswordMinLength {
-				return invalidPasswordLengthError(config)
+				return invalidPasswordLengthError(config.PasswordMinLength)
 			}
 
 			if terr := user.UpdatePassword(tx, *params.Password); terr != nil {
@@ -284,7 +284,7 @@ func (a *API) adminUserUpdate(w http.ResponseWriter, r *http.Request) error {
 	})
 
 	if err != nil {
-		if errors.Is(err, invalidPasswordLengthError(config)) {
+		if errors.Is(err, invalidPasswordLengthError(config.PasswordMinLength)) {
 			return err
 		}
 		return internalServerError("Error updating user").WithInternalError(err)

diff --git a/internal/api/errors.go b/internal/api/errors.go
@@ -65,8 +65,8 @@ func (e *OAuthError) Cause() error {
 	return e
 }
 
-func invalidPasswordLengthError(config *conf.GlobalConfiguration) *HTTPError {
-	return unprocessableEntityError(fmt.Sprintf("Password should be at least %d characters", config.PasswordMinLength))
+func invalidPasswordLengthError(passwordMinLength int) *HTTPError {
+	return unprocessableEntityError(fmt.Sprintf("Password should be at least %d characters", passwordMinLength))
 }
 
 func invalidSignupError(config *conf.GlobalConfiguration) *HTTPError {

diff --git a/internal/api/user.go b/internal/api/user.go
@@ -105,7 +105,7 @@ func (a *API) UserUpdate(w http.ResponseWriter, r *http.Request) error {
 		var terr error
 		if params.Password != nil {
 			if len(*params.Password) < config.PasswordMinLength {
-				return invalidPasswordLengthError(config)
+				return invalidPasswordLengthError(config.PasswordMinLength)
 			}
 
 			isPasswordUpdated := false