info-library 2.10.59 → 2.10.61

package/bundles/info-library.umd.js

@@ -1529,7 +1529,7 @@
             this._modal = _modal;
             this._key = 'token';
             this._keySessao = 'sessao';
-            this._sessionTime = null;
+            this._sessionActive = true;
         }
         /**
          * @return {?}
@@ -1550,13 +1550,17 @@
          */
         InfoAuthenticationService.prototype.canActivate = function (activatedRouteSnapshot, routerStateSnapshot) {
             var _this = this;
-            if (!this.isLogged()) {
+            if (!this.isLogged() || !this._sessionActive) {
                 this.logout();
                 return true;
             }
             /** @type {?} */
             var url = activatedRouteSnapshot.data['URL'] || routerStateSnapshot.url;
-            this.refreshSessionTime();
+            setTimeout(( /**
+             * @return {?}
+             */function () {
+                _this.refreshSessionTime();
+            }), 1000);
             this.definePaginaAtiva(url);
             return this.getPermission(url, true)
                 .pipe(operators.map(( /**
@@ -1618,51 +1622,57 @@
          */
         InfoAuthenticationService.prototype.refreshSessionTime = function () {
             var _this = this;
+            if (!this._sessionActive)
+                return;
             clearInterval(this._sessionTimeInterval);
-            if (this._sessao.TempoInatividade <= 0) {
-                this._sessionTime = null;
-            }
-            else {
-                this._sessionTime = this._sessao.TempoInatividade;
-                if (this._sessao.TempoInatividade <= 0) {
-                    this._sessionTime = null;
+            if (this._sessao.TempoInatividade == null || this._sessao.TempoInatividade <= 0)
+                return;
+            /** @type {?} */
+            var tempoSessao = this._sessao.TempoInatividade;
+            localStorage.setItem('ms', new Date().valueOf().toString());
+            this._sessionTimeInterval = setInterval(( /**
+             * @return {?}
+             */function () {
+                if (tempoSessao > 0) {
+                    tempoSessao--;
                     return;
                 }
-                this._sessionTimeInterval = setInterval(( /**
-                 * @return {?}
-                 */function () {
-                    if (_this._sessionTime == null) {
-                        _this._sessionTime = _this._sessao.TempoInatividade;
-                        if (_this._sessionTime == null || _this._sessionTime <= 0) {
-                            _this.refreshSessionTime();
-                            return;
-                        }
-                    }
-                    if (_this._sessionTime > 0)
-                        _this._sessionTime--;
-                    else {
-                        clearInterval(_this._sessionTimeInterval);
-                        /** @type {?} */
-                        var ref = _this._modal.open(RefreshSessionTimeModalComponent, {
-                            data: null,
-                            disableClose: true,
-                            width: '400px'
-                        });
-                        ref.afterClosed().subscribe(( /**
-                         * @param {?} r
-                         * @return {?}
-                         */function (r) {
-                            clearInterval(_this._sessionTimeInterval);
-                            if (r == null)
-                                _this.logout();
-                            else if (r.modalAction == InfoModalAction.Yes)
-                                _this.refreshSessionTime();
-                            else
-                                _this.logout();
-                        }));
-                    }
-                }), 1000);
-            }
+                /** @type {?} */
+                var tempoRestante = Math.round(_this._sessao.TempoInatividade - ((new Date().valueOf() - parseInt(localStorage.getItem('ms'))) / 1000));
+                if (!isNaN(tempoRestante) && tempoRestante > 0) {
+                    tempoSessao = tempoRestante;
+                    return;
+                }
+                clearInterval(_this._sessionTimeInterval);
+                _this._sessionActive = false;
+                if (isNaN(tempoRestante))
+                    _this.logout();
+                else
+                    _this.showMessage();
+            }), 1000);
+        };
+        /**
+         * @return {?}
+         */
+        InfoAuthenticationService.prototype.showMessage = function () {
+            var _this = this;
+            /** @type {?} */
+            var ref = this._modal.open(RefreshSessionTimeModalComponent, {
+                data: null,
+                disableClose: true,
+                width: '500px'
+            });
+            ref.afterClosed().subscribe(( /**
+             * @param {?} r
+             * @return {?}
+             */function (r) {
+                if (r != null && (r.modalAction == InfoModalAction.Yes || (_this._sessao.TempoInatividade - ((new Date().valueOf() - parseInt(localStorage.getItem('ms'))) / 1000)) > 0)) {
+                    _this._sessionActive = true;
+                    _this.refreshSessionTime();
+                }
+                else
+                    _this.logout();
+            }));
         };
         /**
          * @param {?} usuario
@@ -2085,7 +2095,7 @@
          * @type {?}
          * @private
          */
-        InfoAuthenticationService.prototype._sessionTime;
+        InfoAuthenticationService.prototype._sessionActive;
         /**
          * @type {?}
          * @private
@@ -2541,7 +2551,7 @@
                  * @return {?}
                  */function () {
                     if (_this.selectedValue != null)
-                        if (_this._data == null || (_this._data != null && _this._data.length == 0)) {
+                        if ((_this._data == null || (_this._data != null && _this._data.length == 0)) && !_this.loading) {
                             _this.writeValue(null);
                             _this.selectedValue = null;
                         }