Feature/wf 1329 fix peer deps (#225)

* chore: update peer deps * chore: update foundation-ang & transactions-http-ang * fix: access-control path & mock server * chore: update otel keys
Backbase · Oct 31, 2023 · 15be78b · 15be78b
1 parent 23948a7
commit 15be78b
Show file tree

Hide file tree

Showing 10 changed files with 2,613 additions and 1,830 deletions.
diff --git a/apps/golden-sample-app/src/app/app.module.ts b/apps/golden-sample-app/src/app/app.module.ts
@@ -2,8 +2,10 @@ import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
 import { APP_INITIALIZER, ErrorHandler, NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { ACCESS_CONTROL_BASE_PATH as ACCESS_CONTROL_V3_BASE_PATH } from '@backbase/accesscontrol-v3-http-ang';
-import { ACCESS_CONTROL_BASE_PATH } from '@backbase/accesscontrol-http-ang';
+import {
+  ACCESS_CONTROL_BASE_PATH,
+  ACCESS_CONTROL_BASE_PATH as ACCESS_CONTROL_V3_BASE_PATH,
+} from '@backbase/accesscontrol-v3-http-ang';
 import { ARRANGEMENT_MANAGER_BASE_PATH } from '@backbase/arrangement-manager-http-ang';
 import { TRANSACTIONS_BASE_PATH } from '@backbase/transactions-http-ang';
 import {

diff --git a/apps/golden-sample-app/src/app/services/journey-communication.service.ts b/apps/golden-sample-app/src/app/services/journey-communication.service.ts
@@ -1,6 +1,9 @@
 import { Injectable } from '@angular/core';
 import { Router } from '@angular/router';
-import { TransactionItem } from '@backbase/transactions-http-ang';
+import {
+  TransactionItem,
+  TransactionState,
+} from '@backbase/transactions-http-ang';
 import { TransactionsCommunicationService } from '@backbase-gsa/transactions-journey';
 import { MakeTransferCommunicationService } from '@backbase-gsa/transfer-journey';
 import { Transfer } from '@backbase-gsa/internal-transfer-shared-data';
@@ -31,6 +34,7 @@ export class JourneyCommunicationService
     amount,
   }: Transfer): TransactionItem {
     return {
+      state: TransactionState.Completed,
       id: Date.now().toString(),
       arrangementId: '',
       description: 'Transfer to account',

diff --git a/apps/golden-sample-app/src/app/user-context/user-context.guard.spec.ts b/apps/golden-sample-app/src/app/user-context/user-context.guard.spec.ts
@@ -5,7 +5,7 @@ import {
   RouterStateSnapshot,
   UrlTree,
 } from '@angular/router';
-import { ServiceAgreementHttpService } from '@backbase/accesscontrol-http-ang';
+import { ServiceAgreementsHttpService } from '@backbase/accesscontrol-v3-http-ang';
 import { cold } from 'jest-marbles';
 import { of } from 'rxjs';
 
@@ -24,10 +24,13 @@ describe('UserContextGuard', () => {
     }),
   } as Pick<Router, 'createUrlTree'> as any;
 
-  const mockServiceAgreementHttpService: jest.Mocked<ServiceAgreementHttpService> =
+  const mockServiceAgreementHttpService: jest.Mocked<ServiceAgreementsHttpService> =
     {
       getServiceAgreementContext: jest.fn(),
-    } as Pick<ServiceAgreementHttpService, 'getServiceAgreementContext'> as any;
+    } as Pick<
+      ServiceAgreementsHttpService,
+      'getServiceAgreementContext'
+    > as any;
 
   function createGuard(validationRequestMarbles?: string) {
     mockServiceAgreementHttpService.getServiceAgreementContext.mockReturnValue(

diff --git a/apps/golden-sample-app/src/app/user-context/user-context.guard.ts b/apps/golden-sample-app/src/app/user-context/user-context.guard.ts
@@ -5,7 +5,7 @@ import {
   RouterStateSnapshot,
   UrlTree,
 } from '@angular/router';
-import { ServiceAgreementHttpService } from '@backbase/accesscontrol-http-ang';
+import { ServiceAgreementsHttpService } from '@backbase/accesscontrol-v3-http-ang';
 import { Observable, of, tap } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
 
@@ -26,7 +26,7 @@ export class UserContextGuard {
 
   constructor(
     private readonly router: Router,
-    private readonly serviceAgreementService: ServiceAgreementHttpService
+    private readonly serviceAgreementService: ServiceAgreementsHttpService
   ) {}
 
   canActivateChild(

diff --git a/apps/golden-sample-app/src/environments/environment.mocks.ts b/apps/golden-sample-app/src/environments/environment.mocks.ts
@@ -22,7 +22,7 @@ export const environment: Environment = {
   },
   mockEnabled: true,
   isTelemetryTracerEnabled: true,
-  bbApiKey: '27d4d4ee-afc1-4190-adc4-b9d30d39badb',
+  bbApiKey: 'a554d1b4-6514-4f33-8211-3f52a03ca142',
   telemetryCollectorURL: 'https://botel.bartbase.com/v1/traces',
   env: 'mock',
 };

diff --git a/apps/golden-sample-app/src/environments/environment.prod.ts b/apps/golden-sample-app/src/environments/environment.prod.ts
@@ -8,6 +8,10 @@ export const environment: Environment = {
   common: {
     designSlimMode: false,
   },
+  isTelemetryTracerEnabled: true,
+  bbApiKey: 'a554d1b4-6514-4f33-8211-3f52a03ca142',
+  telemetryCollectorURL: 'https://botel.bartbase.com/v1/traces',
+  env: 'production',
 };
 
 export const authConfig: AuthConfig = {

diff --git a/apps/golden-sample-app/src/environments/environment.ts b/apps/golden-sample-app/src/environments/environment.ts
@@ -25,7 +25,7 @@ export const environment: Environment = {
     designSlimMode: false,
   },
   isTelemetryTracerEnabled: true,
-  bbApiKey: '27d4d4ee-afc1-4190-adc4-b9d30d39badb',
+  bbApiKey: 'a554d1b4-6514-4f33-8211-3f52a03ca142',
   telemetryCollectorURL: 'https://botel.bartbase.com/v1/traces',
   env: 'local',
 };

diff --git a/mock-server/mocks/golden-sample-app/accessgroups/serviceagreements_context.json b/mock-server/mocks/golden-sample-app/accessgroups/serviceagreements_context.json
@@ -1,7 +1,7 @@
 {
   "name": "serviceagreements/context",
   "request": {
-    "url": "/access-control/client-api/v2/accessgroups/serviceagreements/context",
+    "url": "/access-control/client-api/v3/accessgroups/service-agreements/context",
     "method": "GET"
   },
   "responses": {