diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 6db8e61..3fedaf1 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -122,12 +122,12 @@ export class AppComponent { public setUserMenu() { this.userMenuItems = []; - if (Session.isPortalAdministrator(this.user) || Session.isMonitorCurator(this.user) || Session.isCommunityCurator(this.user)) { - /*this.userMenuItems.push(new MenuItem("", "Manage Helptexts", - ((this.properties.environment == "production") ? "https://admin.explore.openaire.eu" : "https://beta.admin.connect.openaire.eu") + "/dashboard?communityId=connect", - "", false, [], [], {}))*/ - this.userMenuItems.push(new MenuItem("", "Manage Stakeholders", - this.properties.domain + properties.baseLink + "/dashboard/admin", "", true, [], [], {})) + if (this.user) { + if (Session.isPortalAdministrator(this.user) || Session.isMonitorCurator(this.user) || Session.isKindOfMonitorManager(this.user)) { + this.userMenuItems.push(new MenuItem("", "Manage profiles", + this.properties.domain + properties.baseLink + "/dashboard/admin", "", false, [], [], {})) + } + this.userMenuItems.push(new MenuItem("", "User information", "", "/user-info", false, [], [], {})); } } } diff --git a/src/app/contact/contact.component.ts b/src/app/contact/contact.component.ts index 7fec514..6db929e 100644 --- a/src/app/contact/contact.component.ts +++ b/src/app/contact/contact.component.ts @@ -62,7 +62,7 @@ export class ContactComponent implements OnInit { this.updateDescription("OpenAIRE - Monitor, Community Gateway, research community - Contact Us"); this.reset(); //this.getDivContents(); - this.getPageContents(); + // this.getPageContents(); HelperFunctions.scroll(); this.showLoading = false; }); diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts index 49da331..f3fc26b 100644 --- a/src/app/home/home.component.ts +++ b/src/app/home/home.component.ts @@ -127,7 +127,7 @@ export class HomeComponent { this.getStakeholders(); // this.createGifs(); //this.getDivContents(); - this.getPageContents(); + // this.getPageContents(); this.localStorageService.get().subscribe(value => { this.directLink = value; }); diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index beeda2f..4babf56 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -40,6 +40,7 @@ export let properties: EnvProperties = { piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=", piwikSiteId: "104", loginUrl: "https://services.openaire.eu/monitor-login/openid_connect_login", + userInfoUrl: " https://services.openaire.eu/uoa-user-management/api/users/getUserInfo?accessToken=", logoutUrl: "https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=", cookieDomain: ".openaire.eu", feedbackmail: "feedback@openaire.eu", diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 9dd7346..a1bdee6 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -45,12 +45,10 @@ export let properties: EnvProperties = { piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=", piwikSiteId: "80", registryUrl: 'http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/registry/', - loginUrl: "http://mpagasas.di.uoa.gr:8180/dnet-login/openid_connect_login", - userInfoUrl: "http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/users/getUserInfo?accessToken=", - logoutUrl: 'http://mpagasas.di.uoa.gr:8180/dnet-login/openid_logout', - /*loginUrl: "http://dl170.madgik.di.uoa.gr:8180/dnet-login/openid_connect_login", + loginUrl: "http://dl170.madgik.di.uoa.gr:8180/dnet-login/openid_connect_login", userInfoUrl: "http://dl170.madgik.di.uoa.gr:8180/dnet-openaire-users-1.0.0-SNAPSHOT/api/users/getUserInfo?accessToken=", - logoutUrl: "https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",*/ + /*logoutUrl: "http://dl170.madgik.di.uoa.gr:8180/dnet-login/openid_logout",*/ + logoutUrl: "https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=", cookieDomain: ".di.uoa.gr", feedbackmail: "openaire.test@gmail.com", cacheUrl: "http://scoobydoo.di.uoa.gr:3000/get?url=",