Merge pull request #21 from commercetools/ddeliziact/operations

fix(api): clean up operations router
commercetools · Feb 26, 2024 · 1c8be22 · 1c8be22
2 parents f24055f + ca7e1cb
commit 1c8be22
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 27 deletions.
diff --git a/processor/src/config/config.ts b/processor/src/config/config.ts
@@ -18,7 +18,6 @@ export const config = {
   mockEnvironment: process.env.MOCK_ENVIRONMENT,
 
   // Payment Providers config
-  returnUrl: process.env.RETURN_URL,
   adyenEnvironment: process.env.ADYEN_ENVIRONMENT || '',
   adyenClientKey: process.env.ADYEN_CLIENT_KEY || '',
   adyenApiKey: process.env.ADYEN_API_KEY || '',

diff --git a/processor/src/dtos/operations/config.dto.ts b/processor/src/dtos/operations/config.dto.ts
@@ -1,5 +1,9 @@
 import { Static, Type } from '@sinclair/typebox';
 
-export const ConfigResponseSchema = Type.Any();
+export const ConfigResponseSchema = Type.Object({
+  clientKey: Type.String(),
+  environment: Type.String(),
+  returnUrl: Type.String(),
+});
 
 export type ConfigResponseSchemaDTO = Static<typeof ConfigResponseSchema>;
diff --git a/processor/src/server/plugins/mock-payment.plugin.ts b/processor/src/server/plugins/mock-payment.plugin.ts
diff --git a/processor/src/server/plugins/operation.plugin.ts b/processor/src/server/plugins/operation.plugin.ts
@@ -2,10 +2,10 @@ import { FastifyInstance } from 'fastify';
 import { paymentSDK } from '../../payment-sdk';
 import { operationsRoute } from '../../routes/operation.route';
 import { DefaultOperationService } from '../../services/operation.service';
-import { MockOperationProcessor } from '../../services/processors/mock-operation.processor';
+import { AdyenOperationProcessor } from '../../services/processors/adyen-operation.processor';
 
 export default async function (server: FastifyInstance) {
-  const paymentProcessor = new MockOperationProcessor();
+  const paymentProcessor = new AdyenOperationProcessor();
 
   const operationService = new DefaultOperationService({
     ctCartService: paymentSDK.ctCartService,

diff --git a/processor/src/services/processors/adyen-operation.processor.ts b/processor/src/services/processors/adyen-operation.processor.ts
@@ -3,7 +3,6 @@ import { AdyenAPI } from '../../clients/adyen/adyen.client';
 import { config } from '../../config/config';
 import { PaymentModificationStatus } from '../../dtos/operations/payment-intents.dto';
 import { paymentSDK } from '../../payment-sdk';
-import { OperationProcessor } from './operation.processor';
 import {
   CancelPaymentRequest,
   CapturePaymentRequest,
@@ -12,14 +11,15 @@ import {
   RefundPaymentRequest,
   StatusResponse,
 } from '../types/operation.type';
-const packageJSON = require('../../package.json');
+import { OperationProcessor } from './operation.processor';
+const packageJSON = require('../../../package.json');
 
 export class AdyenOperationProcessor implements OperationProcessor {
   async config(): Promise<ConfigResponse> {
     return {
       clientKey: config.adyenClientKey,
       environment: config.adyenEnvironment,
-      returnUrl: config.returnUrl,
+      returnUrl: config.adyenReturnUrl,
     };
   }
 

diff --git a/processor/src/services/processors/mock-operation.processor.ts b/processor/src/services/processors/mock-operation.processor.ts
@@ -18,7 +18,7 @@ export class MockOperationProcessor implements OperationProcessor {
     return {
       clientKey: config.mockClientKey,
       environment: config.mockEnvironment,
-    };
+    } as unknown as ConfigResponse;
   }
 
   async status(): Promise<StatusResponse> {

diff --git a/processor/src/services/types/operation.type.ts b/processor/src/services/types/operation.type.ts
@@ -41,9 +41,7 @@ export type PaymentProviderModificationResponse = {
   pspReference: string;
 };
 
-export type ConfigResponse = {
-  [key: string]: any;
-};
+export type ConfigResponse = ConfigResponseSchemaDTO;
 
 export type StatusResponse = StatusResponseSchemaDTO;