From 29ad55b3f8c5ec6670809817344f42d99f3dcd53 Mon Sep 17 00:00:00 2001
From: Kristan Ntavidi <kntavidi@cite.gr>
Date: Tue, 11 May 2021 11:50:25 +0300
Subject: [PATCH] Invitation fix.

Fixing  issue when user opens invitation without being logged id.
---
 .../dmp-invitation-accepted.component.ts      | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/dmp-frontend/src/app/ui/dmp/invitation/accepted/dmp-invitation-accepted.component.ts b/dmp-frontend/src/app/ui/dmp/invitation/accepted/dmp-invitation-accepted.component.ts
index 4f9f8726b..d78411839 100644
--- a/dmp-frontend/src/app/ui/dmp/invitation/accepted/dmp-invitation-accepted.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/invitation/accepted/dmp-invitation-accepted.component.ts
@@ -1,5 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
+import { AuthService } from '@app/core/services/auth/auth.service';
 import { DmpInvitationService } from '@app/core/services/dmp/dmp-invitation.service';
 import { BaseComponent } from '@common/base/base.component';
 import { takeUntil } from 'rxjs/operators';
@@ -13,19 +14,37 @@ export class InvitationAcceptedComponent extends BaseComponent implements OnInit
 	constructor(
 		private dmpInvitationService: DmpInvitationService,
 		private route: ActivatedRoute,
-		private router: Router
+		private router: Router,
+		private authentication: AuthService,
 	) { super(); }
 
 	ngOnInit(): void {
+
+
 		this.route.params
 			.pipe(takeUntil(this._destroyed))
 			.subscribe(params => {
 				const id = params['id'];
-				this.dmpInvitationService.exchange(id)
+
+				if(this.isAuthenticated()){
+					this.dmpInvitationService.exchange(id)
 					.pipe(takeUntil(this._destroyed))
 					.subscribe(result => {
 						this.router.navigate(['plans/edit/' + result]);
 					});
+				}else{
+					this.router.navigate(['/login'], {queryParams:{returnUrl:'plans/invitation/'+id}});
+				}
+				
+				
 			});
+		
+
+
+	}
+
+
+	public isAuthenticated(): boolean {
+		return !(!this.authentication.current());
 	}
 }