@lvce-editor/auth-worker 3.0.0 → 3.2.0

package/dist/authWorkerMain.js

@@ -1864,9 +1864,12 @@ async function getResponseJsonBody(response, check = assertApplicationJson) {
 }
 const _expectedIssuer = Symbol();
 
-const trailingSlashesRegex = /\/+$/;
 const trimTrailingSlashes = value => {
-  return value.replace(trailingSlashesRegex, '');
+  let end = value.length;
+  while (end > 0 && value[end - 1] === '/') {
+    end--;
+  }
+  return value.slice(0, end);
 };
 
 const getBackendAuthUrl = (backendUrl, path) => {
@@ -1948,14 +1951,18 @@ const getOidcUserName = async (backendUrl, accessToken, fetchFn = fetch) => {
   if (!payload || typeof payload !== 'object') {
     return '';
   }
-  const displayName = Reflect.get(payload, 'displayName');
+  const {
+    displayName
+  } = payload;
   return typeof displayName === 'string' ? displayName : '';
 };
 
 const databaseName = 'auth-worker';
 const objectStoreName = 'auth';
 const memoryStorage = new Map();
-let databasePromise;
+const state$1 = {
+  databasePromise: undefined
+};
 
 // IndexedDB request objects are mutable browser primitives and cannot satisfy the readonly rule structurally.
 // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
@@ -1988,8 +1995,8 @@ const getDatabase = async () => {
   if (typeof indexedDB === 'undefined') {
     return undefined;
   }
-  if (!databasePromise) {
-    databasePromise = new Promise((resolve, reject) => {
+  if (!state$1.databasePromise) {
+    state$1.databasePromise = new Promise((resolve, reject) => {
       const request = indexedDB.open(databaseName, 1);
       request.addEventListener('upgradeneeded', () => {
         const database = request.result;
@@ -2005,7 +2012,7 @@ const getDatabase = async () => {
       });
     });
   }
-  return databasePromise;
+  return state$1.databasePromise;
 };
 const getPersistentAuthValue = async key => {
   const database = await getDatabase();
@@ -2084,7 +2091,7 @@ const normalizeRedirectUri = value => {
   const url = new URL(value);
   url.hash = '';
   url.search = '';
-  return url.toString();
+  return url.href;
 };
 const getCallbackHref = async () => {
   const storedCallbackUrl = await getOidcCallbackUrl();
@@ -2107,7 +2114,6 @@ const completeBrowserOidcLogin = async backendUrl => {
   }
   const code = url.searchParams.get('code') || '';
   const error = url.searchParams.get('error') || '';
-  const errorDescription = url.searchParams.get('error_description') || '';
   if (!code && !error) {
     return undefined;
   }
@@ -2120,6 +2126,7 @@ const completeBrowserOidcLogin = async backendUrl => {
     await clearPendingOidcAuthState();
     return getLoggedOutBackendAuthState('Authentication returned to an unexpected redirect URI.');
   }
+  const errorDescription = url.searchParams.get('error_description') || '';
   if (error) {
     await clearPendingOidcAuthState();
     return getLoggedOutBackendAuthState(errorDescription || error);
@@ -2176,24 +2183,24 @@ const getPersistedAuthSession = async () => {
     authAccessToken: accessToken,
     authErrorMessage: '',
     userState: 'loggedIn',
-    ...(optionalAuthClientId ? {
+    ...(optionalAuthClientId && {
       authClientId
-    } : {}),
-    ...(optionalRefreshToken ? {
+    }),
+    ...(optionalRefreshToken && {
       authRefreshToken: refreshToken
-    } : {}),
-    ...(optionalUserName ? {
+    }),
+    ...(optionalUserName && {
       userName
-    } : {}),
-    ...(optionalSubscriptionPlan ? {
+    }),
+    ...(optionalSubscriptionPlan && {
       userSubscriptionPlan
-    } : {}),
-    ...(optionalSubscriptionStatus ? {
+    }),
+    ...(optionalSubscriptionStatus && {
       userSubscriptionStatus
-    } : {}),
-    ...(typeof optionalUsedTokens === 'number' ? {
+    }),
+    ...(typeof optionalUsedTokens === 'number' && {
       userUsedTokens: optionalUsedTokens
-    } : {})
+    })
   };
 };
 const persistAuthSession = async loginResult => {
@@ -2209,6 +2216,65 @@ const persistLoginResult = async loginResult => {
   return loginResult;
 };
 
+const getAuthorizationServer = backendUrl => {
+  return {
+    issuer: getBackendAuthUrl(backendUrl, '/oidc'),
+    jwks_uri: getBackendAuthUrl(backendUrl, '/oidc/jwks'),
+    token_endpoint: getBackendOidcTokenUrl(backendUrl)
+  };
+};
+const getClient = clientId => {
+  return {
+    client_id: clientId
+  };
+};
+const refreshOidcTokens = async (backendUrl, clientId, refreshToken, requestTokenEndpoint = genericTokenEndpointRequest, processTokenEndpointResponse = processGenericTokenEndpointResponse) => {
+  const authorizationServer = getAuthorizationServer(backendUrl);
+  const client = getClient(clientId);
+  const response = await requestTokenEndpoint(authorizationServer, client, None(), 'refresh_token', new URLSearchParams({
+    refresh_token: refreshToken
+  }));
+  const tokenResponse = await processTokenEndpointResponse(authorizationServer, client, response);
+  return {
+    accessToken: tokenResponse.access_token,
+    refreshToken: typeof tokenResponse.refresh_token === 'string' ? tokenResponse.refresh_token : refreshToken
+  };
+};
+
+const clearStoredOidcAuth = async () => {
+  await clearPersistedAuthSession();
+};
+const toLoginResult = (accessToken, refreshToken, clientId, userName) => {
+  return {
+    authAccessToken: accessToken,
+    authClientId: clientId,
+    authErrorMessage: '',
+    authRefreshToken: refreshToken,
+    userName,
+    userState: accessToken ? 'loggedIn' : 'loggedOut'
+  };
+};
+const restoreOidcAuth = async backendUrl => {
+  const [accessToken, refreshToken, clientId] = await Promise.all([getPersistentAuthValue('accessToken'), getPersistentAuthValue('refreshToken'), getStoredOidcClientId()]);
+  if (!refreshToken || !clientId) {
+    return undefined;
+  }
+  try {
+    const refreshedTokens = await refreshOidcTokens(backendUrl, clientId, refreshToken);
+    const userName = await getOidcUserName(backendUrl, refreshedTokens.accessToken);
+    return toLoginResult(refreshedTokens.accessToken, refreshedTokens.refreshToken, clientId, userName);
+  } catch {
+    if (accessToken) {
+      const userName = await getOidcUserName(backendUrl, accessToken);
+      if (userName) {
+        return toLoginResult(accessToken, refreshToken, clientId, userName);
+      }
+    }
+    await clearStoredOidcAuth();
+    return undefined;
+  }
+};
+
 const getBackendUrl = options => {
   if (typeof options === 'number') {
     return '';
@@ -2223,6 +2289,10 @@ const initialize = async options => {
       if (completedBrowserLogin) {
         return persistLoginResult(completedBrowserLogin);
       }
+      const restoredOidcAuth = await restoreOidcAuth(backendUrl);
+      if (restoredOidcAuth) {
+        return persistLoginResult(restoredOidcAuth);
+      }
     }
     const persistedAuthSession = await getPersistedAuthSession();
     if (persistedAuthSession) {
@@ -2264,30 +2334,32 @@ const delay = async ms => {
   await new Promise(resolve => setTimeout(resolve, ms));
 };
 
-let nextLoginResponse;
-let nextRefreshResponse;
+const state = {
+  nextLoginResponse: undefined,
+  nextRefreshResponse: undefined
+};
 const setNextLoginResponse = response => {
-  nextLoginResponse = response;
+  state.nextLoginResponse = response;
 };
 const setNextRefreshResponse = response => {
-  nextRefreshResponse = response;
+  state.nextRefreshResponse = response;
 };
 const clear = () => {
-  nextLoginResponse = undefined;
-  nextRefreshResponse = undefined;
+  state.nextLoginResponse = undefined;
+  state.nextRefreshResponse = undefined;
 };
 const hasPendingMockLoginResponse = () => {
-  return !!nextLoginResponse;
+  return !!state.nextLoginResponse;
 };
 const hasPendingMockRefreshResponse = () => {
-  return !!nextRefreshResponse;
+  return !!state.nextRefreshResponse;
 };
 const consumeNextLoginResponse = async () => {
-  if (!nextLoginResponse) {
+  if (!state.nextLoginResponse) {
     return undefined;
   }
-  const response = nextLoginResponse;
-  nextLoginResponse = undefined;
+  const response = state.nextLoginResponse;
+  state.nextLoginResponse = undefined;
   if (response.delay > 0) {
     await delay(response.delay);
   }
@@ -2297,11 +2369,11 @@ const consumeNextLoginResponse = async () => {
   return response.response;
 };
 const consumeNextRefreshResponse = async () => {
-  if (!nextRefreshResponse) {
+  if (!state.nextRefreshResponse) {
     return undefined;
   }
-  const response = nextRefreshResponse;
-  nextRefreshResponse = undefined;
+  const response = state.nextRefreshResponse;
+  state.nextRefreshResponse = undefined;
   if (response.delay > 0) {
     await new Promise(resolve => setTimeout(resolve, response.delay));
   }
@@ -2353,65 +2425,6 @@ const parseBackendAuthResponse = value => {
   return toBackendAuthState(value);
 };
 
-const getAuthorizationServer = backendUrl => {
-  return {
-    issuer: getBackendAuthUrl(backendUrl, '/oidc'),
-    jwks_uri: getBackendAuthUrl(backendUrl, '/oidc/jwks'),
-    token_endpoint: getBackendOidcTokenUrl(backendUrl)
-  };
-};
-const getClient = clientId => {
-  return {
-    client_id: clientId
-  };
-};
-const refreshOidcTokens = async (backendUrl, clientId, refreshToken, requestTokenEndpoint = genericTokenEndpointRequest, processTokenEndpointResponse = processGenericTokenEndpointResponse) => {
-  const authorizationServer = getAuthorizationServer(backendUrl);
-  const client = getClient(clientId);
-  const response = await requestTokenEndpoint(authorizationServer, client, None(), 'refresh_token', new URLSearchParams({
-    refresh_token: refreshToken
-  }));
-  const tokenResponse = await processTokenEndpointResponse(authorizationServer, client, response);
-  return {
-    accessToken: tokenResponse.access_token,
-    refreshToken: typeof tokenResponse.refresh_token === 'string' ? tokenResponse.refresh_token : refreshToken
-  };
-};
-
-const clearStoredOidcAuth = async () => {
-  await clearPersistedAuthSession();
-};
-const toLoginResult = (accessToken, refreshToken, clientId, userName) => {
-  return {
-    authAccessToken: accessToken,
-    authClientId: clientId,
-    authErrorMessage: '',
-    authRefreshToken: refreshToken,
-    userName,
-    userState: accessToken ? 'loggedIn' : 'loggedOut'
-  };
-};
-const restoreOidcAuth = async backendUrl => {
-  const [accessToken, refreshToken, clientId] = await Promise.all([getPersistentAuthValue('accessToken'), getPersistentAuthValue('refreshToken'), getStoredOidcClientId()]);
-  if (!refreshToken || !clientId) {
-    return undefined;
-  }
-  try {
-    const refreshedTokens = await refreshOidcTokens(backendUrl, clientId, refreshToken);
-    const userName = await getOidcUserName(backendUrl, refreshedTokens.accessToken);
-    return toLoginResult(refreshedTokens.accessToken, refreshedTokens.refreshToken, clientId, userName);
-  } catch {
-    if (accessToken) {
-      const userName = await getOidcUserName(backendUrl, accessToken);
-      if (userName) {
-        return toLoginResult(accessToken, refreshToken, clientId, userName);
-      }
-    }
-    await clearStoredOidcAuth();
-    return undefined;
-  }
-};
-
 const getPayload = async response => {
   try {
     return await response.json();
@@ -2806,7 +2819,7 @@ const getBackendLoginRequest = async (backendUrl, platform = 0, uid = 0, redirec
   return {
     clientId,
     codeVerifier,
-    loginUrl: loginUrl.toString(),
+    loginUrl: loginUrl.href,
     nonce,
     redirectUri: effectiveRedirectUri,
     state
@@ -2816,12 +2829,13 @@ const getBackendLoginRequest = async (backendUrl, platform = 0, uid = 0, redirec
 const getLoggedInState = (state, response) => {
   const accessToken = typeof response.accessToken === 'string' ? response.accessToken : '';
   const refreshToken = typeof response.refreshToken === 'string' ? response.refreshToken : '';
+  const userNameState = typeof response.userName === 'string' ? response : state;
   return {
     ...state,
     authAccessToken: accessToken,
     authErrorMessage: '',
     authRefreshToken: refreshToken,
-    userName: typeof response.userName === 'string' ? response.userName : state.userName,
+    userName: userNameState.userName,
     userState: accessToken ? 'loggedIn' : 'loggedOut',
     userSubscriptionPlan: typeof response.subscriptionPlan === 'string' ? response.subscriptionPlan : state.userSubscriptionPlan,
     userSubscriptionStatus: typeof response.subscriptionStatus === 'string' ? response.subscriptionStatus : state.userSubscriptionStatus,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/auth-worker",
-  "version": "3.0.0",
+  "version": "3.2.0",
   "description": "Auth Worker",
   "repository": {
     "type": "git",