MaDgIK
/
connect-admin
13
0
Fork 0
Code Issues Pull Requests Projects Releases 9 Wiki Activity

[Admin | Trunk]: Remove url from get user info. 

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-admin-portal/trunk@57947 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
k.triantafyllou 2019-12-23 15:57:56 +00:00
parent a8135cbb43
commit 81c6123d53
8 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/app.component.html
View File

@ -1,10 +1,10 @@
<navbar *ngIf= "properties && showMenu && checkLogin" portal="connect-admin" logoPath="assets/imgs/" [onlyTop]=false [userMenu]=true
<navbar *ngIf= "properties && showMenu" portal="connect-admin" logoPath="assets/imgs/" [onlyTop]=false [userMenu]=true
[homeurl] = false [user]="user" [userMenuItems]=userMenuItems [menuItems]=menuItems [properties]=properties
[community]=community class="adminMenu"></navbar>
<div id="wrapper" class="uk-section uk-padding-remove">
<div class="uk-grid-collapse" uk-height-viewport="expand: true" uk-grid>
<sidebar *ngIf="showSidebar && checkLogin && this.router.url.split('?')[0]!= '/customize-layout'"
<sidebar *ngIf="showSidebar && this.router.url.split('?')[0]!= '/customize-layout'"
[menuItems]="sideMenuItems"
class="uk-width-1-5 uk-light sidebar "></sidebar>
<div class="uk-width-expand uk-overflow-auto"

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

@ -36,7 +36,6 @@ export class AppComponent implements OnInit {
wellcome = false;
showMenu: boolean = false;
user: User;
checkLogin: boolean = false;
constructor(private route: ActivatedRoute,
private propertiesService: EnvironmentSpecificService,
@ -64,9 +63,8 @@ export class AppComponent implements OnInit {
this.logOutUrl = this.properties.logoutUrl;
this.showSidebar = false;
this.showMenu = false;
this.userManagementService.getUserInfo(this.properties.userInfoUrl).subscribe(user => {
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);

2
src/app/pages/curator/curator.component.ts
View File

@ -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,

2
src/app/pages/entity/entities.component.ts
View File

@ -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;

2
src/app/pages/page/pages.component.ts
View File

@ -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;

2
src/app/pages/usernotifications/manage-user-notifications.component.ts
View File

@ -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;

2
src/app/pages/wellcome/wellcome.component.ts
View File

@ -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(

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

@ -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=",