fix: cleanup and reinstate blank lines

supabase · Mar 6, 2024 · f374f87 · f374f87
1 parent f7715bf
commit f374f87
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/internal/api/pkce.go b/internal/api/pkce.go
@@ -40,7 +40,7 @@ func addFlowPrefixToToken(token string, flowType models.FlowType) string {
 
 func issueAuthCode(tx *storage.Connection, user *models.User, authenticationMethod models.AuthenticationMethod) (string, error) {
 	flowState, err := models.FindFlowStateByUserID(tx, user.ID.String(), authenticationMethod)
-	if models.IsNotFoundError(err) {
+	if err != nil && models.IsNotFoundError(err) {
 		return "", badRequestError("No valid flow state found for user.")
 	} else if err != nil {
 		return "", err

diff --git a/internal/api/token.go b/internal/api/token.go
@@ -246,7 +246,6 @@ func (a *API) PKCE(ctx context.Context, w http.ResponseWriter, r *http.Request)
 	} else if err != nil {
 		return err
 	}
-
 	if flowState.IsExpired(a.config.External.FlowStateExpiryDuration) {
 		return forbiddenError("invalid flow state, flow state has expired")
 	}

diff --git a/internal/api/verify.go b/internal/api/verify.go
@@ -181,11 +181,13 @@ func (a *API) verifyGet(w http.ResponseWriter, r *http.Request, params *VerifyPa
 		if terr := tx.Reload(user); err != nil {
 			return terr
 		}
+
 		if isImplicitFlow(flowType) {
 			token, terr = a.issueRefreshToken(ctx, tx, user, models.OTP, grantParams)
 			if terr != nil {
 				return terr
 			}
+
 			if terr = a.setCookieTokens(config, token, false, w); terr != nil {
 				return internalServerError("Failed to set JWT cookie. %s", terr)
 			}