ru.coon 2.8.3 → 2.8.4

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+# Version 2.8.4, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/79f9eb3363e07fb47ac3ac23659b94b34c7423b9)
+* TR-69542 fix: восстановление утраченной авторизации по токену. ([402a8a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/402a8a5e63da1342b44b6e95a7eed96d5b9a42aa))
+* update: CHANGELOG.md ([b11b4c], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b11b4c53ff53f0dde24c4e017e09046a77609ac4))
+
 # Version 2.8.3, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f2bd405e3421aa5e65c5c112ce39cd61806e1e09)
 * update: CHANGELOG.md ([f52e7b], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f52e7b66d3bb410cfe89272d0eccd0632d1c30e3))
 

package/package.json

@@ -4,7 +4,7 @@
     "name": "ru.coon"
   },
   "description": "",
-  "version": "2.8.3",
+  "version": "2.8.4",
   "repository": {
     "type": "git",
     "url": "git+http://gitlab-dbr.sigma-it.local/dbr/ru.coon"

package/src/app/Application.js

@@ -196,25 +196,41 @@ Ext.define('Coon.app.Application', {
         });
     },
 
-
     launch: function() {
         this.appRouter.onBeforeRouteEnterFn = this.isAuthenticated.bind(this);
         Ext.on('auth:logout', this.onLogout, this);
-        this.checkAuth().then(() => {
-            Ext.get('splash').fadeOut({
-                duration: 1000,
-                listeners: {
-                    afteranimate: {
-                        fn: this.afterLoad,
-                        single: true,
-                        scope: this,
-                    },
-                },
+        let jwtToken;
+        let beforeAuth = () => Promise.resolve();
+        if (Ext.isFunction(this.checkJwtAuth)) {
+            jwtToken = this.appRouter.getAuthToken();
+            if (jwtToken) {
+                beforeAuth = this.checkJwtAuth;
+            }
+        }
+
+        beforeAuth.call(this, jwtToken)
+            .then(this.checkAuth.bind(this))
+            .then(() => {
+                this.stopAnimation();
+                this.afterCheckAuth();
             });
-            this.afterCheckAuth();
-        });
+
         this.afterLaunch();
     },
+
+    stopAnimation() {
+        Ext.get('splash').fadeOut({
+            duration: 1000,
+            listeners: {
+                afteranimate: {
+                    fn: this.afterLoad,
+                    single: true,
+                    scope: this,
+                },
+            },
+        });
+    },
+
     afterAuthorized() {},
 
     afterLaunch() {},

package/src/app/Router.js

@@ -75,5 +75,14 @@ Ext.define('Coon.app.Router', {
         const routerView = this.getRouterView();
         return routerView && routerView.getLayout().getActiveItem();
     },
+    getAuthToken() {
+        const search = document.location.search;
+        let jwtToken;
+        if (Ext.isString(search) && search.includes('?')) {
+            const urlParameters = Ext.Object.fromQueryString(search);
+            jwtToken = urlParameters.jwtToken;
+        }
+        return jwtToken;
+    },
 
 });

package/src/version.js

@@ -1,4 +1,4 @@
 Ext.define('Coon.version', {
     singleton: true,
-    number: '2.8.3',
+    number: '2.8.4',
 });