Required changes done

opencrvs · Nov 12, 2024 · a5f538e · a5f538e
1 parent a588419
commit a5f538e
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 127 deletions.
diff --git a/packages/gateway/src/features/registration/root-resolvers.ts b/packages/gateway/src/features/registration/root-resolvers.ts
@@ -63,7 +63,6 @@ import {
   confirmRegistration
 } from '@gateway/workflow/index'
 import { getRecordById } from '@gateway/records'
-import { tokenExchangeHandler } from './token-exchange'
 
 async function getAnonymousToken() {
   const res = await fetch(new URL('/anonymous-token', AUTH_URL).toString())
@@ -639,78 +638,46 @@ export const resolvers: GQLResolver = {
 
       return taskEntry.resource.id
     },
-    async confirmRegistration(_, { id, details }, { headers: authHeader }) {     
-      const token = authHeader.Authorization.replace("Bearer ", "").trim();
-      const recordSpecificToken = await tokenExchangeHandler(
-        token,
-        authHeader,
-        id
-      )
-
-      authHeader.Authorization = `Bearer ${recordSpecificToken.access_token}`
-
+    async confirmRegistration(_, { id, details }, { headers: authHeader }) {
       if (!inScope(authHeader, ['record.confirm-registration'])) {
-        throw new Error('User does not have a Confirm Registration scope');
+        throw new Error('User does not have a Confirm Registration scope')
       }
 
       if (!hasRecordAccess(authHeader, id)) {
-        throw new Error('User does not have access to the record');
+        throw new Error('User does not have access to the record')
       }
 
       try {
-        const taskEntry = await confirmRegistration(
-          id,
-          authHeader,
-          {
-            error: details.error,
-            registrationNumber: details.registrationNumber,
-            childIdentifiers: details.identifiers,
-            compositionId: id
-          }
-        );
-
-        return taskEntry.resource.id;
+        const taskEntry = await confirmRegistration(id, authHeader, {
+          error: details.error,
+          registrationNumber: details.registrationNumber,
+          childIdentifiers: details.identifiers,
+          compositionId: id
+        })
+
+        return taskEntry.resource.id
       } catch (error) {
-        throw new Error(`Failed to confirm registration: ${error.message}`);
+        throw new Error(`Failed to confirm registration: ${error.message}`)
       }
     },
-    async rejectRegistration(
-      _,
-      { id, details },
-      { headers: authHeader }
-    ) {
-
-      const token = authHeader.Authorization.replace("Bearer ", "").trim();
-      const recordSpecificToken = await tokenExchangeHandler(
-        token,
-        authHeader,
-        id
-      )
-
-      authHeader.Authorization = `Bearer ${recordSpecificToken.access_token}`
-
+    async rejectRegistration(_, { id, details }, { headers: authHeader }) {
       if (!inScope(authHeader, ['record.reject-registration'])) {
-        throw new Error('User does not have a Reject Registration" scope');
+        throw new Error('User does not have a Reject Registration" scope')
       }
 
       if (!hasRecordAccess(authHeader, id)) {
-        throw new Error('User does not have access to the record');
+        throw new Error('User does not have access to the record')
       }
 
       try {
-        const taskEntry = await rejectRegistration(
-          id,
-          authHeader,
-          {
-            comment: details.comment || 'No comment provided',
-            reason: details.reason
-          }
-        );
+        const taskEntry = await rejectRegistration(id, authHeader, {
+          comment: details.comment || 'No comment provided',
+          reason: details.reason
+        })
 
-        // Return the task ID from the rejected record
-        return taskEntry.resource.id;
+        return taskEntry.resource.id
       } catch (error) {
-        throw new Error(`Error in rejectRegistration: ${error.message}`);
+        throw new Error(`Error in rejectRegistration: ${error.message}`)
       }
     }
   }

diff --git a/packages/gateway/src/features/registration/token-exchange.ts b/packages/gateway/src/features/registration/token-exchange.ts
diff --git a/packages/migration/src/migrations/openhim/20220826062206-channels-v1.0.1-to-v1.1.0.ts b/packages/migration/src/migrations/openhim/20220826062206-channels-v1.0.1-to-v1.1.0.ts
@@ -40,7 +40,7 @@ const newChannel: Channel = {
       secured: false,
       host: 'workflow',
       port: 5050,
-      path: '/records/{id}/confirm',
+      path: '/confirm/registration',
       pathTransform: '',
       primary: true,
       username: '',
@@ -52,7 +52,7 @@ const newChannel: Channel = {
   rewriteUrlsConfig: [],
   name: 'Confirm Registration',
   description: 'Confirm registration & assign a BRN',
-  urlPattern: '^/records/{id}/confirm$',
+  urlPattern: '^/confirm/registration$',
   priority: 1,
   maxBodyAgeDays: 30,
   matchContentRegex: null,

diff --git a/packages/workflow/src/config/routes.ts b/packages/workflow/src/config/routes.ts
@@ -59,16 +59,6 @@ export const getRoutes = () => {
         description: 'Health check endpoint'
       }
     },
-    // {
-    //   method: 'POST',
-    //   path: '/confirm/registration',
-    //   handler: markEventAsRegisteredCallbackHandler,
-    //   config: {
-    //     tags: ['api'],
-    //     description:
-    //       'Register event based on tracking id and registration number.'
-    //   }
-    // },
     {
       method: 'POST',
       path: '/records/{id}/confirm',