@lenne.tech/ng-base 0.3.10 → 0.3.13

package/bundles/lenne.tech-ng-base-src-lib-base.umd.js

@@ -488,6 +488,23 @@
         { type: undefined, decorators: [{ type: i0.Inject, args: [BASE_MODULE_CONFIG,] }] }
     ]; };
 
+    var WsService = /** @class */ (function () {
+        function WsService() {
+        }
+        WsService.prototype.reconnect = function () {
+            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();
+        };
+        return WsService;
+    }());
+    WsService.ɵprov = i0__namespace.ɵɵdefineInjectable({ factory: function WsService_Factory() { return new WsService(); }, token: WsService, providedIn: "root" });
+    WsService.decorators = [
+        { type: i0.Injectable, args: [{
+                    providedIn: 'root',
+                },] }
+    ];
+
     /**
      * Authentication service
      */
@@ -495,9 +512,10 @@
         /**
          * Constructor
          */
-        function AuthService(moduleConfig, storageService) {
+        function AuthService(moduleConfig, storageService, wsService) {
             this.moduleConfig = moduleConfig;
             this.storageService = storageService;
+            this.wsService = wsService;
             // Subjects
             this._currentUser = new rxjs.BehaviorSubject(null);
             this._token = new rxjs.BehaviorSubject(null);
@@ -543,6 +561,7 @@
             set: function (token) {
                 this._token.next(token);
                 this.storageService.save('token', token);
+                this.wsService.reconnect();
             },
             enumerable: false,
             configurable: true
@@ -556,7 +575,7 @@
         });
         return AuthService;
     }());
-    AuthService.ɵprov = i0__namespace.ɵɵdefineInjectable({ factory: function AuthService_Factory() { return new AuthService(i0__namespace.ɵɵinject(BASE_MODULE_CONFIG), i0__namespace.ɵɵinject(StorageService)); }, token: AuthService, providedIn: "root" });
+    AuthService.ɵprov = i0__namespace.ɵɵdefineInjectable({ factory: function AuthService_Factory() { return new AuthService(i0__namespace.ɵɵinject(BASE_MODULE_CONFIG), i0__namespace.ɵɵinject(StorageService), i0__namespace.ɵɵinject(WsService)); }, token: AuthService, providedIn: "root" });
     AuthService.decorators = [
         { type: i0.Injectable, args: [{
                     providedIn: 'root',
@@ -564,13 +583,14 @@
     ];
     AuthService.ctorParameters = function () { return [
         { type: undefined, decorators: [{ type: i0.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) {
         var links = [];
         var defaultUrl = 'api.' + window.location.href + '/graphql';
         var http = httpLink.create({
@@ -588,27 +608,17 @@
             return forward(operation);
         });
         if (baseModuleConfig.wsUrl) {
-            var wsClient = void 0;
-            if (localStorage) {
-                var token = authService.token || null;
-                wsClient = new ws.WebSocketLink({
-                    uri: baseModuleConfig.wsUrl,
-                    options: {
-                        reconnect: true,
-                        connectionParams: {
-                            Authorization: 'Bearer ' + token,
-                        },
-                    },
-                });
-            }
-            else {
-                wsClient = new ws.WebSocketLink({
-                    uri: baseModuleConfig.wsUrl,
-                    options: {
-                        reconnect: true,
-                    },
-                });
-            }
+            var wsLink = new ws.WebSocketLink({
+                uri: baseModuleConfig.wsUrl,
+                options: {
+                    reconnect: true,
+                    connectionParams: function () { return ({
+                        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(core.split(
@@ -618,7 +628,7 @@
                 // @ts-ignore
                 var _b = utilities.getMainDefinition(query), kind = _b.kind, operation = _b.operation;
                 return kind === 'OperationDefinition' && operation === 'subscription';
-            }, wsClient, core.concat(authMiddleware, http)));
+            }, wsLink, core.concat(authMiddleware, http)));
         }
         else {
             links.push(http);
@@ -1562,7 +1572,7 @@
                 providers.push({
                     provide: i1$1.APOLLO_OPTIONS,
                     useFactory: apolloOptionsFactory,
-                    deps: [BASE_MODULE_CONFIG, http.HttpLink, AuthService],
+                    deps: [BASE_MODULE_CONFIG, http.HttpLink, AuthService, WsService],
                 });
             }
             else if (config.logging) {
@@ -3133,6 +3143,7 @@
     exports.ScrollService = ScrollService;
     exports.Standard = Standard;
     exports.StorageService = StorageService;
+    exports.WsService = WsService;
     exports.apolloOptionsFactory = apolloOptionsFactory;
 
     Object.defineProperty(exports, '__esModule', { value: true });