From 0c7953b710f7c49e0479d1f183fac979dfad7cf5 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Wed, 10 Jun 2020 09:21:12 +0000 Subject: [PATCH] [Library | Trunk]: Session methods change condition if user is undefined not not equal to null, to avoid error on server git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58873 d315682c-612b-4755-9ff5-7f18f6832af3 --- login/utils/helper.class.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/login/utils/helper.class.ts b/login/utils/helper.class.ts index f005cfe2..0e4d69a2 100644 --- a/login/utils/helper.class.ts +++ b/login/utils/helper.class.ts @@ -51,32 +51,32 @@ export class Session{ //Methods to check roles public static isClaimsCurator(user: User): boolean { - return user !== null && + return user && user.role.indexOf('urn:geant:openaire.eu:group:Curator+-+Claim#aai.openaire.eu') !== -1; } public static isCommunityCurator(user: User): boolean { - return user !== null && + return user && user.role.indexOf('urn:geant:openaire.eu:group:Curator+-+Community#aai.openaire.eu') !== -1; } public static isMonitorCurator(user: User): boolean { - return user !== null && + return user && (user.role.indexOf('urn:geant:openaire.eu:group:Expert+-+Funder#aai.openaire.eu') !== -1 || user.role.indexOf('urn:geant:openaire.eu:group:Curator+-+Funder#aai.openaire.eu') !== -1); } public static isPortalAdministrator(user: User): boolean { - return user !== null && + return user && user.role.indexOf('urn:geant:openaire.eu:group:Portal+Administrator#aai.openaire.eu') !== -1; } public static isUserManager(user: User): boolean { - return user !== null && + return user && user.role.indexOf('urn:geant:openaire.eu:group:User+Manager#aai.openaire.eu') !== -1; } public static isRegisteredUser(user: User): boolean { - return user !== null && + return user && user.role.indexOf('urn:geant:openaire.eu:group:Registered+User#aai.openaire.eu') !== -1; }