@haiiro/docuflow 0.0.11 → 0.0.12

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

@@ -4,8 +4,10 @@ import { 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 { findOrCreateWorkspaceMemberFromBitrix } from 'src/server/bitrix-member';
 import { proveAndLinkBitrixPortal } from 'src/server/bitrix-portal';
 import { renderBitrixPage, type BitrixPageTask } from 'src/server/bitrix-page';
 import { htmlResponse } from 'src/server/http-response';
@@ -22,28 +24,16 @@ const getCrmUrl = (): string | undefined => {
     : 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,
+const listOpenTasksForMember = async (
+  memberId: 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 }>(
+): Promise<BitrixPageTask[]> =>
+  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),
+          restEq('assigneeId', memberId),
           restOr(restNeq('status', TASK_DONE_STATUS), restIsNull('status')),
         ),
         order_by: 'dueAt[AscNullsLast]',
@@ -58,7 +48,6 @@ const findMyTasks = async (
         ? 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.
@@ -86,41 +75,61 @@ 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);
+
+    if (member === undefined) {
+      return htmlResponse(
+        200,
+        renderBitrixPage({
+          title: 'Документооборот',
+          message: 'В профиле Битрикс24 нет почты — без неё нельзя найти или создать сотрудника в CRM.',
+          crmUrl,
+          tasks: [],
+          isInstall: false,
+        }),
+      );
+    }
+
+    const tasks = await listOpenTasksForMember(member.id, crmUrl);
 
     return htmlResponse(
       200,
       renderBitrixPage({
         title: 'Документооборот',
-        message:
-          tasks === undefined
-            ? 'В CRM нет сотрудника с почтой вашего профиля Битрикс24.'
-            : tasks.length === 0
-              ? 'Открытых заданий нет.'
-              : 'Ваши открытые задания:',
+        message: tasks.length === 0 ? 'Открытых заданий нет.' : 'Ваши открытые задания:',
         crmUrl,
-        tasks: tasks ?? [],
+        tasks,
         isInstall: false,
       }),
     );
   } catch (error) {
+    if (error instanceof BitrixError) {
+      return htmlResponse(
+        403,
+        renderBitrixPage({
+          title: 'Документооборот',
+          message: `Запрос портала не подтверждён: ${error.message}`,
+          crmUrl,
+          tasks: [],
+          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/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) => {

package/src/logic-functions/hand-out-form-step.logic-function.mjs

@@ -59551,7 +59551,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) => {

package/src/logic-functions/on-workflow-run-updated.logic-function.mjs

@@ -119461,7 +119461,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) => {