oasis_test_v2 2.2.108 → 2.2.109

package/dist/index.js

@@ -207031,7 +207031,65 @@ var init_feishu = __esm({
 });
 
 // ../connectors/src/feishu/scopes.ts
-var FEISHU_BASIC_SCOPES, FEISHU_USER_SCOPES, FEISHU_USER_SCOPE_STRING;
+function scopesForDomains(domains) {
+  const set = /* @__PURE__ */ new Set(["offline_access"]);
+  for (const d of domains) {
+    const g2 = FEISHU_DOMAIN_SCOPES[d];
+    if (g2) for (const s2 of g2.scopes) set.add(s2);
+  }
+  return [...set];
+}
+function feishuModuleNeedsApproval(module2) {
+  const g2 = FEISHU_DOMAIN_SCOPES[module2];
+  return !!g2 && g2.scopes.some((s2) => !AUTO_APPROVED.has(s2));
+}
+function normalizeFeishuAuthSelection(body2) {
+  const all2 = Object.keys(FEISHU_DOMAIN_SCOPES);
+  let raw = body2.modules;
+  if (raw === void 0) {
+    if (body2.scopeLevel === "full") raw = all2;
+    else if (body2.scopeLevel === "basic") raw = all2.filter((m2) => !feishuModuleNeedsApproval(m2));
+    else raw = body2.domains;
+  }
+  const picked = new Set(Array.isArray(raw) ? raw.filter((m2) => typeof m2 === "string") : []);
+  const modules = all2.filter((m2) => picked.has(m2));
+  if (modules.length === 0) return null;
+  return { modules, sendAsUser: body2.sendAsUser === true };
+}
+function scopesForSelection(sel, includeSendAsUser) {
+  const scopes = scopesForDomains(sel.modules);
+  if (includeSendAsUser) scopes.push(FEISHU_SEND_AS_USER_SCOPE);
+  return scopes;
+}
+async function appHasScope(appId, appSecret, scope2, fetchImpl = fetch) {
+  const tokenResp = await fetchImpl("https://open.feishu.cn/open-apis/auth/v3/tenant_access_token/internal", {
+    method: "POST",
+    headers: { "Content-Type": "application/json; charset=utf-8" },
+    body: JSON.stringify({ app_id: appId, app_secret: appSecret })
+  });
+  const tokenBody = await tokenResp.json();
+  if (tokenBody.code !== 0 || !tokenBody.tenant_access_token) {
+    throw new Error(`tenant_access_token failed: code=${tokenBody.code} msg=${tokenBody.msg ?? ""}`);
+  }
+  const resp = await fetchImpl("https://open.feishu.cn/open-apis/application/v6/scopes", {
+    headers: { authorization: `Bearer ${tokenBody.tenant_access_token}` }
+  });
+  const body2 = await resp.json();
+  if (body2.code !== 0) throw new Error(`application/v6/scopes failed: code=${body2.code} msg=${body2.msg ?? ""}`);
+  return (body2.data?.scopes ?? []).some(
+    (s2) => s2.scope_name === scope2 && (!s2.scope_type || s2.scope_type === "user")
+  );
+}
+function feishuAuthSelectionRecord(sel, sendAsUserRequested, tokenResponse) {
+  const granted = typeof tokenResponse["scope"] === "string" ? tokenResponse["scope"].split(/\s+/).filter(Boolean) : void 0;
+  return {
+    modules: sel.modules,
+    sendAsUser: sel.sendAsUser,
+    sendAsUserRequested,
+    ...granted ? { grantedScopes: granted } : {}
+  };
+}
+var FEISHU_BASIC_SCOPES, FEISHU_DOMAIN_SCOPES, FEISHU_USER_SCOPES, FEISHU_USER_SCOPE_STRING, FEISHU_SEND_AS_USER_SCOPE, FEISHU_AUTH_SELECTION_VAR, AUTO_APPROVED;
 var init_scopes = __esm({
   "../connectors/src/feishu/scopes.ts"() {
     "use strict";
@@ -207174,6 +207232,231 @@ var init_scopes = __esm({
       "offline_access"
       // refresh_token（--recommend 不含，但 token 刷新必须）
     ];
+    FEISHU_DOMAIN_SCOPES = {
+      im: {
+        label: "\u5373\u65F6\u6D88\u606F\uFF08\u53D1\u6D88\u606F\u3001\u7FA4\u804A\u3001\u53CD\u5E94\uFF09",
+        scopes: [
+          "im:chat.members:read",
+          "im:chat.members:write_only",
+          "im:chat:read",
+          "im:chat:update",
+          "im:feed.flag:read",
+          "im:feed.flag:write",
+          "im:message",
+          "im:message.group_msg:get_as_user",
+          "im:message.p2p_msg:get_as_user",
+          "im:message.pins:read",
+          "im:message.pins:write_only",
+          "im:message.reactions:read",
+          "im:message.reactions:write_only",
+          "im:message:readonly"
+        ]
+      },
+      calendar: {
+        label: "\u65E5\u5386\uFF08\u65E5\u7A0B\u8BFB\u5199\uFF09",
+        scopes: [
+          "calendar:calendar:read",
+          "calendar:calendar:create",
+          "calendar:calendar:update",
+          "calendar:calendar:delete",
+          "calendar:calendar.event:read",
+          "calendar:calendar.event:create",
+          "calendar:calendar.event:update",
+          "calendar:calendar.event:delete",
+          "calendar:calendar.free_busy:read"
+        ]
+      },
+      docs: {
+        label: "\u4E91\u6587\u6863\uFF08\u6587\u6863\u3001\u6743\u9650\u3001\u8BC4\u8BBA\uFF09",
+        scopes: [
+          "docs:document.content:read",
+          "docs:document:copy",
+          "docs:document:export",
+          "docs:document:import",
+          "docs:document.comment:read",
+          "docs:document.comment:create",
+          "docs:document.comment:update",
+          "docs:document.comment:delete",
+          "docs:document.comment:write_only",
+          "docs:document.media:download",
+          "docs:document.media:upload",
+          "docs:event:subscribe",
+          "docs:permission.member:apply",
+          "docs:permission.member:auth",
+          "docs:permission.member:create",
+          "docs:permission.member:transfer",
+          "docs:permission.setting:read",
+          "docs:permission.setting:write_only",
+          "docs:secure_label:write_only",
+          "docx:document:create",
+          "docx:document:readonly",
+          "docx:document:write_only",
+          "space:document:delete",
+          "space:document:move",
+          "space:document:shortcut",
+          "space:folder:create"
+        ]
+      },
+      drive: {
+        label: "\u4E91\u76D8\uFF08\u6587\u4EF6\u4E0A\u4F20\u4E0B\u8F7D\uFF09",
+        scopes: [
+          "drive:drive.metadata:readonly",
+          "drive:file:download",
+          "drive:file:upload",
+          "drive:file:view_record:readonly",
+          "drive:quota_detail:read_one"
+        ]
+      },
+      sheets: {
+        label: "\u7535\u5B50\u8868\u683C",
+        scopes: [
+          "sheets:spreadsheet:create",
+          "sheets:spreadsheet:read",
+          "sheets:spreadsheet:write_only",
+          "sheets:spreadsheet.meta:read",
+          "sheets:spreadsheet.meta:write_only"
+        ]
+      },
+      base: {
+        label: "\u591A\u7EF4\u8868\u683C\uFF08Base\uFF09",
+        scopes: [
+          "base:app:copy",
+          "base:app:create",
+          "base:app:read",
+          "base:app:update",
+          "base:dashboard:create",
+          "base:dashboard:delete",
+          "base:dashboard:read",
+          "base:dashboard:update",
+          "base:field:create",
+          "base:field:delete",
+          "base:field:read",
+          "base:field:update",
+          "base:form:create",
+          "base:form:delete",
+          "base:form:read",
+          "base:form:update",
+          "base:history:read",
+          "base:record:create",
+          "base:record:delete",
+          "base:record:read",
+          "base:record:update",
+          "base:role:create",
+          "base:role:delete",
+          "base:role:read",
+          "base:role:update",
+          "base:table:create",
+          "base:table:delete",
+          "base:table:read",
+          "base:table:update",
+          "base:view:read",
+          "base:view:write_only",
+          "base:workflow:create",
+          "base:workflow:read",
+          "base:workflow:update"
+        ]
+      },
+      wiki: {
+        label: "\u77E5\u8BC6\u5E93",
+        scopes: [
+          "wiki:member:create",
+          "wiki:member:retrieve",
+          "wiki:member:update",
+          "wiki:node:copy",
+          "wiki:node:create",
+          "wiki:node:move",
+          "wiki:node:read",
+          "wiki:node:retrieve",
+          "wiki:space:read",
+          "wiki:space:retrieve",
+          "wiki:space:write_only"
+        ]
+      },
+      slides: {
+        label: "\u5E7B\u706F\u7247",
+        scopes: [
+          "slides:presentation:create",
+          "slides:presentation:read",
+          "slides:presentation:update",
+          "slides:presentation:write_only"
+        ]
+      },
+      task: {
+        label: "\u4EFB\u52A1",
+        scopes: [
+          "task:attachment:write",
+          "task:comment:write",
+          "task:custom_field:read",
+          "task:custom_field:write",
+          "task:section:read",
+          "task:section:write",
+          "task:task:read",
+          "task:task:write",
+          "task:tasklist:read",
+          "task:tasklist:write"
+        ]
+      },
+      approval: {
+        label: "\u5BA1\u6279",
+        scopes: [
+          "approval:instance:read",
+          "approval:instance:write",
+          "approval:task:read",
+          "approval:task:write"
+        ]
+      },
+      mail: {
+        label: "\u90AE\u4EF6",
+        scopes: [
+          "mail:user_mailbox:readonly",
+          "mail:user_mailbox.message:modify",
+          "mail:user_mailbox.message.address:read",
+          "mail:user_mailbox.message.body:read",
+          "mail:user_mailbox.message.subject:read",
+          "mail:user_mailbox.message:readonly",
+          "mail:user_mailbox.mail_contact:read",
+          "mail:user_mailbox.mail_contact:write",
+          "mail:event"
+        ]
+      },
+      minutes: {
+        label: "\u5999\u8BB0\uFF08\u4F1A\u8BAE\u5F55\u97F3\uFF09",
+        scopes: ["minutes:minutes.search:read", "minutes:minutes.upload:write"]
+      },
+      vc: {
+        label: "\u89C6\u9891\u4F1A\u8BAE",
+        scopes: [
+          "vc:meeting.meetingevent:read",
+          "vc:meeting.search:read",
+          "vc:note:read",
+          "vc:record:readonly"
+        ]
+      },
+      contact: {
+        label: "\u901A\u8BAF\u5F55",
+        scopes: [
+          "contact:user.base:readonly",
+          "contact:user:search",
+          "contact:user.basic_profile:readonly"
+        ]
+      },
+      okr: {
+        label: "OKR",
+        scopes: ["okr:okr:read"]
+      },
+      attendance: {
+        label: "\u8003\u52E4",
+        scopes: ["attendance:record:read"]
+      },
+      board: {
+        label: "\u767D\u677F",
+        scopes: ["board:whiteboard:node:create", "board:whiteboard:node:read"]
+      },
+      spark: {
+        label: "\u5E94\u7528\uFF08Spark\uFF09",
+        scopes: ["spark:app:read", "spark:app:write"]
+      }
+    };
     FEISHU_USER_SCOPES = [
       // ── 自动审批权限（与 FEISHU_BASIC_SCOPES 完全相同）────────────────────
       ...FEISHU_BASIC_SCOPES,
@@ -207206,6 +207489,9 @@ var init_scopes = __esm({
       "space:document:retrieve"
     ];
     FEISHU_USER_SCOPE_STRING = FEISHU_USER_SCOPES.join(" ");
+    FEISHU_SEND_AS_USER_SCOPE = "im:message.send_as_user";
+    FEISHU_AUTH_SELECTION_VAR = "FEISHU_AUTH_SELECTION";
+    AUTO_APPROVED = new Set(FEISHU_BASIC_SCOPES);
   }
 });
 
@@ -217183,15 +217469,34 @@ ${composed}`;
             return;
           }
           if (url.pathname === "/api/connectors/feishu/login/start" && req.method === "POST") {
-            const { appId, actorId } = JSON.parse(rawBody);
+            const startBody = JSON.parse(rawBody);
+            const { appId, actorId } = startBody;
             if (!appId) {
               res.writeHead(400).end(JSON.stringify({ error: "appId required" }));
               return;
             }
+            const selection = normalizeFeishuAuthSelection(startBody);
+            if (!selection) {
+              res.writeHead(400).end(JSON.stringify({ error: "\u8BF7\u81F3\u5C11\u9009\u62E9\u4E00\u4E2A\u529F\u80FD\u6A21\u5757" }));
+              return;
+            }
             try {
               const startSvc = await connectorActorsService();
               const appSecret = startSvc ? await startSvc.revealResolvedVariable("FEISHU_APP_SECRET", actorId) : null;
               if (!appSecret) throw new Error("FEISHU_APP_SECRET not found \u2014 please complete app setup first");
+              let sendAsUserRequested = false;
+              let notice;
+              if (selection.sendAsUser) {
+                try {
+                  sendAsUserRequested = await appHasScope(appId, appSecret, FEISHU_SEND_AS_USER_SCOPE);
+                  if (!sendAsUserRequested) {
+                    notice = "\u8BE5\u98DE\u4E66\u5E94\u7528\u5C1A\u672A\u5F00\u901A\u300C\u4EE5\u7528\u6237\u8EAB\u4EFD\u53D1\u6D88\u606F\u300D\u6743\u9650\uFF08im:message.send_as_user\uFF09\uFF0C\u672C\u6B21\u6388\u6743\u5DF2\u8DF3\u8FC7\u8FD9\u4E00\u9879\uFF0C\u5176\u4F59\u6743\u9650\u7167\u5E38\u7533\u8BF7\u3002\u5728\u98DE\u4E66\u5F00\u653E\u5E73\u53F0\u4E3A\u5E94\u7528\u5F00\u901A\u540E\u91CD\u65B0\u8FDE\u63A5\u5373\u53EF\u3002";
+                  }
+                } catch (e) {
+                  console.error(`[feishu-oauth] app scopes check failed: ${String(e)}`);
+                  notice = "\u6682\u65F6\u65E0\u6CD5\u786E\u8BA4\u8BE5\u98DE\u4E66\u5E94\u7528\u662F\u5426\u5F00\u901A\u4E86\u300C\u4EE5\u7528\u6237\u8EAB\u4EFD\u53D1\u6D88\u606F\u300D\u6743\u9650\uFF0C\u672C\u6B21\u6388\u6743\u5DF2\u8DF3\u8FC7\u8FD9\u4E00\u9879\uFF0C\u5176\u4F59\u6743\u9650\u7167\u5E38\u7533\u8BF7\u3002\u7A0D\u540E\u53EF\u91CD\u65B0\u8FDE\u63A5\u518D\u8BD5\u3002";
+                }
+              }
               const basicAuth = Buffer.from(`${appId}:${appSecret}`).toString("base64");
               const resp = await fetch("https://accounts.feishu.cn/oauth/v1/device_authorization", {
                 method: "POST",
@@ -217199,7 +217504,10 @@ ${composed}`;
                   "Content-Type": "application/x-www-form-urlencoded",
                   "Authorization": `Basic ${basicAuth}`
                 },
-                body: new URLSearchParams({ client_id: appId, scope: FEISHU_USER_SCOPE_STRING }).toString()
+                body: new URLSearchParams({
+                  client_id: appId,
+                  scope: scopesForSelection(selection, sendAsUserRequested).join(" ")
+                }).toString()
               });
               const data = await resp.json();
               if (!resp.ok || data["error"]) {
@@ -217207,14 +217515,22 @@ ${composed}`;
               }
               const verificationUrl = String(data["verification_uri_complete"] ?? data["verification_uri"] ?? "");
               if (!verificationUrl) throw new Error("no verification_uri in response");
-              res.writeHead(200, { "content-type": "application/json" }).end(JSON.stringify({ verificationUrl, deviceCode: data["device_code"] }));
+              res.writeHead(200, { "content-type": "application/json" }).end(JSON.stringify({
+                verificationUrl,
+                deviceCode: data["device_code"],
+                modules: selection.modules,
+                sendAsUser: selection.sendAsUser,
+                sendAsUserRequested,
+                ...notice ? { notice } : {}
+              }));
             } catch (e) {
               res.writeHead(500).end(JSON.stringify({ error: String(e) }));
             }
             return;
           }
           if (url.pathname === "/api/connectors/feishu/login/poll" && req.method === "POST") {
-            const { appId, deviceCode, actorId } = JSON.parse(rawBody);
+            const pollBody = JSON.parse(rawBody);
+            const { appId, deviceCode, actorId } = pollBody;
             if (!appId || !deviceCode) {
               res.writeHead(400).end(JSON.stringify({ error: "appId and deviceCode required" }));
               return;
@@ -217254,6 +217570,17 @@ ${composed}`;
                 }
                 await persistFeishuUserTokens(svc, actorId, data, Date.now());
                 const nameScope = actorId ? { scope: "personal", actorId } : { scope: "global" };
+                const pollSelection = pollBody.modules === void 0 ? null : normalizeFeishuAuthSelection(pollBody);
+                if (pollSelection) {
+                  const record10 = feishuAuthSelectionRecord(pollSelection, pollBody.sendAsUserRequested === true, data);
+                  await svc.putVariable({
+                    key: FEISHU_AUTH_SELECTION_VAR,
+                    value: JSON.stringify(record10),
+                    ...nameScope,
+                    connectorId: "feishu",
+                    encrypted: false
+                  });
+                }
                 try {
                   const uiResp = await fetch("https://open.feishu.cn/open-apis/authen/v1/user_info", {
                     headers: { authorization: `Bearer ${String(data["access_token"])}` }
@@ -299391,7 +299718,7 @@ async function waitForCommandAuthorization(base, headers, draftId, fallback) {
     }
   }
 }
-var CLI_VERSION = "2.2.108" ? "2.2.108" : "dev";
+var CLI_VERSION = "2.2.109" ? "2.2.109" : "dev";
 function apiHeaders(token2, company) {
   const headers = {
     authorization: `Bearer ${token2}`,
@@ -303562,7 +303889,7 @@ function shimScript() {
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "2.2.108" : "dev";
+var PKG_VERSION = true ? "2.2.109" : "dev";
 var LOCAL_BIN = localBin();
 var NPM_PREFIX = npmPrefix();
 var INSTANCE = DEFAULT_INSTANCE;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oasis_test_v2",
-  "version": "2.2.108",
+  "version": "2.2.109",
   "description": "Oasis node daemon + CLI — background daemon, auto-start, full server CLI",
   "bin": {
     "oasis": "./dist/index.js"
@@ -26,6 +26,6 @@
     "node": ">=20"
   },
   "oasisRelease": {
-    "sourceHead": "a953575106dcf944d7b32f0eca289792092539ff"
+    "sourceHead": "ed886e183f5c2444ee63e480a04b46976ddcf303"
   }
 }