Project

General

Profile

« Previous | Next » 

Revision 57948

Added by Konstantinos Triantafyllou almost 5 years ago

[Monitor | Trunk]: Remove url from get user info

View differences:

modules/uoa-monitor-portal/trunk/monitor/src/app/utils/subscribe/subscribe.component.ts
69 69 
    this.route.data
70 70 
      .subscribe((data: { envSpecific: EnvProperties }) => {
71 71 
        this.properties = data.envSpecific;
72 
        this.userManagementService.getUserInfo(this.properties.userInfoUrl).subscribe( user => {
72 
        this.userManagementService.getUserInfo().subscribe( user => {
73 73 
          this.user = user;
74 74 
          if (!this.showNumbers) {
75 75 
            let email = (this.user)?this.user.email:null;
modules/uoa-monitor-portal/trunk/monitor/src/app/app.component.ts
19 19 
  `],
20 20 
  template: `
21 21 
    <div [class]="(community)?(community.id +'App'):'connectApp'">
22 
      <navbar *ngIf="properties && showMenu && !community && loginCheck" portal="monitor" [onlyTop]=false
22 
      <navbar *ngIf="properties && showMenu && !community" portal="monitor" [onlyTop]=false
23 23 
              [userMenuItems]=userMenuItems [menuItems]=menuItems [user]="user"
24 24 
              [showMenu]=showMenu [properties]="properties" [showHomeMenuItem]="true"></navbar>
25 
      <navbar *ngIf="properties && showMenu  && community && loginCheck" portal="monitor" [onlyTop]=false [communityId]="community.id"
25 
      <navbar *ngIf="properties && showMenu  && community" portal="monitor" [onlyTop]=false [communityId]="community.id"
26 26 
              [userMenuItems]=userMenuItems [menuItems]=menuItems [user]="user"
27 27 
              [community]=community [showMenu]=showMenu [properties]="properties" [enableSearch]="true"
28 28 
              [showHomeMenuItem]="true"></navbar>
......
67 67 
  subscriberOfCommunities = false;
68 68 
  managerOfCommunities = false;
69 69 
  user: User;
70 
  loginCheck: boolean = false;
71 70 

  		




  72
  71
  
    
  //  community: {id:string, name:string, logoUrl:string};


  		




  73
  72
  
    
  constructor(private  route: ActivatedRoute, private propertiesService: EnvironmentSpecificService,


  		




  ......




  86
  85
  
    
        this.properties = this.propertiesService.envSpecific;


  		




  87
  86
  
    
        var communityId: string = "";


  		




  88
  87
  
    
        this._communitiesService.updateCommunities(this.properties, this.properties.communitiesAPI);


  		




  89
  
  
    
        this.userManagementService.getUserInfo(this.properties.userInfoUrl).subscribe( user => {


  		




  
  88
  
    
        this.userManagementService.getUserInfo().subscribe( user => {


  		




  90
  89
  
    
          this.user = user;


  		




  91
  
  
    
          this.loginCheck = true;


  		




  92
  90
  
    
          if (this.properties.environment == "development") {


  		




  93
  91
  
    
            this.showMenu = false;


  		




  94
  92
  
    
            this.route.queryParams.subscribe(params => {


  		












  

    
      modules/uoa-monitor-portal/trunk/monitor/src/app/funders/searchFunders.component.ts
    
  





  80
  80
  
    
      let queryParams = this.searchPage.getQueryParamsFromUrl(params);


  		




  81
  81
  
    
      console.log(queryParams)


  		




  82
  82
  
    
      if(typeof document !== 'undefined') {


  		




  83
  
  
    
        this.userManagementService.getUserInfo(this.properties.userInfoUrl).subscribe(user => {


  		




  
  83
  
    
        this.userManagementService.getUserInfo().subscribe(user => {


  		




  84
  84
  
    
          this.user = user;


  		




  85
  85
  
    
          this.initFunders(queryParams);


  		




  86
  86
  
    
        });


  		












  

    
      modules/uoa-monitor-portal/trunk/monitor/src/assets/env-properties.json
    
  





  37
  37
  
    

  		




  38
  38
  
    
  "piwikBaseUrl" :"https://analytics.openaire.eu/piwik.php?idsite=",


  		




  39
  39
  
    
  "piwikSiteId" : "80",


  		




  40
  
  
    
  "loginUrl" :"http://rudie.di.uoa.gr:8080/dnet-login/openid_connect_login",


  		




  
  40
  
    
  "loginUrl" :"http://dl170.madgik.di.uoa.gr:8180/dnet-login/openid_connect_login",


  		




  41
  41
  
    

  		




  42
  
  
    
  "userInfoUrl" : "http://rudie.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/users/getUserInfo?accessToken=",


  		




  
  42
  
    
  "userInfoUrl" : "http://dl170.madgik.di.uoa.gr:8180/dnet-openaire-users-1.0.0-SNAPSHOT/api/users/getUserInfo?accessToken=",


  		




  43
  43
  
    

  		




  44
  44
  
    
  "logoutUrl" :"https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",


  		




  45
  45
  
    

  		












Also available in:  Unified diff