fix: reduce size of PR

supabase · Jun 18, 2024 · cc4d1db · cc4d1db
1 parent 37a20cd
commit cc4d1db
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/internal/api/recover.go b/internal/api/recover.go
@@ -32,7 +32,6 @@ func (p *RecoverParams) Validate() error {
 // Recover sends a recovery email
 func (a *API) Recover(w http.ResponseWriter, r *http.Request) error {
 	ctx := r.Context()
-	config := a.config
 	db := a.db.WithContext(ctx)
 	params := &RecoverParams{}
 	if err := retrieveRequestParams(r, params); err != nil {
@@ -69,7 +68,7 @@ func (a *API) Recover(w http.ResponseWriter, r *http.Request) error {
 	})
 	if err != nil {
 		if errors.Is(err, MaxFrequencyLimitError) {
-			return tooManyRequestsError(ErrorCodeOverEmailSendRateLimit, generateFrequencyLimitErrorMessage(user.RecoverySentAt, config.SMTP.MaxFrequency))
+			return tooManyRequestsError(ErrorCodeOverEmailSendRateLimit, "For security purposes, you can only request this once every 60 seconds")
 		}
 		return internalServerError("Unable to process request").WithInternalError(err)
 	}

diff --git a/internal/api/resend.go b/internal/api/resend.go
@@ -3,6 +3,7 @@ package api
 import (
 	"errors"
 	"net/http"
+	"time"
 
 	"github.com/supabase/auth/internal/api/sms_provider"
 	"github.com/supabase/auth/internal/conf"
@@ -153,15 +154,12 @@ func (a *API) Resend(w http.ResponseWriter, r *http.Request) error {
 	if err != nil {
 		if errors.Is(err, MaxFrequencyLimitError) {
 			reason := ErrorCodeOverEmailSendRateLimit
-			if params.Type == smsVerification {
+			if params.Type == smsVerification || params.Type == phoneChangeVerification {
 				reason = ErrorCodeOverSMSSendRateLimit
-				return tooManyRequestsError(reason, generateFrequencyLimitErrorMessage(user.ConfirmationSentAt, config.Sms.MaxFrequency))
-			} else if params.Type == phoneChangeVerification {
-				reason = ErrorCodeOverSMSSendRateLimit
-				return tooManyRequestsError(reason, generateFrequencyLimitErrorMessage(user.PhoneChangeSentAt, config.Sms.MaxFrequency))
 			}
 
-			return tooManyRequestsError(reason, generateFrequencyLimitErrorMessage(user.ConfirmationSentAt, config.SMTP.MaxFrequency))
+			until := time.Until(user.ConfirmationSentAt.Add(config.SMTP.MaxFrequency)) / time.Second
+			return tooManyRequestsError(reason, "For security purposes, you can only request this once every %d seconds.", until)
 		}
 		return internalServerError("Unable to process request").WithInternalError(err)
 	}