|
@@ -16,6 +16,7 @@
|
|
* limitations under the License.
|
|
* limitations under the License.
|
|
*/
|
|
*/
|
|
|
|
|
|
|
|
+var misc = require('utils/misc');
|
|
var App = require('app');
|
|
var App = require('app');
|
|
|
|
|
|
App.WizardRoute = Em.Route.extend({
|
|
App.WizardRoute = Em.Route.extend({
|
|
@@ -210,7 +211,7 @@ App.Router = Em.Router.extend({
|
|
var controller = this.get('loginController');
|
|
var controller = this.get('loginController');
|
|
var loginName = controller.get('loginName').toLowerCase();
|
|
var loginName = controller.get('loginName').toLowerCase();
|
|
controller.set('loginName', loginName);
|
|
controller.set('loginName', loginName);
|
|
- var hash = window.btoa(loginName + ":" + controller.get('password'));
|
|
|
|
|
|
+ var hash = misc.utf8ToB64(loginName + ":" + controller.get('password'));
|
|
var usr = '';
|
|
var usr = '';
|
|
|
|
|
|
if (App.get('testMode')) {
|
|
if (App.get('testMode')) {
|
|
@@ -243,7 +244,7 @@ App.Router = Em.Router.extend({
|
|
loginSuccessCallback: function(data, opt, params) {
|
|
loginSuccessCallback: function(data, opt, params) {
|
|
console.log('login success');
|
|
console.log('login success');
|
|
App.usersMapper.map({"items": [data]});
|
|
App.usersMapper.map({"items": [data]});
|
|
- this.setUserLoggedIn(params.loginName);
|
|
|
|
|
|
+ this.setUserLoggedIn(decodeURIComponent(params.loginName));
|
|
App.router.get('mainViewsController').loadAmbariViews();
|
|
App.router.get('mainViewsController').loadAmbariViews();
|
|
App.ajax.send({
|
|
App.ajax.send({
|
|
name: 'router.login.clusters',
|
|
name: 'router.login.clusters',
|
|
@@ -391,7 +392,7 @@ App.Router = Em.Router.extend({
|
|
|
|
|
|
logOff: function (context) {
|
|
logOff: function (context) {
|
|
$('title').text(Em.I18n.t('app.name'));
|
|
$('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.router.get('mainController').stopPolling();
|
|
// App.db.cleanUp() must be called before router.clearAllSteps().
|
|
// App.db.cleanUp() must be called before router.clearAllSteps().
|