@gadmin2n/schematics 0.0.141 → 0.0.143

package/dist/lib/application/files/gadmin2-game-angle-demo/server/src/modules/externalInteraction/external-interaction-runtime.controller.spec.ts

@@ -1,64 +1,6 @@
 import { ExternalInteractionRuntimeController } from './external-interaction-runtime.controller';
 
 describe('ExternalInteractionRuntimeController', () => {
-  const input = {
-    tenantNamespace: 'tenant-a',
-    workflowInstanceId: '901',
-    workflowVersionId: '71',
-    temporalRunId: 'wf-callback-901',
-    nodeId: 'submit-result-1',
-    callbackToken: 'ext_cb_token',
-    eventId: 'provider-1001',
-    outcome: 'SIGNED',
-  };
-
-  it('submits a normalized result for the configured tenant', async () => {
-    const service = {
-      submitResult: jest.fn().mockResolvedValue({
-        accepted: true,
-        duplicate: false,
-        interactionStatus: 'RESOLVED',
-        resolvedOutcome: 'SIGNED',
-      }),
-    };
-    const controller = new ExternalInteractionRuntimeController(
-      service as any,
-      {
-        get: jest.fn().mockReturnValue({ tenantNamespace: 'tenant-a' }),
-      } as any,
-      { resolve: jest.fn() } as any,
-    );
-
-    await expect(controller.submitResult(input)).resolves.toEqual({
-      accepted: true,
-      duplicate: false,
-      interactionStatus: 'RESOLVED',
-      resolvedOutcome: 'SIGNED',
-    });
-  });
-
-  it('rejects callback activity metadata from another tenant', async () => {
-    const controller = new ExternalInteractionRuntimeController(
-      { submitResult: jest.fn() } as any,
-      {
-        get: jest.fn().mockReturnValue({ tenantNamespace: 'tenant-a' }),
-      } as any,
-      { resolve: jest.fn() } as any,
-    );
-
-    expect(() =>
-      controller.submitResult({ ...input, tenantNamespace: 'tenant-b' }),
-    ).toThrow(
-      expect.objectContaining({
-        response: {
-          code: 'WORKFLOW_RUNTIME_TENANT_MISMATCH',
-          message: 'Runtime tenant does not match this application',
-          retryable: false,
-        },
-      }),
-    );
-  });
-
   it('starts an external wait and resolves the selected callback Workflow', async () => {
     const service = {
       createInteraction: jest.fn().mockResolvedValue({
@@ -77,7 +19,7 @@ describe('ExternalInteractionRuntimeController', () => {
     const controller = new ExternalInteractionRuntimeController(
       service as any,
       {
-        get: jest.fn().mockReturnValue({ tenantNamespace: 'tenant-a' }),
+        assertTenant: jest.fn().mockResolvedValue(undefined),
       } as any,
       callbackUrls as any,
     );

package/dist/lib/application/files/gadmin2-game-angle-demo/server/src/modules/externalInteraction/external-interaction-runtime.controller.ts

@@ -1,17 +1,10 @@
-import {
-  BadRequestException,
-  Body,
-  Controller,
-  Post,
-  UseGuards,
-} from '@nestjs/common';
-import { ConfigService } from '@nestjs/config';
+import { Body, Controller, Post, UseGuards } from '@nestjs/common';
 import { AllowUnauthorizedRequest } from '../../lib/auth.guard';
 import { RuntimeTokenGuard } from '../humanApproval/runtime/runtime-token.guard';
+import { WorkflowRuntimeConfigService } from '../workflowRuntimeConfig/workflow-runtime-config.service';
 import {
   CloseExternalInteractionRuntimeDto,
   StartExternalInteractionRuntimeDto,
-  SubmitExternalResultRuntimeDto,
 } from './external-interaction-runtime.dto';
 import { ExternalInteractionService } from './external-interaction.service';
 import { WorkflowCallbackUrlService } from './workflow-callback-url.service';
@@ -21,14 +14,14 @@ import { WorkflowCallbackUrlService } from './workflow-callback-url.service';
 export class ExternalInteractionRuntimeController {
   constructor(
     private readonly interactions: ExternalInteractionService,
-    private readonly config: ConfigService,
+    private readonly runtimeConfig: WorkflowRuntimeConfigService,
     private readonly callbackUrls: WorkflowCallbackUrlService,
   ) {}
 
   @Post('start')
   @AllowUnauthorizedRequest()
   async start(@Body() input: StartExternalInteractionRuntimeDto) {
-    this.assertTenant(input.tenantNamespace);
+    await this.runtimeConfig.assertTenant(input.tenantNamespace);
     const callbackUrl = input.callbackWorkflowId
       ? await this.callbackUrls.resolve(input.callbackWorkflowId)
       : undefined;
@@ -48,8 +41,8 @@ export class ExternalInteractionRuntimeController {
 
   @Post('expire')
   @AllowUnauthorizedRequest()
-  expire(@Body() input: CloseExternalInteractionRuntimeDto) {
-    this.assertTenant(input.tenantNamespace);
+  async expire(@Body() input: CloseExternalInteractionRuntimeDto) {
+    await this.runtimeConfig.assertTenant(input.tenantNamespace);
     return this.interactions.expireInteraction(
       input.tenantNamespace,
       input.callbackToken,
@@ -58,39 +51,11 @@ export class ExternalInteractionRuntimeController {
 
   @Post('cancel')
   @AllowUnauthorizedRequest()
-  cancel(@Body() input: CloseExternalInteractionRuntimeDto) {
-    this.assertTenant(input.tenantNamespace);
+  async cancel(@Body() input: CloseExternalInteractionRuntimeDto) {
+    await this.runtimeConfig.assertTenant(input.tenantNamespace);
     return this.interactions.cancelInteraction(
       input.tenantNamespace,
       input.callbackToken,
     );
   }
-
-  @Post('results')
-  @AllowUnauthorizedRequest()
-  submitResult(@Body() input: SubmitExternalResultRuntimeDto) {
-    this.assertTenant(input.tenantNamespace);
-    const {
-      tenantNamespace,
-      workflowInstanceId: _workflowInstanceId,
-      workflowVersionId: _workflowVersionId,
-      temporalRunId: _temporalRunId,
-      nodeId: _nodeId,
-      ...result
-    } = input;
-    return this.interactions.submitResult(tenantNamespace, result);
-  }
-
-  private assertTenant(tenantNamespace: string): void {
-    const runtime = this.config.get<{ tenantNamespace: string }>(
-      'humanApprovalRuntime',
-    );
-    if (tenantNamespace !== runtime?.tenantNamespace) {
-      throw new BadRequestException({
-        code: 'WORKFLOW_RUNTIME_TENANT_MISMATCH',
-        message: 'Runtime tenant does not match this application',
-        retryable: false,
-      });
-    }
-  }
 }

package/dist/lib/application/files/gadmin2-game-angle-demo/server/src/modules/externalInteraction/external-interaction-runtime.dto.ts

@@ -3,7 +3,6 @@ import {
   IsArray,
   IsISO8601,
   IsNotEmpty,
-  IsObject,
   IsOptional,
   IsString,
 } from 'class-validator';
@@ -54,25 +53,3 @@ export class CloseExternalInteractionRuntimeDto extends ExternalInteractionRunti
   @IsNotEmpty()
   callbackToken!: string;
 }
-
-export class SubmitExternalResultRuntimeDto extends ExternalInteractionRuntimeMetadataDto {
-  @IsString()
-  @IsNotEmpty()
-  callbackToken!: string;
-
-  @IsString()
-  @IsNotEmpty()
-  eventId!: string;
-
-  @IsString()
-  @IsNotEmpty()
-  outcome!: string;
-
-  @IsOptional()
-  @IsString()
-  operatorId?: string;
-
-  @IsOptional()
-  @IsObject()
-  data?: Record<string, unknown>;
-}

package/dist/lib/application/files/gadmin2-game-angle-demo/server/src/modules/externalInteraction/external-interaction.service.ts

@@ -201,6 +201,8 @@ export class ExternalInteractionService {
             signalName: result.signal?.name ?? 'externalInteractionResolved',
             payload: (result.signal?.payload ?? {
               nodeId: interaction.nodeId,
+              callbackToken: input.callbackToken,
+              eventId: input.eventId,
               outcome: result.outcome,
               ...(input.operatorId && { operatorId: input.operatorId }),
               ...(input.data && { data: input.data }),

package/dist/lib/application/files/gadmin2-game-angle-demo/server/src/modules/externalInteraction/external-wait.handler.ts

@@ -32,6 +32,8 @@ export class ExternalWaitHandler implements ExternalInteractionHandler {
       state: 'RESOLVED',
       outcome: event.outcome,
       output: {
+        callbackToken: event.callbackToken,
+        eventId: event.eventId,
         outcome: event.outcome,
         ...(event.operatorId && { operatorId: event.operatorId }),
         ...(event.data && { data: event.data }),

package/dist/lib/application/files/gadmin2-game-angle-demo/server/src/modules/externalInteraction/externalInteraction.module.ts

@@ -1,6 +1,6 @@
 import { Injectable, Module, OnModuleInit } from '@nestjs/common';
-import { RuntimeTokenGuard } from '../humanApproval/runtime/runtime-token.guard';
 import { TemporalModule } from '../workflow/temporal.module';
+import { ExternalCallbackController } from './external-callback.controller';
 import { ExternalInteractionHandlerRegistry } from './external-interaction-handler.registry';
 import { ExternalInteractionRuntimeController } from './external-interaction-runtime.controller';
 import { ExternalInteractionSignalOutboxService } from './external-interaction-signal-outbox.service';
@@ -24,6 +24,7 @@ class ExternalInteractionHandlerRegistrar implements OnModuleInit {
 @Module({
   imports: [TemporalModule],
   controllers: [
+    ExternalCallbackController,
     ExternalInteractionRuntimeController,
     WorkflowCallbackUrlController,
   ],
@@ -34,8 +35,11 @@ class ExternalInteractionHandlerRegistrar implements OnModuleInit {
     ExternalInteractionHandlerRegistrar,
     ExternalInteractionSignalOutboxService,
     WorkflowCallbackUrlService,
-    RuntimeTokenGuard,
   ],
-  exports: [ExternalInteractionHandlerRegistry, ExternalInteractionService],
+  exports: [
+    ExternalInteractionHandlerRegistry,
+    ExternalInteractionService,
+    WorkflowCallbackUrlService,
+  ],
 })
 export class ExternalInteractionModule {}

package/dist/lib/application/files/gadmin2-game-angle-demo/server/src/modules/externalInteraction/workflow-callback-url.controller.ts

@@ -6,7 +6,7 @@ export class WorkflowCallbackUrlController {
   constructor(private readonly callbackUrls: WorkflowCallbackUrlService) {}
 
   @Get('endpoint')
-  resolveEndpoint(@Query('path') path = ''): { endpoint: string } {
-    return { endpoint: this.callbackUrls.resolvePath(path) };
+  async resolveEndpoint(@Query('path') path = '') {
+    return { endpoint: await this.callbackUrls.resolvePath(path) };
   }
 }

package/dist/lib/application/files/gadmin2-game-angle-demo/server/src/modules/externalInteraction/workflow-callback-url.service.spec.ts

@@ -39,6 +39,19 @@ describe('WorkflowCallbackUrlService', () => {
     );
   });
 
+  it('resolves the platform callback through the shared public URL generator', () => {
+    const service = new WorkflowCallbackUrlService(
+      {} as any,
+      {
+        get: jest.fn().mockReturnValue('https://gadmin.example.com/'),
+      } as any,
+    );
+
+    expect(service.resolveExternalCallback()).toBe(
+      'https://gadmin.example.com/api/workflow/external-callback',
+    );
+  });
+
   it('rejects a callback Workflow with multiple external request triggers', async () => {
     const service = new WorkflowCallbackUrlService(
       {
@@ -63,13 +76,11 @@ describe('WorkflowCallbackUrlService', () => {
     );
 
     await expect(service.resolve('44')).rejects.toMatchObject({
-      response: {
-        code: 'CALLBACK_WORKFLOW_TRIGGER_INVALID',
-      },
+      response: { code: 'CALLBACK_WORKFLOW_TRIGGER_INVALID' },
     });
   });
 
-  it('uses the PM2-assigned server port and a reachable IPv4 address when no public base URL is configured', async () => {
+  it('uses the server port and a reachable IPv4 address by default', () => {
     jest.spyOn(os, 'networkInterfaces').mockReturnValue({
       lo: [
         {
@@ -93,123 +104,7 @@ describe('WorkflowCallbackUrlService', () => {
       ],
     });
     const service = new WorkflowCallbackUrlService(
-      {
-        workflow: {
-          findUnique: jest.fn().mockResolvedValue({
-            status: 'PUBLISHED',
-            isEnabled: true,
-            versions: [
-              {
-                dsl: {
-                  nodes: [
-                    {
-                      type: 'webhook_trigger',
-                      config: { path: 'myoa-callback' },
-                    },
-                  ],
-                },
-              },
-            ],
-          }),
-        },
-      } as any,
-      {
-        get: jest.fn((key: string) => {
-          if (key === 'workflow.publicBaseUrl') return '';
-          if (key === 'workflow.publicHost') return '';
-          if (key === 'nest.port') return 14003;
-          return undefined;
-        }),
-      } as any,
-    );
-
-    await expect(service.resolve('44')).resolves.toBe(
-      'http://10.20.30.40:14003/api/workflow/webhook/myoa-callback',
-    );
-  });
-
-  it('lets deployments override the automatically detected host', async () => {
-    jest.spyOn(os, 'networkInterfaces').mockReturnValue({});
-    const service = new WorkflowCallbackUrlService(
-      {
-        workflow: {
-          findUnique: jest.fn().mockResolvedValue({
-            status: 'PUBLISHED',
-            isEnabled: true,
-            versions: [
-              {
-                dsl: {
-                  nodes: [
-                    {
-                      type: 'webhook_trigger',
-                      config: { path: 'myoa-callback' },
-                    },
-                  ],
-                },
-              },
-            ],
-          }),
-        },
-      } as any,
-      {
-        get: jest.fn((key: string) => {
-          if (key === 'workflow.publicBaseUrl') return '';
-          if (key === 'workflow.publicHost') return '10.50.60.70';
-          if (key === 'nest.port') return 14009;
-          return undefined;
-        }),
-      } as any,
-    );
-
-    await expect(service.resolve('44')).resolves.toBe(
-      'http://10.50.60.70:14009/api/workflow/webhook/myoa-callback',
-    );
-  });
-
-  it('does not expose a Docker bridge address as the callback host', async () => {
-    jest.spyOn(os, 'networkInterfaces').mockReturnValue({
-      docker0: [
-        {
-          address: '172.17.0.1',
-          netmask: '255.255.0.0',
-          family: 'IPv4',
-          mac: '00:00:00:00:00:01',
-          internal: false,
-          cidr: '172.17.0.1/16',
-        },
-      ],
-      eth0: [
-        {
-          address: '11.22.33.44',
-          netmask: '255.255.255.0',
-          family: 'IPv4',
-          mac: '00:11:22:33:44:55',
-          internal: false,
-          cidr: '11.22.33.44/24',
-        },
-      ],
-    });
-    const service = new WorkflowCallbackUrlService(
-      {
-        workflow: {
-          findUnique: jest.fn().mockResolvedValue({
-            status: 'PUBLISHED',
-            isEnabled: true,
-            versions: [
-              {
-                dsl: {
-                  nodes: [
-                    {
-                      type: 'webhook_trigger',
-                      config: { path: 'myoa-callback' },
-                    },
-                  ],
-                },
-              },
-            ],
-          }),
-        },
-      } as any,
+      {} as any,
       {
         get: jest.fn((key: string) => {
           if (key === 'workflow.publicBaseUrl') return '';
@@ -220,8 +115,8 @@ describe('WorkflowCallbackUrlService', () => {
       } as any,
     );
 
-    await expect(service.resolve('44')).resolves.toBe(
-      'http://11.22.33.44:14003/api/workflow/webhook/myoa-callback',
+    expect(service.resolveExternalCallback()).toBe(
+      'http://10.20.30.40:14003/api/workflow/external-callback',
     );
   });
 });

package/dist/lib/application/files/gadmin2-game-angle-demo/server/src/modules/externalInteraction/workflow-callback-url.service.ts

@@ -71,6 +71,10 @@ export class WorkflowCallbackUrlService {
     )}`;
   }
 
+  resolveExternalCallback(): string {
+    return `${this.resolvePublicBaseUrl()}/api/workflow/external-callback`;
+  }
+
   private resolvePublicBaseUrl(): string {
     const configuredBaseUrl = this.config
       .get<string>('workflow.publicBaseUrl')

package/dist/lib/application/files/gadmin2-game-angle-demo/server/src/modules/httpRequest/http-request-runtime.controller.ts

@@ -7,13 +7,13 @@ import {
   Post,
   UseGuards,
 } from '@nestjs/common';
-import { ConfigService } from '@nestjs/config';
 import axios from 'axios';
 import { PrismaService } from 'nestjs-prisma';
 import { Agent as HttpsAgent } from 'node:https';
 import { AllowUnauthorizedRequest } from '../../lib/auth.guard';
 import { RuntimeTokenGuard } from '../humanApproval/runtime/runtime-token.guard';
 import { IntegrationConnectionService } from '../integrationConnection/integration-connection.service';
+import { WorkflowRuntimeConfigService } from '../workflowRuntimeConfig/workflow-runtime-config.service';
 import { ExecuteHttpRequestRuntimeDto } from './http-request-runtime.dto';
 import {
   HttpRequestNodeConfig,
@@ -26,7 +26,7 @@ export class HttpRequestRuntimeController {
   constructor(
     private readonly prisma: PrismaService,
     private readonly connections: IntegrationConnectionService,
-    private readonly config: ConfigService,
+    private readonly runtimeConfig: WorkflowRuntimeConfigService,
   ) {}
 
   @Post('execute')
@@ -36,14 +36,7 @@ export class HttpRequestRuntimeController {
     data: unknown;
     headers: Record<string, unknown>;
   }> {
-    const runtime = this.config.get<{ tenantNamespace: string }>(
-      'humanApprovalRuntime',
-    );
-    if (input.tenantNamespace !== runtime?.tenantNamespace)
-      throw runtimeError(
-        'WORKFLOW_RUNTIME_TENANT_MISMATCH',
-        'Runtime tenant does not match this application',
-      );
+    await this.runtimeConfig.assertTenant(input.tenantNamespace);
 
     const instanceId = parseId(input.workflowInstanceId);
     const versionId = parseId(input.workflowVersionId);

package/dist/lib/application/files/gadmin2-game-angle-demo/server/src/modules/httpRequest/httpRequest.module.ts

@@ -1,5 +1,4 @@
 import { Injectable, Module, OnModuleInit } from '@nestjs/common';
-import { RuntimeTokenGuard } from '../humanApproval/runtime/runtime-token.guard';
 import { IntegrationConnectionModule } from '../integrationConnection/integrationConnection.module';
 import { WidgetCatalogService } from '../workflowConfig/widget-catalog.service';
 import { WorkflowConfigModule } from '../workflowConfig/workflowConfig.module';
@@ -17,6 +16,6 @@ class HttpRequestWidgetRegistrar implements OnModuleInit {
 @Module({
   imports: [IntegrationConnectionModule, WorkflowConfigModule],
   controllers: [HttpRequestRuntimeController],
-  providers: [RuntimeTokenGuard, HttpRequestWidgetRegistrar],
+  providers: [HttpRequestWidgetRegistrar],
 })
 export class HttpRequestModule {}

package/dist/lib/application/files/gadmin2-game-angle-demo/server/src/modules/humanApproval/human-approval.controller.ts

@@ -48,16 +48,6 @@ export class HumanApprovalController {
       actorContextFromRequest(request),
     );
   }
-
-  @Post(':requestId/retry-dispatch')
-  @UseRoles({
-    resource: 'humanApproval',
-    action: 'update',
-    possession: 'any',
-  })
-  retryDispatch(@Param('requestId') requestId: string) {
-    return this.service.retryDispatch(parseBigIntParam(requestId));
-  }
 }
 
 function parseBigIntParam(value: string): bigint {

package/dist/lib/application/files/gadmin2-game-angle-demo/server/src/modules/humanApproval/human-approval.dto.ts

@@ -45,11 +45,11 @@ export class ApprovalConfigSnapshotDto {
   @IsOptional()
   @IsString()
   @IsNotEmpty()
-  channelRef?: string;
+  approvalWorkflowId?: string;
 
   @IsOptional()
   @IsObject()
-  channelInputBindings?: Record<string, unknown>;
+  approvalWorkflowInputBindings?: Record<string, unknown>;
 
   @IsArray()
   @ValidateNested({ each: true })
@@ -84,6 +84,14 @@ export class StartApprovalRequestDto {
   @IsString()
   temporalRunId?: string;
 
+  @IsOptional()
+  @IsString()
+  approvalWorkflowRunId?: string;
+
+  @IsOptional()
+  @IsString()
+  callbackToken?: string;
+
   @IsString()
   @IsNotEmpty()
   configHash: string;
@@ -98,7 +106,7 @@ export class StartApprovalRequestDto {
 
   @IsOptional()
   @IsObject()
-  channelInputs?: Record<string, unknown>;
+  approvalWorkflowInputs?: Record<string, unknown>;
 
   @IsOptional()
   @IsArray()
@@ -132,7 +140,7 @@ export class SubmitApprovalDecisionDto {
 export class SubmitExternalApprovalDecisionDto extends SubmitApprovalDecisionDto {
   @IsString()
   @IsNotEmpty()
-  channelRef!: string;
+  approvalWorkflowId!: string;
 
   @IsString()
   @IsNotEmpty()

package/dist/lib/application/files/gadmin2-game-angle-demo/server/src/modules/humanApproval/human-approval.errors.ts

@@ -5,7 +5,7 @@ export type HumanApprovalErrorCode =
   | 'APPROVAL_REQUEST_NOT_FOUND'
   | 'APPROVAL_REQUEST_CLOSED'
   | 'APPROVAL_NOT_CANDIDATE'
-  | 'APPROVAL_CHANNEL_MISMATCH'
+  | 'APPROVAL_WORKFLOW_MISMATCH'
   | 'APPROVAL_DECISION_CONFLICT';
 
 export class HumanApprovalDomainError extends HttpException {