From 56a8a035cc5df422fc5fa442694bdc87894cdd26 Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Tue, 25 Oct 2022 15:31:59 +0300
Subject: [PATCH] Fix bug with redirect to login caused by fixed of role
 verification

---
 .../role-verification.component.ts            | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/role-verification/role-verification.component.ts b/role-verification/role-verification.component.ts
index 1113c994..bb7f61fa 100644
--- a/role-verification/role-verification.component.ts
+++ b/role-verification/role-verification.component.ts
@@ -104,12 +104,12 @@ export class RoleVerificationComponent implements OnInit, OnDestroy, AfterViewIn
   ngAfterViewInit() {
     this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => {
       this.user = user;
-      if (this.user) {
-        if(this.paramsSubscription instanceof Subscription) {
-          this.paramsSubscription.unsubscribe();
-        }
-        this.paramsSubscription = this.route.queryParams.subscribe(params => {
-          if (params && params['verify']) {
+      if (this.paramsSubscription instanceof Subscription) {
+        this.paramsSubscription.unsubscribe();
+      }
+      this.paramsSubscription = this.route.queryParams.subscribe(params => {
+        if (params && params['verify']) {
+          if (this.user) {
             this.subscriptions.push(this.userRegistryService.getInvitation(params['verify']).subscribe(verification => {
               this.verification = verification;
               if (this.user.email === this.verification.email.toLowerCase() && this.id === this.verification.entity && this.type === this.verification.type) {
@@ -126,21 +126,21 @@ export class RoleVerificationComponent implements OnInit, OnDestroy, AfterViewIn
             }, error => {
               this.openErrorModal();
             }));
+          } else {
+            this.router.navigate(['/user-info'], {
+              queryParams: {
+                'errorCode': LoginErrorCodes.NOT_LOGIN,
+                'redirectUrl': this.router.url
+              }
+            });
           }
-        });
-      } else {
-        this.router.navigate(['/user-info'], {
-          queryParams: {
-            'errorCode': LoginErrorCodes.NOT_LOGIN,
-            'redirectUrl': this.router.url
-          }
-        });
-      }
+        }
+      });
     }));
   }
   
   ngOnDestroy() {
-    if(this.paramsSubscription instanceof Subscription) {
+    if (this.paramsSubscription instanceof Subscription) {
       this.paramsSubscription.unsubscribe();
     }
     this.subscriptions.forEach(subscription => {