From 03177959b3e50b6f4e80045a7e545938f56e84fa Mon Sep 17 00:00:00 2001 From: Ognjen Cirkovic Date: Sat, 30 Apr 2022 18:56:46 +0200 Subject: Omoguceno da Guest ne gubi token na refreshu. --- frontend/src/app/app.component.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'frontend/src/app/app.component.ts') diff --git a/frontend/src/app/app.component.ts b/frontend/src/app/app.component.ts index f9bc2726..e301b46f 100644 --- a/frontend/src/app/app.component.ts +++ b/frontend/src/app/app.component.ts @@ -40,7 +40,8 @@ export class AppComponent implements OnInit, AfterViewInit { } }); if (!this.authService.isAuthenticated()) { - this.authService.addGuestToken(); + if(!this.authService.alreadyGuest()) + this.authService.addGuestToken(); } this.signalRService.startConnection(); //this.startHttpRequest(); -- cgit v1.2.3 From 0e5aaf6d3976b9a46b48f554d004f3b90ca8b813 Mon Sep 17 00:00:00 2001 From: Ognjen Cirkovic Date: Sat, 30 Apr 2022 19:45:20 +0200 Subject: Omoguceno na frontu da se guestu refresha token. --- backend/api/api/Services/TempRemovalService.cs | 2 +- frontend/src/app/_services/auth.service.ts | 10 +--------- frontend/src/app/app.component.ts | 2 +- 3 files changed, 3 insertions(+), 11 deletions(-) (limited to 'frontend/src/app/app.component.ts') diff --git a/backend/api/api/Services/TempRemovalService.cs b/backend/api/api/Services/TempRemovalService.cs index 525ff386..9e6b7f96 100644 --- a/backend/api/api/Services/TempRemovalService.cs +++ b/backend/api/api/Services/TempRemovalService.cs @@ -29,7 +29,7 @@ namespace api.Services List tempUsers=_user.Find(u=>u.isPermament==false).ToList(); foreach (User user in tempUsers) { - if ((DateTime.Now.ToUniversalTime() - user.dateCreated).TotalMinutes < 1) + if ((DateTime.Now.ToUniversalTime() - user.dateCreated).TotalDays < 1) continue; List tempPredictors=_predictor.Find(p=>p.uploaderId==user._id).ToList(); List tempModels=_model.Find(m=>m.uploaderId==user._id).ToList(); diff --git a/frontend/src/app/_services/auth.service.ts b/frontend/src/app/_services/auth.service.ts index 845cb3f5..92920b24 100644 --- a/frontend/src/app/_services/auth.service.ts +++ b/frontend/src/app/_services/auth.service.ts @@ -52,21 +52,13 @@ export class AuthService { } var property = jwtHelper.decodeToken(this.cookie.get('token')); var username = property['name']; - if (username != "") { this.refresher = setTimeout(() => { this.http.post(`${Configuration.settings.apiURL}/auth/renewJwt`, {}, { headers: this.authHeader(), responseType: 'text' }).subscribe((response) => { this.authenticate(response); }); }, exp.getTime() - new Date().getTime() - 60000); - } - else { - this.refresher = setTimeout(() => { - this.getGuestToken().subscribe((response) => { - this.authenticate(response); - }); - }, exp.getTime() - new Date().getTime() - 60000); - } + } addGuestToken() { diff --git a/frontend/src/app/app.component.ts b/frontend/src/app/app.component.ts index e301b46f..dfe4febc 100644 --- a/frontend/src/app/app.component.ts +++ b/frontend/src/app/app.component.ts @@ -43,7 +43,7 @@ export class AppComponent implements OnInit, AfterViewInit { if(!this.authService.alreadyGuest()) this.authService.addGuestToken(); } - this.signalRService.startConnection(); + //this.signalRService.startConnection(); //this.startHttpRequest(); } } -- cgit v1.2.3 From 45c519d53fee1124c2882c7b353cd930fd311f9e Mon Sep 17 00:00:00 2001 From: Ognjen Cirkovic Date: Sat, 30 Apr 2022 20:04:42 +0200 Subject: Stranica se refreshuje po dodeli tokena Guesta ili Usera da bi se refreshovala komunikacija preko webSocketa. Potrebno izmeniti u buducnosti. --- frontend/src/app/_modals/login-modal/login-modal.component.ts | 2 ++ frontend/src/app/_services/auth.service.ts | 1 + frontend/src/app/app.component.ts | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) (limited to 'frontend/src/app/app.component.ts') diff --git a/frontend/src/app/_modals/login-modal/login-modal.component.ts b/frontend/src/app/_modals/login-modal/login-modal.component.ts index 062a0550..ccd78509 100644 --- a/frontend/src/app/_modals/login-modal/login-modal.component.ts +++ b/frontend/src/app/_modals/login-modal/login-modal.component.ts @@ -50,7 +50,9 @@ export class LoginModalComponent implements OnInit { this.userInfoService.getUserInfo().subscribe((response) => { shared.photoId = response.photoId; }); + location.reload(); } + }); } else { diff --git a/frontend/src/app/_services/auth.service.ts b/frontend/src/app/_services/auth.service.ts index 92920b24..68c29182 100644 --- a/frontend/src/app/_services/auth.service.ts +++ b/frontend/src/app/_services/auth.service.ts @@ -64,6 +64,7 @@ export class AuthService { addGuestToken() { this.getGuestToken().subscribe((token) => { this.authenticate(token); + location.reload(); }); } diff --git a/frontend/src/app/app.component.ts b/frontend/src/app/app.component.ts index dfe4febc..e301b46f 100644 --- a/frontend/src/app/app.component.ts +++ b/frontend/src/app/app.component.ts @@ -43,7 +43,7 @@ export class AppComponent implements OnInit, AfterViewInit { if(!this.authService.alreadyGuest()) this.authService.addGuestToken(); } - //this.signalRService.startConnection(); + this.signalRService.startConnection(); //this.startHttpRequest(); } } -- cgit v1.2.3