@krainovsd/js-helpers 0.15.2 → 0.15.3

package/lib/cjs/index.cjs

@@ -1330,7 +1330,7 @@ function generateConsoleMiddleware(options = {}) {
 }
 
 function generateConsolePostMiddleware(options = {}) {
-    return (response) => {
+    return (request, response) => {
         return new Promise((resolve) => {
             void (async function logger() {
                 try {
@@ -1380,13 +1380,8 @@ function generateConsolePostMiddleware(options = {}) {
     };
 }
 
-let waiting = false;
 async function getOauthTokenFromOtherWindow(options) {
-    await waitUntil(() => waiting);
-    const expires = localStorage.getItem(options.expiresTokenStorageName);
-    if (expires != undefined && !Number.isNaN(+expires) && Date.now() < +expires)
-        return;
-    waiting = true;
+    let waiting = true;
     const url = new URL(typeof options.refreshTokenWindowUrl === "function"
         ? options.refreshTokenWindowUrl()
         : (options.refreshTokenWindowUrl ?? window.origin));
@@ -1431,9 +1426,6 @@ async function getOauthTokenFromOtherWindow(options) {
     await waitUntil(() => waiting);
 }
 function getOauthToken(options) {
-    let expires = localStorage.getItem(options.expiresTokenStorageName);
-    if (!expires || Number.isNaN(+expires) || Date.now() > +expires)
-        expires = null;
     const queries = getQueryValues([
         options.expiresTokenQueryName,
         options.onlyRefreshTokenWindowQueryName,
@@ -1447,17 +1439,11 @@ function getOauthToken(options) {
             ? refreshQuery[refreshQuery.length - 1] === "true"
             : false;
     /** Expires token */
-    const expiresFromQuery = isString(expiresQuery)
+    const expires = isString(expiresQuery)
         ? expiresQuery
         : isArray(expiresQuery)
             ? expiresQuery[expiresQuery.length - 1]
             : false;
-    /** Extract expires from query */
-    if (!expires && expiresFromQuery) {
-        expires = expiresFromQuery;
-        if (!expires || Number.isNaN(+expires) || Date.now() > +expires)
-            expires = null;
-    }
     /** OAuth flow if not expires */
     if (!expires) {
         window.location.replace(typeof options.oauthUrl === "function" ? options.oauthUrl() : options.oauthUrl);
@@ -1472,7 +1458,7 @@ function getOauthToken(options) {
         window.close();
     }
     /** Delete expires query */
-    if (expiresFromQuery) {
+    if (expires) {
         const url = new URL(window.location.href);
         url.searchParams.delete(options.expiresTokenQueryName);
         window.location.replace(url.toString());
@@ -1553,14 +1539,34 @@ const generateOauthMiddleware = (options) => async (request) => {
             Authorization: `Bearer ${token}`,
         };
 };
+async function refetchAfterOauth(options, refetch) {
+    isFetchingAccessToken = true;
+    await getOauthTokenFromOtherWindow({
+        onlyRefreshTokenWindowQueryName: options.onlyRefreshTokenWindowQueryName,
+        onWindowOpenError: options.onWindowOpenError,
+        refreshTokenWindowUrl: options.refreshTokenWindowUrl,
+        wait: options.wait,
+        expiresTokenStorageName: options.expiresTokenStorageName,
+        closeObserveInterval: options.closeObserveInterval,
+    });
+    if (options.tokenRequest) {
+        const token = await options.tokenRequest();
+        if (token != undefined && options.tokenStorageName) {
+            localStorage.setItem(options.tokenStorageName, token);
+        }
+    }
+    isFetchingAccessToken = false;
+    return await refetch();
+}
 
-function generateMiddlewares(activeMiddlewares, middlewareOptions, customMiddlewares) {
+// eslint-disable-next-line max-params
+function generateMiddlewares(activeMiddlewares, middlewareOptions, oauthOptions, customMiddlewares) {
     const selectedMiddlewares = customMiddlewares;
     for (const key of activeMiddlewares) {
         switch (key) {
             case API_MIDDLEWARES.Oauth: {
-                if (middlewareOptions.oauth && (IS_BROWSER || IS_JEST))
-                    selectedMiddlewares.push(generateOauthMiddleware(middlewareOptions.oauth));
+                if (oauthOptions && (IS_BROWSER || IS_JEST))
+                    selectedMiddlewares.push(generateOauthMiddleware(oauthOptions));
                 continue;
             }
             case API_MIDDLEWARES.Logger: {
@@ -1597,12 +1603,12 @@ function generatePostMiddlewares(activePostMiddlewares, postMiddlewaresOptions,
             }
         }
     }
-    return function executeMiddlewares(response) {
+    return function executeMiddlewares(request, response) {
         return new Promise((resolve) => {
             void (async () => {
                 for (const middleware of selectedMiddlewares) {
                     // eslint-disable-next-line no-await-in-loop
-                    await middleware(response);
+                    await middleware(request, response);
                 }
                 resolve(1);
             })();
@@ -1626,8 +1632,8 @@ class ResponseError extends Error {
 function createRequestClientInstance(options) {
     let executeMiddlewares;
     let executePostMiddlewares;
-    function setMiddlewares({ activeMiddlewares = [], middlewareOptions = {}, customMiddlewares = [], activePostMiddlewares = [], postMiddlewaresOptions = {}, customPostMiddlewares = [], } = {}) {
-        executeMiddlewares = generateMiddlewares(activeMiddlewares, middlewareOptions, customMiddlewares);
+    function setMiddlewares({ activeMiddlewares = [], middlewareOptions = {}, customMiddlewares = [], activePostMiddlewares = [], postMiddlewaresOptions = {}, customPostMiddlewares = [], oauthOptions = undefined, } = {}) {
+        executeMiddlewares = generateMiddlewares(activeMiddlewares, middlewareOptions, oauthOptions, customMiddlewares);
         executePostMiddlewares = generatePostMiddlewares(activePostMiddlewares, postMiddlewaresOptions, customPostMiddlewares);
     }
     setMiddlewares(options);
@@ -1645,7 +1651,7 @@ function createRequestClientInstance(options) {
                 : transformedResult;
         }
         await executeMiddlewares(request);
-        const { method, body, path, params, headers = {} } = request;
+        const { method, body, path, params, headers = {}, refetchNoAuth = true } = request;
         const url = createURLWithParams({ baseURL: path, params });
         const [, requestContentType] = Object.entries(headers).find(([header]) => header.toLowerCase() === "content-type") ?? [];
         let preparedBody = body;
@@ -1670,7 +1676,7 @@ function createRequestClientInstance(options) {
             headers: headers,
             signal: request.signal,
         });
-        await executePostMiddlewares(response);
+        await executePostMiddlewares(request, response);
         if (!response) {
             throw new Error("hasn't response");
         }
@@ -1684,6 +1690,9 @@ function createRequestClientInstance(options) {
                     }
                     : undefined;
             }
+            if (response.status === 401 && refetchNoAuth && options.oauthOptions) {
+                return refetchAfterOauth(options.oauthOptions, () => handleRequest({ ...request, refetchNoAuth: false }, responseWithStatus));
+            }
             if (request.defaultResponse) {
                 const defaultResponse = typeof request.defaultResponse === "function"
                     ? request.defaultResponse()