@cedarjs/auth-supabase-web 1.0.0-canary.12695 → 1.0.0-canary.12696

package/dist/cjs/supabase.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"supabase.d.ts","sourceRoot":"","sources":["../../src/supabase.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,cAAc,EACd,YAAY,EACZ,aAAa,EACb,WAAW,EACX,0BAA0B,EAC1B,4BAA4B,EAC5B,6BAA6B,EAC7B,iCAAiC,EACjC,aAAa,EAId,MAAM,uBAAuB,CAAA;AAG9B,OAAO,KAAK,EAAE,WAAW,EAAuB,MAAM,eAAe,CAAA;AAMrE,MAAM,MAAM,sBAAsB,GAAG,0BAA0B,GAAG;IAChE,UAAU,EAAE,OAAO,CAAA;CACpB,CAAA;AAED,MAAM,MAAM,wBAAwB,GAAG,4BAA4B,GAAG;IACpE,UAAU,EAAE,UAAU,CAAA;CACvB,CAAA;AAED,MAAM,MAAM,yBAAyB,GAAG,6BAA6B,GAAG;IACtE,UAAU,EAAE,UAAU,CAAA;CACvB,CAAA;AAED,MAAM,MAAM,6BAA6B,GACvC,iCAAiC,GAAG;IAClC,UAAU,EAAE,KAAK,CAAA;CAClB,CAAA;AAEH,MAAM,MAAM,oBAAoB,GAAG,aAAa,GAAG;IACjD,UAAU,EAAE,KAAK,CAAA;CAClB,CAAA;AAmBD,wBAAgB,UAAU,CACxB,cAAc,EAAE,cAAc,EAC9B,mBAAmB,CAAC,EAAE;IACpB,cAAc,CAAC,EAAE,MAAM,OAAO,CAAC,WAAW,CAAC,CAAA;IAC3C,UAAU,CAAC,EAAE,CACX,WAAW,EAAE,WAAW,GAAG,IAAI,KAC5B,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,EAAE,KAAK,OAAO,CAAA;CAClD;;;;;wBAyO25H,CAAC;;;oBA7Qj5H,UAAU;;;;;wBA6Q2oI,CAAC;;;oBA7QtpI,UAAU;;;;2BA6Qo3I,CAAC;4BAA4H,CAAC;gBAAoS,CAAC;wBAA0H,CAAC;;;oBAxQ15J,KAAK;;;;4BAwQqmK,CAAC;gBAAoS,CAAC;wBAA0H,CAAC;mBAAwF,CAAC;;;oBAxQpmL,KAAK;;;;sBAwQ+sT,CAAC;wBAA0H,CAAC;;;oBApQl1T,KAAK;;;;sBAoQ6iU,CAAC;wBAA0H,CAAC;;;oBApQ9qU,KAAK;;;;;2BAoQq/E,CAAC;gBAAmS,CAAC;wBAA0H,CAAC;;;;;;gBAA6a,CAAC;wBAA0K,CAAC;mBAAwF,CAAC;;;;;;;;wBAAoU,CAAC;;;oBA7Qj5H,UAAU;;;;;wBA6Q2oI,CAAC;;;oBA7QtpI,UAAU;;;;2BA6Qo3I,CAAC;4BAA4H,CAAC;gBAAoS,CAAC;wBAA0H,CAAC;;;oBAxQ15J,KAAK;;;;4BAwQqmK,CAAC;gBAAoS,CAAC;wBAA0H,CAAC;mBAAwF,CAAC;;;oBAxQpmL,KAAK;;;;sBAwQ+sT,CAAC;wBAA0H,CAAC;;;oBApQl1T,KAAK;;;;sBAoQ6iU,CAAC;wBAA0H,CAAC;;;oBApQ9qU,KAAK;;;;;2BAoQq/E,CAAC;gBAAmS,CAAC;wBAA0H,CAAC;;;;;;gBAA6a,CAAC;wBAA0K,CAAC;mBAAwF,CAAC;;;EAhOzlH"}
+{"version":3,"file":"supabase.d.ts","sourceRoot":"","sources":["../../src/supabase.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,cAAc,EACd,YAAY,EACZ,aAAa,EACb,WAAW,EACX,0BAA0B,EAC1B,4BAA4B,EAC5B,6BAA6B,EAC7B,iCAAiC,EACjC,aAAa,EAId,MAAM,uBAAuB,CAAA;AAG9B,OAAO,KAAK,EAAE,WAAW,EAAuB,MAAM,eAAe,CAAA;AAMrE,MAAM,MAAM,sBAAsB,GAAG,0BAA0B,GAAG;IAChE,UAAU,EAAE,OAAO,CAAA;CACpB,CAAA;AAED,MAAM,MAAM,wBAAwB,GAAG,4BAA4B,GAAG;IACpE,UAAU,EAAE,UAAU,CAAA;CACvB,CAAA;AAED,MAAM,MAAM,yBAAyB,GAAG,6BAA6B,GAAG;IACtE,UAAU,EAAE,UAAU,CAAA;CACvB,CAAA;AAED,MAAM,MAAM,6BAA6B,GACvC,iCAAiC,GAAG;IAClC,UAAU,EAAE,KAAK,CAAA;CAClB,CAAA;AAEH,MAAM,MAAM,oBAAoB,GAAG,aAAa,GAAG;IACjD,UAAU,EAAE,KAAK,CAAA;CAClB,CAAA;AAmBD,wBAAgB,UAAU,CACxB,cAAc,EAAE,cAAc,EAC9B,mBAAmB,CAAC,EAAE;IACpB,cAAc,CAAC,EAAE,MAAM,OAAO,CAAC,WAAW,CAAC,CAAA;IAC3C,UAAU,CAAC,EAAE,CACX,WAAW,EAAE,WAAW,GAAG,IAAI,KAC5B,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,EAAE,KAAK,OAAO,CAAA;CAClD;;;;;wBA8Pi0G,CAAC;;;oBAlSvzG,UAAU;;;;;wBAkSijH,CAAC;;;oBAlS5jH,UAAU;;;;2BAkS0xH,CAAC;4BAA4H,CAAC;gBAAoS,CAAC;wBAA0H,CAAC;;;oBA7Rh0I,KAAK;;;;4BA6R2gJ,CAAC;gBAAoS,CAAC;wBAA0H,CAAC;mBAAwF,CAAC;;;oBA7R1gK,KAAK;;;;sBA6RqnS,CAAC;wBAA0H,CAAC;;;oBAzRxvS,KAAK;;;;sBAyRm9S,CAAC;wBAA0H,CAAC;;;oBAzRplT,KAAK;;;;;2BAyR25D,CAAC;gBAAmS,CAAC;wBAA0H,CAAC;;;;;;gBAA6a,CAAC;wBAA0K,CAAC;mBAAwF,CAAC;;;;;;;;wBAAoU,CAAC;;;oBAlSvzG,UAAU;;;;;wBAkSijH,CAAC;;;oBAlS5jH,UAAU;;;;2BAkS0xH,CAAC;4BAA4H,CAAC;gBAAoS,CAAC;wBAA0H,CAAC;;;oBA7Rh0I,KAAK;;;;4BA6R2gJ,CAAC;gBAAoS,CAAC;wBAA0H,CAAC;mBAAwF,CAAC;;;oBA7R1gK,KAAK;;;;sBA6RqnS,CAAC;wBAA0H,CAAC;;;oBAzRxvS,KAAK;;;;sBAyRm9S,CAAC;wBAA0H,CAAC;;;oBAzRplT,KAAK;;;;;2BAyR25D,CAAC;gBAAmS,CAAC;wBAA0H,CAAC;;;;;;gBAA6a,CAAC;wBAA0K,CAAC;mBAAwF,CAAC;;;EArP//F"}

package/dist/cjs/supabase.js

@@ -196,13 +196,14 @@ function createAuthImplementation({
       return data?.session?.user?.user_metadata ?? null;
     },
     /**
-     * Restore Redwood authentication state when an OAuth or magiclink
-     * callback redirects back to site with access token
-     * by restoring the Supabase auth session.
+     * Restore CedarJS authentication state when an OAuth or magiclink callback
+     * redirects back to site with access token by restoring the Supabase auth
+     * session.
      *
-     * Initializes the Supabase client session either from the url or from storage.
-     * This method is automatically called when instantiating the client, but should also be called
-     * manually when checking for an error from an auth redirect (oauth, magiclink, password recovery, etc).
+     * Initializes the Supabase client session either from the url or from
+     * storage. This method is automatically called when instantiating the
+     * client, but should also be called manually when checking for an error
+     * from an auth redirect (oauth, magiclink, password recovery, etc).
      */
     restoreAuthState: async () => {
       try {
@@ -214,11 +215,25 @@ function createAuthImplementation({
             expireAuthProviderCookie();
           }
         }
-        window.history.replaceState(
-          {},
-          document.title,
-          window.location.pathname
-        );
+        const currentUrl = new URL(window.location.href);
+        const authParams = [
+          "access_token",
+          "refresh_token",
+          "token_type",
+          "expires_in",
+          "expires_at"
+        ];
+        let hasAuthParams = false;
+        authParams.forEach((param) => {
+          if (currentUrl.searchParams.has(param)) {
+            currentUrl.searchParams.delete(param);
+            hasAuthParams = true;
+          }
+        });
+        if (hasAuthParams) {
+          const cleanUrl = currentUrl.pathname + (currentUrl.search || "");
+          window.history.replaceState({}, document.title, cleanUrl);
+        }
       } catch (error) {
         console.error(error);
       }

package/dist/supabase.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"supabase.d.ts","sourceRoot":"","sources":["../src/supabase.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,cAAc,EACd,YAAY,EACZ,aAAa,EACb,WAAW,EACX,0BAA0B,EAC1B,4BAA4B,EAC5B,6BAA6B,EAC7B,iCAAiC,EACjC,aAAa,EAId,MAAM,uBAAuB,CAAA;AAG9B,OAAO,KAAK,EAAE,WAAW,EAAuB,MAAM,eAAe,CAAA;AAMrE,MAAM,MAAM,sBAAsB,GAAG,0BAA0B,GAAG;IAChE,UAAU,EAAE,OAAO,CAAA;CACpB,CAAA;AAED,MAAM,MAAM,wBAAwB,GAAG,4BAA4B,GAAG;IACpE,UAAU,EAAE,UAAU,CAAA;CACvB,CAAA;AAED,MAAM,MAAM,yBAAyB,GAAG,6BAA6B,GAAG;IACtE,UAAU,EAAE,UAAU,CAAA;CACvB,CAAA;AAED,MAAM,MAAM,6BAA6B,GACvC,iCAAiC,GAAG;IAClC,UAAU,EAAE,KAAK,CAAA;CAClB,CAAA;AAEH,MAAM,MAAM,oBAAoB,GAAG,aAAa,GAAG;IACjD,UAAU,EAAE,KAAK,CAAA;CAClB,CAAA;AAmBD,wBAAgB,UAAU,CACxB,cAAc,EAAE,cAAc,EAC9B,mBAAmB,CAAC,EAAE;IACpB,cAAc,CAAC,EAAE,MAAM,OAAO,CAAC,WAAW,CAAC,CAAA;IAC3C,UAAU,CAAC,EAAE,CACX,WAAW,EAAE,WAAW,GAAG,IAAI,KAC5B,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,EAAE,KAAK,OAAO,CAAA;CAClD;;;;;wBAyO25H,CAAC;;;oBA7Qj5H,UAAU;;;;;wBA6Q2oI,CAAC;;;oBA7QtpI,UAAU;;;;2BA6Qo3I,CAAC;4BAA4H,CAAC;gBAAoS,CAAC;wBAA0H,CAAC;;;oBAxQ15J,KAAK;;;;4BAwQqmK,CAAC;gBAAoS,CAAC;wBAA0H,CAAC;mBAAwF,CAAC;;;oBAxQpmL,KAAK;;;;sBAwQ+sT,CAAC;wBAA0H,CAAC;;;oBApQl1T,KAAK;;;;sBAoQ6iU,CAAC;wBAA0H,CAAC;;;oBApQ9qU,KAAK;;;;;2BAoQq/E,CAAC;gBAAmS,CAAC;wBAA0H,CAAC;;;;;;gBAA6a,CAAC;wBAA0K,CAAC;mBAAwF,CAAC;;;;;;;;wBAAoU,CAAC;;;oBA7Qj5H,UAAU;;;;;wBA6Q2oI,CAAC;;;oBA7QtpI,UAAU;;;;2BA6Qo3I,CAAC;4BAA4H,CAAC;gBAAoS,CAAC;wBAA0H,CAAC;;;oBAxQ15J,KAAK;;;;4BAwQqmK,CAAC;gBAAoS,CAAC;wBAA0H,CAAC;mBAAwF,CAAC;;;oBAxQpmL,KAAK;;;;sBAwQ+sT,CAAC;wBAA0H,CAAC;;;oBApQl1T,KAAK;;;;sBAoQ6iU,CAAC;wBAA0H,CAAC;;;oBApQ9qU,KAAK;;;;;2BAoQq/E,CAAC;gBAAmS,CAAC;wBAA0H,CAAC;;;;;;gBAA6a,CAAC;wBAA0K,CAAC;mBAAwF,CAAC;;;EAhOzlH"}
+{"version":3,"file":"supabase.d.ts","sourceRoot":"","sources":["../src/supabase.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,cAAc,EACd,YAAY,EACZ,aAAa,EACb,WAAW,EACX,0BAA0B,EAC1B,4BAA4B,EAC5B,6BAA6B,EAC7B,iCAAiC,EACjC,aAAa,EAId,MAAM,uBAAuB,CAAA;AAG9B,OAAO,KAAK,EAAE,WAAW,EAAuB,MAAM,eAAe,CAAA;AAMrE,MAAM,MAAM,sBAAsB,GAAG,0BAA0B,GAAG;IAChE,UAAU,EAAE,OAAO,CAAA;CACpB,CAAA;AAED,MAAM,MAAM,wBAAwB,GAAG,4BAA4B,GAAG;IACpE,UAAU,EAAE,UAAU,CAAA;CACvB,CAAA;AAED,MAAM,MAAM,yBAAyB,GAAG,6BAA6B,GAAG;IACtE,UAAU,EAAE,UAAU,CAAA;CACvB,CAAA;AAED,MAAM,MAAM,6BAA6B,GACvC,iCAAiC,GAAG;IAClC,UAAU,EAAE,KAAK,CAAA;CAClB,CAAA;AAEH,MAAM,MAAM,oBAAoB,GAAG,aAAa,GAAG;IACjD,UAAU,EAAE,KAAK,CAAA;CAClB,CAAA;AAmBD,wBAAgB,UAAU,CACxB,cAAc,EAAE,cAAc,EAC9B,mBAAmB,CAAC,EAAE;IACpB,cAAc,CAAC,EAAE,MAAM,OAAO,CAAC,WAAW,CAAC,CAAA;IAC3C,UAAU,CAAC,EAAE,CACX,WAAW,EAAE,WAAW,GAAG,IAAI,KAC5B,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,EAAE,KAAK,OAAO,CAAA;CAClD;;;;;wBA8Pi0G,CAAC;;;oBAlSvzG,UAAU;;;;;wBAkSijH,CAAC;;;oBAlS5jH,UAAU;;;;2BAkS0xH,CAAC;4BAA4H,CAAC;gBAAoS,CAAC;wBAA0H,CAAC;;;oBA7Rh0I,KAAK;;;;4BA6R2gJ,CAAC;gBAAoS,CAAC;wBAA0H,CAAC;mBAAwF,CAAC;;;oBA7R1gK,KAAK;;;;sBA6RqnS,CAAC;wBAA0H,CAAC;;;oBAzRxvS,KAAK;;;;sBAyRm9S,CAAC;wBAA0H,CAAC;;;oBAzRplT,KAAK;;;;;2BAyR25D,CAAC;gBAAmS,CAAC;wBAA0H,CAAC;;;;;;gBAA6a,CAAC;wBAA0K,CAAC;mBAAwF,CAAC;;;;;;;;wBAAoU,CAAC;;;oBAlSvzG,UAAU;;;;;wBAkSijH,CAAC;;;oBAlS5jH,UAAU;;;;2BAkS0xH,CAAC;4BAA4H,CAAC;gBAAoS,CAAC;wBAA0H,CAAC;;;oBA7Rh0I,KAAK;;;;4BA6R2gJ,CAAC;gBAAoS,CAAC;wBAA0H,CAAC;mBAAwF,CAAC;;;oBA7R1gK,KAAK;;;;sBA6RqnS,CAAC;wBAA0H,CAAC;;;oBAzRxvS,KAAK;;;;sBAyRm9S,CAAC;wBAA0H,CAAC;;;oBAzRplT,KAAK;;;;;2BAyR25D,CAAC;gBAAmS,CAAC;wBAA0H,CAAC;;;;;;gBAA6a,CAAC;wBAA0K,CAAC;mBAAwF,CAAC;;;EArP//F"}

package/dist/supabase.js

@@ -176,13 +176,14 @@ function createAuthImplementation({
       return data?.session?.user?.user_metadata ?? null;
     },
     /**
-     * Restore Redwood authentication state when an OAuth or magiclink
-     * callback redirects back to site with access token
-     * by restoring the Supabase auth session.
+     * Restore CedarJS authentication state when an OAuth or magiclink callback
+     * redirects back to site with access token by restoring the Supabase auth
+     * session.
      *
-     * Initializes the Supabase client session either from the url or from storage.
-     * This method is automatically called when instantiating the client, but should also be called
-     * manually when checking for an error from an auth redirect (oauth, magiclink, password recovery, etc).
+     * Initializes the Supabase client session either from the url or from
+     * storage. This method is automatically called when instantiating the
+     * client, but should also be called manually when checking for an error
+     * from an auth redirect (oauth, magiclink, password recovery, etc).
      */
     restoreAuthState: async () => {
       try {
@@ -194,11 +195,25 @@ function createAuthImplementation({
             expireAuthProviderCookie();
           }
         }
-        window.history.replaceState(
-          {},
-          document.title,
-          window.location.pathname
-        );
+        const currentUrl = new URL(window.location.href);
+        const authParams = [
+          "access_token",
+          "refresh_token",
+          "token_type",
+          "expires_in",
+          "expires_at"
+        ];
+        let hasAuthParams = false;
+        authParams.forEach((param) => {
+          if (currentUrl.searchParams.has(param)) {
+            currentUrl.searchParams.delete(param);
+            hasAuthParams = true;
+          }
+        });
+        if (hasAuthParams) {
+          const cleanUrl = currentUrl.pathname + (currentUrl.search || "");
+          window.history.replaceState({}, document.title, cleanUrl);
+        }
       } catch (error) {
         console.error(error);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/auth-supabase-web",
-  "version": "1.0.0-canary.12695+dd0610f95",
+  "version": "1.0.0-canary.12696+23ff3ce3e",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cedarjs/cedar.git",
@@ -49,10 +49,10 @@
     "test:watch": "vitest watch"
   },
   "dependencies": {
-    "@cedarjs/auth": "1.0.0-canary.12695"
+    "@cedarjs/auth": "1.0.0-canary.12696"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "1.0.0-canary.12695",
+    "@cedarjs/framework-tools": "1.0.0-canary.12696",
     "@supabase/ssr": "0.5.1",
     "@supabase/supabase-js": "2.45.4",
     "@types/react": "^18.2.55",
@@ -69,5 +69,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "dd0610f95c9d032a3a1b099d3d017731ac7d33a6"
+  "gitHead": "23ff3ce3e8edc97dcb3d47e39df0a1b2779852ac"
 }