From adad0f27868f41a24d9b104b01c8303a0cab8c5f Mon Sep 17 00:00:00 2001 From: "argiro.kokogiannaki" Date: Tue, 3 Apr 2018 08:45:46 +0000 Subject: [PATCH] Using new AAI, update some properties git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@51636 d315682c-612b-4755-9ff5-7f18f6832af3 --- .../explore-production-properties.json | 4 ++-- portal-4cli-lib/src/app/app.component.ts | 3 ++- portal-4cli-lib/src/assets/env-properties.json | 18 +++--------------- 3 files changed, 7 insertions(+), 18 deletions(-) diff --git a/portal-4cli-lib/explore-production-properties.json b/portal-4cli-lib/explore-production-properties.json index 47bbde53..60d6352a 100644 --- a/portal-4cli-lib/explore-production-properties.json +++ b/portal-4cli-lib/explore-production-properties.json @@ -25,14 +25,14 @@ "h2020Guidlines" : "https://www.openaire.eu/oa-publications/h2020/open-access-in-horizon-2020", "ercGuidlines" : "http://erc.europa.eu/sites/default/files/document/file/ERC_Open_Access_Guidelines-revised_2014.pdf", "helpdesk" : "https://www.openaire.eu/support/helpdesk", - "uploadService" : "https://demo.openaire.eu/upload", + "uploadService" : "https://demo.openaire.eu/upload/", "vocabulariesAPI" :"https://beta.services.openaire.eu/provision/mvc/vocabularies/", "piwikBaseUrl" :" https://analytics.openaire.eu/piwik.php?idsite=6", "loginUrl" :"https://beta.services.openaire.eu/uoa-user-management/openid_connect_login", - "logoutUrl" :"https://aai.openminted.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo:", + "logoutUrl" :"https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=", "logoutOpenaireUrl" :"http://dl067.madgik.di.uoa.gr/idp/profile/Logout", diff --git a/portal-4cli-lib/src/app/app.component.ts b/portal-4cli-lib/src/app/app.component.ts index d8a42bc7..f861b946 100644 --- a/portal-4cli-lib/src/app/app.component.ts +++ b/portal-4cli-lib/src/app/app.component.ts @@ -6,6 +6,7 @@ import { EnvProperties} from './openaireLibrary/utils/properties/env-properties' import{MenuItem, RootMenuItem} from './openaireLibrary/sharedComponents/menu'; import { EnvironmentSpecificService} from './openaireLibrary/utils/properties/environment-specific.service'; +import {Session} from './openaireLibrary/login/utils/helper.class'; @Component({ //changeDetection: ChangeDetectionStrategy.Default, @@ -78,7 +79,7 @@ export class AppComponent { } ngOnInit() { - + if (typeof document !== 'undefined') { try{ this.isClient = true; diff --git a/portal-4cli-lib/src/assets/env-properties.json b/portal-4cli-lib/src/assets/env-properties.json index c85f68f0..76611c21 100644 --- a/portal-4cli-lib/src/assets/env-properties.json +++ b/portal-4cli-lib/src/assets/env-properties.json @@ -7,26 +7,17 @@ "statisticsAPIURL" : "http://vatopedi.di.uoa.gr:8080/stats/", "statisticsFrameAPIURL":"https://beta.openaire.eu/stats/", "claimsAPIURL" : "http://scoobydoo.di.uoa.gr:8080/dnet-claims-service-2.0.0-SNAPSHOT/rest/claimsService/", - - "searchAPIURLLAst" : "https://beta.services.openaire.eu/search/v2/api/", - + "searchAPIURLLAst" : "https://beta.services.openaire.eu/search/v2/api/", "searchResourcesAPIURL" : "https://beta.services.openaire.eu/search/v2/api/resources", - - - "csvAPIURL" : "http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/reports", - "searchCrossrefAPIURL" : "https://api.crossref.org/works", "searchDataciteAPIURL" : "https://api.datacite.org/works", - "searchOrcidURL" : "https://pub.orcid.org/", - "pmidURL" : "http://www.ncbi.nlm.nih.gov/pubmed/", "doiURL" : "https://dx.doi.org/", "cordisURL" : "http://cordis.europa.eu/projects/", "pmcURL" : "http://europepmc.org/articles/", "handleURL" : "http://hdl.handle.net/", - "zenodo" : "https://zenodo.org/", "openAccess" : "https://www.openaire.eu/support/faq#article-id-234", "openAccessRepo" : "https://www.openaire.eu/support/faq#article-id-310", @@ -34,17 +25,14 @@ "h2020Guidlines" : "https://www.openaire.eu/oa-publications/h2020/open-access-in-horizon-2020", "ercGuidlines" : "http://erc.europa.eu/sites/default/files/document/file/ERC_Open_Access_Guidelines-revised_2014.pdf", "helpdesk" : "https://www.openaire.eu/support/helpdesk", - "uploadService" : "http://scoobydoo.di.uoa.gr:8000/upload", "vocabulariesAPI" :"https://beta.services.openaire.eu/provision/mvc/vocabularies/", "piwikBaseUrl" :"https://analytics.openaire.eu/piwik.php?idsite=6", + "loginUrl" :"http://rudie.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/openid_connect_login", - - "loginUrl" :"http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/openid_connect_login", - - "logoutUrl" :"https://aai.openminted.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=", + "logoutUrl" :"https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=", "logoutOpenaireUrl" :"http://dl067.madgik.di.uoa.gr/idp/profile/Logout",