dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[2.5] Improved login by params to support nagivation to different dashboards (#2702)

Browse Source 
* Improved login by params

* Fix

* Removed incorrect redirect

* Refactoring
This commit is contained in:
VoBa 2020-04-30 15:48:07 +03:00 committed by GitHub
parent 30a2d19d2d
commit e39ccaa2cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ui/src/app/api/user.service.js
View File

@ -386,6 +386,26 @@ function UserService($http, $q, $rootScope, adminService, dashboardService, time
deferred.reject();
}
procceedJwtTokenValidate();
} else if (locationSearch.username && locationSearch.password) {
var user = {};
user.name = locationSearch.username;
user.password = locationSearch.password;
$location.search('username', null);
$location.search('password', null);
loginService.login(user).then(function success(response) {
var token = response.data.token;
var refreshToken = response.data.refreshToken;
try {
updateAndValidateToken(token, 'jwt_token', false);
updateAndValidateToken(refreshToken, 'refresh_token', false);
} catch (e) {
deferred.reject();
}
procceedJwtTokenValidate();
}, function fail() {
deferred.reject();
});
} else {
procceedJwtTokenValidate();
}

8
ui/src/app/login/login.controller.js
View File

@ -20,7 +20,7 @@ import logoSvg from '../../svg/logo_title_white.svg';
/* eslint-enable import/no-unresolved, import/default */
/*@ngInject*/
export default function LoginController(toast, loginService, userService, types, $state, $stateParams/*, $rootScope, $log, $translate*/) {
export default function LoginController(toast, loginService, userService, types, $state/*, $rootScope, $log, $translate*/) {
var vm = this;
vm.logoSvg = logoSvg;
@ -32,12 +32,6 @@ export default function LoginController(toast, loginService, userService, types,
vm.login = login;
if ($stateParams.username && $stateParams.password) {
vm.user.name = $stateParams.username;
vm.user.password = $stateParams.password;
doLogin();
}
function doLogin() {
loginService.login(vm.user).then(function success(response) {
var token = response.data.token;

2
ui/src/app/login/login.routes.js
View File

@ -25,7 +25,7 @@ import createPasswordTemplate from './create-password.tpl.html';
/*@ngInject*/
export default function LoginRoutes($stateProvider) {
$stateProvider.state('login', {
url: '/login?username&password',
url: '/login',
module: 'public',
views: {
"@": {