AAE-30358 Remove apollo client if already exists and init subscription to use the frefreshed token changing the page, turn connectionParams into a function to ensures that the latest token is always used for WebSocket connections

Author: alep85

lib/process-services-cloud/src/lib/services/web-socket.service.spec.ts

@@ -27,7 +27,7 @@ describe('WebSocketService', () => {
     let service: WebSocketService;
     const onLogoutSubject: Subject<void> = new Subject<void>();
 
-    const apolloMock = jasmine.createSpyObj('Apollo', ['use', 'createNamed']);
+    const apolloMock = jasmine.createSpyObj('Apollo', ['use', 'createNamed', 'removeClient']);
 
     beforeEach(() => {
         TestBed.configureTestingModule({
@@ -61,7 +61,7 @@ describe('WebSocketService', () => {
         apolloMock.createNamed.calls.reset();
     });
 
-    it('should not create a new Apollo client if it is already in use', async () => {
+    it('should create a new Apollo client if it is already in use to connect with a new auth token', async () => {
         const apolloClientName = 'testClient';
         const subscriptionOptions: SubscriptionOptions = { query: gql(`subscription {testQuery}`) };
         const wsOptions = { apolloClientName, wsUrl: 'testUrl', subscriptionOptions };
@@ -72,7 +72,7 @@ describe('WebSocketService', () => {
 
         expect(apolloMock.use).toHaveBeenCalledTimes(2);
         expect(apolloMock.use).toHaveBeenCalledWith(apolloClientName);
-        expect(apolloMock.createNamed).not.toHaveBeenCalled();
+        expect(apolloMock.createNamed).toHaveBeenCalled();
     });
 
     it('should subscribe to Apollo client if not already in use', async () => {

lib/process-services-cloud/src/lib/services/web-socket.service.ts

@@ -66,12 +66,17 @@ export class WebSocketService {
             }
         });
 
-        if (this.apollo.use(apolloClientName) === undefined) {
-            this.initSubscriptions(options);
-        }
+        this.removeApolloClientIfExists(apolloClientName);
+        this.initSubscriptions(options);
         return this.apollo.use(apolloClientName).subscribe<T>({ errorPolicy: 'all', ...subscriptionOptions });
     }
 
+    private removeApolloClientIfExists(apolloClientName: string) {
+        if (this.apollo.use(apolloClientName)) {
+            this.apollo.removeClient(apolloClientName);
+        }
+    }
+
     private get contextRoot() {
         return this.appConfigService.get('bpmHost', '');
     }
@@ -155,10 +160,13 @@ export class WebSocketService {
         this.wsLink = new GraphQLWsLink(
             createClient({
                 url: this.createWsUrl(options.wsUrl) + '/v2/ws/graphql',
-                connectionParams: {
+                connectionParams: () => ({
                     Authorization: 'Bearer ' + this.authService.getToken()
-                },
+                }),
                 on: {
+                    closed: () => {
+                        this.removeApolloClientIfExists(options.apolloClientName);
+                    },
                     error: () => {
                         this.apollo.removeClient(options.apolloClientName);
                         this.initSubscriptions(options);