@krainovsd/js-helpers 0.17.0 → 0.18.0

package/lib/cjs/index.cjs

@@ -1775,17 +1775,22 @@ class OauthState {
     }
 }
 const OAUTH_STATE = new OauthState();
+const OAUTH_TOKEN_STORAGE_NAME = "session_token";
+const OAUTH_TOKEN_EXPIRES_STORAGE_NAME = "session_token_expires";
+const OAUTH_REFRESH_QUERY = "only_session_refresh";
 
 async function getOauthTokenFromOtherWindow(options) {
     let waiting = true;
     const url = new URL(typeof options.refreshTokenWindowUrl === "function"
         ? options.refreshTokenWindowUrl()
         : (options.refreshTokenWindowUrl ?? window.origin));
-    url.searchParams.append(options.onlyRefreshTokenWindowQueryName, "true");
+    // added only refresh tag to autoclose window after flow
+    url.searchParams.append(options.onlyRefreshTokenWindowQueryName ?? OAUTH_REFRESH_QUERY, "true");
+    // try open window with both of action
     let windowInstance = window.open(url.toString(), "_blank", "width=800,height=600,left=100,top=100");
     windowInstance ??= window.open(url.toString(), "_blank");
     if (windowInstance) {
-        const channel = new BroadcastChannel(options.onlyRefreshTokenWindowQueryName);
+        const channel = new BroadcastChannel(options.onlyRefreshTokenWindowQueryName ?? OAUTH_REFRESH_QUERY);
         const windowCloseObserver = setInterval(() => {
             if (windowInstance.closed) {
                 if (waiting) {
@@ -1811,11 +1816,14 @@ async function getOauthTokenFromOtherWindow(options) {
             if (windowInstance && !windowInstance.closed) {
                 windowInstance.close();
             }
-        }, options.wait ?? 15000);
+        }, options.wait ?? 8000);
     }
     else {
-        if (options.onWindowOpenError)
-            options.onWindowOpenError();
+        if ("onWindowOpenError" in options)
+            options.onWindowOpenError?.();
+        else {
+            getOauthToken(options.oauthUrl);
+        }
         waiting = false;
         return;
     }
@@ -1828,19 +1836,21 @@ async function refetchAfterOauth(options, refetch) {
         onWindowOpenError: options.onWindowOpenError,
         refreshTokenWindowUrl: options.refreshTokenWindowUrl,
         wait: options.wait,
-        expiresTokenStorageName: options.expiresTokenStorageName,
         closeObserveInterval: options.closeObserveInterval,
     });
     OAUTH_STATE.fetching = false;
     return await refetch();
 }
-async function getOauthToken(options) {
-    const queries = getQueryValues([
-        options.expiresTokenQueryName,
-        options.onlyRefreshTokenWindowQueryName,
-    ]);
-    const refreshQuery = queries?.[options.onlyRefreshTokenWindowQueryName];
-    const expiresQuery = queries?.[options.expiresTokenQueryName];
+function getOauthToken(oauthUrl) {
+    oauthUrl ??= `/api/v1/auth?frontend_protocol=${window.location.protocol.replace(":", "")}&frontend_host=${window.location.host}&comeback_path=${window.location.pathname}${encodeURIComponent(window.location.search)}`;
+    window.location.replace(typeof oauthUrl === "function" ? oauthUrl() : oauthUrl);
+    return null;
+}
+async function extractOauthOptions(options = {}) {
+    const { expiresTokenQueryName = OAUTH_TOKEN_EXPIRES_STORAGE_NAME, onlyRefreshTokenWindowQueryName = OAUTH_REFRESH_QUERY, tokenStorageName = OAUTH_TOKEN_STORAGE_NAME, expiresTokenStorageName = OAUTH_TOKEN_EXPIRES_STORAGE_NAME, tokenRequest = undefined, } = options;
+    const queries = getQueryValues([expiresTokenQueryName, onlyRefreshTokenWindowQueryName]);
+    const refreshQuery = queries?.[onlyRefreshTokenWindowQueryName];
+    const expiresQuery = queries?.[expiresTokenQueryName];
     /** Is OnlyRefresh window */
     const isRefresh = isString(refreshQuery)
         ? refreshQuery === "true"
@@ -1853,21 +1863,18 @@ async function getOauthToken(options) {
         : isArray(expiresQuery)
             ? expiresQuery[expiresQuery.length - 1]
             : false;
-    /** OAuth flow if not expires */
-    if (!expires) {
-        window.location.replace(typeof options.oauthUrl === "function" ? options.oauthUrl() : options.oauthUrl);
-        return null;
-    }
-    localStorage.setItem(options.expiresTokenStorageName, expires);
-    if (options.tokenRequest) {
-        const token = await options.tokenRequest();
-        if (token != undefined && options.tokenStorageName) {
-            localStorage.setItem(options.tokenStorageName, token);
+    if (expires && !Number.isNaN(+expires) && Date.now() < +expires) {
+        localStorage.setItem(expiresTokenStorageName, expires);
+        if (tokenRequest) {
+            const token = await tokenRequest();
+            if (token != undefined && tokenStorageName) {
+                localStorage.setItem(tokenStorageName, token);
+            }
         }
     }
     /** Close if OnlyRefresh window  */
     if (isRefresh) {
-        const channel = new BroadcastChannel(options.onlyRefreshTokenWindowQueryName);
+        const channel = new BroadcastChannel(onlyRefreshTokenWindowQueryName);
         channel.postMessage(true);
         channel.close();
         window.close();
@@ -1875,7 +1882,7 @@ async function getOauthToken(options) {
     /** Delete expires query */
     if (expires) {
         const url = new URL(window.location.href);
-        url.searchParams.delete(options.expiresTokenQueryName);
+        url.searchParams.delete(expiresTokenQueryName);
         window.location.replace(url.toString());
         return null;
     }
@@ -2029,7 +2036,10 @@ function createFetchClient(options) {
                     request.onError?.(REQUEST_ERROR.CACHE_ERROR, error);
                     return { data: error, error: REQUEST_ERROR.CACHE_ERROR, response };
                 }
-                if (response.status === 401 && refetchAfterOauth$1 && oauthOptions) {
+                if ((oauthOptions?.responseStatusesForOauth?.includes(response.status) ||
+                    (!oauthOptions?.responseStatusesForOauth && response.status === 401)) &&
+                    oauthOptions &&
+                    refetchAfterOauth$1) {
                     return await refetchAfterOauth(oauthOptions, () => handleRequest({ ...request, refetchAfterOauth: false }));
                 }
                 if (response.status === 401 && refetchAfterAuth) {
@@ -2200,7 +2210,6 @@ function executeBeforeHandlers(handlers, request) {
     return new Promise((resolve) => {
         void (async () => {
             for (const handler of handlers) {
-                // eslint-disable-next-line no-await-in-loop
                 await handler(request);
             }
             resolve(1);
@@ -2211,7 +2220,6 @@ function executeAfterHandlers(handlers, request, response) {
     return new Promise((resolve) => {
         void (async () => {
             for (const handler of handlers) {
-                // eslint-disable-next-line no-await-in-loop
                 await handler(request, response);
             }
             resolve(1);
@@ -2289,39 +2297,13 @@ function loggerBeforeHandler(options = {}) {
     };
 }
 
-const oauthBeforeHandler = (options) => async (request) => {
-    if (!options.expiresTokenStorageName) {
-        throw new Error("Auth middleware hasn't required options");
-    }
-    const isSameOrigin = !startWith(request.path, "http");
-    if (request.token) {
-        if (!isSameOrigin)
-            request.headers = {
-                ...request.headers,
-                Authorization: `Bearer ${request.token}`,
-            };
-        return;
-    }
+const authBeforeHandler = (options = {}) => async (request) => {
+    const { tokenStorageName = OAUTH_TOKEN_STORAGE_NAME, forceSetToken = false } = options;
     if (OAUTH_STATE.fetching)
         await waitUntil(() => OAUTH_STATE.fetching);
-    const expires = localStorage.getItem(options.expiresTokenStorageName);
-    let token;
-    if (!expires || Number.isNaN(+expires) || Date.now() > +expires) {
-        OAUTH_STATE.fetching = true;
-        await getOauthTokenFromOtherWindow({
-            onlyRefreshTokenWindowQueryName: options.onlyRefreshTokenWindowQueryName,
-            onWindowOpenError: options.onWindowOpenError,
-            refreshTokenWindowUrl: options.refreshTokenWindowUrl,
-            wait: options.wait,
-            expiresTokenStorageName: options.expiresTokenStorageName,
-            closeObserveInterval: options.closeObserveInterval,
-        });
-        if (options.tokenStorageName) {
-            token = localStorage.getItem(options.tokenStorageName);
-        }
-        OAUTH_STATE.fetching = false;
-    }
-    if (!isSameOrigin && token)
+    const token = request.token ?? localStorage.getItem(tokenStorageName);
+    const isSameOrigin = request.path.includes(window.location.origin) || !startWith(request.path, "http");
+    if ((!isSameOrigin || forceSetToken) && token)
         request.headers = {
             ...request.headers,
             Authorization: `Bearer ${token}`,
@@ -2337,12 +2319,16 @@ exports.IS_DENO = IS_DENO;
 exports.IS_JEST = IS_JEST;
 exports.IS_NODE = IS_NODE;
 exports.IS_WEB_WORKER = IS_WEB_WORKER;
+exports.OAUTH_REFRESH_QUERY = OAUTH_REFRESH_QUERY;
 exports.OAUTH_STATE = OAUTH_STATE;
+exports.OAUTH_TOKEN_EXPIRES_STORAGE_NAME = OAUTH_TOKEN_EXPIRES_STORAGE_NAME;
+exports.OAUTH_TOKEN_STORAGE_NAME = OAUTH_TOKEN_STORAGE_NAME;
 exports.REQUEST_ERROR = REQUEST_ERROR;
 exports.RESPONSE_DATA_SYMBOL = RESPONSE_DATA_SYMBOL;
 exports.ResponseError = ResponseError;
 exports.arrayToMapByKey = arrayToMapByKey;
 exports.asyncLoop = asyncLoop;
+exports.authBeforeHandler = authBeforeHandler;
 exports.buildQueryString = buildQueryString;
 exports.checkType = checkType;
 exports.cloneDeep = cloneDeep;
@@ -2361,6 +2347,7 @@ exports.differenceWith = differenceWith;
 exports.downloadFile = downloadFile;
 exports.downloadJson = downloadJson;
 exports.execAnimation = execAnimation;
+exports.extractOauthOptions = extractOauthOptions;
 exports.extractQueries = extractQueries;
 exports.fieldViewFormat = fieldViewFormat;
 exports.getByPath = getByPath;
@@ -2392,7 +2379,6 @@ exports.jsonParse = jsonParse;
 exports.limitStreamOfRequests = limitStreamOfRequests;
 exports.loggerAfterHandler = loggerAfterHandler;
 exports.loggerBeforeHandler = loggerBeforeHandler;
-exports.oauthBeforeHandler = oauthBeforeHandler;
 exports.randomBase64 = randomBase64;
 exports.randomHex = randomHex;
 exports.randomNumber = randomNumber;