@lvce-editor/chat-view 7.12.0 → 7.14.0

package/dist/chatViewWorkerMain.js

@@ -1290,9 +1290,6 @@ const {
 const openExternal = async url => {
   return invoke$1('Open.openExternal', url);
 };
-const openUrl = async (url, platform) => {
-  return invoke$1('Open.openUrl', url, platform);
-};
 
 const {
   invoke,
@@ -2368,6 +2365,7 @@ const createDefaultState = () => {
     authAccessToken: '',
     authEnabled: false,
     authErrorMessage: '',
+    authUseRedirect: false,
     backendUrl: '',
     chatFocusContentMaxWidth: 700,
     chatHistoryEnabled: true,
@@ -4386,13 +4384,16 @@ const getEffectiveRedirectUri = async (platform, uid, redirectUri) => {
   }
   return getCurrentHref();
 };
-const getBackendLoginUrl = async (backendUrl, platform = 0, uid = 0, redirectUri = '') => {
+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.toString();
+  return {
+    loginUrl: loginUrl.toString(),
+    redirectUri: effectiveRedirectUri
+  };
 };
 
 const getLoggedOutBackendAuthState = (authErrorMessage = '') => {
@@ -4555,6 +4556,39 @@ const delay = async ms => {
   await new Promise(resolve => setTimeout(resolve, ms));
 };
 
+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 waitForBackendLogin = async (backendUrl, timeoutMs = 30_000, pollIntervalMs = 1000) => {
   const deadline = Date.now() + timeoutMs;
   let lastErrorMessage = '';
@@ -4574,7 +4608,7 @@ const waitForBackendLogin = async (backendUrl, timeoutMs = 30_000, pollIntervalM
 const hasAuthorizationCode = value => {
   return typeof value === 'string' && value.length > 0;
 };
-const waitForElectronBackendLogin = async (backendUrl, uid, timeoutMs = 30_000, pollIntervalMs = 1000) => {
+const waitForElectronBackendLogin = async (backendUrl, uid, redirectUri, timeoutMs = 30_000, pollIntervalMs = 1000) => {
   const started = Date.now();
   const deadline = started + timeoutMs;
   while (Date.now() < deadline) {
@@ -4582,6 +4616,7 @@ const waitForElectronBackendLogin = async (backendUrl, uid, timeoutMs = 30_000,
     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);
@@ -4615,6 +4650,7 @@ const getLoggedInState = (state, response) => {
 };
 const handleClickLogin = async state => {
   const {
+    authUseRedirect,
     backendUrl,
     platform,
     uid
@@ -4654,9 +4690,12 @@ const handleClickLogin = async state => {
       }
       return getLoggedInState(signingInState, response);
     }
-    const url = await getBackendLoginUrl(backendUrl, platform, uid);
-    await openUrl(url, platform);
-    const authState = platform === PlatformTypeElectron ? await waitForElectronBackendLogin(backendUrl, uid) : await waitForBackendLogin(backendUrl);
+    const {
+      loginUrl,
+      redirectUri
+    } = await getBackendLoginRequest(backendUrl, platform, uid);
+    await invoke$1('Open.openUrl', loginUrl, platform, authUseRedirect);
+    const authState = platform === PlatformTypeElectron ? await waitForElectronBackendLogin(backendUrl, uid, redirectUri) : await waitForBackendLogin(backendUrl);
     return {
       ...signingInState,
       ...authState
@@ -10643,6 +10682,15 @@ const loadAuthEnabled = async () => {
   }
 };
 
+const loadAuthUseRedirect = async () => {
+  try {
+    const savedAuthUseRedirect = await get('chat.authUseRedirect');
+    return typeof savedAuthUseRedirect === 'boolean' ? savedAuthUseRedirect : false;
+  } catch {
+    return false;
+  }
+};
+
 const loadBackendUrl = async () => {
   try {
     const savedBackendUrl = await get('chat.backendUrl');
@@ -10823,10 +10871,11 @@ const loadVoiceDictationEnabled = async () => {
 };
 
 const loadPreferences = async () => {
-  const [aiSessionTitleGenerationEnabled, authEnabled, backendUrl, chatHistoryEnabled, composerDropEnabled, openApiApiKey, openRouterApiKey, emitStreamingFunctionCallEvents, reasoningPickerEnabled, scrollDownButtonEnabled, searchEnabled, streamingEnabled, todoListToolEnabled, toolEnablement, passIncludeObfuscation, useChatCoordinatorWorker, useChatMathWorker, useChatNetworkWorkerForRequests, useChatToolWorker, useOwnBackend, voiceDictationEnabled] = await Promise.all([loadAiSessionTitleGenerationEnabled(), loadAuthEnabled(), loadBackendUrl(), loadChatHistoryEnabled(), loadComposerDropEnabled(), loadOpenApiApiKey(), loadOpenRouterApiKey(), loadEmitStreamingFunctionCallEvents(), loadReasoningPickerEnabled(), loadScrollDownButtonEnabled(), loadSearchEnabled(), loadStreamingEnabled(), loadTodoListToolEnabled(), loadToolEnablement(), loadPassIncludeObfuscation(), loadUseChatCoordinatorWorker(), loadUseChatMathWorker(), loadUseChatNetworkWorkerForRequests(), loadUseChatToolWorker(), loadUseOwnBackend(), loadVoiceDictationEnabled()]);
+  const [aiSessionTitleGenerationEnabled, authEnabled, authUseRedirect, backendUrl, chatHistoryEnabled, composerDropEnabled, openApiApiKey, openRouterApiKey, emitStreamingFunctionCallEvents, reasoningPickerEnabled, scrollDownButtonEnabled, searchEnabled, streamingEnabled, todoListToolEnabled, toolEnablement, passIncludeObfuscation, useChatCoordinatorWorker, useChatMathWorker, useChatNetworkWorkerForRequests, useChatToolWorker, useOwnBackend, voiceDictationEnabled] = await Promise.all([loadAiSessionTitleGenerationEnabled(), loadAuthEnabled(), loadAuthUseRedirect(), loadBackendUrl(), loadChatHistoryEnabled(), loadComposerDropEnabled(), loadOpenApiApiKey(), loadOpenRouterApiKey(), loadEmitStreamingFunctionCallEvents(), loadReasoningPickerEnabled(), loadScrollDownButtonEnabled(), loadSearchEnabled(), loadStreamingEnabled(), loadTodoListToolEnabled(), loadToolEnablement(), loadPassIncludeObfuscation(), loadUseChatCoordinatorWorker(), loadUseChatMathWorker(), loadUseChatNetworkWorkerForRequests(), loadUseChatToolWorker(), loadUseOwnBackend(), loadVoiceDictationEnabled()]);
   return {
     aiSessionTitleGenerationEnabled,
     authEnabled,
+    authUseRedirect,
     backendUrl,
     chatHistoryEnabled,
     composerDropEnabled,
@@ -10899,6 +10948,7 @@ const loadContent = async (state, savedState) => {
   const {
     aiSessionTitleGenerationEnabled,
     authEnabled,
+    authUseRedirect,
     backendUrl,
     chatHistoryEnabled,
     composerDropEnabled,
@@ -10979,6 +11029,7 @@ const loadContent = async (state, savedState) => {
     authAccessToken: authState.authAccessToken,
     authEnabled,
     authErrorMessage: authState.authErrorMessage,
+    authUseRedirect,
     backendUrl,
     chatHistoryEnabled,
     chatListScrollTop,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/chat-view",
-  "version": "7.12.0",
+  "version": "7.14.0",
   "description": "Chat View Worker",
   "repository": {
     "type": "git",