@lvce-editor/auth-worker 3.4.1 → 3.5.1

package/dist/authWorkerMain.js

@@ -1060,6 +1060,31 @@ const initializeOpenerWorker = async () => {
   set(rpc);
 };
 
+const millisecondsPerSecond = 1000;
+const getAccessTokenExpiresAt = (expiresIn, now = Date.now()) => {
+  if (typeof expiresIn !== 'number' || !Number.isFinite(expiresIn) || expiresIn <= 0) {
+    return undefined;
+  }
+  return now + expiresIn * millisecondsPerSecond;
+};
+const isAccessTokenValid = (accessToken, expiresAt, now = Date.now()) => {
+  if (!accessToken || !expiresAt) {
+    return false;
+  }
+  const expiresAtNumber = Number(expiresAt);
+  return Number.isFinite(expiresAtNumber) && expiresAtNumber > now;
+};
+
+const state$2 = {
+  backendUrl: ''
+};
+const getAuthBackendUrl = () => {
+  return state$2.backendUrl;
+};
+const setAuthBackendUrl = backendUrl => {
+  state$2.backendUrl = backendUrl;
+};
+
 const databaseName = 'auth-worker';
 const objectStoreName = 'auth';
 const memoryStorage = new Map();
@@ -1150,19 +1175,44 @@ const clearPersistentAuthValue = async key => {
   await transactionToPromise(transaction);
 };
 
-const getAccessToken = () => {
-  return getPersistentAuthValue('accessToken');
+const callbackUrlKey = 'oidcCallbackUrl';
+const clientIdKey = 'oidcClientId';
+const pendingClientIdKey = 'pendingOidcClientId';
+const pendingCodeVerifierKey = 'pendingOidcCodeVerifier';
+const pendingRedirectUriKey = 'pendingOidcRedirectUri';
+const pendingStateKey = 'pendingOidcState';
+const clearOidcCallbackUrl = async () => {
+  await clearPersistentAuthValue(callbackUrlKey);
 };
-
-const handleMessagePort = async (port, rpcId) => {
-  const rpc = await create$4({
-    commandMap: commandMap,
-    isMessagePortOpen: true,
-    messagePort: port
-  });
-  if (rpcId) {
-    set$2(rpcId, rpc);
+const clearStoredOidcClientId = async () => {
+  await clearPersistentAuthValue(clientIdKey);
+};
+const clearPendingOidcAuthState = async () => {
+  await Promise.all([clearPersistentAuthValue(pendingClientIdKey), clearPersistentAuthValue(pendingCodeVerifierKey), clearPersistentAuthValue(pendingRedirectUriKey), clearPersistentAuthValue(pendingStateKey)]);
+};
+const getOidcCallbackUrl = async () => {
+  return getPersistentAuthValue(callbackUrlKey);
+};
+const getStoredOidcClientId = async () => {
+  return getPersistentAuthValue(clientIdKey);
+};
+const loadPendingOidcAuthState = async () => {
+  const [clientId, codeVerifier, redirectUri, state] = await Promise.all([getPersistentAuthValue(pendingClientIdKey), getPersistentAuthValue(pendingCodeVerifierKey), getPersistentAuthValue(pendingRedirectUriKey), getPersistentAuthValue(pendingStateKey)]);
+  if (!clientId || !codeVerifier || !redirectUri || !state) {
+    return undefined;
   }
+  return {
+    clientId,
+    codeVerifier,
+    redirectUri,
+    state
+  };
+};
+const saveOidcClientId = async clientId => {
+  await setPersistentAuthValue(clientIdKey, clientId);
+};
+const savePendingOidcAuthState = async value => {
+  await Promise.all([setPersistentAuthValue(pendingClientIdKey, value.clientId), setPersistentAuthValue(pendingCodeVerifierKey, value.codeVerifier), setPersistentAuthValue(pendingRedirectUriKey, value.redirectUri), setPersistentAuthValue(pendingStateKey, value.state)]);
 };
 
 let USER_AGENT;
@@ -1986,9 +2036,62 @@ const getClient$1 = clientId => {
     client_id: clientId
   };
 };
-const exchangeAuthorizationCode = async (backendUrl, clientId, code, redirectUri, codeVerifier, requestTokenEndpoint = genericTokenEndpointRequest, processTokenEndpointResponse = processGenericTokenEndpointResponse) => {
+const refreshOidcTokens = async (backendUrl, clientId, refreshToken, requestTokenEndpoint = genericTokenEndpointRequest, processTokenEndpointResponse = processGenericTokenEndpointResponse) => {
   const authorizationServer = getAuthorizationServer$1(backendUrl);
   const client = getClient$1(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,
+    expiresIn: typeof tokenResponse.expires_in === 'number' ? tokenResponse.expires_in : undefined,
+    refreshToken: typeof tokenResponse.refresh_token === 'string' ? tokenResponse.refresh_token : refreshToken
+  };
+};
+
+const getAccessToken = async (options = {}, refreshTokens = refreshOidcTokens, now = Date.now()) => {
+  const [accessToken, accessTokenExpiresAt] = await Promise.all([getPersistentAuthValue('accessToken'), getPersistentAuthValue('accessTokenExpiresAt')]);
+  if (options.refresh !== 'if-needed' || isAccessTokenValid(accessToken, accessTokenExpiresAt, now)) {
+    return accessToken;
+  }
+  const [clientId, refreshToken] = await Promise.all([getStoredOidcClientId(), getPersistentAuthValue('refreshToken')]);
+  const backendUrl = getAuthBackendUrl();
+  if (!backendUrl || !clientId || !refreshToken) {
+    return accessToken;
+  }
+  const refreshedTokens = await refreshTokens(backendUrl, clientId, refreshToken);
+  const expiresAt = getAccessTokenExpiresAt(refreshedTokens.expiresIn, now);
+  await Promise.all([setPersistentAuthValue('accessToken', refreshedTokens.accessToken), setPersistentAuthValue('accessTokenExpiresAt', typeof expiresAt === 'number' ? String(expiresAt) : ''), setPersistentAuthValue('refreshToken', refreshedTokens.refreshToken)]);
+  return refreshedTokens.accessToken;
+};
+
+const handleMessagePort = async (port, rpcId) => {
+  const rpc = await create$4({
+    commandMap: commandMap,
+    isMessagePortOpen: true,
+    messagePort: port
+  });
+  if (rpcId) {
+    set$2(rpcId, rpc);
+  }
+};
+
+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 exchangeAuthorizationCode = async (backendUrl, clientId, code, redirectUri, codeVerifier, requestTokenEndpoint = genericTokenEndpointRequest, processTokenEndpointResponse = processGenericTokenEndpointResponse) => {
+  const authorizationServer = getAuthorizationServer(backendUrl);
+  const client = getClient(clientId);
   const response = await requestTokenEndpoint(authorizationServer, client, None(), 'authorization_code', new URLSearchParams({
     code,
     code_verifier: codeVerifier,
@@ -1997,6 +2100,7 @@ const exchangeAuthorizationCode = async (backendUrl, clientId, code, redirectUri
   const tokenResponse = await processTokenEndpointResponse(authorizationServer, client, response);
   return {
     accessToken: tokenResponse.access_token,
+    expiresIn: typeof tokenResponse.expires_in === 'number' ? tokenResponse.expires_in : undefined,
     refreshToken: typeof tokenResponse.refresh_token === 'string' ? tokenResponse.refresh_token : ''
   };
 };
@@ -2051,46 +2155,6 @@ const getOidcUserName = async (backendUrl, accessToken, fetchFn = fetch) => {
   return typeof displayName === 'string' ? displayName : '';
 };
 
-const callbackUrlKey = 'oidcCallbackUrl';
-const clientIdKey = 'oidcClientId';
-const pendingClientIdKey = 'pendingOidcClientId';
-const pendingCodeVerifierKey = 'pendingOidcCodeVerifier';
-const pendingRedirectUriKey = 'pendingOidcRedirectUri';
-const pendingStateKey = 'pendingOidcState';
-const clearOidcCallbackUrl = async () => {
-  await clearPersistentAuthValue(callbackUrlKey);
-};
-const clearStoredOidcClientId = async () => {
-  await clearPersistentAuthValue(clientIdKey);
-};
-const clearPendingOidcAuthState = async () => {
-  await Promise.all([clearPersistentAuthValue(pendingClientIdKey), clearPersistentAuthValue(pendingCodeVerifierKey), clearPersistentAuthValue(pendingRedirectUriKey), clearPersistentAuthValue(pendingStateKey)]);
-};
-const getOidcCallbackUrl = async () => {
-  return getPersistentAuthValue(callbackUrlKey);
-};
-const getStoredOidcClientId = async () => {
-  return getPersistentAuthValue(clientIdKey);
-};
-const loadPendingOidcAuthState = async () => {
-  const [clientId, codeVerifier, redirectUri, state] = await Promise.all([getPersistentAuthValue(pendingClientIdKey), getPersistentAuthValue(pendingCodeVerifierKey), getPersistentAuthValue(pendingRedirectUriKey), getPersistentAuthValue(pendingStateKey)]);
-  if (!clientId || !codeVerifier || !redirectUri || !state) {
-    return undefined;
-  }
-  return {
-    clientId,
-    codeVerifier,
-    redirectUri,
-    state
-  };
-};
-const saveOidcClientId = async clientId => {
-  await setPersistentAuthValue(clientIdKey, clientId);
-};
-const savePendingOidcAuthState = async value => {
-  await Promise.all([setPersistentAuthValue(pendingClientIdKey, value.clientId), setPersistentAuthValue(pendingCodeVerifierKey, value.codeVerifier), setPersistentAuthValue(pendingRedirectUriKey, value.redirectUri), setPersistentAuthValue(pendingStateKey, value.state)]);
-};
-
 const normalizeRedirectUri = value => {
   const url = new URL(value);
   url.hash = '';
@@ -2142,9 +2206,13 @@ const completeBrowserOidcLogin = async backendUrl => {
   }
   const exchanged = await exchangeAuthorizationCode(backendUrl, pendingAuthState.clientId, code, pendingAuthState.redirectUri, pendingAuthState.codeVerifier);
   const userName = await getOidcUserName(backendUrl, exchanged.accessToken);
+  const authAccessTokenExpiresAt = getAccessTokenExpiresAt(exchanged.expiresIn);
   await clearPendingOidcAuthState();
   return {
     authAccessToken: exchanged.accessToken,
+    ...(authAccessTokenExpiresAt && {
+      authAccessTokenExpiresAt
+    }),
     authClientId: pendingAuthState.clientId,
     authErrorMessage: '',
     authRefreshToken: exchanged.refreshToken,
@@ -2154,6 +2222,7 @@ const completeBrowserOidcLogin = async backendUrl => {
 };
 
 const accessTokenKey = 'accessToken';
+const accessTokenExpiresAtKey = 'accessTokenExpiresAt';
 const refreshTokenKey = 'refreshToken';
 const userNameKey = 'userName';
 const userSubscriptionPlanKey = 'userSubscriptionPlan';
@@ -2170,14 +2239,15 @@ const toOptionalNumber = 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)]);
+  await Promise.all([clearPersistentAuthValue(accessTokenKey), clearPersistentAuthValue(accessTokenExpiresAtKey), 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)]);
+  const [accessToken, accessTokenExpiresAt, refreshToken, authClientId, userName, userSubscriptionPlan, userSubscriptionStatus, userUsedTokens] = await Promise.all([getPersistentAuthValue(accessTokenKey), getPersistentAuthValue(accessTokenExpiresAtKey), getPersistentAuthValue(refreshTokenKey), getStoredOidcClientId(), getPersistentAuthValue(userNameKey), getPersistentAuthValue(userSubscriptionPlanKey), getPersistentAuthValue(userSubscriptionStatusKey), getPersistentAuthValue(userUsedTokensKey)]);
   if (!accessToken && !refreshToken) {
     return undefined;
   }
   const optionalAuthClientId = toOptionalString(authClientId);
+  const optionalAccessTokenExpiresAt = toOptionalNumber(accessTokenExpiresAt);
   const optionalRefreshToken = toOptionalString(refreshToken);
   const optionalUserName = toOptionalString(userName);
   const optionalSubscriptionPlan = toOptionalString(userSubscriptionPlan);
@@ -2185,6 +2255,9 @@ const getPersistedAuthSession = async () => {
   const optionalUsedTokens = toOptionalNumber(userUsedTokens);
   return {
     authAccessToken: accessToken,
+    ...(typeof optionalAccessTokenExpiresAt === 'number' && {
+      authAccessTokenExpiresAt: optionalAccessTokenExpiresAt
+    }),
     authErrorMessage: '',
     userState: 'loggedIn',
     ...(optionalAuthClientId && {
@@ -2208,7 +2281,7 @@ const getPersistedAuthSession = async () => {
   };
 };
 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) : '')]);
+  await Promise.all([setPersistentAuthValue(accessTokenKey, loginResult.authAccessToken ?? ''), setPersistentAuthValue(accessTokenExpiresAtKey, typeof loginResult.authAccessTokenExpiresAt === 'number' ? String(loginResult.authAccessTokenExpiresAt) : ''), 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 => {
@@ -2220,37 +2293,15 @@ 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) => {
+const toLoginResult = (accessToken, refreshToken, clientId, userName, authAccessTokenExpiresAt) => {
   return {
     authAccessToken: accessToken,
+    ...(authAccessTokenExpiresAt && {
+      authAccessTokenExpiresAt
+    }),
     authClientId: clientId,
     authErrorMessage: '',
     authRefreshToken: refreshToken,
@@ -2266,7 +2317,8 @@ const restoreOidcAuth = async backendUrl => {
   try {
     const refreshedTokens = await refreshOidcTokens(backendUrl, clientId, refreshToken);
     const userName = await getOidcUserName(backendUrl, refreshedTokens.accessToken);
-    return toLoginResult(refreshedTokens.accessToken, refreshedTokens.refreshToken, clientId, userName);
+    const authAccessTokenExpiresAt = getAccessTokenExpiresAt(refreshedTokens.expiresIn);
+    return toLoginResult(refreshedTokens.accessToken, refreshedTokens.refreshToken, clientId, userName, authAccessTokenExpiresAt);
   } catch {
     if (accessToken) {
       const userName = await getOidcUserName(backendUrl, accessToken);
@@ -2287,6 +2339,7 @@ const getBackendUrl = options => {
 };
 const initialize = async options => {
   const backendUrl = getBackendUrl(options);
+  setAuthBackendUrl(backendUrl);
   try {
     if (backendUrl) {
       const completedBrowserLogin = await completeBrowserOidcLogin(backendUrl);
@@ -2871,8 +2924,12 @@ const waitForElectronBackendLogin = async (backendUrl, uid, redirectUri, codeVer
     const authorizationCode = await getAuthorizationCode(uid);
     if (hasAuthorizationCode(authorizationCode)) {
       const tokenResponse = await exchangeAuthorizationCode(backendUrl, authorizationCode, redirectUri, codeVerifier);
+      const authAccessTokenExpiresAt = getAccessTokenExpiresAt(tokenResponse.expiresIn);
       return {
         authAccessToken: tokenResponse.accessToken,
+        ...(authAccessTokenExpiresAt && {
+          authAccessTokenExpiresAt
+        }),
         authErrorMessage: '',
         authRefreshToken: tokenResponse.refreshToken,
         userState: tokenResponse.accessToken ? 'loggedIn' : 'loggedOut'

package/package.json

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