Merge pull request #63 from bcgov/fix/uniform-login

Check uniform response for idir field
bcgov · Jan 7, 2025 · 886ec9b · 886ec9b
2 parents 953fcaa + be720b5
commit 886ec9b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/src/common/guards/auth/auth.service.spec.ts b/src/common/guards/auth/auth.service.spec.ts
@@ -79,8 +79,13 @@ describe('AuthService', () => {
       const spy = jest.spyOn(httpService, 'get').mockReturnValueOnce(
         of({
           data: {
-            [configService.get(`upstreamAuth.${validRecordType}.idirField`)]:
-              testIdir,
+            items: [
+              {
+                [configService.get(
+                  `upstreamAuth.${validRecordType}.idirField`,
+                )]: testIdir,
+              },
+            ],
           },
           headers: {},
           config: {
@@ -174,8 +179,12 @@ describe('AuthService', () => {
       const spy = jest.spyOn(httpService, 'get').mockReturnValueOnce(
         of({
           data: {
-            [configService.get(`upstreamAuth.${recordType}.idirField`)]:
-              testIdir,
+            items: [
+              {
+                [configService.get(`upstreamAuth.${recordType}.idirField`)]:
+                  testIdir,
+              },
+            ],
           },
           headers: {},
           config: {

diff --git a/src/common/guards/auth/auth.service.ts b/src/common/guards/auth/auth.service.ts
@@ -11,6 +11,8 @@ import {
   CHILD_LINKS,
   CONTENT_TYPE,
   idName,
+  UNIFORM_RESPONSE,
+  uniformResponseParamName,
   VIEW_MODE,
 } from '../../../common/constants/parameter-constants';
 import { firstValueFrom } from 'rxjs';
@@ -87,6 +89,7 @@ export class AuthService {
     const params = {
       ViewMode: VIEW_MODE,
       ChildLinks: CHILD_LINKS,
+      [uniformResponseParamName]: UNIFORM_RESPONSE,
     };
     if (
       (workspace = this.configService.get(
@@ -112,13 +115,12 @@ export class AuthService {
         throw new Error('Upstream auth failed');
       }
       headers['Authorization'] = token;
-      this.logger.log(url, params, headers);
       response = await firstValueFrom(
         this.httpService.get(url, { params, headers }),
       );
-      this.logger.log(response);
+
       const idir =
-        response.data[
+        response.data['items'][0][
           this.configService.get<string>(`upstreamAuth.${recordType}.idirField`)
         ];
       if (idir === undefined) {