@sumaris-net/ngx-components 1.9.5 → 1.9.6

package/bundles/sumaris-net.ngx-components.umd.js

@@ -15432,7 +15432,7 @@
     };
     var AccountService = /** @class */ (function (_super) {
         __extends(AccountService, _super);
-        function AccountService(cryptoService, network, graphql, settings, storage, file, environment) {
+        function AccountService(cryptoService, network, graphql, settings, storage, file, translate, toastController, environment) {
             var _this = _super.call(this, graphql, environment) || this;
             _this.cryptoService = cryptoService;
             _this.network = network;
@@ -15440,6 +15440,8 @@
             _this.settings = settings;
             _this.storage = storage;
             _this.file = file;
+            _this.translate = translate;
+            _this.toastController = toastController;
             _this.environment = environment;
             _this.onLogin = new rxjs.Subject();
             _this.onLogout = new rxjs.Subject();
@@ -15869,7 +15871,7 @@
         };
         AccountService.prototype.reload = function () {
             return __awaiter(this, void 0, void 0, function () {
-                var now;
+                var now, wasLogin, error_6;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -15879,17 +15881,32 @@
                                 throw new Error('Cannot check account in offline mode');
                             now = Date.now();
                             console.debug("[account] Reloading account...");
-                            return [4 /*yield*/, this.loadData()];
+                            wasLogin = this.isLogin();
+                            _b.label = 1;
                         case 1:
+                            _b.trys.push([1, 4, , 8]);
+                            return [4 /*yield*/, this.loadData()];
+                        case 2:
                             _b.sent();
                             return [4 /*yield*/, this.saveLocally()];
-                        case 2:
+                        case 3:
                             _b.sent();
                             console.debug("[account] Reloading account [OK] in " + (Date.now() - now) + "ms");
                             // Emit login event to subscribers
                             this.onLogin.next(this._data);
                             this.onChange.next(this._data);
                             return [2 /*return*/, this._data];
+                        case 4:
+                            error_6 = _b.sent();
+                            if (!(wasLogin && !this.isLogin())) return [3 /*break*/, 6];
+                            console.error("[account] Reloading account failed. Will force logout...", error_6);
+                            return [4 /*yield*/, this.logout()];
+                        case 5:
+                            _b.sent();
+                            return [3 /*break*/, 7];
+                        case 6: throw error_6;
+                        case 7: return [3 /*break*/, 8];
+                        case 8: return [2 /*return*/];
                     }
                 });
             });
@@ -16188,7 +16205,7 @@
         };
         AccountService.prototype.loadData = function (opts) {
             return __awaiter(this, void 0, void 0, function () {
-                var account, settings, error_6;
+                var account, settings, error_7;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -16225,11 +16242,11 @@
                             _b.label = 4;
                         case 4: return [2 /*return*/, this._data];
                         case 5:
-                            error_6 = _b.sent();
+                            error_7 = _b.sent();
                             this.resetData();
-                            if (error_6.code && error_6.message)
-                                throw error_6;
-                            console.error(error_6);
+                            if (error_7.code && error_7.message)
+                                throw error_7;
+                            console.error(error_7);
                             throw {
                                 code: ErrorCodes$2.LOAD_ACCOUNT_ERROR,
                                 message: 'ERROR.LOAD_ACCOUNT_ERROR'
@@ -16253,7 +16270,7 @@
         };
         AccountService.prototype.restoreLocally = function () {
             return __awaiter(this, void 0, void 0, function () {
-                var values, pubkey, token, seckey, canRemoteAuth, error_7, jsonAccount, accountStr, account;
+                var values, pubkey, token, seckey, canRemoteAuth, error_8, jsonAccount, accountStr, account;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0: return [4 /*yield*/, Promise.all([
@@ -16291,7 +16308,7 @@
                                 throw new Error('Authentication failed');
                             return [3 /*break*/, 5];
                         case 4:
-                            error_7 = _b.sent();
+                            error_8 = _b.sent();
                             // Offline feature are enable: continue in offline mode
                             if (this.settings.hasOfflineFeature()) {
                                 console.warn('[account] Unable to authenticate on pod: forcing offline mode');
@@ -16300,7 +16317,7 @@
                             }
                             // No offline features enable (=offline mode not allowed)
                             else {
-                                console.error(error_7);
+                                console.error(error_8);
                                 this.logout();
                                 return [2 /*return*/];
                             }
@@ -16663,9 +16680,12 @@
             target.id = source.id || target.id;
             target.updateDate = source.updateDate || target.updateDate;
         };
+        AccountService.prototype.showToast = function (opts) {
+            return Toasts.show(this.toastController, this.translate, opts);
+        };
         return AccountService;
     }(BaseGraphqlService));
-    AccountService.ɵprov = i0__namespace.ɵɵdefineInjectable({ factory: function AccountService_Factory() { return new AccountService(i0__namespace.ɵɵinject(CryptoService), i0__namespace.ɵɵinject(NetworkService), i0__namespace.ɵɵinject(GraphqlService), i0__namespace.ɵɵinject(LocalSettingsService), i0__namespace.ɵɵinject(i3__namespace$1.Storage), i0__namespace.ɵɵinject(FileService), i0__namespace.ɵɵinject(ENVIRONMENT)); }, token: AccountService, providedIn: "root" });
+    AccountService.ɵprov = i0__namespace.ɵɵdefineInjectable({ factory: function AccountService_Factory() { return new AccountService(i0__namespace.ɵɵinject(CryptoService), i0__namespace.ɵɵinject(NetworkService), i0__namespace.ɵɵinject(GraphqlService), i0__namespace.ɵɵinject(LocalSettingsService), i0__namespace.ɵɵinject(i3__namespace$1.Storage), i0__namespace.ɵɵinject(FileService), i0__namespace.ɵɵinject(i1__namespace$1.TranslateService, 8), i0__namespace.ɵɵinject(i1__namespace$4.ToastController, 8), i0__namespace.ɵɵinject(ENVIRONMENT)); }, token: AccountService, providedIn: "root" });
     AccountService.decorators = [
         { type: i0.Injectable, args: [{ providedIn: 'root' },] }
     ];
@@ -16676,6 +16696,8 @@
         { type: LocalSettingsService },
         { type: i3$2.Storage },
         { type: FileService },
+        { type: i1$2.TranslateService, decorators: [{ type: i0.Optional }] },
+        { type: i1$5.ToastController, decorators: [{ type: i0.Optional }] },
         { type: undefined, decorators: [{ type: i0.Inject, args: [ENVIRONMENT,] }] }
     ]; };
     var templateObject_1$4, templateObject_2$4, templateObject_3$3, templateObject_4$3, templateObject_5$2, templateObject_6, templateObject_7, templateObject_8, templateObject_9, templateObject_10, templateObject_11, templateObject_12;