Browse Source

Minor improvements

pull/2709/head
Igor Kulikov 6 years ago
parent
commit
3d2270e11e
  1. 20
      ui-ngx/src/app/core/auth/auth.service.ts

20
ui-ngx/src/app/core/auth/auth.service.ts

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

Loading…
Cancel
Save