Fix/integration with api sandbox

.gitignore

@@ -54,3 +54,4 @@ playwright-report/
 .ngapimock
 allure-results/
 test-output/
+.nx/cache

apps/golden-sample-app/project.json

@@ -103,7 +103,8 @@
  "executor": "@angular-devkit/build-angular:dev-server",
  "configurations": {
  "development": {
- "browserTarget": "golden-sample-app:build:development"
+ "browserTarget": "golden-sample-app:build:development",
+ "proxyConfig": "./apps/golden-sample-app/proxy.conf.json"
  },
  "production": {
  "browserTarget": "golden-sample-app:build:production"

apps/golden-sample-app/proxy.conf.json

@@ -0,0 +1,9 @@
+{
+ "context": "/api",
+ "target": "https://app.dev.sdbxaz.azure.backbaseservices.com/",
+ "secure": false,
+ "changeOrigin": true,
+ "headers": {
+ "X-SDBXAZ-API-KEY": "goldensample-25481CBA-0A08-4B77-810D-D3875BAEEF5E"
+ }
+}

apps/golden-sample-app/src/app/auth/interceptor/auth.interceptor.ts

@@ -1,23 +1,23 @@
 import {
  HttpEvent,
  HttpHandler,
+ HttpHeaders,
  HttpInterceptor,
  HttpRequest,
 } from '@angular/common/http';
-import { Injectable } from '@angular/core';
-import { OAuthService } from 'angular-oauth2-oidc';
+import { OAuthService, TokenResponse } from 'angular-oauth2-oidc';
+import { Observable, ReplaySubject, from, throwError } from 'rxjs';
 import {
  catchError,
  exhaustMap,
- from,
  map,
- Observable,
- ReplaySubject,
  share,
  switchMap,
  take,
- throwError,
-} from 'rxjs';
+} from 'rxjs/operators';
+
+import { Injectable } from '@angular/core';
+import { environment } from './../../../environments/environment.prod';
 import { isInvalidToken401 } from '../utils/auth.utils';
 
 /**
@@ -52,25 +52,34 @@ export class AuthInterceptor implements HttpInterceptor {
  catchError((error) => {
  if (isInvalidToken401(error)) {
  this.triggerRefresh$$.next();
+
  return this.refreshToken$.pipe(
  take(1),
  catchError(() => throwError(() => error)),
- switchMap((token) =>
- next.handle(
- request.clone({
- headers: request.headers.set(
- 'Authorization',
- 'Bearer ' + token
- ),
- })
- )
- )
+ switchMap((token) => this.handleTokenRefresh(request, next, token))
  );
  }
  return throwError(() => error);
  })
  );
  }
 
- private readonly refreshToken = () => from(this.oAuthService.refreshToken());
+ private handleTokenRefresh(
+ request: HttpRequest<unknown>,
+ next: HttpHandler,
+ token: string
+ ): Observable<HttpEvent<unknown>> {
+ return next.handle(
+ request.clone({
+ headers: new HttpHeaders({
+ Authorization: `Bearer ${token}`,
+ 'X-SDBXAZ-API-KEY': environment.sandboxApiKey,
+ }),
+ })
+ );
+ }
+
+ private refreshToken(): Observable<TokenResponse> {
+ return from(this.oAuthService.refreshToken());
+ }
 }

apps/golden-sample-app/src/environments/environment.mocks.ts

@@ -1,8 +1,8 @@
-import { HTTP_INTERCEPTORS } from '@angular/common/http';
-import { Provider } from '@angular/core';
-import { AuthConfig } from 'angular-oauth2-oidc';
 import { AchPositivePayInterceptor } from '../app/interceptors/ach-positive-pay.interceptor';
+import { AuthConfig } from 'angular-oauth2-oidc';
 import { Environment } from './type';
+import { HTTP_INTERCEPTORS } from '@angular/common/http';
+import { Provider } from '@angular/core';
 
 const mockProviders: Provider[] = [
  {
@@ -13,7 +13,7 @@ const mockProviders: Provider[] = [
 ];
 
 export const environment: Environment = {
- production: false,
+ production: true,
  apiRoot: '/api',
  mockProviders,
  locales: ['en-US', 'nl-NL'],
@@ -25,6 +25,7 @@ export const environment: Environment = {
  bbApiKey: 'a554d1b4-6514-4f33-8211-3f52a03ca142',
  telemetryCollectorURL: 'https://rum-collector.backbase.io/v1/traces',
  env: 'mock',
+ sandboxApiKey: 'mock-api-key',
 };
 
 export const authConfig: AuthConfig = {

apps/golden-sample-app/src/environments/environment.prod.ts

@@ -12,6 +12,7 @@ export const environment: Environment = {
  bbApiKey: 'a554d1b4-6514-4f33-8211-3f52a03ca142',
  telemetryCollectorURL: 'https://rum-collector.backbase.io/v1/traces',
  env: 'production',
+ sandboxApiKey: 'goldensample-25481CBA-0A08-4B77-810D-D3875BAEEF5E',
 };
 
 export const authConfig: AuthConfig = {

apps/golden-sample-app/src/environments/environment.ts

@@ -2,11 +2,11 @@
 // `ng build --prod` replaces `environment.ts` with `environment.prod.ts`.
 // The list of file replacements can be found in `angular.json`.
 
-import { HTTP_INTERCEPTORS } from '@angular/common/http';
-import { Provider } from '@angular/core';
-import { AuthConfig } from 'angular-oauth2-oidc';
 import { AchPositivePayInterceptor } from '../app/interceptors/ach-positive-pay.interceptor';
+import { AuthConfig } from 'angular-oauth2-oidc';
 import { Environment } from './type';
+import { HTTP_INTERCEPTORS } from '@angular/common/http';
+import { Provider } from '@angular/core';
 
 const mockProviders: Provider[] = [
  {
@@ -18,7 +18,7 @@ const mockProviders: Provider[] = [
 
 export const environment: Environment = {
  production: false,
- apiRoot: 'https://app.prd.sdbxaz.azure.backbaseservices.com/api',
+ apiRoot: '/api',
  mockProviders,
  locales: ['en-US', 'nl-NL'],
  common: {
@@ -28,12 +28,13 @@ export const environment: Environment = {
  bbApiKey: 'a554d1b4-6514-4f33-8211-3f52a03ca142',
  telemetryCollectorURL: 'https://rum-collector.backbase.io/v1/traces',
  env: 'local',
+ sandboxApiKey: 'goldensample-25481CBA-0A08-4B77-810D-D3875BAEEF5E',
 };
 
 export const authConfig: AuthConfig = {
  // Url of the Identity Provider
  issuer:
- 'https://identity.prd.sdbxaz.azure.backbaseservices.com/auth/realms/customer',
+ 'https://identity.dev.sdbxaz.azure.backbaseservices.com/auth/realms/customer',
 
  // URL of the SPA to redirect the user to after login
  redirectUri: document.baseURI,

apps/golden-sample-app/src/environments/type.ts

@@ -15,4 +15,5 @@ export interface Environment {
  bbApiKey?: string;
  telemetryCollectorURL?: string;
  env?: string;
+ sandboxApiKey: string;
 }

docker-compose.yml

@@ -1,4 +1,4 @@
-version: "3"
+version: '3'
 
 services:
  web:
@@ -12,8 +12,8 @@ services:
  HOSTNAME: localhost
  PORT: 4200
  BASE_HREF: /
- API_ROOT: https://app.prd.sdbxaz.azure.backbaseservices.com/api
- AUTH_URL: https://identity.prd.sdbxaz.azure.backbaseservices.com/auth/realms/customer
+ API_ROOT: https://app.dev.sdbxaz.azure.backbaseservices.com/api
+ AUTH_URL: https://identity.dev.sdbxaz.azure.backbaseservices.com/auth/realms/customer
  AUTH_SCOPE: openid profile email
  AUTH_CLIENT_ID: bb-web-client
  LOCALES: en,nl