ru.coon 2.6.3 → 2.6.5

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+# Version 2.6.5, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/5695d2c215ad6469aacd802ca46a536c81845c35)
+* ## Fixes
+* <span style='color:red'>Fix:TR-67289 refactoring authorization</span> ([8bdc4b], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8bdc4b11e7443b819b52c4eef8e0cc2d9c8f3f5b))
+
+* update: CHANGELOG.md ([490d0e], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/490d0eb96a199419068bdf69e20aa0db63a6180d))
+
+# Version 2.6.4, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f9a1013bbcc9c01ba7baa130b16648d222144ea0)
+* ## Fixes
+* <span style='color:red'>fix "сохнарить"</span> ([a5fa42], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a5fa421c079792cf51f04ac696664731427620bf))
+
+* update: CHANGELOG.md ([827275], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8272753c3e16fa05b3e7cadb2880d4e0c8af4853))
+
 # Version 2.6.3, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f79e922e4a2767df64ca69e459661b9e24e9098e)
 * ## Fixes
 * <span style='color:red'>fix uiElement/get request</span> ([edac67], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/edac674cb5d023de5ad274262db6d619de7d50fd))

package/package.json

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

package/src/common/component/Auth.js

@@ -4,14 +4,6 @@ Ext.define('Coon.common.component.Auth', {
     systemPropertyName: 'VERSIONING_EMAIL_PERSONIFICATION_SW',
     defaultDomain: '@sigma-it.ru',
     privates: {
-        showError(e) {
-            Ext.create('Coon.report.component.ErrorWindow', {
-                autoShow: true,
-                title: 'Ошибка авторизации',
-                trace: e.message,
-                message: 'Во время авторизации произошла ошибка',
-            });
-        },
 
         verify(data) {
             return new Promise((resolve, reject) => {
@@ -39,25 +31,6 @@ Ext.define('Coon.common.component.Auth', {
             });
         },
 
-        isVerified(data) {
-            return (
-                data &&
-                Coon.util.generateHashFromObj(
-                    Object.assign({}, data, {salt: 'auth'})
-                ) === this.dataChecksum
-            );
-        },
-
-        markAsVerified(data) {
-            try {
-                this.dataChecksum = Coon.util.generateHashFromObj(
-                    Object.assign({}, data, {salt: 'auth'})
-                );
-            } catch (e) {
-                Coon.log.error('Failed to mark auth data as verified', e);
-            }
-        },
-
         parseJWT: (token) => {
             try {
                 return JSON.parse(
@@ -99,6 +72,14 @@ Ext.define('Coon.common.component.Auth', {
             });
         },
     },
+    showError(e) {
+        Ext.create('Coon.report.component.ErrorWindow', {
+            autoShow: true,
+            title: 'Ошибка авторизации',
+            trace: e.message,
+            message: 'Во время авторизации произошла ошибка',
+        });
+    },
 
     handleAuthorization() {
         return this.isValid().then((authorized) => authorized || this.request());
@@ -106,6 +87,7 @@ Ext.define('Coon.common.component.Auth', {
 
     // Проверяет включена ли авторизация
     isEnabled() {
+        return Promise.resolve(true);
         return Coon.SystemProperties.fetch(
             this.systemPropertyName,
             'boolean'
@@ -116,20 +98,15 @@ Ext.define('Coon.common.component.Auth', {
         return new Promise((resolve) => {
             const data = this.getCachedData();
             if (data) {
-                if (!this.isVerified(data)) {
-                    this.verify(data)
-                        .then((isValid) => {
-                            this.markAsVerified(data);
-                            resolve(isValid);
-                        })
-                        .catch((e) => {
-                            this.clearCache();
-                            this.showError(e);
-                            resolve(false);
-                        });
-                } else {
-                    resolve(true);
-                }
+                this.verify(data)
+                    .then((isValid) => {
+                        resolve(isValid);
+                    })
+                    .catch((e) => {
+                        this.clearCache();
+                        this.showError(e);
+                        resolve(false);
+                    });
             } else {
                 resolve(false);
             }
@@ -142,8 +119,10 @@ Ext.define('Coon.common.component.Auth', {
             const wrap = Ext.widget('WindowWrap', {
                 title: 'Авторизация',
                 maximizable: false,
-                resizable: false,
+                resizable: true,
                 autoShow: true,
+                width: 520,
+                height: 280,
                 listeners: {
                     close: function() {
                         resolve(authorized);

package/src/report/component/reportpanel/CopyReportPanel.js

@@ -25,7 +25,7 @@ Ext.define('Coon.report.component.reportpanel.CopyReportPanel', {
                 '->',
                 {
                     xtype: 'button',
-                    text: 'Сохнарить',
+                    text: 'Сохранить',
                     handler: 'copy',
                     ui: 'orange-button',
                     bind: {

package/src/security/GenerateTokenPanel.js

@@ -24,8 +24,6 @@ Ext.define('Coon.security.GenerateTokenPanel', {
             },
         },
     },
-    width: 520,
-    height: 240,
     bodyPadding: 20,
     items: [
         {
@@ -102,8 +100,10 @@ Ext.define('Coon.security.GenerateTokenPanel', {
                 const email =
                     values.emailPrefix.replace(this.vm.get('defaultDomain'), '') +
                     this.vm.get('defaultDomain');
+                form.mask();
                 this.auth.generateToken(email, values.gitToken)
                     .then(function(properties) {
+                        form && form.unmask();
                         if (!Ext.isObject(properties)) {
                             throw new Error('Не удалось сохранить токен');
                         }
@@ -117,6 +117,7 @@ Ext.define('Coon.security.GenerateTokenPanel', {
                         }
                     })
                     .catch((e) => {
+                        form && form.unmask();
                         Coon.log.error(e.message);
                         this.vm.set('pending', false);
                     });

package/src/version.js

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