diff --git a/src/app/components/login/login.component.ts b/src/app/components/login/login.component.ts index eac9604e..022e98c4 100644 --- a/src/app/components/login/login.component.ts +++ b/src/app/components/login/login.component.ts @@ -63,8 +63,6 @@ export class LoginComponent implements OnInit, DoCheck { let getCurrentUser = JSON.parse(localStorage.getItem(`isRememberMe`)) ?? null; if (getCurrentUser && getCurrentUser.isRememberMe) { - this.loginForm.get('username').setValue(getCurrentUser.username); - this.loginForm.get('password').setValue(getCurrentUser.password); this.isRememberMeCheked = getCurrentUser.isRememberMe; } } diff --git a/src/app/interceptors/http.interceptor.ts b/src/app/interceptors/http.interceptor.ts index 4663a2a1..0b1ea7b5 100644 --- a/src/app/interceptors/http.interceptor.ts +++ b/src/app/interceptors/http.interceptor.ts @@ -21,17 +21,20 @@ export class HttpRequestsInterceptor implements HttpInterceptor { } async call() { + let getCurrentUser = JSON.parse(localStorage.getItem(`isRememberMe`)) ?? null; const server_id = this.loginService.server_id; let server = await this.serverService.get(parseInt(server_id, 10)); server.tokenExpired = true; await this.serverService.update(server); try { - let response = await this.loginService.getLoggedUserRefToken(server); - server.authToken = response.access_token; - server.tokenExpired = false; - await this.serverService.update(server); - await this.loginService.getLoggedUser(server); - this.reloadCurrentRoute(); + if (getCurrentUser && getCurrentUser.isRememberMe) { + let response = await this.loginService.getLoggedUserRefToken(server, getCurrentUser); + server.authToken = response.access_token; + server.tokenExpired = false; + await this.serverService.update(server); + await this.loginService.getLoggedUser(server); + this.reloadCurrentRoute(); + } } catch (e) { throw e; } diff --git a/src/app/services/login.service.ts b/src/app/services/login.service.ts index 5b42317b..a5ff85b7 100644 --- a/src/app/services/login.service.ts +++ b/src/app/services/login.service.ts @@ -25,7 +25,7 @@ export class LoginService { getLoggedUser(server: Server) { return this.httpServer.get(server, "/users/me").toPromise() } - async getLoggedUserRefToken(server: Server):Promise { - return await this.httpServer.post(server, "/users/authenticate", {"username":server.username,"password":server.password}).toPromise() + async getLoggedUserRefToken(server: Server,current_user):Promise { + return await this.httpServer.post(server, "/users/authenticate", {"username":current_user.username,"password":current_user.password}).toPromise() } }