/modules/uoa-repository-dashboard-gui/trunk/src/app/services/authentication.service.ts - Annotate - D-Net - D-Net project tracking tool

dnet45/modules/uoa-repository-dashboard-gui/trunk/src/app/services/authentication.service.ts @ 61435

-            myrto.kouk
+import { Injectable } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { HttpClient } from '@angular/common/http';
 import { environment } from '../../environments/environment';
 import { deleteCookie, getCookie } from '../domain/utils';
 @Injectable()
 export class AuthenticationService {
   constructor(private route: ActivatedRoute,
               private router: Router,
               private http: HttpClient) {}
   private apiUrl: string = environment.API_ENDPOINT;
   private loginUrl = environment.API_ENDPOINT + '/openid_connect_login';
   // store the URL so we can redirect after logging in
   public redirectUrl: string;
-            myrto.kouk
+  private _storage: Storage = sessionStorage;
             myrto.kouk
-            spyroukon
+  private cookie: string = null;
-            myrto.kouk
+  isLoggedIn: boolean = false;
   public loginWithState() {
     console.log(`logging in with state. Current url is: ${this.router.url}`);
     if (this.redirectUrl) {
       const url = this.redirectUrl;
       this.redirectUrl = null;
       console.log('stored location', url);
       sessionStorage.setItem('state.location', url);
     } else {
       /*sessionStorage.setItem("state.location", this.router.url);*/
-            stefania.m
+      sessionStorage.setItem('state.location', '/join');
             myrto.kouk
     console.log('redirect location', sessionStorage.getItem('state.location'));
     window.location.href = this.loginUrl;
+  }
   public logout() {
     deleteCookie('AccessToken');
     sessionStorage.clear();
     this.isLoggedIn = false;
     console.log('logging out, calling:');
     console.log(`${this.apiUrl}/openid_logout`);
     /*window.location.href = `${this.apiUrl}/openid_logout`;*/
     window.location.href = `https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=${this.apiUrl}/openid_logout`;
+  }
   public tryLogin() {
-            spyroukon
+    this.cookie = getCookie('AccessToken');
     if (this.cookie && this.cookie !== '') {
       // console.log(`I got the cookie!`);
       // console.log(`in tryLogin -> document.cookie is: ${document.cookie.toString()}`);
-            myrto.kouk
+      /* SETTING INTERVAL TO REFRESH SESSION TIMEOUT COUNTDOWN */
       setInterval(() => {
         this.http.get(this.apiUrl + '/user/login', { withCredentials: true }).subscribe(
           userInfo => {
-            spyroukon
+            // console.log('User is still logged in');
             // console.log(userInfo);
-            myrto.kouk
+            this.isLoggedIn = true;
           },
           () => {
             this.logout();
           },
           () => {
-            spyroukon
+            this.cookie = getCookie('AccessToken');
             if ( !this.cookie || this.cookie === '') {
-            myrto.kouk
+              this.logout();
+            }
+          }
         );
         /*this.redirectUrl = window.location.pathname;
         this.loginWithState();*/
       }, 1000 * 60 * 5);
       if (!this.getIsUserLoggedIn()) {
-            spyroukon
+        // console.log(`session.name wasn't found --> logging in via repo-service!`);
-            myrto.kouk
+        this.http.get(this.apiUrl + '/user/login', { withCredentials: true }).subscribe(
           userInfo => {
-            spyroukon
+            // console.log(userInfo);
-            myrto.kouk
+            sessionStorage.setItem('name', userInfo['name']);
             sessionStorage.setItem('email', userInfo['email'].trim());
             sessionStorage.setItem('role', userInfo['role']);
-            myrto.kouk
+            this.isLoggedIn = true;
-            spyroukon
+            // console.log(`the current user is: ${sessionStorage.getItem('name')},
             //              ${sessionStorage.getItem('email')}, ${sessionStorage.getItem('role')}`);
-            myrto.kouk
+          },
           error => {
             sessionStorage.clear();
             console.log('Error!');
             console.log(error);
             deleteCookie('AccessToken');
-            spyroukon
+            deleteCookie('AccessToken');
-            myrto.kouk
+            this.isLoggedIn = false;
-            stefania.m
+            this.router.navigate(['/home']);
-            myrto.kouk
+          },
           () => {
             if ( sessionStorage.getItem('state.location') ) {
               const state = sessionStorage.getItem('state.location');
-            myrto.kouk
+              sessionStorage.removeItem('state.location');
-            myrto.kouk
+              console.log(`tried to login - returning to state: ${state}`);
               if ( !this.getIsUserLoggedIn() ) {
-            spyroukon
+                // console.log('user hasn\'t logged in yet -- going to home');
-            stefania.m
+                this.router.navigate(['/home']);
-            myrto.kouk
+              } else {
                 this.router.navigate([state]);
+              }
+            }
+          }
         );
       } else {
         this.isLoggedIn = true;
-            spyroukon
+        // console.log(`the current user is: ${sessionStorage.getItem('name')},
         //              ${sessionStorage.getItem('email')}, ${sessionStorage.getItem('role')}`);
-            myrto.kouk
+        if (this.redirectUrl) {
           const url = this.redirectUrl;
           this.redirectUrl = null;
           this.router.navigate([url]);
-            spyroukon
+          // console.log('route is', url);
             myrto.kouk
+      }
+    }
+  }
   public getIsUserLoggedIn() {
-            spyroukon
+    // todo: probably not all of them are needed
     return this.isLoggedIn && this.cookie && this.cookie !== '' && sessionStorage.getItem('email') !== null;
             myrto.kouk
   public getUserName() {
     if (this.isLoggedIn) {
-            myrto.kouk
+      return sessionStorage.getItem('name');
-            myrto.kouk
+    } else {
       return '';
+    }
+  }
   public getUserEmail() {
-            stefania.m
+    if (this.getIsUserLoggedIn()) {
-            myrto.kouk
+      return sessionStorage.getItem('email');
-            myrto.kouk
+    } else {
       return '';
+    }
+  }
   public getUserRole() {
     if (this.isLoggedIn) {
-            myrto.kouk
+      return sessionStorage.getItem('role');
-            myrto.kouk
+    } else {
       return '';
+    }
+  }
+}

Project

General

Profile

D-Net