drop jslint lines

[pve-manager.git] / www / manager6 / window / LoginWindow.js

diff --git a/www/manager6/window/LoginWindow.js b/www/manager6/window/LoginWindow.js
index a923bca1153085875555a09dab24112d7021029f..6123c655ab89d4e0053da37152a9ad0fac747e4e 100644 (file)
--- a/www/manager6/window/LoginWindow.js
+++ b/www/manager6/window/LoginWindow.js
@@ -37,8 +37,16 @@ Ext.define('PVE.window.LoginWindow', {
                    view.el.unmask();
 
                    var data = resp.result.data;
-                   if (Ext.isDefined(data.U2FChallenge)) {
-                       me.perform_u2f(data);
+                   if (Ext.isDefined(data.NeedTFA)) {
+                       // Store first factor login information first:
+                       data.LoggedOut = true;
+                       Proxmox.Utils.setAuthData(data);
+
+                       if (Ext.isDefined(data.U2FChallenge)) {
+                           me.perform_u2f(data);
+                       } else {
+                           me.perform_otp();
+                       }
                    } else {
                        me.success(data);
                    }
@@ -55,9 +63,13 @@ Ext.define('PVE.window.LoginWindow', {
                uf.focus(true, true);
            };
 
-           Ext.MessageBox.alert(gettext('Error'),
-                                gettext("Login failed. Please try again"),
-                                handler);
+           let emsg = gettext("Login failed. Please try again");
+
+           if (resp.failureType === "connect") {
+               emsg = gettext("Connection failure. Network error or Proxmox VE services not running?");
+           }
+
+           Ext.MessageBox.alert(gettext('Error'), emsg, handler);
        },
        success: function(data) {
            var me = this;
@@ -67,11 +79,23 @@ Ext.define('PVE.window.LoginWindow', {
            view.close();
        },
 
+       perform_otp: function() {
+           var me = this;
+           var win = Ext.create('PVE.window.TFALoginWindow', {
+               onLogin: function(value) {
+                   me.finish_tfa(value);
+               },
+               onCancel: function() {
+                   Proxmox.LoggedOut = false;
+                   Proxmox.Utils.authClear();
+                   me.getView().show();
+               }
+           });
+           win.show();
+       },
+
        perform_u2f: function(data) {
            var me = this;
-           // Store first factor login information first:
-           data.LoggedOut = true;
-           Proxmox.Utils.setAuthData(data);
            // Show the message:
            var msg = Ext.Msg.show({
                title: 'U2F: '+gettext('Verification'),
@@ -87,18 +111,18 @@ Ext.define('PVE.window.LoginWindow', {
                msg.close();
                if (res.errorCode) {
                    Proxmox.Utils.authClear();
-                   Ext.Msg.alert(gettext('Error'), "U2F Error: "+res.errorCode);
+                   Ext.Msg.alert(gettext('Error'), PVE.Utils.render_u2f_error(res.errorCode));
                    return;
                }
                delete res.errorCode;
-               me.finish_u2f(res);
+               me.finish_tfa(JSON.stringify(res));
            });
        },
-       finish_u2f: function(res) {
+       finish_tfa: function(res) {
            var me = this;
            var view = me.getView();
            view.el.mask(gettext('Please wait...'), 'x-mask-loading');
-           var params = { response: JSON.stringify(res) };
+           var params = { response: res };
            Proxmox.Utils.API2Request({
                url: '/api2/extjs/access/tfa',
                params: params,
@@ -131,19 +155,6 @@ Ext.define('PVE.window.LoginWindow', {
                    }
                }
            },
-           'field[name=realm]': {
-               change: function(f, value) {
-                   var otp_field = this.lookupReference('otpField');
-                   if (f.needOTP(value)) {
-                       otp_field.setConfig('allowBlank', false);
-                       otp_field.setEmptyText(gettext('2nd factor'));
-                   } else {
-                       otp_field.setConfig('allowBlank', true);
-                       otp_field.setEmptyText(gettext('2nd factor, if required'));
-                   }
-                   otp_field.validate();
-               }
-           },
            'field[name=lang]': {
                change: function(f, value) {
                    var dt = Ext.Date.add(new Date(), Ext.Date.YEAR, 10);
@@ -176,23 +187,16 @@ Ext.define('PVE.window.LoginWindow', {
     },
 
     width: 400,
-
     modal: true,
-
     border: false,
-
     draggable: true,
-
     closable: false,
-
     resizable: false,
-
     layout: 'auto',
 
     title: gettext('Proxmox VE Login'),
 
     defaultFocus: 'usernameField',
-
     defaultButton: 'loginButton',
 
     items: [{
@@ -223,15 +227,7 @@ Ext.define('PVE.window.LoginWindow', {
                reference: 'passwordField'
            },
            {
-               xtype: 'textfield',
-               fieldLabel: gettext('OTP'),
-               name: 'otp',
-               reference: 'otpField',
-               allowBlank: true,
-               emptyText: gettext('2nd factor, if required')
-           },
-           {
-               xtype: 'pveRealmComboBox',
+               xtype: 'pmxRealmComboBox',
                name: 'realm'
            },
            {
@@ -250,7 +246,7 @@ Ext.define('PVE.window.LoginWindow', {
                name: 'saveusername',
                reference: 'saveunField',
                stateId: 'login-saveusername',
-               labelWidth: 'auto',
+               labelWidth: 250,
                labelAlign: 'right',
                submitValue: false
            },
@@ -261,3 +257,52 @@ Ext.define('PVE.window.LoginWindow', {
        ]
     }]
  });
+Ext.define('PVE.window.TFALoginWindow', {
+    extend: 'Ext.window.Window',
+
+    modal: true,
+    resizable: false,
+    title: 'Two-Factor Authentication',
+    layout: 'form',
+    defaultButton: 'loginButton',
+    defaultFocus: 'otpField',
+
+    controller: {
+       xclass: 'Ext.app.ViewController',
+       login: function() {
+           var me = this;
+           var view = me.getView();
+           view.onLogin(me.lookup('otpField').getValue());
+           view.close();
+       },
+       cancel: function() {
+           var me = this;
+           var view = me.getView();
+           view.onCancel();
+           view.close();
+       }
+    },
+
+    items: [
+       {
+           xtype: 'textfield',
+           fieldLabel: gettext('Please enter your OTP verification code:'),
+           name: 'otp',
+           itemId: 'otpField',
+           reference: 'otpField',
+           allowBlank: false
+       }
+    ],
+
+    buttons: [
+       {
+           text: gettext('Login'),
+           reference: 'loginButton',
+           handler: 'login'
+       },
+       {
+           text: gettext('Cancel'),
+           handler: 'cancel'
+       }
+    ]
+});