diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index d9e742d..71f0d7d 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -19,10 +19,10 @@ import {UserManagementService} from "./openaireLibrary/services/user-management.
`],
template: `
-
-
@@ -67,7 +67,6 @@ export class AppComponent {
subscriberOfCommunities = false;
managerOfCommunities = false;
user: User;
- loginCheck: boolean = false;
// community: {id:string, name:string, logoUrl:string};
constructor(private route: ActivatedRoute, private propertiesService: EnvironmentSpecificService,
@@ -86,9 +85,8 @@ export class AppComponent {
this.properties = this.propertiesService.envSpecific;
var communityId: string = "";
this._communitiesService.updateCommunities(this.properties, this.properties.communitiesAPI);
- this.userManagementService.getUserInfo(this.properties.userInfoUrl).subscribe( user => {
+ this.userManagementService.getUserInfo().subscribe( user => {
this.user = user;
- this.loginCheck = true;
if (this.properties.environment == "development") {
this.showMenu = false;
this.route.queryParams.subscribe(params => {
diff --git a/src/app/funders/searchFunders.component.ts b/src/app/funders/searchFunders.component.ts
index 50971cd..35544f5 100644
--- a/src/app/funders/searchFunders.component.ts
+++ b/src/app/funders/searchFunders.component.ts
@@ -80,7 +80,7 @@ export class SearchFundersComponent {
let queryParams = this.searchPage.getQueryParamsFromUrl(params);
console.log(queryParams)
if(typeof document !== 'undefined') {
- this.userManagementService.getUserInfo(this.properties.userInfoUrl).subscribe(user => {
+ this.userManagementService.getUserInfo().subscribe(user => {
this.user = user;
this.initFunders(queryParams);
});
diff --git a/src/app/utils/subscribe/subscribe.component.ts b/src/app/utils/subscribe/subscribe.component.ts
index aa10a26..0d7def5 100644
--- a/src/app/utils/subscribe/subscribe.component.ts
+++ b/src/app/utils/subscribe/subscribe.component.ts
@@ -69,7 +69,7 @@ export class SubscribeComponent {
this.route.data
.subscribe((data: { envSpecific: EnvProperties }) => {
this.properties = data.envSpecific;
- this.userManagementService.getUserInfo(this.properties.userInfoUrl).subscribe( user => {
+ this.userManagementService.getUserInfo().subscribe( user => {
this.user = user;
if (!this.showNumbers) {
let email = (this.user)?this.user.email:null;
diff --git a/src/assets/env-properties.json b/src/assets/env-properties.json
index 159b3d5..b6b0744 100644
--- a/src/assets/env-properties.json
+++ b/src/assets/env-properties.json
@@ -37,9 +37,9 @@
"piwikBaseUrl" :"https://analytics.openaire.eu/piwik.php?idsite=",
"piwikSiteId" : "80",
- "loginUrl" :"http://rudie.di.uoa.gr:8080/dnet-login/openid_connect_login",
+ "loginUrl" :"http://dl170.madgik.di.uoa.gr:8180/dnet-login/openid_connect_login",
- "userInfoUrl" : "http://rudie.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/users/getUserInfo?accessToken=",
+ "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=",