Reverting 'Two-factor authentication' support as it cause OSX and docker build failures.

This reverts commit 787a441343.

web/pgadmin/tools/user_management/static/js/user_management.js

@@ -11,10 +11,10 @@ define([
   'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'pgadmin.alertifyjs',
   'pgadmin.browser', 'backbone', 'backgrid', 'backform', 'pgadmin.browser.node', 'pgadmin.backform',
   'pgadmin.user_management.current_user', 'sources/utils', 'pgadmin.browser.constants',
-  'pgadmin.browser.dialog','backgrid.select.all', 'backgrid.filter',
+  'backgrid.select.all', 'backgrid.filter',
 ], function(
   gettext, url_for, $, _, alertify, pgBrowser, Backbone, Backgrid, Backform,
-  pgNode, pgBackform, userInfo, commonUtils, pgConst, pgDialog,
+  pgNode, pgBackform, userInfo, commonUtils, pgConst,
 ) {
 
   // if module is already initialized, refer to that.
@@ -87,9 +87,93 @@ define([
 
     // Callback to draw change password Dialog.
     change_password: function(url) {
-      pgDialog.url_dialog(
-        gettext('Chagne Password'), url, 'change_user_password.html',
-      );
+      var title = gettext('Change Password');
+
+      if (!alertify.ChangePassword) {
+        alertify.dialog('ChangePassword', function factory() {
+          return {
+            main: function(alertTitle, alertUrl) {
+              this.set({
+                'title': alertTitle,
+                'url': alertUrl,
+              });
+            },
+            build: function() {
+              alertify.pgDialogBuild.apply(this);
+            },
+            settings: {
+              url: undefined,
+            },
+            setup: function() {
+              return {
+                buttons: [{
+                  text: '',
+                  key: 112,
+                  className: 'btn btn-primary-icon pull-left fa fa-question pg-alertify-icon-button',
+                  attrs: {
+                    name: 'dialog_help',
+                    type: 'button',
+                    label: gettext('Change Password'),
+                    url: url_for(
+                      'help.static', {
+                        'filename': 'change_user_password.html',
+                      }),
+                  },
+                }, {
+                  text: gettext('Close'),
+                  key: 27,
+                  className: 'btn btn-secondary fa fa-lg fa-times pg-alertify-button',
+                  attrs: {
+                    name: 'close',
+                    type: 'button',
+                  },
+                }],
+                // Set options for dialog
+                options: {
+                  //disable both padding and overflow control.
+                  padding: !1,
+                  overflow: !1,
+                  modal: false,
+                  resizable: true,
+                  maximizable: true,
+                  pinnable: false,
+                  closableByDimmer: false,
+                  closable: false,
+                },
+              };
+            },
+            hooks: {
+              // Triggered when the dialog is closed
+              onclose: function() {
+                // Clear the view
+                return setTimeout((function() {
+                  return alertify.ChangePassword().destroy();
+                }), 500);
+              },
+            },
+            prepare: function() {
+              // create the iframe element
+              var iframe = document.createElement('iframe');
+              iframe.frameBorder = 'no';
+              iframe.width = '100%';
+              iframe.height = '100%';
+              iframe.src = this.setting('url');
+              // add it to the dialog
+              this.elements.content.appendChild(iframe);
+            },
+            callback: function(e) {
+              if (e.button.element.name == 'dialog_help') {
+                e.cancel = true;
+                pgBrowser.showHelp(e.button.element.name, e.button.element.getAttribute('url'),
+                  null, null);
+                return;
+              }
+            },
+          };
+        });
+      }
+
+      alertify.ChangePassword(title, url).resizeTo(pgBrowser.stdW.lg, pgBrowser.stdH.md);
     },
 
     isPgaLoginRequired(xhr) {