@lvce-editor/auth-worker 1.18.0 → 3.0.0

package/dist/authWorkerMain.js

@@ -1071,48 +1071,6 @@ const handleMessagePort = async (port, rpcId) => {
   }
 };
 
-const initialize = async platform => {
-  // TODO
-};
-
-const trailingSlashesRegex = /\/+$/;
-const trimTrailingSlashes = value => {
-  return value.replace(trailingSlashesRegex, '');
-};
-
-const getBackendAuthUrl = (backendUrl, path) => {
-  return `${trimTrailingSlashes(backendUrl)}${path}`;
-};
-
-const getLoggedOutBackendAuthState = (authErrorMessage = '') => {
-  return {
-    authAccessToken: '',
-    authErrorMessage,
-    userState: 'loggedOut'
-  };
-};
-
-const getBackendLogoutUrl = backendUrl => {
-  return getBackendAuthUrl(backendUrl, '/auth/logout');
-};
-
-const logoutFromBackend = async backendUrl => {
-  if (!backendUrl) {
-    return;
-  }
-  try {
-    await fetch(getBackendLogoutUrl(backendUrl), {
-      credentials: 'include',
-      headers: {
-        Accept: 'application/json'
-      },
-      method: 'POST'
-    });
-  } catch {
-    // Ignore logout failures and still clear local auth state.
-  }
-};
-
 let USER_AGENT;
 if (typeof navigator === 'undefined' || !navigator.userAgent?.startsWith?.('Mozilla/5.0 ')) {
   const NAME = 'oauth4webapi';
@@ -1906,6 +1864,15 @@ async function getResponseJsonBody(response, check = assertApplicationJson) {
 }
 const _expectedIssuer = Symbol();
 
+const trailingSlashesRegex = /\/+$/;
+const trimTrailingSlashes = value => {
+  return value.replace(trailingSlashesRegex, '');
+};
+
+const getBackendAuthUrl = (backendUrl, path) => {
+  return `${trimTrailingSlashes(backendUrl)}${path}`;
+};
+
 const getBackendOidcTokenUrl = backendUrl => {
   return getBackendAuthUrl(backendUrl, '/oidc/token');
 };
@@ -1949,6 +1916,14 @@ const getCurrentHref = async () => {
   return globalThis.location.href;
 };
 
+const getLoggedOutBackendAuthState = (authErrorMessage = '') => {
+  return {
+    authAccessToken: '',
+    authErrorMessage,
+    userState: 'loggedOut'
+  };
+};
+
 const getPayload$1 = async response => {
   try {
     return await response.json();
@@ -2167,6 +2142,120 @@ const completeBrowserOidcLogin = async backendUrl => {
   };
 };
 
+const accessTokenKey = 'accessToken';
+const refreshTokenKey = 'refreshToken';
+const userNameKey = 'userName';
+const userSubscriptionPlanKey = 'userSubscriptionPlan';
+const userSubscriptionStatusKey = 'userSubscriptionStatus';
+const userUsedTokensKey = 'userUsedTokens';
+const toOptionalString = value => {
+  return value || undefined;
+};
+const toOptionalNumber = value => {
+  if (!value) {
+    return undefined;
+  }
+  const numberValue = Number(value);
+  return Number.isFinite(numberValue) ? numberValue : undefined;
+};
+const clearPersistedAuthSession = async () => {
+  await Promise.all([clearPersistentAuthValue(accessTokenKey), clearPersistentAuthValue(refreshTokenKey), clearStoredOidcClientId(), clearPersistentAuthValue(userNameKey), clearPersistentAuthValue(userSubscriptionPlanKey), clearPersistentAuthValue(userSubscriptionStatusKey), clearPersistentAuthValue(userUsedTokensKey)]);
+};
+const getPersistedAuthSession = async () => {
+  const [accessToken, refreshToken, authClientId, userName, userSubscriptionPlan, userSubscriptionStatus, userUsedTokens] = await Promise.all([getPersistentAuthValue(accessTokenKey), getPersistentAuthValue(refreshTokenKey), getStoredOidcClientId(), getPersistentAuthValue(userNameKey), getPersistentAuthValue(userSubscriptionPlanKey), getPersistentAuthValue(userSubscriptionStatusKey), getPersistentAuthValue(userUsedTokensKey)]);
+  if (!accessToken && !refreshToken) {
+    return undefined;
+  }
+  const optionalAuthClientId = toOptionalString(authClientId);
+  const optionalRefreshToken = toOptionalString(refreshToken);
+  const optionalUserName = toOptionalString(userName);
+  const optionalSubscriptionPlan = toOptionalString(userSubscriptionPlan);
+  const optionalSubscriptionStatus = toOptionalString(userSubscriptionStatus);
+  const optionalUsedTokens = toOptionalNumber(userUsedTokens);
+  return {
+    authAccessToken: accessToken,
+    authErrorMessage: '',
+    userState: 'loggedIn',
+    ...(optionalAuthClientId ? {
+      authClientId
+    } : {}),
+    ...(optionalRefreshToken ? {
+      authRefreshToken: refreshToken
+    } : {}),
+    ...(optionalUserName ? {
+      userName
+    } : {}),
+    ...(optionalSubscriptionPlan ? {
+      userSubscriptionPlan
+    } : {}),
+    ...(optionalSubscriptionStatus ? {
+      userSubscriptionStatus
+    } : {}),
+    ...(typeof optionalUsedTokens === 'number' ? {
+      userUsedTokens: optionalUsedTokens
+    } : {})
+  };
+};
+const persistAuthSession = async loginResult => {
+  await Promise.all([setPersistentAuthValue(accessTokenKey, loginResult.authAccessToken ?? ''), setPersistentAuthValue(refreshTokenKey, loginResult.authRefreshToken ?? ''), loginResult.authClientId ? saveOidcClientId(loginResult.authClientId) : clearStoredOidcClientId(), setPersistentAuthValue(userNameKey, loginResult.userName ?? ''), setPersistentAuthValue(userSubscriptionPlanKey, loginResult.userSubscriptionPlan ?? ''), setPersistentAuthValue(userSubscriptionStatusKey, loginResult.userSubscriptionStatus ?? ''), setPersistentAuthValue(userUsedTokensKey, typeof loginResult.userUsedTokens === 'number' ? String(loginResult.userUsedTokens) : '')]);
+};
+
+const persistLoginResult = async loginResult => {
+  if (loginResult.userState !== 'loggedIn') {
+    await clearPersistedAuthSession();
+    return loginResult;
+  }
+  await persistAuthSession(loginResult);
+  return loginResult;
+};
+
+const getBackendUrl = options => {
+  if (typeof options === 'number') {
+    return '';
+  }
+  return options.backendUrl || '';
+};
+const initialize = async options => {
+  const backendUrl = getBackendUrl(options);
+  try {
+    if (backendUrl) {
+      const completedBrowserLogin = await completeBrowserOidcLogin(backendUrl);
+      if (completedBrowserLogin) {
+        return persistLoginResult(completedBrowserLogin);
+      }
+    }
+    const persistedAuthSession = await getPersistedAuthSession();
+    if (persistedAuthSession) {
+      return persistedAuthSession;
+    }
+    return getLoggedOutBackendAuthState();
+  } catch (error) {
+    const authErrorMessage = error instanceof Error && error.message ? error.message : 'Backend authentication failed.';
+    return getLoggedOutBackendAuthState(authErrorMessage);
+  }
+};
+
+const getBackendLogoutUrl = backendUrl => {
+  return getBackendAuthUrl(backendUrl, '/auth/logout');
+};
+
+const logoutFromBackend = async backendUrl => {
+  if (!backendUrl) {
+    return;
+  }
+  try {
+    await fetch(getBackendLogoutUrl(backendUrl), {
+      credentials: 'include',
+      headers: {
+        Accept: 'application/json'
+      },
+      method: 'POST'
+    });
+  } catch {
+    // Ignore logout failures and still clear local auth state.
+  }
+};
+
 const getBackendRefreshUrl = backendUrl => {
   return getBackendAuthUrl(backendUrl, '/auth/refresh');
 };
@@ -2264,14 +2353,6 @@ const parseBackendAuthResponse = value => {
   return toBackendAuthState(value);
 };
 
-const persistLoginResult = async loginResult => {
-  if (loginResult.userState !== 'loggedIn') {
-    return loginResult;
-  }
-  await Promise.all([setPersistentAuthValue('accessToken', loginResult.authAccessToken ?? ''), setPersistentAuthValue('refreshToken', loginResult.authRefreshToken ?? ''), loginResult.authClientId ? saveOidcClientId(loginResult.authClientId) : Promise.resolve()]);
-  return loginResult;
-};
-
 const getAuthorizationServer = backendUrl => {
   return {
     issuer: getBackendAuthUrl(backendUrl, '/oidc'),
@@ -2298,7 +2379,7 @@ const refreshOidcTokens = async (backendUrl, clientId, refreshToken, requestToke
 };
 
 const clearStoredOidcAuth = async () => {
-  await Promise.all([clearPersistentAuthValue('accessToken'), clearPersistentAuthValue('refreshToken'), clearStoredOidcClientId()]);
+  await clearPersistedAuthSession();
 };
 const toLoginResult = (accessToken, refreshToken, clientId, userName) => {
   return {
@@ -2662,6 +2743,16 @@ const getElectronRedirectUri = async uid => {
   return `http://localhost:${localOauthServerPort}/callback`;
 };
 
+const getGithubPagesBasePath = url => {
+  if (!url.hostname.endsWith('.github.io')) {
+    return '';
+  }
+  const firstSegment = url.pathname.split('/').find(Boolean);
+  if (!firstSegment) {
+    return '';
+  }
+  return `/${firstSegment}`;
+};
 const getWebRedirectUri = async () => {
   const href = await getCurrentHref();
   if (!href) {
@@ -2669,7 +2760,7 @@ const getWebRedirectUri = async () => {
   }
   try {
     const url = new URL(href);
-    return `${url.origin}/auth/callback`;
+    return `${url.origin}${getGithubPagesBasePath(url)}/auth/callback`;
   } catch {
     return '';
   }
@@ -2857,7 +2948,7 @@ const logout = async state => {
     userState: 'loggingOut'
   };
   await logoutFromBackend(state.backendUrl);
-  await Promise.all([clearOidcCallbackUrl(), clearPendingOidcAuthState(), clearStoredOidcClientId(), clearPersistentAuthValue('accessToken'), clearPersistentAuthValue('refreshToken')]);
+  await Promise.all([clearOidcCallbackUrl(), clearPendingOidcAuthState(), clearPersistedAuthSession()]);
   return {
     ...loggingOutState,
     ...getLoggedOutBackendAuthState()

package/package.json

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