npm - @lvce-editor/auth-worker - Versions diffs - 1.4.0 → 1.6.0 - Mend

@lvce-editor/auth-worker 1.4.0 → 1.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (2) hide show

package/dist/authWorkerMain.js +345 -10
package/package.json +1 -1

package/dist/authWorkerMain.js CHANGED Viewed

@@ -1127,18 +1127,18 @@ const create = rpcId => {
   };
 };
+const Electron = 2;
 const OpenerWorker = 4561;
 const RendererWorker = 1;
 const {
-  invoke,
+  invoke: invoke$1,
   set: set$1
 } = create(OpenerWorker);
-const openUrl = async (url, platform) => {
-  return invoke('Open.openUrl', url, platform);
-};
 const {
+  invoke,
   invokeAndTransfer,
   set
 } = create(RendererWorker);
@@ -1178,10 +1178,6 @@ const getBackendAuthUrl = (backendUrl, path) => {
   return `${trimTrailingSlashes(backendUrl)}${path}`;
 };
-const getBackendLoginUrl = backendUrl => {
-  return getBackendAuthUrl(backendUrl, '/auth/login');
-};
 const getLoggedOutBackendAuthState = (authErrorMessage = '') => {
   return {
     authAccessToken: '',
@@ -1359,6 +1355,287 @@ const waitForBackendLogin = async (backendUrl, timeoutMs = 30_000, pollIntervalM
   return getLoggedOutBackendAuthState(lastErrorMessage);
 };
+const successHtml = `<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>Authentication Complete</title>
+    <style>
+      :root {
+        color-scheme: light;
+        --background: linear-gradient(180deg, #f4f7fb 0%, #e9eef8 100%);
+        --panel: rgba(255, 255, 255, 0.92);
+        --panel-border: rgba(33, 52, 88, 0.08);
+        --text: #132238;
+        --muted: #5f6f86;
+        --accent: #1f7a5a;
+        --accent-soft: #e7f6ef;
+        --shadow: 0 24px 60px rgba(44, 65, 98, 0.16);
+      }
+      * {
+        box-sizing: border-box;
+      }
+      html,
+      body {
+        margin: 0;
+        min-height: 100%;
+        font-family: Inter, sans-serif;
+        background: var(--background);
+        color: var(--text);
+      }
+      body {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        padding: 24px;
+      }
+      .card {
+        width: min(100%, 460px);
+        padding: 32px 28px;
+        border: 1px solid var(--panel-border);
+        border-radius: 20px;
+        background: var(--panel);
+        box-shadow: var(--shadow);
+        text-align: center;
+        backdrop-filter: blur(12px);
+      }
+      .badge {
+        display: inline-flex;
+        align-items: center;
+        justify-content: center;
+        width: 64px;
+        height: 64px;
+        margin-bottom: 20px;
+        border-radius: 999px;
+        background: var(--accent-soft);
+        color: var(--accent);
+      }
+      h1 {
+        margin: 0;
+        font-size: 28px;
+        line-height: 1.15;
+        letter-spacing: -0.03em;
+      }
+      p {
+        margin: 14px 0 0;
+        font-size: 15px;
+        line-height: 1.6;
+        color: var(--muted);
+      }
+      .hint {
+        margin-top: 22px;
+        padding: 12px 14px;
+        border-radius: 12px;
+        background: rgba(19, 34, 56, 0.04);
+        font-size: 14px;
+      }
+      .button {
+        margin-top: 20px;
+        border: 0;
+        border-radius: 999px;
+        background: var(--text);
+        color: #fff;
+        padding: 10px 18px;
+        font: inherit;
+        cursor: pointer;
+      }
+      .button:hover {
+        background: #0d182a;
+      }
+    </style>
+  </head>
+  <body>
+    <main class="card">
+      <div class="badge" aria-hidden="true">
+        <svg width="28" height="28" viewBox="0 0 24 24" fill="none" role="presentation">
+          <path d="M20 7L10 17L5 12" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round"></path>
+        </svg>
+      </div>
+      <h1>Authentication complete</h1>
+      <p>Your sign-in finished successfully. You can return to the app now.</p>
+      <p class="hint">This window is no longer needed and can be closed.</p>
+      <button class="button" type="button" id="close-button">Close Window</button>
+    </main>
+    <script>
+      const closeWindow = () => {
+        window.close()
+      }
+      document.getElementById('close-button')?.addEventListener('click', closeWindow)
+      window.setTimeout(closeWindow, 1200)
+    </script>
+  </body>
+</html>`;
+const errorHtml = `<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>Authentication Failed</title>
+    <style>
+      :root {
+        color-scheme: light;
+        --background: linear-gradient(180deg, #fbf4f2 0%, #f7e5df 100%);
+        --panel: rgba(255, 255, 255, 0.94);
+        --panel-border: rgba(120, 43, 24, 0.12);
+        --text: #3a1d16;
+        --muted: #7f5a4c;
+        --accent: #b4492d;
+        --accent-soft: #fde9e2;
+        --shadow: 0 24px 60px rgba(96, 48, 32, 0.14);
+      }
+      * {
+        box-sizing: border-box;
+      }
+      html,
+      body {
+        margin: 0;
+        min-height: 100%;
+        font-family: Inter, sans-serif;
+        background: var(--background);
+        color: var(--text);
+      }
+      body {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        padding: 24px;
+      }
+      .card {
+        width: min(100%, 460px);
+        padding: 32px 28px;
+        border: 1px solid var(--panel-border);
+        border-radius: 20px;
+        background: var(--panel);
+        box-shadow: var(--shadow);
+        text-align: center;
+        backdrop-filter: blur(12px);
+      }
+      .badge {
+        display: inline-flex;
+        align-items: center;
+        justify-content: center;
+        width: 64px;
+        height: 64px;
+        margin-bottom: 20px;
+        border-radius: 999px;
+        background: var(--accent-soft);
+        color: var(--accent);
+      }
+      h1 {
+        margin: 0;
+        font-size: 28px;
+        line-height: 1.15;
+        letter-spacing: -0.03em;
+      }
+      p {
+        margin: 14px 0 0;
+        font-size: 15px;
+        line-height: 1.6;
+        color: var(--muted);
+      }
+      .hint {
+        margin-top: 22px;
+        padding: 12px 14px;
+        border-radius: 12px;
+        background: rgba(58, 29, 22, 0.05);
+        font-size: 14px;
+      }
+      .button {
+        margin-top: 20px;
+        border: 0;
+        border-radius: 999px;
+        background: var(--text);
+        color: #fff;
+        padding: 10px 18px;
+        font: inherit;
+        cursor: pointer;
+      }
+      .button:hover {
+        background: #24110d;
+      }
+    </style>
+  </head>
+  <body>
+    <main class="card">
+      <div class="badge" aria-hidden="true">
+        <svg width="28" height="28" viewBox="0 0 24 24" fill="none" role="presentation">
+          <path d="M12 8V12" stroke="currentColor" stroke-width="2.2" stroke-linecap="round"></path>
+          <path d="M12 16H12.01" stroke="currentColor" stroke-width="2.2" stroke-linecap="round"></path>
+          <path d="M10.29 3.86L1.82 18A2 2 0 0 0 3.53 21H20.47A2 2 0 0 0 22.18 18L13.71 3.86A2 2 0 0 0 10.29 3.86Z" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round"></path>
+        </svg>
+      </div>
+      <h1>Authentication failed</h1>
+      <p>The sign-in flow did not return an authorization code.</p>
+      <p class="hint">You can close this window and try again from the app.</p>
+      <button class="button" type="button" id="close-button">Close Window</button>
+    </main>
+    <script>
+      const closeWindow = () => {
+        window.close()
+      }
+      document.getElementById('close-button')?.addEventListener('click', closeWindow)
+    </script>
+  </body>
+</html>`;
+const getElectronRedirectUri = async (uid, invoke) => {
+  return `http://localhost:${await invoke('OAuthServer.create', String(uid), successHtml, errorHtml)}`;
+};
+const getCurrentHref = async () => {
+  try {
+    return await invoke('Layout.getHref');
+  } catch {
+    // ignore
+  }
+  if (!globalThis.location || typeof globalThis.location.href !== 'string' || !globalThis.location.href) {
+    return '';
+  }
+  return globalThis.location.href;
+};
+const getEffectiveRedirectUri = async (platform, uid, redirectUri) => {
+  if (redirectUri) {
+    return redirectUri;
+  }
+  if (platform === Electron) {
+    return getElectronRedirectUri(uid, invoke);
+  }
+  return getCurrentHref();
+};
+const getBackendLoginRequest = async (backendUrl, platform = 0, uid = 0, redirectUri = '') => {
+  const loginUrl = new URL(getBackendAuthUrl(backendUrl, '/login'));
+  const effectiveRedirectUri = await getEffectiveRedirectUri(platform, uid, redirectUri);
+  if (effectiveRedirectUri) {
+    loginUrl.searchParams.set('redirect_uri', effectiveRedirectUri);
+  }
+  return {
+    loginUrl: loginUrl.toString(),
+    redirectUri: effectiveRedirectUri
+  };
+};
 const getLoggedInState = (state, response) => {
   const accessToken = typeof response.accessToken === 'string' ? response.accessToken : '';
   return {
@@ -1379,6 +1656,58 @@ const isLoginResponse = value => {
   return true;
 };
+const getBackendNativeExchangeUrl = backendUrl => {
+  return getBackendAuthUrl(backendUrl, '/auth/native/exchange');
+};
+const getExchangeErrorMessage = async response => {
+  try {
+    const payload = await response.json();
+    if (payload && typeof payload === 'object' && typeof payload.error === 'string' && payload.error) {
+      return payload.error;
+    }
+  } catch {
+    // ignore
+  }
+  return 'Backend authentication failed.';
+};
+const exchangeElectronAuthorizationCode = async (backendUrl, code, redirectUri) => {
+  const response = await fetch(getBackendNativeExchangeUrl(backendUrl), {
+    body: JSON.stringify({
+      code,
+      redirectUri
+    }),
+    credentials: 'include',
+    headers: {
+      Accept: 'application/json',
+      'Content-Type': 'application/json'
+    },
+    method: 'POST'
+  });
+  if (!response.ok) {
+    throw new Error(await getExchangeErrorMessage(response));
+  }
+};
+const hasAuthorizationCode = value => {
+  return typeof value === 'string' && value.length > 0;
+};
+const waitForElectronBackendLogin = async (backendUrl, uid, redirectUri, timeoutMs = 30_000, pollIntervalMs = 1000) => {
+  const started = Date.now();
+  const deadline = started + timeoutMs;
+  while (Date.now() < deadline) {
+    const authorizationCode = await invoke('OAuthServer.getCode', String(uid));
+    if (hasAuthorizationCode(authorizationCode)) {
+      const elapsed = Date.now() - started;
+      const remainingTime = Math.max(0, timeoutMs - elapsed);
+      await exchangeElectronAuthorizationCode(backendUrl, authorizationCode, redirectUri);
+      return waitForBackendLogin(backendUrl, remainingTime, pollIntervalMs);
+    }
+    await delay(pollIntervalMs);
+  }
+  return getLoggedOutBackendAuthState('Timed out waiting for backend login.');
+};
 const handleClickLogin = async options => {
   const {
     backendUrl,
@@ -1411,8 +1740,14 @@ const handleClickLogin = async options => {
       }
       return getLoggedInState(signingInState, response);
     }
-    await openUrl(getBackendLoginUrl(backendUrl), platform);
-    const authState = await waitForBackendLogin(backendUrl);
+    const uid = 0;
+    const {
+      loginUrl,
+      redirectUri
+    } = await getBackendLoginRequest(backendUrl, platform, uid);
+    const authUseRedirect = false;
+    await invoke$1('Open.openUrl', loginUrl, platform, authUseRedirect);
+    const authState = platform === Electron ? await waitForElectronBackendLogin(backendUrl, uid, redirectUri) : await waitForBackendLogin(backendUrl);
     return {
       ...authState
     };

package/package.json CHANGED Viewed

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