@haiiro/docuflow 0.0.11 → 0.0.13

package/src/logic-functions/bitrix-app.logic-function.ts

@@ -1,68 +1,26 @@
 import { defineLogicFunction } from 'twenty-sdk/define';
-import { type RoutePayload } from 'twenty-sdk/logic-function';
+import {
+  type LogicFunctionExecutionContext,
+  type RoutePayload,
+} from 'twenty-sdk/logic-function';
 
-import { restAnd, restEq, restIsNull, restNeq, restOr } from 'src/shared/api/rest-filter.util';
-import { readRestList } from 'src/shared/api/rest-response.util';
 import { BitrixError, callBitrix, isBitrixConfigured } from 'src/shared/bitrix/bitrix-client';
+import { type BitrixUserProfile } from 'src/shared/bitrix/bitrix-user.util';
 import { parseBitrixRequest } from 'src/shared/bitrix/bitrix.util';
-import { DOCFLOW_SECTION, TASK_DONE_STATUS } from 'src/shared/docflow.constants';
+import { readDocflowAppSection } from 'src/shared/app/docflow-app.util';
+import { findOrCreateWorkspaceMemberFromBitrix } from 'src/server/bitrix-member';
 import { proveAndLinkBitrixPortal } from 'src/server/bitrix-portal';
-import { renderBitrixPage, type BitrixPageTask } from 'src/server/bitrix-page';
+import { renderBitrixPage } from 'src/server/bitrix-page';
+import { getCrmUrl } from 'src/server/crm-url';
+import { renderDocflowAppPage } from 'src/server/docflow-app-page';
 import { htmlResponse } from 'src/server/http-response';
-import { restClient } from 'src/server/records';
 import { BITRIX_APP_LOGIC_FUNCTION_UNIVERSAL_IDENTIFIER } from 'src/universal-identifiers';
 
-const TASKS_SHOWN_IN_PORTAL = 20;
-
-const getCrmUrl = (): string | undefined => {
-  const value = process.env.CRM_PUBLIC_URL?.trim();
-
-  return value !== undefined && /^https?:\/\//.test(value)
-    ? value.replace(/\/$/, '')
-    : undefined;
-};
-
-// The person is found by the e-mail of their Bitrix24 account; their open
-// docflow tasks are listed with links into the CRM.
-const findMyTasks = async (
-  email: string,
-  crmUrl: string | undefined,
-): Promise<BitrixPageTask[] | undefined> => {
-  const [member] = readRestList<{ id: string }>(
-    await restClient('application').get('/rest/workspaceMembers', {
-      query: { filter: restEq('userEmail', email), limit: 1 },
-    }),
-  ).records;
-
-  if (member === undefined) {
-    return undefined;
-  }
-
-  return readRestList<{ id: string; title?: string | null; dueAt?: string | null }>(
-    await restClient('application').get('/rest/tasks', {
-      query: {
-        filter: restAnd(
-          restEq('smbSection', DOCFLOW_SECTION),
-          restEq('assigneeId', member.id),
-          restOr(restNeq('status', TASK_DONE_STATUS), restIsNull('status')),
-        ),
-        order_by: 'dueAt[AscNullsLast]',
-        limit: TASKS_SHOWN_IN_PORTAL,
-      },
-    }),
-  ).records.map((task) => ({
-    title: task.title?.trim() || 'Без названия',
-    url: crmUrl !== undefined ? `${crmUrl}/object/task/${task.id}` : undefined,
-    dueAt:
-      typeof task.dueAt === 'string'
-        ? new Date(task.dueAt).toLocaleDateString('ru-RU')
-        : undefined,
-  }));
-};
-
 // "Путь вашего обработчика" of the local Bitrix24 application: the page a
-// person sees when they open the app in the portal.
-const handler = async (event: RoutePayload) => {
+// person sees when they open the app in the portal. After the portal and the
+// person are checked it is the standalone docflow page; it signs in to the
+// CRM itself (the portal frame gets no CRM cookie).
+const handler = async (event: RoutePayload, context: LogicFunctionExecutionContext) => {
   const crmUrl = getCrmUrl();
 
   if (!isBitrixConfigured()) {
@@ -72,7 +30,6 @@ const handler = async (event: RoutePayload) => {
         title: 'Документооборот',
         message: 'В настройках приложения в CRM не указаны BITRIX_CLIENT_ID и BITRIX_CLIENT_SECRET.',
         crmUrl,
-        tasks: [],
         isInstall: false,
       }),
     );
@@ -86,43 +43,58 @@ const handler = async (event: RoutePayload) => {
 
   try {
     const portal = await proveAndLinkBitrixPortal(request);
-    const user = await callBitrix<{ EMAIL?: string }>({
+    const user = await callBitrix<BitrixUserProfile>({
       restEndpoint: portal.restEndpoint,
       accessToken: request.authId ?? portal.accessToken,
       method: 'user.current',
       params: {},
     });
-    const tasks =
-      typeof user.EMAIL === 'string' && user.EMAIL.length > 0
-        ? await findMyTasks(user.EMAIL, crmUrl)
-        : undefined;
+    const member = await findOrCreateWorkspaceMemberFromBitrix(user);
 
-    return htmlResponse(
-      200,
-      renderBitrixPage({
-        title: 'Документооборот',
-        message:
-          tasks === undefined
-            ? 'В CRM нет сотрудника с почтой вашего профиля Битрикс24.'
-            : tasks.length === 0
-              ? 'Открытых заданий нет.'
-              : 'Ваши открытые задания:',
-        crmUrl,
-        tasks: tasks ?? [],
-        isInstall: false,
-      }),
-    );
+    if (member === undefined) {
+      return htmlResponse(
+        200,
+        renderBitrixPage({
+          title: 'Документооборот',
+          message: 'В профиле Битрикс24 нет почты — без неё нельзя найти или создать сотрудника в CRM.',
+          crmUrl,
+          isInstall: false,
+        }),
+      );
+    }
+
+    return renderDocflowAppPage({
+      workspaceId: context.workspaceId,
+      config: {
+        mode: 'bitrix',
+        crmUrl: crmUrl ?? '',
+        section: readDocflowAppSection(event.queryStringParameters.section),
+        expectedWorkspaceMemberId: member.id,
+        portalDomain: portal.portalDomain,
+      },
+    });
   } catch (error) {
+    if (error instanceof BitrixError) {
+      return htmlResponse(
+        403,
+        renderBitrixPage({
+          title: 'Документооборот',
+          message: `Запрос портала не подтверждён: ${error.message}`,
+          crmUrl,
+          isInstall: false,
+        }),
+      );
+    }
+
     return htmlResponse(
-      403,
+      200,
       renderBitrixPage({
         title: 'Документооборот',
         message:
-          error instanceof BitrixError
-            ? `Запрос портала не подтверждён: ${error.message}`
-            : 'Запрос портала не подтверждён.',
+          error instanceof Error
+            ? error.message
+            : 'Не удалось открыть документооборот для вашего профиля Битрикс24.',
         crmUrl,
-        tasks: [],
         isInstall: false,
       }),
     );

package/src/logic-functions/bitrix-install.logic-function.mjs

@@ -119538,7 +119538,6 @@ var renderBitrixPage = ({
   title,
   message,
   crmUrl,
-  tasks,
   isInstall
 }) => `<!doctype html>
 <html lang="ru">
@@ -119552,19 +119551,12 @@ var renderBitrixPage = ({
   h1 { font-size: 20px; margin: 0 0 8px; }
   p { color: #666; margin: 0 0 16px; }
   a.button { display: inline-block; padding: 8px 16px; border-radius: 8px; background: #1961ed; color: #fff; text-decoration: none; }
-  ul { list-style: none; padding: 0; margin: 16px 0 0; }
-  li { padding: 8px 0; border-top: 1px solid #eee; display: flex; justify-content: space-between; gap: 16px; }
-  li a { color: #1961ed; text-decoration: none; }
-  .due { color: #999; white-space: nowrap; }
 </style>
 </head>
 <body>
 <h1>${escapeHtml(title)}</h1>
 <p>${escapeHtml(message)}</p>
 ${crmUrl !== void 0 ? `<a class="button" href="${escapeHtml(crmUrl)}" target="_blank" rel="noopener">\u041E\u0442\u043A\u0440\u044B\u0442\u044C \u0434\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u043E\u043E\u0431\u043E\u0440\u043E\u0442</a>` : ""}
-${tasks.length > 0 ? `<ul>${tasks.map(
-  (task) => `<li>${task.url !== void 0 ? `<a href="${escapeHtml(task.url)}" target="_blank" rel="noopener">${escapeHtml(task.title)}</a>` : escapeHtml(task.title)}<span class="due">${escapeHtml(task.dueAt ?? "")}</span></li>`
-).join("")}</ul>` : ""}
 ${isInstall ? "<script>if (window.BX24) { BX24.init(function () { BX24.installFinish(); }); }</script>" : ""}
 </body>
 </html>`;
@@ -119586,7 +119578,6 @@ var handler = async (event) => {
       renderBitrixPage({
         title: "\u0414\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u043E\u043E\u0431\u043E\u0440\u043E\u0442",
         message: "\u0412 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0430\u0445 \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u044F \u0432 CRM \u043D\u0435 \u0443\u043A\u0430\u0437\u0430\u043D\u044B BITRIX_CLIENT_ID \u0438 BITRIX_CLIENT_SECRET.",
-        tasks: [],
         isInstall: false
       })
     );
@@ -119613,7 +119604,6 @@ var handler = async (event) => {
       renderBitrixPage({
         title: "\u0414\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u043E\u043E\u0431\u043E\u0440\u043E\u0442 \u043F\u043E\u0434\u043A\u043B\u044E\u0447\u0451\u043D",
         message: `\u041F\u043E\u0440\u0442\u0430\u043B ${portal.portalDomain} \u0441\u0432\u044F\u0437\u0430\u043D \u0441 CRM.`,
-        tasks: [],
         isInstall: true
       })
     );
@@ -119623,7 +119613,6 @@ var handler = async (event) => {
       renderBitrixPage({
         title: "\u0414\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u043E\u043E\u0431\u043E\u0440\u043E\u0442",
         message: error instanceof BitrixError ? `\u041F\u043E\u0440\u0442\u0430\u043B \u043D\u0435 \u043F\u043E\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0451\u043D: ${error.message}` : "\u041F\u043E\u0440\u0442\u0430\u043B \u043D\u0435 \u043F\u043E\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0451\u043D.",
-        tasks: [],
         isInstall: false
       })
     );

package/src/logic-functions/bitrix-install.logic-function.ts

@@ -17,7 +17,6 @@ const handler = async (event: RoutePayload) => {
       renderBitrixPage({
         title: 'Документооборот',
         message: 'В настройках приложения в CRM не указаны BITRIX_CLIENT_ID и BITRIX_CLIENT_SECRET.',
-        tasks: [],
         isInstall: false,
       }),
     );
@@ -47,7 +46,6 @@ const handler = async (event: RoutePayload) => {
       renderBitrixPage({
         title: 'Документооборот подключён',
         message: `Портал ${portal.portalDomain} связан с CRM.`,
-        tasks: [],
         isInstall: true,
       }),
     );
@@ -60,7 +58,6 @@ const handler = async (event: RoutePayload) => {
           error instanceof BitrixError
             ? `Портал не подтверждён: ${error.message}`
             : 'Портал не подтверждён.',
-        tasks: [],
         isInstall: false,
       }),
     );

package/src/logic-functions/capture-file.logic-function.mjs

@@ -42,7 +42,8 @@ var readRestList = (response) => {
   const value = readDataValue(response);
   return {
     records: Array.isArray(value) ? value : [],
-    pageInfo: response?.pageInfo ?? {}
+    pageInfo: response?.pageInfo ?? {},
+    totalCount: response?.totalCount
   };
 };
 var readRestRecord = (response) => {