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; }