From ea7f1f67f28f3e6fa06ed6681e0dae16e8b13b6e Mon Sep 17 00:00:00 2001 From: Harm Meijer Date: Wed, 26 Mar 2025 08:48:58 +0100 Subject: [PATCH 1/2] fix: default for scope is undefined --- .../javascript/event/src/middleware/auth.middleware.js | 2 +- .../javascript/job/src/middleware/auth.middleware.js | 2 +- .../javascript/service/src/middleware/auth.middleware.js | 2 +- .../typescript/job/src/middleware/auth.middleware.ts | 8 +++----- .../typescript/service/src/middleware/auth.middleware.ts | 8 +++----- 5 files changed, 9 insertions(+), 13 deletions(-) diff --git a/application-templates/javascript/event/src/middleware/auth.middleware.js b/application-templates/javascript/event/src/middleware/auth.middleware.js index 0214676..5ad66d9 100644 --- a/application-templates/javascript/event/src/middleware/auth.middleware.js +++ b/application-templates/javascript/event/src/middleware/auth.middleware.js @@ -10,5 +10,5 @@ export const authMiddlewareOptions = { clientId: readConfiguration().clientId, clientSecret: readConfiguration().clientSecret, }, - scopes: [readConfiguration().scope ? readConfiguration().scope : 'default'], + scopes: readConfiguration().scope ? [readConfiguration().scope] : undefined, }; diff --git a/application-templates/javascript/job/src/middleware/auth.middleware.js b/application-templates/javascript/job/src/middleware/auth.middleware.js index 6d45ef4..7ee361f 100644 --- a/application-templates/javascript/job/src/middleware/auth.middleware.js +++ b/application-templates/javascript/job/src/middleware/auth.middleware.js @@ -9,5 +9,5 @@ export const createAuthMiddlewareOptions = () => ({ clientId: readConfiguration().clientId, clientSecret: readConfiguration().clientSecret, }, - scopes: [readConfiguration().scope ? readConfiguration().scope : 'default'], + scopes: readConfiguration().scope ? [readConfiguration().scope] : undefined, }); diff --git a/application-templates/javascript/service/src/middleware/auth.middleware.js b/application-templates/javascript/service/src/middleware/auth.middleware.js index 0214676..5ad66d9 100644 --- a/application-templates/javascript/service/src/middleware/auth.middleware.js +++ b/application-templates/javascript/service/src/middleware/auth.middleware.js @@ -10,5 +10,5 @@ export const authMiddlewareOptions = { clientId: readConfiguration().clientId, clientSecret: readConfiguration().clientSecret, }, - scopes: [readConfiguration().scope ? readConfiguration().scope : 'default'], + scopes: readConfiguration().scope ? [readConfiguration().scope] : undefined, }; diff --git a/application-templates/typescript/job/src/middleware/auth.middleware.ts b/application-templates/typescript/job/src/middleware/auth.middleware.ts index 2f3d38e..3e1900d 100644 --- a/application-templates/typescript/job/src/middleware/auth.middleware.ts +++ b/application-templates/typescript/job/src/middleware/auth.middleware.ts @@ -11,9 +11,7 @@ export const createAuthMiddlewareOptions: () => AuthMiddlewareOptions = () => ({ clientId: readConfiguration().clientId, clientSecret: readConfiguration().clientSecret, }, - scopes: [ - (readConfiguration().scope - ? readConfiguration().scope - : 'default') as string, - ], + scopes: readConfiguration().scope + ? [readConfiguration().scope as string] + : undefined, }); diff --git a/application-templates/typescript/service/src/middleware/auth.middleware.ts b/application-templates/typescript/service/src/middleware/auth.middleware.ts index b8f031f..d2c3566 100644 --- a/application-templates/typescript/service/src/middleware/auth.middleware.ts +++ b/application-templates/typescript/service/src/middleware/auth.middleware.ts @@ -11,9 +11,7 @@ export const authMiddlewareOptions: AuthMiddlewareOptions = { clientId: readConfiguration().clientId, clientSecret: readConfiguration().clientSecret, }, - scopes: [ - readConfiguration().scope - ? (readConfiguration().scope as string) - : 'default', - ], + scopes: readConfiguration().scope + ? [readConfiguration().scope as string] + : undefined, }; From aac1123ed8e0699baf87763020934a46df23be6b Mon Sep 17 00:00:00 2001 From: Harm Meijer Date: Thu, 27 Mar 2025 11:17:08 +0100 Subject: [PATCH 2/2] fix: handle resource created --- .../javascript/event/src/controllers/event.controller.js | 7 +++++++ .../typescript/event/src/controllers/event.controller.ts | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/application-templates/javascript/event/src/controllers/event.controller.js b/application-templates/javascript/event/src/controllers/event.controller.js index 09228d1..d74c8b3 100644 --- a/application-templates/javascript/event/src/controllers/event.controller.js +++ b/application-templates/javascript/event/src/controllers/event.controller.js @@ -39,6 +39,13 @@ export const post = async (request, response) => { if (decodedData) { const jsonData = JSON.parse(decodedData); + //CoCo sending message to indicate the resource was created, does not need processing + if ('ResourceCreated' === jsonData.notificationType) { + throw new CustomError( + 202, + `Incoming message is about subscription resource creation. Skip handling the message.` + ); + } customerId = jsonData.customer.id; } diff --git a/application-templates/typescript/event/src/controllers/event.controller.ts b/application-templates/typescript/event/src/controllers/event.controller.ts index 622a773..77b9ac0 100644 --- a/application-templates/typescript/event/src/controllers/event.controller.ts +++ b/application-templates/typescript/event/src/controllers/event.controller.ts @@ -37,6 +37,13 @@ export const post = async (request: Request, response: Response) => { if (decodedData) { const jsonData = JSON.parse(decodedData); + //CoCo sending message to indicate the resource was created, does not need processing + if ('ResourceCreated' === jsonData.notificationType) { + throw new CustomError( + 202, + `Incoming message is about subscription resource creation. Skip handling the message.` + ); + } customerId = jsonData.customer.id; }