@lvce-editor/auth-worker 3.22.1 → 3.22.2

package/dist/authWorkerMain.js

@@ -1241,14 +1241,11 @@ const createAccountSessions = storage => {
   };
 };
 
-const state$4 = {
-  backendUrl: ''
-};
-const getAuthBackendUrl = () => {
-  return state$4.backendUrl;
-};
-const setAuthBackendUrl = backendUrl => {
-  state$4.backendUrl = backendUrl;
+const getAuthBackendUrl = async backendUrl => {
+  if (typeof backendUrl === 'string') {
+    return backendUrl;
+  }
+  return invoke('Layout.getBackendUrl');
 };
 
 const state$3 = {
@@ -3407,7 +3404,10 @@ const state = {
   login: undefined
 };
 const normalizeBackendUrl = backendUrl => new URL(backendUrl).origin;
-const getNormalizedBackendUrl = (backendUrl = getAuthBackendUrl()) => normalizeBackendUrl(backendUrl);
+const getNormalizedBackendUrl = async backendUrl => {
+  const url = await getAuthBackendUrl(backendUrl);
+  return url ? normalizeBackendUrl(url) : '';
+};
 const addSession = async (backendUrl, session, revision) => {
   if (session.userState !== 'loggedIn' || !session.authAccessToken) {
     return;
@@ -3488,13 +3488,17 @@ const getConnectionRequestHeaders = accessToken => {
   };
 };
 const getConnectedAccounts = async () => {
-  const backendUrl = getNormalizedBackendUrl();
+  const backendUrl = await getNormalizedBackendUrl();
   const accessToken = await getAccessToken({
+    backendUrl,
     refresh: 'if-needed'
   });
   if (!accessToken) {
     return [];
   }
+  if (backendUrl !== (await getNormalizedBackendUrl())) {
+    throw new Error('Account backend changed. Retry connected accounts.');
+  }
   const response = await fetch(getConnectedAccountsUrl(backendUrl), {
     headers: getConnectionRequestHeaders(accessToken)
   });
@@ -3508,13 +3512,17 @@ const getConnectedAccounts = async () => {
   return payload.connections;
 };
 const disconnectConnectedAccount = async provider => {
-  const backendUrl = getNormalizedBackendUrl();
+  const backendUrl = await getNormalizedBackendUrl();
   const accessToken = await getAccessToken({
+    backendUrl,
     refresh: 'if-needed'
   });
   if (!accessToken) {
     throw new Error('Sign in to disconnect connected accounts.');
   }
+  if (backendUrl !== (await getNormalizedBackendUrl())) {
+    throw new Error('Account backend changed. Retry connected accounts.');
+  }
   const response = await fetch(getConnectedAccountDisconnectUrl(backendUrl, provider), {
     headers: getConnectionRequestHeaders(accessToken),
     method: 'POST'
@@ -3524,7 +3532,7 @@ const disconnectConnectedAccount = async provider => {
   }
 };
 const getAccounts = async () => {
-  const backendUrl = getNormalizedBackendUrl();
+  const backendUrl = await getNormalizedBackendUrl();
   const registry = await accounts.read();
   return registry.accounts.filter(account => account.backendUrl === backendUrl).map(account => ({
     ...account.profile,
@@ -3535,7 +3543,10 @@ const getAccounts = async () => {
   }));
 };
 const getAccessToken = async (options = {}) => {
-  const backendUrl = getNormalizedBackendUrl();
+  const backendUrl = await getNormalizedBackendUrl(options.backendUrl);
+  if (!backendUrl) {
+    return '';
+  }
   const account = await getActive(backendUrl);
   if (!account) {
     return '';
@@ -3561,7 +3572,7 @@ const initialize = async (options = {}) => {
   if (typeof options.platform === 'number') {
     setAuthPlatform(options.platform);
   }
-  const backendUrl = getNormalizedBackendUrl(options.backendUrl ?? getAuthBackendUrl());
+  const backendUrl = await getNormalizedBackendUrl(options.backendUrl);
   const registry = await accounts.read();
   const completed = await completeBrowserOidcLogin(backendUrl);
   if (completed) {
@@ -3570,6 +3581,7 @@ const initialize = async (options = {}) => {
   }
   try {
     await getAccessToken({
+      backendUrl,
       refresh: 'if-needed'
     });
     return getCurrentState(backendUrl);
@@ -3582,7 +3594,7 @@ const login = async options => {
     return state.login;
   }
   const operation = (async () => {
-    const backendUrl = getNormalizedBackendUrl(options.backendUrl ?? getAuthBackendUrl());
+    const backendUrl = await getNormalizedBackendUrl(options.backendUrl);
     const registry = await accounts.read();
     const result = await handleClickLogin({
       ...options,
@@ -3599,7 +3611,7 @@ const login = async options => {
   }
 };
 const useAccount = async id => {
-  const backendUrl = getNormalizedBackendUrl();
+  const backendUrl = await getNormalizedBackendUrl();
   const registry = await accounts.read();
   if (registry.accounts.every(account => !(account.id === id && account.backendUrl === backendUrl))) {
     throw new Error('Account is no longer available.');
@@ -3608,7 +3620,7 @@ const useAccount = async id => {
   return getCurrentState(backendUrl);
 };
 const removeAccount = async id => {
-  const backendUrl = getNormalizedBackendUrl();
+  const backendUrl = await getNormalizedBackendUrl();
   const registry = await accounts.read();
   if (registry.accounts.some(account => account.id === id && account.backendUrl === backendUrl)) {
     await accounts.remove(id);
@@ -3616,7 +3628,7 @@ const removeAccount = async id => {
   return getCurrentState(backendUrl);
 };
 const logout = async () => {
-  const backendUrl = getNormalizedBackendUrl();
+  const backendUrl = await getNormalizedBackendUrl();
   const account = await getActive(backendUrl);
   return account ? removeAccount(account.id) : getLoggedOutBackendAuthState();
 };
@@ -3626,13 +3638,18 @@ const syncBackendAuth = async backendUrl => initialize({
 
 const identifier = /^[a-f0-9]{32}$/;
 const confirmationCode = /^[A-F0-9]{8}$/;
-const getCloudflareConnectionsUrl = () => new URL('/cloudflare', getAuthBackendUrl()).href;
+const getCloudflareConnectionsUrl = async () => {
+  const backendUrl = await getAuthBackendUrl();
+  return backendUrl ? new URL('/cloudflare', backendUrl).href : '';
+};
 const request = async (pathname, method = 'GET', body) => {
-  const backendUrl = getAuthBackendUrl();
+  const backendUrl = await getAuthBackendUrl();
+  if (!backendUrl) throw new Error('Sign in to LVCE to manage Cloudflare connections.');
   const accessToken = await getAccessToken({
+    backendUrl,
     refresh: 'if-needed'
   });
-  if (backendUrl !== getAuthBackendUrl()) throw new Error('Account backend changed. Retry Cloudflare setup.');
+  if (backendUrl !== (await getAuthBackendUrl())) throw new Error('Account backend changed. Retry Cloudflare setup.');
   if (!accessToken) throw new Error('Sign in to LVCE to manage Cloudflare connections.');
   const response = await fetch(new URL(pathname, backendUrl), {
     headers: {
@@ -3683,7 +3700,6 @@ const initializeMainProcess = async () => {
 };
 
 const configure = async options => {
-  setAuthBackendUrl(options.backendUrl);
   setAuthPlatform(options.platform);
   setUseNativeAuth(options.useNativeAuth === true);
   if (options.platform === Electron) {

package/package.json

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