Removing leftover uuids and string correlationIds after new services …

…merge (#1215)
pagopa · Nov 25, 2024 · a9b4c14 · a9b4c14
1 parent 5573819
commit a9b4c14
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 18 deletions.
diff --git a/packages/authorization-server/package.json b/packages/authorization-server/package.json
@@ -22,13 +22,11 @@
     "@protobuf-ts/runtime": "2.9.4",
     "@types/express": "4.17.21",
     "@types/node": "20.14.6",
-    "@types/uuid": "9.0.8",
     "pagopa-interop-commons-test": "workspace:*",
     "prettier": "2.8.8",
     "tsx": "4.19.1",
     "typescript": "5.4.5",
     "vitest": "1.6.0",
-    "uuid": "10.0.0",
     "jose": "5.9.4"
   },
   "dependencies": {

diff --git a/packages/authorization-server/src/services/tokenService.ts b/packages/authorization-server/src/services/tokenService.ts
@@ -26,6 +26,7 @@ import {
   GSIPKEServiceIdDescriptorId,
   ClientAssertion,
   FullTokenGenerationStatesClientPurposeEntry,
+  CorrelationId,
 } from "pagopa-interop-models";
 import {
   DynamoDBClient,
@@ -91,7 +92,7 @@ export function tokenServiceBuilder({
   return {
     async generateToken(
       request: authorizationServerApi.AccessTokenRequest,
-      correlationId: string,
+      correlationId: CorrelationId,
       logger: Logger
     ): Promise<GenerateTokenReturnType> {
       const { errors: parametersErrors } = validateRequestParameters({
@@ -299,7 +300,7 @@ export const publishAudit = async ({
   generatedToken: InteropConsumerToken | InteropApiToken;
   key: FullTokenGenerationStatesClientPurposeEntry;
   clientAssertion: ClientAssertion;
-  correlationId: string;
+  correlationId: CorrelationId;
   fileManager: FileManager;
   logger: Logger;
 }): Promise<void> => {

diff --git a/packages/authorization-server/test/authorizationServer.integration.test.ts b/packages/authorization-server/test/authorizationServer.integration.test.ts
@@ -554,7 +554,7 @@ describe("authorization server tests", () => {
     const correlationId = generateId();
     const response = await tokenService.generateToken(
       request,
-      correlationId,
+      unsafeBrandId(correlationId),
       genericLogger
     );
 
@@ -684,7 +684,7 @@ describe("authorization server tests", () => {
     const correlationId = generateId();
     const result = await tokenService.generateToken(
       request,
-      correlationId,
+      unsafeBrandId(correlationId),
       genericLogger
     );
 

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml