@haiiro/docuflow 0.0.22 → 0.0.24

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

@@ -119749,7 +119749,7 @@ var getCrmUrl = () => {
 // package.json
 var package_default = {
   name: "@haiiro/docuflow",
-  version: "0.0.22",
+  version: "0.0.24",
   description: "NorDiv \u0414\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u043E\u043E\u0431\u043E\u0440\u043E\u0442: \u0437\u0430\u0434\u0430\u043D\u0438\u044F \u0441 \u043F\u043E\u043B\u044F\u043C\u0438, \u043F\u0440\u043E\u0446\u0435\u0441\u0441\u044B \u0441 \u0437\u0430\u043F\u0443\u0441\u043A\u043E\u043C \u043F\u043E \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u0430\u043C, \u0434\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u044B \u0441\u043E \u0432\u0441\u0435\u0445 \u0437\u0430\u043F\u0438\u0441\u0435\u0439, \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u0435 \u0411\u0438\u0442\u0440\u0438\u043A\u044124",
   license: "AGPL-3.0-only",
   publishConfig: {

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

@@ -119532,6 +119532,12 @@ var proveAndLinkBitrixPortal = async (request) => {
   return { ...portal, bitrixUserId: grant.bitrixUserId };
 };
 
+// src/server/crm-url.ts
+var getCrmUrl = () => {
+  const value = process.env.CRM_PUBLIC_URL?.trim();
+  return value !== void 0 && /^https?:\/\//.test(value) ? value.replace(/\/$/, "") : void 0;
+};
+
 // src/server/bitrix-page.ts
 var BX24_SDK_URL = "https://api.bitrix24.com/api/v1/";
 var renderBitrixPage = ({
@@ -119615,13 +119621,15 @@ var handler = async (event) => {
         query: event.queryStringParameters
       })
     );
+    const companyUrl = getCrmUrl();
+    const uninstallEventUrl = companyUrl !== void 0 ? `${companyUrl}/s/bitrix/event` : new u2().resolveUrl("/s/bitrix/event");
     await callBitrix({
       restEndpoint: portal.restEndpoint,
       accessToken: portal.accessToken,
       method: "event.bind",
       params: {
         event: "ONAPPUNINSTALL",
-        handler: new u2().resolveUrl("/s/bitrix/event")
+        handler: uninstallEventUrl
       }
     }).catch(() => void 0);
     return htmlResponse(

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

@@ -5,6 +5,7 @@ import { RestApiClient } from 'twenty-client-sdk/rest';
 import { BitrixError, callBitrix, isBitrixConfigured } from 'src/shared/bitrix/bitrix-client';
 import { parseBitrixRequest } from 'src/shared/bitrix/bitrix.util';
 import { proveAndLinkBitrixPortal } from 'src/server/bitrix-portal';
+import { getCrmUrl } from 'src/server/crm-url';
 import { renderBitrixPage } from 'src/server/bitrix-page';
 import { htmlResponse, withRouteErrors } from 'src/server/http-response';
 import { BITRIX_INSTALL_LOGIC_FUNCTION_UNIVERSAL_IDENTIFIER } from 'src/universal-identifiers';
@@ -31,13 +32,21 @@ const handler = async (event: RoutePayload) => {
       }),
     );
 
+    // The company's own address: with several companies on one Twenty server
+    // only it leads to this company (the server address does not)
+    const companyUrl = getCrmUrl();
+    const uninstallEventUrl =
+      companyUrl !== undefined
+        ? `${companyUrl}/s/bitrix/event`
+        : new RestApiClient().resolveUrl('/s/bitrix/event');
+
     await callBitrix({
       restEndpoint: portal.restEndpoint,
       accessToken: portal.accessToken,
       method: 'event.bind',
       params: {
         event: 'ONAPPUNINSTALL',
-        handler: new RestApiClient().resolveUrl('/s/bitrix/event'),
+        handler: uninstallEventUrl,
       },
     }).catch(() => undefined);
 

package/src/logic-functions/docflow-app.logic-function.mjs

@@ -59961,7 +59961,7 @@ var AL = class {
 // package.json
 var package_default = {
   name: "@haiiro/docuflow",
-  version: "0.0.22",
+  version: "0.0.24",
   description: "NorDiv \u0414\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u043E\u043E\u0431\u043E\u0440\u043E\u0442: \u0437\u0430\u0434\u0430\u043D\u0438\u044F \u0441 \u043F\u043E\u043B\u044F\u043C\u0438, \u043F\u0440\u043E\u0446\u0435\u0441\u0441\u044B \u0441 \u0437\u0430\u043F\u0443\u0441\u043A\u043E\u043C \u043F\u043E \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u0430\u043C, \u0434\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u044B \u0441\u043E \u0432\u0441\u0435\u0445 \u0437\u0430\u043F\u0438\u0441\u0435\u0439, \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u0435 \u0411\u0438\u0442\u0440\u0438\u043A\u044124",
   license: "AGPL-3.0-only",
   publishConfig: {

package/src/logic-functions/process-catalog.logic-function.mjs

@@ -1744,6 +1744,12 @@ var CORE_WORKFLOW_VERSION_BY_ID_QUERY = `query CoreWorkflowVersionById($coreWork
   }
 }`;
 
+// src/server/crm-url.ts
+var getCrmUrl = () => {
+  const value = process.env.CRM_PUBLIC_URL?.trim();
+  return value !== void 0 && /^https?:\/\//.test(value) ? value.replace(/\/$/, "") : void 0;
+};
+
 // node_modules/twenty-sdk/dist/logic-function/isDefined-Dtu5EYqP-CMNeFg4z.mjs
 var import_guards = __toESM(require_build(), 1);
 var n = (n4) => !(0, import_guards.isUndefined)(n4) && !(0, import_guards.isNull)(n4);
@@ -119689,7 +119695,7 @@ var handler = async (event, context) => {
     switch (body.action) {
       case "list": {
         const [processes, canAppEdit] = await Promise.all([listDocflowProcesses("person"), canAppEditProcesses()]);
-        return { processes, canAppEdit };
+        return { processes, canAppEdit, crmUrl: getCrmUrl() ?? null };
       }
       case "others":
         return { processes: await listOtherProcesses() };

package/src/logic-functions/process-catalog.logic-function.ts

@@ -5,6 +5,7 @@ import {
 } from 'twenty-sdk/logic-function';
 
 import { CoreGraphqlError } from 'src/shared/api/core-graphql.util';
+import { getCrmUrl } from 'src/server/crm-url';
 import { jsonResponse, readJsonBody, withRouteErrors } from 'src/server/http-response';
 import {
   canAppEditProcesses,
@@ -25,6 +26,7 @@ const readIds = (value: unknown): string[] =>
 // person, so the "Workflows" permission decides who sees them.
 //   { action: 'list' }               docflow processes with their versions, and
 //                                    whether the app may change them (canAppEdit)
+//                                    and the company's address (crmUrl)
 //   { action: 'others' }             the workspace's other processes
 //   { action: 'add' | 'remove', workflowIds }
 const handler = async (event: RoutePayload, context: LogicFunctionExecutionContext) => {
@@ -39,7 +41,7 @@ const handler = async (event: RoutePayload, context: LogicFunctionExecutionConte
       case 'list': {
         const [processes, canAppEdit] = await Promise.all([listDocflowProcesses('person'), canAppEditProcesses()]);
 
-        return { processes, canAppEdit };
+        return { processes, canAppEdit, crmUrl: getCrmUrl() ?? null };
       }
       case 'others':
         return { processes: await listOtherProcesses() };