Project

General

Profile

« Previous | Next » 

Revision 48552

Added by Argiro Kokogiannaki almost 7 years ago

login through AAI - claims API uses AAI authentication | remove cookies locally when logout is clicked | use images for the search forms | fix issue with org landing page where projects tab didn't reload

View differences:

userMini.component.ts
2 2 
import {Observable}       from 'rxjs/Observable';
3 3 
import {ActivatedRoute, Router} from '@angular/router';
4 4 
import {Location} from '@angular/common';
5 
import {LoginService} from './login.service';
5 
// import {LoginService} from './login.service';
6 6 
import {User,Session} from './utils/helper.class';
7 7 
import {RouterHelper} from '../utils/routerHelper.class';
8 
import {OpenaireProperties} from '../utils/properties/openaireProperties';
8 9 

  		




  9
  10
  
    
@Component({


  		




  10
  11
  
    
    selector: 'user-mini',


  		




  11
  12
  
    
    template: `


  		




  12
  13
  
    

  		




  13
  14
  
    
        <div *ngIf="!server" class=" custom-user-mini-panel uk-margin-top uk-margin-right uk-float-right">


  		




  14
  
  
    
        <span  *ngIf="loggedIn" ><a  (click)="gotoUserPage();"   >{{user.fullname}}</a></span>


  		




  15
  
  
    
        <a  *ngIf="!loggedIn" class="loginLink"  (click)="gotoUserPage();"   >Sign in</a>


  		




  
  15
  
    
          <span  *ngIf="loggedIn" >


  		




  
  16
  
    
            <!--a  (click)="gotoUserPage();"   >{{user.fullname}}</a-->


  		




  
  17
  
    
            <span>{{user.fullname}}</span> | <a class="loginLink" (click)="logOut();"  >Log out</a>


  		




  
  18
  
    
          </span>


  		




  
  19
  
    
          <!--a  *ngIf="!loggedIn" class="loginLink"  (click)="gotoUserPage();"   >Sign in</a-->


  		




  
  20
  
    
          <span  *ngIf="!loggedIn">


  		




  
  21
  
    
              <a  class="loginLink" [href]="loginUrl"  >Sign in</a>


  		




  
  22
  
    
           | <a  class="loginLink"  [href]="loginUrl"  >Register</a>


  		




  
  23
  
    
           </span>


  		




  16
  24
  
    
        </div>


  		




  17
  25
  
    

  		




  18
  26
  
    
    `


  		




  ......




  23
  31
  
    
    public loggedIn: boolean = false;


  		




  24
  32
  
    
    public server: boolean = true;


  		




  25
  33
  
    
    public routerHelper:RouterHelper = new RouterHelper();


  		




  
  34
  
    
    public loginUrl= OpenaireProperties.getLoginURL();


  		




  26
  35
  
    

  		




  27
  36
  
    
    public redirectUrl: string = "";


  		




  28
  37
  
    
    private baseUrl = "user-info";


  		




  ......




  66
  75
  
    
        this.router.navigate([this.baseUrl]);


  		




  67
  76
  
    
      }


  		




  68
  77
  
    
    }


  		




  
  78
  
    
    logOut(){


  		




  
  79
  
    
      if(Session.isLoggedIn()){


  		




  
  80
  
    
        Session.removeUser();


  		




  
  81
  
    
      }


  		




  
  82
  
    
      this.loggedIn = false;


  		




  
  83
  
    
      this.user = new User();


  		




  
  84
  
    
    }


  		




  69
  85
  
    

  		




  70
  86
  
    
}


  		












Also available in:  Unified diff