MaDgIK
/
explore-services
13
0
Fork 0
Code Issues Pull Requests Projects Releases 22 Wiki Activity

[Explore | Trunk]: Remove url from user info 

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@57943 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
k.triantafyllou 2019-12-23 15:36:58 +00:00
parent 05a7e9560e
commit d90b756fc4
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
explore/src/app/app.component.ts
View File

@ -17,7 +17,7 @@ import {UserManagementService} from "./openaireLibrary/services/user-management.
`], `],
template: ` template: `
<navbar *ngIf="properties && loginCheck" [portal]="properties.dashboard" [properties]=properties [onlyTop]=false [user]="user" <navbar *ngIf="properties" [portal]="properties.dashboard" [properties]=properties [onlyTop]=false [user]="user"
[communityId]="properties.adminToolsCommunity" [userMenuItems]=userMenuItems [menuItems]=menuItems></navbar> [communityId]="properties.adminToolsCommunity" [userMenuItems]=userMenuItems [menuItems]=menuItems></navbar>
<div class="custom-main-content"> <div class="custom-main-content">
<main> <main>
@ -53,7 +53,6 @@ export class AppComponent {
feedbackmail: string; feedbackmail: string;
properties: EnvProperties; properties: EnvProperties;
user: User; user: User;
loginCheck: boolean = false;
constructor(private route: ActivatedRoute, private propertiesService: EnvironmentSpecificService, constructor(private route: ActivatedRoute, private propertiesService: EnvironmentSpecificService,
private router: Router, private userManagementService: UserManagementService) { private router: Router, private userManagementService: UserManagementService) {
@ -79,9 +78,8 @@ export class AppComponent {
this.propertiesService.setEnvProperties(es); this.propertiesService.setEnvProperties(es);
this.properties = this.propertiesService.envSpecific; this.properties = this.propertiesService.envSpecific;
this.feedbackmail = this.properties.feedbackmail; this.feedbackmail = this.properties.feedbackmail;
this.userManagementService.getUserInfo(this.properties.userInfoUrl).subscribe(user => { this.userManagementService.getUserInfo().subscribe(user => {
this.user = user; this.user = user;
this.loginCheck = true;
this.buildMenu(); this.buildMenu();
}); });
//console.log(this.properties.loginUrl); //console.log(this.properties.loginUrl);

2
explore/src/assets/env-properties.json
View File

@ -35,7 +35,7 @@
"piwikSiteId" : "6", "piwikSiteId" : "6",
"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://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=", "logoutUrl" :"https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",