merged

supabase · Jul 3, 2024 · 959b7ad · 959b7ad
2 parents e8de23c + 247c591
commit 959b7ad
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/conventional-commits.yml b/.github/workflows/conventional-commits.yml
@@ -3,12 +3,12 @@ name: Check pull requests
 on:
   push:
     branches-ignore: # Run the checks on all branches but the protected ones
-      - master
+      - main
       - release/*
 
   pull_request_target:
     branches:
-      - master
+      - main
       - release/*
     types:
       - opened

diff --git a/src/cookies.ts b/src/cookies.ts
@@ -342,7 +342,7 @@ export function createStorageFromOptions(
 
         let decoded = chunkedCookie;
 
-        if (chunkedCookie !== null && chunkedCookie.startsWith(BASE64_PREFIX)) {
+        if (typeof chunkedCookie === 'string' && chunkedCookie.startsWith(BASE64_PREFIX)) {
           decoded = stringFromBase64URL(
             chunkedCookie.substring(BASE64_PREFIX.length),
           );

diff --git a/src/createServerClient.ts b/src/createServerClient.ts
@@ -193,7 +193,9 @@ export function createServerClient<
       (event === "SIGNED_IN" ||
         event === "TOKEN_REFRESHED" ||
         event === "USER_UPDATED" ||
-        event === "SIGNED_OUT")
+        event === "PASSWORD_RECOVERY" ||
+        event === "SIGNED_OUT" ||
+        event === "MFA_CHALLENGE_VERIFIED")
     ) {
       await applyServerStorage(
         { getAll, setAll, setItems, removedItems },