From 91ecb7be6a30fd8a0ebb10d210f82f5efec472ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Mon, 5 Sep 2016 12:45:45 +0200 Subject: [PATCH] Feature #4714: Update sunstone login token dialog --- src/oca/ruby/opennebula/user.rb | 2 +- src/sunstone/public/app/tabs/provision-tab.js | 1 + .../tabs/settings-tab/panels/user-config.js | 47 ++-------- .../settings-tab/panels/user-config/html.hbs | 29 ++---- .../app/tabs/users-tab/dialogs/login-token.js | 90 ++++++++++++++++--- .../users-tab/dialogs/login-token/html.hbs | 40 +++++---- .../app/tabs/users-tab/panels/info/html.hbs | 2 +- 7 files changed, 120 insertions(+), 91 deletions(-) diff --git a/src/oca/ruby/opennebula/user.rb b/src/oca/ruby/opennebula/user.rb index 2326419c15..61c56368c3 100644 --- a/src/oca/ruby/opennebula/user.rb +++ b/src/oca/ruby/opennebula/user.rb @@ -195,7 +195,7 @@ module OpenNebula # @param uname [String] of the user # @param token [String] the login token, if empty OpenNebula will # generate one - # @param expire [String] valid period of the token in secs. If <= 0 + # @param expire [String] valid period of the token in secs. If == 0 # the token will be reset # @param egid [Integer] Effective GID to use with this token. To use # the current GID and user groups set it to -1 diff --git a/src/sunstone/public/app/tabs/provision-tab.js b/src/sunstone/public/app/tabs/provision-tab.js index 9c81f1b74f..fa4509af5e 100644 --- a/src/sunstone/public/app/tabs/provision-tab.js +++ b/src/sunstone/public/app/tabs/provision-tab.js @@ -660,6 +660,7 @@ define(function(require) { require('./vms-tab/dialogs/vnc'), require('./vms-tab/dialogs/spice'), //require('./vms-tab/dialogs/saveas-template') + require('./users-tab/dialogs/login-token') ]; var Actions = require('./vms-tab/actions'); diff --git a/src/sunstone/public/app/tabs/settings-tab/panels/user-config.js b/src/sunstone/public/app/tabs/settings-tab/panels/user-config.js index 77f0907c05..97d57100ba 100644 --- a/src/sunstone/public/app/tabs/settings-tab/panels/user-config.js +++ b/src/sunstone/public/app/tabs/settings-tab/panels/user-config.js @@ -42,6 +42,7 @@ define(function(require) { var PANEL_ID = require('./user-config/panelId'); var RESOURCE = "User"; var XML_ROOT = "USER"; + var LOGIN_TOKEN_DIALOG_ID = require('tabs/users-tab/dialogs/login-token/dialogId'); /* CONSTRUCTOR @@ -92,14 +93,13 @@ define(function(require) { $('#provision_user_views_select option[value="' + config['user_config']["default_view"] + '"]', context).attr('selected', 'selected'); - var login_token = this.element.LOGIN_TOKEN.TOKEN; - if (login_token && login_token.length) { - $(".provision_login_token_current", context).show(); - $(".provision_login_token_valid", context).text(Humanize.prettyTime(this.element.LOGIN_TOKEN.EXPIRATION_TIME)); - $(".provision_login_token_value", context).text(this.element.LOGIN_TOKEN.TOKEN); - } else { - $(".provision_login_token_current", context).hide(); - } + // Login token button + context.off("click", ".provision_login_token_button"); + context.on("click", ".provision_login_token_button", function(){ + Sunstone.getDialog(LOGIN_TOKEN_DIALOG_ID).setParams({element: that.element}); + Sunstone.getDialog(LOGIN_TOKEN_DIALOG_ID).reset(); + Sunstone.getDialog(LOGIN_TOKEN_DIALOG_ID).show(); + }); $("#provision_change_password_form").submit(function() { var pw = $('#provision_new_password', this).val(); @@ -136,37 +136,6 @@ define(function(require) { return false; }); - $("#provision_login_token_form", context).submit(function() { - $(".provision_login_token_button", context).html('') - - OpenNebula.User.login({ - data : { - id: "-1", - 'username': that.element.NAME, - //token - //expire - }, - success: function(req, response){ - OpenNebula.User.show({ - data : { - id: that.element.ID - }, - success: function(request, user_json){ - $(".provision_login_token_button", context).text(Locale.tr("Get a login token")); - - $(".provision_login_token_current", context).show(); - $(".provision_login_token_valid", context).text(Humanize.prettyTime(user_json.USER.LOGIN_TOKEN.EXPIRATION_TIME)); - $(".provision_login_token_value", context).text(user_json.USER.LOGIN_TOKEN.TOKEN); - }, - error: Notifier.onError - }); - }, - error: Notifier.onError - }); - - return false; - }); - $("#provision_change_view_form").submit(function() { var sunstone_setting = {DEFAULT_VIEW : $('#provision_user_views_select', this).val()}; Sunstone.runAction("User.append_sunstone_setting_refresh", that.element.ID, sunstone_setting); diff --git a/src/sunstone/public/app/tabs/settings-tab/panels/user-config/html.hbs b/src/sunstone/public/app/tabs/settings-tab/panels/user-config/html.hbs index f2b0826e12..bdc396fa36 100644 --- a/src/sunstone/public/app/tabs/settings-tab/panels/user-config/html.hbs +++ b/src/sunstone/public/app/tabs/settings-tab/panels/user-config/html.hbs @@ -194,28 +194,15 @@ {{tr "Login Token"}}
-
-
-
-

- {{tr "A login token acts as a password and can be used to authenticate with OpenNebula through Sunstone, the CLI, or the API"}} -

-
diff --git a/src/sunstone/public/app/tabs/users-tab/dialogs/login-token.js b/src/sunstone/public/app/tabs/users-tab/dialogs/login-token.js index 5d810f66f6..f4d5bf4cfd 100644 --- a/src/sunstone/public/app/tabs/users-tab/dialogs/login-token.js +++ b/src/sunstone/public/app/tabs/users-tab/dialogs/login-token.js @@ -51,6 +51,7 @@ define(function(require) { Dialog.prototype.onShow = _onShow; Dialog.prototype.setup = _setup; Dialog.prototype.setParams = _setParams; + Dialog.prototype.loginSuccess = _loginSuccess; return Dialog; @@ -67,15 +68,63 @@ define(function(require) { } function _html() { + var tokens = []; + + if (this.element != undefined && this.element.LOGIN_TOKEN != undefined){ + if ($.isArray(this.element.LOGIN_TOKEN)){ + tokens = this.element.LOGIN_TOKEN; + } else { + tokens = [this.element.LOGIN_TOKEN]; + } + } + + $.each(tokens, function(){ + if (this.EGID == -1){ + this.EGROUP = Locale.tr("None"); + } else { + this.EGROUP = OpenNebula.Group.getName(this.EGID); + } + }); + return TemplateHTML({ 'dialogId': this.dialogId, - 'element': this.element + 'tokens': tokens }); } function _setup(context) { var that = this; + context.on("click", "i.remove-tab", function(){ + var tr = $(this).closest('tr'); + + $(this).closest('td').html('') + + var token = $(".token-text", tr).text(); + + OpenNebula.User.login({ + data : { + id: "-1", + 'username': that.element.NAME, + 'token': token, + 'expire': 0 + }, + success: function(req, response){ + OpenNebula.User.show({ + data : { + id: that.element.ID + }, + success: that.loginSuccess.bind(that), + error: function(request, error_json){ + Sunstone.getDialog(DIALOG_ID).hide(); + Notifier.onError(request, error_json); + } + }); + }, + error: Notifier.onError + }); + }); + $("#token_btn", context).click(function(){ $("#token_btn", context).html('') @@ -92,18 +141,7 @@ define(function(require) { data : { id: that.element.ID }, - success: function(request, user_json){ - Sunstone.getDialog(DIALOG_ID).hide(); - Sunstone.getDialog(DIALOG_ID).setParams({element: user_json.USER}); - Sunstone.getDialog(DIALOG_ID).reset(); - Sunstone.getDialog(DIALOG_ID).show(); - - if (Sunstone.getTab() == USERS_TAB_ID){ - Sunstone.runAction('User.refresh'); - } else { - Sunstone.runAction('Settings.refresh'); - } - }, + success: that.loginSuccess.bind(that), error: function(request, error_json){ Sunstone.getDialog(DIALOG_ID).hide(); Notifier.onError(request, error_json); @@ -117,6 +155,32 @@ define(function(require) { return false; } + function _loginSuccess(req, response){ + var that = this; + + OpenNebula.User.show({ + data : { + id: that.element.ID + }, + success: function(request, user_json){ + Sunstone.getDialog(DIALOG_ID).hide(); + Sunstone.getDialog(DIALOG_ID).setParams({element: user_json.USER}); + Sunstone.getDialog(DIALOG_ID).reset(); + Sunstone.getDialog(DIALOG_ID).show(); + + if (Sunstone.getTab() == USERS_TAB_ID){ + Sunstone.runAction('User.refresh'); + } else { + Sunstone.runAction('Settings.refresh'); + } + }, + error: function(request, error_json){ + Sunstone.getDialog(DIALOG_ID).hide(); + Notifier.onError(request, error_json); + } + }); + } + function _onShow(context) { var tabId = Sunstone.getTab(); diff --git a/src/sunstone/public/app/tabs/users-tab/dialogs/login-token/html.hbs b/src/sunstone/public/app/tabs/users-tab/dialogs/login-token/html.hbs index f03d4731af..5da6be2f87 100644 --- a/src/sunstone/public/app/tabs/users-tab/dialogs/login-token/html.hbs +++ b/src/sunstone/public/app/tabs/users-tab/dialogs/login-token/html.hbs @@ -14,7 +14,7 @@ {{! limitations under the License. }} {{! -------------------------------------------------------------------------- }} -