@krainovsd/js-helpers 0.14.11 → 0.14.13

package/lib/cjs/index.cjs

@@ -736,11 +736,11 @@ function getVisiblePosition({ initialPosition, node, visibleArea, placement = "b
     ? 0
     : 10, flex, nested, }) {
     /** Viewport Variables */
-    const totalHeight = document.documentElement.scrollHeight;
-    const totalWidth = document.documentElement.scrollWidth;
-    const viewport = visibleArea ?? document.documentElement;
-    const scrollTop = document.documentElement.scrollTop;
-    const scrollLeft = document.documentElement.scrollLeft;
+    const totalHeight = document.body.scrollHeight;
+    const totalWidth = document.body.scrollWidth;
+    const viewport = visibleArea ?? document.body;
+    const scrollTop = document.body.scrollTop;
+    const scrollLeft = document.body.scrollLeft;
     const rect = viewport.getBoundingClientRect();
     const viewportWidth = viewport.clientWidth;
     const viewportHeight = viewport.clientHeight;
@@ -1245,15 +1245,15 @@ function execAnimation(element, className, autoCloseDelay = 700) {
 const RESPONSE_DATA_SYMBOL = Symbol("response data");
 
 async function updateAuthToken(options) {
-    let token = localStorage.getItem(options.storageTokenName);
-    const expires = localStorage.getItem(options.storageTokenExpiresName);
+    let token = localStorage.getItem(options.tokenStorageName);
+    const expires = localStorage.getItem(options.expiresTokenStorageName);
     if (!token || !expires || Date.now() > +expires) {
         token = await (options.tokenRequest ? options.tokenRequest() : getAuthToken(options));
         if (isNull(token)) {
-            return void window.location.replace(options.authUrl());
+            return void window.location.replace(typeof options.oauthUrl === "function" ? options.oauthUrl() : options.oauthUrl);
         }
         if (isUndefined(token)) {
-            return void window.location.replace(options.errorUrl);
+            return void window.location.replace(typeof options.errorUrl === "function" ? options.errorUrl() : options.errorUrl);
         }
     }
     return token;
@@ -1271,8 +1271,8 @@ async function getAuthToken(options) {
         const result = (await response.json());
         try {
             const { expires, token } = transformData(result, options.pathToToken, options.pathToTokenExpires);
-            localStorage.setItem(options.storageTokenExpiresName, expires);
-            localStorage.setItem(options.storageTokenName, token);
+            localStorage.setItem(options.expiresTokenStorageName, expires);
+            localStorage.setItem(options.tokenStorageName, token);
             return token;
         }
         catch {
@@ -1299,8 +1299,10 @@ function transformData(data, pathToToken, pathToTokenExpires) {
 }
 async function getAuthTokenNoRefresh(options) {
     let waiting = true;
-    const url = new URL(window.origin);
-    url.searchParams.append(options.queryIsRefreshTokenName, "true");
+    const url = new URL(typeof options.refreshTokenWindowUrl === "function"
+        ? options.refreshTokenWindowUrl()
+        : (options.refreshTokenWindowUrl ?? window.origin));
+    url.searchParams.append(options.onlyRefreshTokenWindowQueryName, "true");
     let windowInstance = window.open(url.toString(), "_blank", "width=800,height=600,left=100,top=100");
     windowInstance ??= window.open(url.toString());
     if (!windowInstance) {
@@ -1308,7 +1310,7 @@ async function getAuthTokenNoRefresh(options) {
             options.onWindowOpenError();
         return;
     }
-    const channel = new BroadcastChannel(options.queryIsRefreshTokenName);
+    const channel = new BroadcastChannel(options.onlyRefreshTokenWindowQueryName);
     channel.onmessage = () => {
         if (waiting) {
             waiting = false;
@@ -1327,41 +1329,50 @@ async function getAuthTokenNoRefresh(options) {
     await waitUntil(() => waiting);
 }
 function updateAuthTokenNoRefresh(options) {
-    let expires = localStorage.getItem(options.storageTokenExpiresName);
+    let expires = localStorage.getItem(options.expiresTokenStorageName);
     if (!expires || Number.isNaN(+expires) || Date.now() > +expires)
         expires = null;
-    const queries = getQueryValues([options.queryTokenExpiresName, options.queryIsRefreshTokenName]);
-    const refreshQuery = queries?.[options.queryIsRefreshTokenName];
-    const expiresQuery = queries?.[options.queryTokenExpiresName];
+    const queries = getQueryValues([
+        options.expiresTokenQueryName,
+        options.onlyRefreshTokenWindowQueryName,
+    ]);
+    const refreshQuery = queries?.[options.onlyRefreshTokenWindowQueryName];
+    const expiresQuery = queries?.[options.expiresTokenQueryName];
+    /** Is OnlyRefresh window */
     const isRefresh = isString(refreshQuery)
         ? refreshQuery === "true"
         : isArray(refreshQuery)
             ? refreshQuery[refreshQuery.length - 1] === "true"
             : false;
+    /** Expires token */
     const expiresFromQuery = 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(options.authUrl());
+        window.location.replace(typeof options.oauthUrl === "function" ? options.oauthUrl() : options.oauthUrl);
         return null;
     }
-    localStorage.setItem(options.storageTokenExpiresName, expires);
+    localStorage.setItem(options.expiresTokenStorageName, expires);
+    /** Close if OnlyRefresh window  */
     if (isRefresh) {
-        const channel = new BroadcastChannel(options.queryIsRefreshTokenName);
+        const channel = new BroadcastChannel(options.onlyRefreshTokenWindowQueryName);
         channel.postMessage(true);
         channel.close();
         window.close();
     }
+    /** Delete expires query */
     if (expiresFromQuery) {
         const url = new URL(window.location.href);
-        url.searchParams.delete(options.queryTokenExpiresName);
+        url.searchParams.delete(options.expiresTokenQueryName);
         window.location.replace(url.toString());
         return null;
     }
@@ -1371,7 +1382,7 @@ function updateAuthTokenNoRefresh(options) {
 async function updateAuthUser(options) {
     const userInfo = await (options.userRequest ? options.userRequest() : getAuthUser(options));
     if (isNull(userInfo)) {
-        return void window.location.replace(options.authUrl());
+        return void window.location.replace(options.oauthUrl());
     }
     if (isUndefined(userInfo)) {
         return void window.location.replace(options.errorUrl);
@@ -1401,9 +1412,9 @@ async function getAuthUser(options) {
 let isFetchingAccessToken$1 = false;
 const generateAuthMiddleWare = (options) => async (request) => {
     if (!options.authTokenUrl ||
-        !options.authUrl ||
-        !options.storageTokenExpiresName ||
-        !options.storageTokenName ||
+        !options.oauthUrl ||
+        !options.expiresTokenStorageName ||
+        !options.tokenStorageName ||
         !options.pathToTokenExpires ||
         !options.pathToToken ||
         !options.errorUrl) {
@@ -1420,17 +1431,17 @@ const generateAuthMiddleWare = (options) => async (request) => {
     }
     if (isFetchingAccessToken$1)
         await waitUntil(() => isFetchingAccessToken$1);
-    const expires = localStorage.getItem(options.storageTokenExpiresName);
-    let token = localStorage.getItem(options.storageTokenName);
+    const expires = localStorage.getItem(options.expiresTokenStorageName);
+    let token = localStorage.getItem(options.tokenStorageName);
     if (!expires || Date.now() > +expires || !token) {
         isFetchingAccessToken$1 = true;
         token = await (options.tokenRequest ? options.tokenRequest() : getAuthToken(options));
         isFetchingAccessToken$1 = false;
         if (isNull(token)) {
-            return void window.location.replace(options.authUrl());
+            return void window.location.replace(typeof options.oauthUrl === "function" ? options.oauthUrl() : options.oauthUrl);
         }
         if (isUndefined(token)) {
-            return void window.location.replace(options.errorUrl);
+            return void window.location.replace(typeof options.errorUrl === "function" ? options.errorUrl() : options.errorUrl);
         }
     }
     if (!isSameOrigin)
@@ -1442,7 +1453,7 @@ const generateAuthMiddleWare = (options) => async (request) => {
 
 let isFetchingAccessToken = false;
 const generateAuthNoRefreshMiddleWare = (options) => async (request) => {
-    if (!options.authUrl || !options.storageTokenExpiresName || !options.errorUrl) {
+    if (!options.oauthUrl || !options.expiresTokenStorageName || !options.errorUrl) {
         throw new Error("Auth middleware hasn't required options");
     }
     const isSameOrigin = !startWith(request.path, "http");
@@ -1456,13 +1467,13 @@ const generateAuthNoRefreshMiddleWare = (options) => async (request) => {
     }
     if (isFetchingAccessToken)
         await waitUntil(() => isFetchingAccessToken);
-    const expires = localStorage.getItem(options.storageTokenExpiresName);
+    const expires = localStorage.getItem(options.expiresTokenStorageName);
     if (!expires || Number.isNaN(+expires) || Date.now() > +expires) {
         isFetchingAccessToken = true;
         await (options.tokenRequest ? options.tokenRequest() : getAuthTokenNoRefresh(options));
         isFetchingAccessToken = false;
     }
-    const token = options.storageTokenName ? localStorage.getItem(options.storageTokenName) : null;
+    const token = options.tokenStorageName ? localStorage.getItem(options.tokenStorageName) : null;
     if (!isSameOrigin && token)
         request.headers = {
             ...request.headers,