From 34b4e4d55009ada740b96ab63c9f4d03d7a52cfe Mon Sep 17 00:00:00 2001
From: Konstantinos Triantafyllou <k.triantafyllou@di.uoa.gr>
Date: Mon, 23 Dec 2019 16:01:48 +0000
Subject: [PATCH] [Monitor | Trunk]: Remove url from get user info

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor@57948 d315682c-612b-4755-9ff5-7f18f6832af3
---
 src/app/app.component.ts                       | 8 +++-----
 src/app/funders/searchFunders.component.ts     | 2 +-
 src/app/utils/subscribe/subscribe.component.ts | 2 +-
 src/assets/env-properties.json                 | 4 ++--
 4 files changed, 7 insertions(+), 9 deletions(-)

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: `
     <div [class]="(community)?(community.id +'App'):'connectApp'">
-      <navbar *ngIf="properties && showMenu && !community && loginCheck" portal="monitor" [onlyTop]=false
+      <navbar *ngIf="properties && showMenu && !community" portal="monitor" [onlyTop]=false
               [userMenuItems]=userMenuItems [menuItems]=menuItems [user]="user"
               [showMenu]=showMenu [properties]="properties" [showHomeMenuItem]="true"></navbar>
-      <navbar *ngIf="properties && showMenu  && community && loginCheck" portal="monitor" [onlyTop]=false [communityId]="community.id"
+      <navbar *ngIf="properties && showMenu  && community" portal="monitor" [onlyTop]=false [communityId]="community.id"
               [userMenuItems]=userMenuItems [menuItems]=menuItems [user]="user"
               [community]=community [showMenu]=showMenu [properties]="properties" [enableSearch]="true"
               [showHomeMenuItem]="true"></navbar>
@@ -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=",