ExternalVendorCode/gns3-web-ui
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-web-ui.git synced 2025-06-06 09:11:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Resolve/modified remember me check box user cases

Browse Source
This commit is contained in:
Rajnikant 2022-05-31 13:18:52 +05:30
parent 78da4f0efa
commit eb07abe786
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/components/login/login.component.ts
View File

@ -63,8 +63,6 @@ export class LoginComponent implements OnInit, DoCheck {
let getCurrentUser = JSON.parse(localStorage.getItem(`isRememberMe`)) ?? null; let getCurrentUser = JSON.parse(localStorage.getItem(`isRememberMe`)) ?? null;
if (getCurrentUser && getCurrentUser.isRememberMe) { if (getCurrentUser && getCurrentUser.isRememberMe) {
this.loginForm.get('username').setValue(getCurrentUser.username);
this.loginForm.get('password').setValue(getCurrentUser.password);
this.isRememberMeCheked = getCurrentUser.isRememberMe; this.isRememberMeCheked = getCurrentUser.isRememberMe;
} }
} }

15
src/app/interceptors/http.interceptor.ts
View File

@ -21,17 +21,20 @@ export class HttpRequestsInterceptor implements HttpInterceptor {
} }
async call() { async call() {
let getCurrentUser = JSON.parse(localStorage.getItem(`isRememberMe`)) ?? null;
const server_id = this.loginService.server_id; const server_id = this.loginService.server_id;
let server = await this.serverService.get(parseInt(server_id, 10)); let server = await this.serverService.get(parseInt(server_id, 10));
server.tokenExpired = true; server.tokenExpired = true;
await this.serverService.update(server); await this.serverService.update(server);
try { try {
let response = await this.loginService.getLoggedUserRefToken(server); if (getCurrentUser && getCurrentUser.isRememberMe) {
server.authToken = response.access_token; let response = await this.loginService.getLoggedUserRefToken(server, getCurrentUser);
server.tokenExpired = false; server.authToken = response.access_token;
await this.serverService.update(server); server.tokenExpired = false;
await this.loginService.getLoggedUser(server); await this.serverService.update(server);
this.reloadCurrentRoute(); await this.loginService.getLoggedUser(server);
this.reloadCurrentRoute();
}
} catch (e) { } catch (e) {
throw e; throw e;
} }

4
src/app/services/login.service.ts
View File

@ -25,7 +25,7 @@ export class LoginService {
getLoggedUser(server: Server) { getLoggedUser(server: Server) {
return this.httpServer.get(server, "/users/me").toPromise() return this.httpServer.get(server, "/users/me").toPromise()
} }
async getLoggedUserRefToken(server: Server):Promise<any> { async getLoggedUserRefToken(server: Server,current_user):Promise<any> {
return await this.httpServer.post<AuthResponse>(server, "/users/authenticate", {"username":server.username,"password":server.password}).toPromise() return await this.httpServer.post<AuthResponse>(server, "/users/authenticate", {"username":current_user.username,"password":current_user.password}).toPromise()
} }
} }