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

Minor improvements

Browse Source
This commit is contained in:
Igor Kulikov 2020-04-30 15:46:45 +03:00
parent 11d4ef74e8
commit 3d2270e11e
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ui-ngx/src/app/core/auth/auth.service.ts
View File

@ -293,22 +293,20 @@ export class AuthService {
} }
return this.procceedJwtTokenValidate(); return this.procceedJwtTokenValidate();
} else if (username && password) { } else if (username && password) {
this.utils.updateQueryParam('username', null);
this.utils.updateQueryParam('password', null);
const loginRequest: LoginRequest = { const loginRequest: LoginRequest = {
username: username, username,
password: password password
}; };
return this.http.post<LoginResponse>('/api/auth/login', loginRequest, defaultHttpOptions()).pipe( return this.http.post<LoginResponse>('/api/auth/login', loginRequest, defaultHttpOptions()).pipe(
tap((loginResponse: LoginResponse) => { mergeMap((loginResponse: LoginResponse) => {
try {
this.updateAndValidateToken(loginResponse.token, 'jwt_token', false); this.updateAndValidateToken(loginResponse.token, 'jwt_token', false);
this.updateAndValidateToken(loginResponse.refreshToken, 'refresh_token', false); this.updateAndValidateToken(loginResponse.refreshToken, 'refresh_token', false);
} catch (e) {
}
}
), mergeMap( () => {
return this.procceedJwtTokenValidate(); return this.procceedJwtTokenValidate();
} }
)); )
);
} }
return this.procceedJwtTokenValidate(doTokenRefresh); return this.procceedJwtTokenValidate(doTokenRefresh);
} else { } else {