diff --git a/src/app/app.component.html b/src/app/app.component.html index 1f0404d..4d82d34 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1,10 +1,10 @@ -
-
{ + this.userManagementService.getUserInfo().subscribe(user => { this.user = user; - this.checkLogin = true; if (this.user) { localStorage.setItem('user_id', this.user.id); localStorage.setItem('mining_backend_address', this.properties.miningBackendURL); diff --git a/src/app/pages/curator/curator.component.ts b/src/app/pages/curator/curator.component.ts index 0b82154..78b4cc2 100644 --- a/src/app/pages/curator/curator.component.ts +++ b/src/app/pages/curator/curator.component.ts @@ -66,7 +66,7 @@ export class CuratorComponent implements OnInit { this.communityId = params['communityId']; this.showLoading = true; this.updateErrorMessage = ''; - this.userManagementService.getUserInfo(this.properties.userInfoUrl).subscribe(user => { + this.userManagementService.getUserInfo().subscribe(user => { this.user = user; this.curatorId = this.user.id; this.curatorService.getCurator(this.properties, diff --git a/src/app/pages/entity/entities.component.ts b/src/app/pages/entity/entities.component.ts index 2d55d45..3401132 100644 --- a/src/app/pages/entity/entities.component.ts +++ b/src/app/pages/entity/entities.component.ts @@ -69,7 +69,7 @@ export class EntitiesComponent implements OnInit { this.route.queryParams.subscribe(params => { HelperFunctions.scroll(); - this.userManagementService.getUserInfo(this.properties.userInfoUrl).subscribe( user => { + this.userManagementService.getUserInfo().subscribe( user => { this.selectedCommunityPid = params['communityId']; this.applyCommunityFilter(this.selectedCommunityPid); this.isPortalAdministrator = Session.isPortalAdministrator(user) && !this.selectedCommunityPid; diff --git a/src/app/pages/page/pages.component.ts b/src/app/pages/page/pages.component.ts index 64ca3c4..4fed6fb 100644 --- a/src/app/pages/page/pages.component.ts +++ b/src/app/pages/page/pages.component.ts @@ -75,7 +75,7 @@ export class PagesComponent implements OnInit { } this.keyword = ''; - this.userManagementService.getUserInfo(this.properties.userInfoUrl).subscribe( user => { + this.userManagementService.getUserInfo().subscribe( user => { this.selectedCommunityPid = params['communityId']; this.applyCommunityFilter(this.selectedCommunityPid); this.isPortalAdministrator = Session.isPortalAdministrator(user) && !this.selectedCommunityPid; diff --git a/src/app/pages/usernotifications/manage-user-notifications.component.ts b/src/app/pages/usernotifications/manage-user-notifications.component.ts index 46c8108..93d4821 100644 --- a/src/app/pages/usernotifications/manage-user-notifications.component.ts +++ b/src/app/pages/usernotifications/manage-user-notifications.component.ts @@ -60,7 +60,7 @@ export class ManageUserNotificationsComponent implements OnInit { this.updateErrorMessage = ''; this.errorMessage = ''; this.successfulSaveMessage = ''; - this.userManagementService.getUserInfo(this.properties.userInfoUrl).subscribe(user => { + this.userManagementService.getUserInfo().subscribe(user => { this.user = user; if (this.user) { this.userEmail = this.user.email; diff --git a/src/app/pages/wellcome/wellcome.component.ts b/src/app/pages/wellcome/wellcome.component.ts index 1db4ac7..78de599 100644 --- a/src/app/pages/wellcome/wellcome.component.ts +++ b/src/app/pages/wellcome/wellcome.component.ts @@ -101,7 +101,7 @@ export class WellcomeComponent implements OnInit { this.propertiesService.setEnvProperties(es); this.properties = this.propertiesService.envSpecific; HelperFunctions.scroll(); - this.userManagementService.getUserInfo(this.properties.userInfoUrl).subscribe(user => { + this.userManagementService.getUserInfo().subscribe(user => { this.user = user; //this._communitiesService.getCommunities(this.properties, this.properties.communityAPI + 'communities').subscribe( diff --git a/src/assets/env-properties.json b/src/assets/env-properties.json index e3eb930..9cd1bb6 100644 --- a/src/assets/env-properties.json +++ b/src/assets/env-properties.json @@ -34,7 +34,7 @@ "piwikBaseUrl" :" https://analytics.openaire.eu/piwik.php?idsite=6", "loginUrl" :"http://dl170.madgik.di.uoa.gr:8180/dnet-login/openid_connect_login", - "userInfoUrl" : "http://scoobydoo.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=",