You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2015/04/16 20:18:31 UTC
ambari git commit: AMBARI-10538. login page freeze after using сyrillic characters (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 5bb1faefb -> c7022dc36
AMBARI-10538. login page freeze after using сyrillic characters (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c7022dc3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c7022dc3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c7022dc3
Branch: refs/heads/trunk
Commit: c7022dc36a89a6660def99bf8eadd0f95154144f
Parents: 5bb1fae
Author: Alex Antonenko <hi...@gmail.com>
Authored: Thu Apr 16 21:17:55 2015 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Thu Apr 16 21:18:27 2015 +0300
----------------------------------------------------------------------
ambari-web/app/router.js | 7 ++++---
ambari-web/app/utils/misc.js | 9 +++++++++
2 files changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/c7022dc3/ambari-web/app/router.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/router.js b/ambari-web/app/router.js
index 9f715ad..8d2a5d2 100644
--- a/ambari-web/app/router.js
+++ b/ambari-web/app/router.js
@@ -16,6 +16,7 @@
* limitations under the License.
*/
+var misc = require('utils/misc');
var App = require('app');
App.WizardRoute = Em.Route.extend({
@@ -210,7 +211,7 @@ App.Router = Em.Router.extend({
var controller = this.get('loginController');
var loginName = controller.get('loginName').toLowerCase();
controller.set('loginName', loginName);
- var hash = window.btoa(loginName + ":" + controller.get('password'));
+ var hash = misc.utf8ToB64(loginName + ":" + controller.get('password'));
var usr = '';
if (App.get('testMode')) {
@@ -243,7 +244,7 @@ App.Router = Em.Router.extend({
loginSuccessCallback: function(data, opt, params) {
console.log('login success');
App.usersMapper.map({"items": [data]});
- this.setUserLoggedIn(params.loginName);
+ this.setUserLoggedIn(decodeURIComponent(params.loginName));
App.router.get('mainViewsController').loadAmbariViews();
App.ajax.send({
name: 'router.login.clusters',
@@ -391,7 +392,7 @@ App.Router = Em.Router.extend({
logOff: function (context) {
$('title').text(Em.I18n.t('app.name'));
- var hash = window.btoa(this.get('loginController.loginName') + ":" + this.get('loginController.password'));
+ var hash = misc.utf8ToB64(this.get('loginController.loginName') + ":" + this.get('loginController.password'));
App.router.get('mainController').stopPolling();
// App.db.cleanUp() must be called before router.clearAllSteps().
http://git-wip-us.apache.org/repos/asf/ambari/blob/c7022dc3/ambari-web/app/utils/misc.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/misc.js b/ambari-web/app/utils/misc.js
index b9e9530..ae0e49b 100644
--- a/ambari-web/app/utils/misc.js
+++ b/ambari-web/app/utils/misc.js
@@ -63,5 +63,14 @@ module.exports = {
}
}
return sorted;
+ },
+
+ utf8ToB64: function(stringToEncode) {
+ return window.btoa(unescape(encodeURIComponent(stringToEncode)));
+ },
+
+ b64ToUtf8: function(stringTodecode) {
+ return decodeURIComponent(escape(window.atob(stringTodecode)));
}
+
};