Commit cef5937a authored by Jie Yuan's avatar Jie Yuan
Browse files

add username resolver

parent b3e4f7bf

src/app/auth.service.ts

+2 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ export class AuthService { 
         //console.log(this.sharedHeaderString);

         //console.log(response);

         sessionStorage.setItem('authHeader',this.sharedHeaderString);

         sessionStorage.setItem('currentUser', response['email']);

         console.log('login success');

     } else if (response['authService'] === 'AAI') {

       this.headerBuilder('');
@@ -170,6 +171,7 @@ aaiAuthentication(token) { 
    if (response['authService'] === 'AAI') {

        this.loginSuccess();

        sessionStorage.setItem('authHeader',this.sharedHeaderString);

        sessionStorage.setItem('currentUser', response['email']);

        console.log(this.sharedHeaderString);

        console.log(response);

        console.log('#####################');

src/app/dashboard/fulltable/fulltable.component.html

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ 


   



<button class="menu-button"  mat-button [matMenuTriggerFor]="menuuser">Username</button>

<button class="menu-button"  mat-button [matMenuTriggerFor]="menuuser">{{username}}</button>

<mat-menu #menuuser="matMenu">

  <button mat-menu-item>Profile</button>

  <button mat-menu-item (click)="onLogout()">Logout</button>

src/app/dashboard/fulltable/fulltable.component.ts

+2 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ export class FulltableComponent implements OnInit , DoCheck, AfterViewInit{ 
  eoscSiteNames: string[];

  gocdbSiteNames: string[];

  dpmtSiteNames: string[];

  username: string;

  

  @ViewChild(MatPaginator) paginator: MatPaginator;

  @ViewChild(MatSort) sort: MatSort;
@@ -48,6 +49,7 @@ export class FulltableComponent implements OnInit , DoCheck, AfterViewInit{ 
 

  ) { 

    console.log('fulltable constructor');

    this.username = sessionStorage.getItem("currentUser");

  

    const source = sessionStorage.getItem('currentServiceSource');

src/app/dashboard/hostname/hostname.component.html

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ 


&nbsp; &nbsp;



<button class="menu-button"  mat-button [matMenuTriggerFor]="menuuser">Username</button>

<button class="menu-button"  mat-button [matMenuTriggerFor]="menuuser">{{username}}</button>

<mat-menu #menuuser="matMenu">

  <button mat-menu-item>Profile</button>

  <button mat-menu-item>Logout</button>

src/app/dashboard/hostname/hostname.component.ts

+2 −1
Original line number Diff line number Diff line
@@ -25,13 +25,14 @@ export class HostnameComponent implements OnInit, OnDestroy { 
  gocdbSiteNames: string[];

  dpmtSiteNames: string[];

  sidebarOpen:boolean = true;



  username: string;



  constructor(private siteService: SiteShortService, public router: Router,

    public route: ActivatedRoute, public authService: AuthService) {

   // this.siteName = '';

    // this.hostList = [];

    this.siteName = this.siteService.currentSite;

    this.username = sessionStorage.getItem("currentUser");

    console.log('now in hostname component');

    console.log(this.siteName);

    console.log(this.hostList);