openyida 2026.5.9-beta.2 → 2026.5.9-beta.4

package/lib/auth/qr-login.js

@@ -378,6 +378,66 @@ function resolveDingtalkLoginResultUrl(loginResult) {
     null;
 }
 
+function isDingtalkOAuthPassResult(loginResult) {
+  return !!(
+    loginResult &&
+    typeof loginResult === 'object' &&
+    loginResult.pass === true
+  );
+}
+
+function getDingtalkOAuthRedirectUri(context = {}) {
+  try {
+    const parsedUrl = new URL(context.loginPageUrl);
+    return parsedUrl.searchParams.get('redirect_uri') || '';
+  } catch {
+    return '';
+  }
+}
+
+async function confirmDingtalkOAuthAuth(context, cookieHeader, loginResult = {}, options = {}) {
+  const postConfirmAuth = options.fetchPost || fetchPost;
+  const confirmUrl = `${context.origin}/oauth2/confirm_auth`;
+  const targetCorpId = options.corpId || loginResult.corpId || context.corpId || '';
+  const redirectUri = getDingtalkOAuthRedirectUri(context);
+
+  const confirmParams = {};
+  if (targetCorpId) {confirmParams.corpId = targetCorpId;}
+  if (loginResult.secondaryValidationResult) {
+    confirmParams.secondaryValidationResult = loginResult.secondaryValidationResult;
+  }
+  if (redirectUri) {confirmParams.redirect_uri = redirectUri;}
+
+  const response = await postConfirmAuth(confirmUrl, buildOAuthPostData(context.loginPageUrl, confirmParams), {
+    cookieHeader,
+    referer: context.loginPageUrl,
+    origin: context.origin,
+  });
+
+  const updatedCookieHeader = mergeCookies(cookieHeader, response.cookies);
+  let parsed;
+  try {
+    parsed = JSON.parse(response.body);
+  } catch {
+    throw new Error(t('qr_login.exchange_failed', response.body.substring(0, 200)));
+  }
+
+  if (!parsed.success) {
+    throw new Error(t('qr_login.exchange_api_failed', parsed.errorMsg || JSON.stringify(parsed)));
+  }
+
+  const result = parsed.result || parsed.content || parsed;
+  const redirectUrl = resolveDingtalkLoginResultUrl(result);
+  if (!redirectUrl) {
+    throw new Error(t('qr_login.exchange_api_failed', JSON.stringify(result)));
+  }
+
+  return {
+    redirectUrl,
+    cookieHeader: updatedCookieHeader,
+  };
+}
+
 function shouldChooseDingtalkOAuthOrganization(loginResult) {
   return !!(
     loginResult &&
@@ -740,7 +800,16 @@ async function exchangeDingtalkOAuthResult(baseUrl, loginResult, cookieHeader, c
     resolvedLoginResult = parsed.result || parsed.content || parsed;
   }
 
-  const redirectUrl = resolveDingtalkLoginResultUrl(resolvedLoginResult);
+  let redirectUrl = resolveDingtalkLoginResultUrl(resolvedLoginResult);
+  if (!redirectUrl && isDingtalkOAuthPassResult(resolvedLoginResult)) {
+    const confirmResult = await confirmDingtalkOAuthAuth(context, cookieHeader, resolvedLoginResult, {
+      ...options,
+      corpId: options.corpId || selectedCorp?.corpId || resolvedLoginResult.corpId || context.corpId,
+    });
+    redirectUrl = confirmResult.redirectUrl;
+    cookieHeader = confirmResult.cookieHeader;
+  }
+
   if (!redirectUrl) {
     throw new Error(t('qr_login.exchange_api_failed', JSON.stringify(resolvedLoginResult)));
   }
@@ -1373,6 +1442,9 @@ module.exports = {
     resolveDingtalkOAuthCorpForFreshQr,
     pollDingtalkQrCodeStatus,
     buildOAuthPostData,
+    confirmDingtalkOAuthAuth,
+    getDingtalkOAuthRedirectUri,
+    isDingtalkOAuthPassResult,
     buildCodexCorpInteraction,
     buildCodexPollCommand,
     getTargetCorpId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openyida",
-  "version": "2026.5.9-beta.2",
+  "version": "2026.5.9-beta.4",
   "description": "OpenYida CLI - 宜搭低代码 AI 开发工具（安装即用，零配置）",
   "bin": {
     "openyida": "bin/yida.js",