MaDgIK
/
monitor
13
0
Fork 0
Code Issues Pull Requests Projects Releases 15 Wiki Activity

[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
This commit is contained in:
Konstantinos Triantafyllou 2019-12-23 16:01:48 +00:00
parent e6626b90d0
commit 34b4e4d550
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/app.component.ts
View File

@ -19,10 +19,10 @@ import {UserManagementService} from "./openaireLibrary/services/user-management.
`], `],
template: ` template: `
<div [class]="(community)?(community.id +'App'):'connectApp'"> <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" [userMenuItems]=userMenuItems [menuItems]=menuItems [user]="user"
[showMenu]=showMenu [properties]="properties" [showHomeMenuItem]="true"></navbar> [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" [userMenuItems]=userMenuItems [menuItems]=menuItems [user]="user"
[community]=community [showMenu]=showMenu [properties]="properties" [enableSearch]="true" [community]=community [showMenu]=showMenu [properties]="properties" [enableSearch]="true"
[showHomeMenuItem]="true"></navbar> [showHomeMenuItem]="true"></navbar>
@ -67,7 +67,6 @@ export class AppComponent {
subscriberOfCommunities = false; subscriberOfCommunities = false;
managerOfCommunities = false; managerOfCommunities = false;
user: User; user: User;
loginCheck: boolean = false;
// community: {id:string, name:string, logoUrl:string}; // community: {id:string, name:string, logoUrl:string};
constructor(private route: ActivatedRoute, private propertiesService: EnvironmentSpecificService, constructor(private route: ActivatedRoute, private propertiesService: EnvironmentSpecificService,
@ -86,9 +85,8 @@ export class AppComponent {
this.properties = this.propertiesService.envSpecific; this.properties = this.propertiesService.envSpecific;
var communityId: string = ""; var communityId: string = "";
this._communitiesService.updateCommunities(this.properties, this.properties.communitiesAPI); 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.user = user;
this.loginCheck = true;
if (this.properties.environment == "development") { if (this.properties.environment == "development") {
this.showMenu = false; this.showMenu = false;
this.route.queryParams.subscribe(params => { this.route.queryParams.subscribe(params => {

2
src/app/funders/searchFunders.component.ts
View File

@ -80,7 +80,7 @@ export class SearchFundersComponent {
let queryParams = this.searchPage.getQueryParamsFromUrl(params); let queryParams = this.searchPage.getQueryParamsFromUrl(params);
console.log(queryParams) console.log(queryParams)
if(typeof document !== 'undefined') { if(typeof document !== 'undefined') {
this.userManagementService.getUserInfo(this.properties.userInfoUrl).subscribe(user => { this.userManagementService.getUserInfo().subscribe(user => {
this.user = user; this.user = user;
this.initFunders(queryParams); this.initFunders(queryParams);
}); });

2
src/app/utils/subscribe/subscribe.component.ts
View File

@ -69,7 +69,7 @@ export class SubscribeComponent {
this.route.data this.route.data
.subscribe((data: { envSpecific: EnvProperties }) => { .subscribe((data: { envSpecific: EnvProperties }) => {
this.properties = data.envSpecific; this.properties = data.envSpecific;
this.userManagementService.getUserInfo(this.properties.userInfoUrl).subscribe( user => { this.userManagementService.getUserInfo().subscribe( user => {
this.user = user; this.user = user;
if (!this.showNumbers) { if (!this.showNumbers) {
let email = (this.user)?this.user.email:null; let email = (this.user)?this.user.email:null;

4
src/assets/env-properties.json
View File

@ -37,9 +37,9 @@
"piwikBaseUrl" :"https://analytics.openaire.eu/piwik.php?idsite=", "piwikBaseUrl" :"https://analytics.openaire.eu/piwik.php?idsite=",
"piwikSiteId" : "80", "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=", "logoutUrl" :"https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",