refactors to solve for supertokens/supertokens-web-js#62

supertokens · Jan 18, 2023 · 8a7a8d0 · sublimator · Jan 18, 2023 · sublimator
1 parent 662ee62
commit 8a7a8d0
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 43 deletions.
diff --git a/bundle/bundle.js b/bundle/bundle.js
diff --git a/lib/build/fetch.js b/lib/build/fetch.js
diff --git a/lib/build/utils/cookieHandler/defaultImplementation.js b/lib/build/utils/cookieHandler/defaultImplementation.js
diff --git a/lib/ts/fetch.ts b/lib/ts/fetch.ts
@@ -21,16 +21,6 @@ import WindowHandlerReference from "./utils/windowHandler";
 import LockFactoryReference from "./utils/lockFactory";
 import { logDebugMessage } from "./logger";
 
-function getWindowOrThrow(): Window {
-    if (typeof window === "undefined") {
-        throw Error(
-            "If you are using this package with server-side rendering, please make sure that you are checking if the window object is defined."
-        );
-    }
-
-    return window;
-}
-
 export class AntiCsrfToken {
     private static tokenInfo:
         | undefined
@@ -163,7 +153,8 @@ export default class AuthHttpRequest {
         logDebugMessage("init: Input sessionExpiredStatusCode: " + config.sessionExpiredStatusCode);
         logDebugMessage("init: Input sessionScope: " + config.sessionScope);
 
-        AuthHttpRequest.env = getWindowOrThrow().fetch === undefined ? global : getWindowOrThrow();
+        const fetchedWindow = WindowHandlerReference.getReferenceOrThrow().windowHandler.getWindowUnsafe();
+        AuthHttpRequest.env = fetchedWindow === undefined || fetchedWindow.fetch === undefined ? global : fetchedWindow;
 
         AuthHttpRequest.refreshTokenUrl = config.apiDomain + config.apiBasePath + "/session/refresh";
         AuthHttpRequest.signOutUrl = config.apiDomain + config.apiBasePath + "/signout";

diff --git a/lib/ts/utils/cookieHandler/defaultImplementation.ts b/lib/ts/utils/cookieHandler/defaultImplementation.ts
@@ -13,22 +13,13 @@
  * under the License.
  */
 import { CookieHandlerInterface } from "./types";
-
-function getWindowOrThrow(): Window {
-    if (typeof window === "undefined") {
-        throw Error(
-            "If you are using this package with server-side rendering, please make sure that you are checking if the window object is defined."
-        );
-    }
-
-    return window;
-}
+import WindowHandlerReference from "../windowHandler";
 
 export const defaultCookieHandlerImplementation: CookieHandlerInterface = {
     getCookie: async function () {
-        return getWindowOrThrow().document.cookie;
+        return WindowHandlerReference.getReferenceOrThrow().windowHandler.getWindowUnsafe().document.cookie;
     },
     setCookie: async function (cookieString: string) {
-        getWindowOrThrow().document.cookie = cookieString;
+        WindowHandlerReference.getReferenceOrThrow().windowHandler.getWindowUnsafe().document.cookie = cookieString;
     }
 };