hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-18 07:23:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added comment

Browse Source
This commit is contained in:
Giuseppe Digilio
2018-03-01 11:50:40 +01:00
parent 564f148e5c
commit abb8fc1677
3 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/core/auth/auth.service.ts
View File

@@ -1,7 +1,7 @@
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import { filter, map, withLatestFrom } from 'rxjs/operators';
import { map, withLatestFrom } from 'rxjs/operators';
import { Eperson } from '../eperson/models/eperson.model';
import { AuthRequestService } from './auth-request.service';
@@ -20,6 +20,7 @@ import { Router } from '@angular/router';
import { CookieAttributes } from 'js-cookie';
export const LOGIN_ROUTE = '/login';
/**
* The auth service.
*/
@@ -43,7 +44,7 @@ export class AuthService {
// If current route is different from the one setted in authentication guard
// and is not the login route, clear redirect url and messages
const routeUrlObs = this.store.select(routerStateSelector)
.filter((routerState: RouterReducerState) => isNotUndefined(routerState) && isNotUndefined(routerState.state) )
.filter((routerState: RouterReducerState) => isNotUndefined(routerState) && isNotUndefined(routerState.state))
.filter((routerState: RouterReducerState) => (routerState.state.url !== LOGIN_ROUTE))
.map((routerState: RouterReducerState) => routerState.state.url);
const redirectUrlObs = this.getRedirectUrl();
@@ -52,8 +53,8 @@ export class AuthService {
map(([routeUrl, redirectUrl]) => [routeUrl, redirectUrl])
).filter(([routeUrl, redirectUrl]) => isNotEmpty(redirectUrl) && (routeUrl !== redirectUrl))
.subscribe(() => {
this.setRedirectUrl('');
});
this.setRedirectUrl('');
});
}
/**
@@ -202,7 +203,7 @@ export class AuthService {
}
/**
* Check if a token is about to expire
* Check if a token is next to be expired
* @returns {boolean}
*/
public isTokenExpiring(): Observable<boolean> {
@@ -226,6 +227,7 @@ export class AuthService {
const token = this.getToken();
return token && token.expires < Date.now();
}
/**
* Save authentication token info
*
@@ -234,7 +236,7 @@ export class AuthService {
*/
public storeToken(token: AuthTokenInfo) {
const expires = new Date(token.expires);
const options: CookieAttributes = { expires: expires };
const options: CookieAttributes = {expires: expires};
return this.storage.set(TOKENITEM, token, options);
}