reverted old flow

Signed-off-by: Amol Sontakke <[email protected]>

Author: amolsontakke3576

edge/security-headers.js

@@ -43,7 +43,8 @@ function generateCSP(env, isDevServer) {
     'https://api.lfcla.dev.platform.linuxfoundation.org/',
     'https://easycla.dev.communitybridge.org/',
     'https://easycla.lfx.linuxfoundation.org/',
-    'https://contributor.easycla.lfx.linuxfoundation.org/'
+    'https://contributor.easycla.lfx.linuxfoundation.org/',
+    'https://github.com/'
   ];
   let scriptSources = [SELF, UNSAFE_EVAL, UNSAFE_INLINE,
     'https://cdn.dev.platform.linuxfoundation.org/lfx-header-v2.js',
@@ -105,7 +106,8 @@ function generateCSP(env, isDevServer) {
       'https://linuxfoundation-dev.auth0.com',
       'https://linuxfoundation-staging.auth0.com',
       'https://linuxfoundation.auth0.com',
-      'https://sso.linuxfoundation.org/'
+      'https://sso.linuxfoundation.org/',
+      'https://github.com/'
     ],
     'child-src': [],
     'media-src': [],

src/app/app-routing.module.ts

@@ -23,6 +23,11 @@ const routes: Routes = [
     pathMatch: 'full',
     component: AuthComponent
   },
+  {
+    path: 'cla/project/:projectId',
+    pathMatch: 'full',
+    component: ClaDashboardComponent
+  },
   {
     path: 'cla/project/:projectId/user/:userId',
     pathMatch: 'full',

src/app/core/models/user.ts

@@ -34,3 +34,33 @@ export class UpdateUserModel {
     version: string;
 }
 
+export class UserFromTokenModel {
+    dateCreated: string
+    dateModified: string
+    emails: any
+    lfEmail: string
+    lfUsername: string
+    userID: string
+    username: string
+    version: string
+  }
+
+  export class UserFromSessionModel {
+    date_created: string
+    date_modified: string
+    lf_email: any
+    lf_sub: any
+    lf_username: any
+    note: any
+    user_company_id: any
+    user_emails: string[]
+    user_external_id: any
+    user_github_id: string
+    user_github_username: string
+    user_gitlab_id: any
+    user_gitlab_username: any
+    user_id: string
+    user_ldap_id: any
+    user_name: string
+    version: string
+  }

src/app/core/services/cla-contributor.service.ts

@@ -5,7 +5,7 @@ import {Injectable, isDevMode} from '@angular/core';
 import {HttpClient} from '@angular/common/http';
 import {Observable, Subject} from 'rxjs';
 import {Project, ProjectModel} from '../models/project';
-import {UpdateUserModel, UserModel} from '../models/user';
+import {UpdateUserModel, UserFromTokenModel, UserModel} from '../models/user';
 import {AlertService} from 'src/app/shared/services/alert.service';
 import {ActiveSignatureModel} from '../models/active-signature';
 import {IndividualRequestSignatureModel} from '../models/individual-request-signature';
@@ -70,6 +70,16 @@ export class ClaContributorService {
     return this.httpClient.get<ProjectModel>(url);
   }
 
+  getUserFromToken(): Observable<UserFromTokenModel> {
+    const url = this.getV4Endpoint('/v4/user-from-token');
+    return this.httpClient.get<UserFromTokenModel>(url);
+  }
+
+  getUserFromSession(): Observable<string> {
+    const url = this.getV2Endpoint('/v2/user-from-session');
+    return this.httpClient.get<string>(url);
+  }
+
   getUserActiveSignature(userId: string): Observable<ActiveSignatureModel> {
     const url = this.getV2Endpoint('/v2/user/' + userId + '/active-signature');
     return this.httpClient.get<ActiveSignatureModel>(url);

src/app/shared/components/project-title/project-title.component.ts

@@ -5,7 +5,7 @@ import { Component, OnInit, Input, EventEmitter, Output } from '@angular/core';
 import { AlertService } from '../../services/alert.service';
 import { ClaContributorService } from 'src/app/core/services/cla-contributor.service';
 import { ProjectModel } from 'src/app/core/models/project';
-import { UserModel } from 'src/app/core/models/user';
+import { UserFromSessionModel, UserFromTokenModel, UserModel } from 'src/app/core/models/user';
 import { StorageService } from '../../services/storage.service';
 import { AppSettings } from 'src/app/config/app-settings';
 
@@ -19,10 +19,12 @@ export class ProjectTitleComponent implements OnInit {
   @Input() userId: string;
   @Output() errorEmitter: EventEmitter<any> = new EventEmitter<any>();
   @Output() successEmitter: EventEmitter<any> = new EventEmitter<any>();
+  @Output() setUserIdEmitter: EventEmitter<any> = new EventEmitter<any>();
 
   project = new ProjectModel();
+  userFromToken = new UserFromTokenModel();
   user = new UserModel();
-
+  userFromSession = new UserFromSessionModel();
   constructor(
     private alertService: AlertService,
     private storageService: StorageService,
@@ -39,18 +41,12 @@ export class ProjectTitleComponent implements OnInit {
   }
 
   validateGithubFlow() {
-    if (this.projectId && this.userId) {
-      const localProjectId = JSON.parse(this.storageService.getItem(AppSettings.PROJECT_ID));
-      const localUserId = JSON.parse(this.storageService.getItem(AppSettings.USER_ID));
-      if (localProjectId !== this.projectId) {
-        this.getProject();
-      } else {
-        this.successEmitter.emit('Project');
-        this.project.project_name = JSON.parse(this.storageService.getItem(AppSettings.PROJECT_NAME));
-      }
-
-      if (localUserId !== this.userId) {
+    if (this.projectId ) {
+      this.getProject();
+      if (this.userId) {
         this.getUser();
+      } else {
+        this.getUserFromToken();
       }
     } else {
       this.errorEmitter.emit(true);
@@ -79,7 +75,6 @@ export class ProjectTitleComponent implements OnInit {
     }
   }
 
-
   getUser() {
     if (this.userId) {
       this.claContributorService.getUser(this.userId).subscribe(
@@ -101,6 +96,51 @@ export class ProjectTitleComponent implements OnInit {
   }
 
 
+  getUserFromToken() {
+    this.claContributorService.getUserFromToken().subscribe(
+      (response) => {
+        console.log('getUserFromToken response ==>', response)
+        this.userFromToken = response;
+        this.storageService.setItem(AppSettings.USER_ID, this.userFromToken.userID);
+        this.storageService.setItem(AppSettings.USER, this.userFromToken);
+        this.successEmitter.emit('User');
+        this.setUserIdEmitter.emit(this.userFromToken.userID);
+      },
+      () => {
+        // If user is not found in token, get user from session
+        this.getUserFromSession();
+      }
+    );
+}
+
+getUserFromSession() {
+  this.claContributorService.getUserFromSession().subscribe(
+    (response: any) => {
+      console.log('getUserFromSession response ==>', response)
+      this.userFromSession = response;
+      this.storageService.setItem(AppSettings.USER_ID, this.userFromSession.user_id);
+      this.storageService.setItem(AppSettings.USER, {
+        dateCreated: this.userFromSession.date_created,
+        dateModified: this.userFromSession.date_modified,
+        emails: this.userFromSession.user_emails,
+        lfEmail: this.userFromSession.lf_email,
+        lfUsername: this.userFromSession.lf_username,
+        userID: this.userFromSession.user_id,
+        username: this.userFromSession.user_name,
+        version: this.userFromSession.version
+      });
+      this.successEmitter.emit('User');
+    },
+    (exception) => {
+      console.log('getUserFromSession exception ==>', exception)
+      this.errorEmitter.emit(true);
+      this.alertService.error('An error occurred while retrieving the GitHub user from the session.');
+      this.claContributorService.handleError(exception);
+    }
+  );
+}
+
+
 
 
 }