@lenne.tech/ng-base 0.3.9 → 0.3.12

package/fesm2015/lenne.tech-ng-base.js

@@ -146,6 +146,20 @@ StorageService.ctorParameters = () => [
     { type: undefined, decorators: [{ type: Inject, args: [BASE_MODULE_CONFIG,] }] }
 ];
 
+class WsService {
+    reconnect() {
+        var _a, _b;
+        (_a = this.client) === null || _a === void 0 ? void 0 : _a.close();
+        (_b = this.client) === null || _b === void 0 ? void 0 : _b.connect();
+    }
+}
+WsService.ɵprov = i0.ɵɵdefineInjectable({ factory: function WsService_Factory() { return new WsService(); }, token: WsService, providedIn: "root" });
+WsService.decorators = [
+    { type: Injectable, args: [{
+                providedIn: 'root',
+            },] }
+];
+
 /**
  * Authentication service
  */
@@ -153,9 +167,10 @@ class AuthService {
     /**
      * Constructor
      */
-    constructor(moduleConfig, storageService) {
+    constructor(moduleConfig, storageService, wsService) {
         this.moduleConfig = moduleConfig;
         this.storageService = storageService;
+        this.wsService = wsService;
         // Subjects
         this._currentUser = new BehaviorSubject(null);
         this._token = new BehaviorSubject(null);
@@ -192,12 +207,13 @@ class AuthService {
     set token(token) {
         this._token.next(token);
         this.storageService.save('token', token);
+        this.wsService.reconnect();
     }
     get tokenObservable() {
         return this._token.asObservable();
     }
 }
-AuthService.ɵprov = i0.ɵɵdefineInjectable({ factory: function AuthService_Factory() { return new AuthService(i0.ɵɵinject(BASE_MODULE_CONFIG), i0.ɵɵinject(StorageService)); }, token: AuthService, providedIn: "root" });
+AuthService.ɵprov = i0.ɵɵdefineInjectable({ factory: function AuthService_Factory() { return new AuthService(i0.ɵɵinject(BASE_MODULE_CONFIG), i0.ɵɵinject(StorageService), i0.ɵɵinject(WsService)); }, token: AuthService, providedIn: "root" });
 AuthService.decorators = [
     { type: Injectable, args: [{
                 providedIn: 'root',
@@ -205,13 +221,14 @@ AuthService.decorators = [
 ];
 AuthService.ctorParameters = () => [
     { type: undefined, decorators: [{ type: Inject, args: [BASE_MODULE_CONFIG,] }] },
-    { type: StorageService }
+    { type: StorageService },
+    { type: WsService }
 ];
 
 /**
  * Factory for apollo-angular options
  */
-function apolloOptionsFactory(baseModuleConfig, httpLink, authService) {
+function apolloOptionsFactory(baseModuleConfig, httpLink, authService, wsService) {
     const links = [];
     const defaultUrl = 'api.' + window.location.href + '/graphql';
     const http = httpLink.create({
@@ -229,27 +246,17 @@ function apolloOptionsFactory(baseModuleConfig, httpLink, authService) {
         return forward(operation);
     });
     if (baseModuleConfig.wsUrl) {
-        let wsClient;
-        if (localStorage) {
-            const token = authService.token || null;
-            wsClient = new WebSocketLink({
-                uri: baseModuleConfig.wsUrl,
-                options: {
-                    reconnect: true,
-                    connectionParams: {
-                        Authorization: token,
-                    },
-                },
-            });
-        }
-        else {
-            wsClient = new WebSocketLink({
-                uri: baseModuleConfig.wsUrl,
-                options: {
-                    reconnect: true,
-                },
-            });
-        }
+        const wsLink = new WebSocketLink({
+            uri: baseModuleConfig.wsUrl,
+            options: {
+                reconnect: true,
+                connectionParams: () => ({
+                    Authorization: authService.token ? 'Bearer ' + authService.token : undefined,
+                }),
+            },
+        });
+        // Set client for reconnection on logout/login
+        wsService.client = wsLink.subscriptionClient;
         // using the ability to split links, you can send data to each link
         // depending on what kind of operation is being sent
         links.push(split(
@@ -258,7 +265,7 @@ function apolloOptionsFactory(baseModuleConfig, httpLink, authService) {
             // @ts-ignore
             const { kind, operation } = getMainDefinition(query);
             return kind === 'OperationDefinition' && operation === 'subscription';
-        }, wsClient, concat(authMiddleware, http)));
+        }, wsLink, concat(authMiddleware, http)));
     }
     else {
         links.push(http);
@@ -1035,7 +1042,7 @@ class BaseModule {
             providers.push({
                 provide: APOLLO_OPTIONS,
                 useFactory: apolloOptionsFactory,
-                deps: [BASE_MODULE_CONFIG, HttpLink, AuthService],
+                deps: [BASE_MODULE_CONFIG, HttpLink, AuthService, WsService],
             });
         }
         else if (config.logging) {