Merge branch 'main' into chore-move-repo

Author: ahmedomosanya

edge/security-headers.js

@@ -43,7 +43,12 @@ 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://cmp.osano.com', // Cookie consent management
+    'https://www.google-analytics.com', // Google Analytics beacons
+    'https://analytics.google.com', // Google Analytics 4
+    'https://www.googletagmanager.com', // GTM fetch requests
+    'https://stats.g.doubleclick.net' // DoubleClick stats
   ];
   let scriptSources = [SELF, UNSAFE_EVAL, UNSAFE_INLINE,
     'https://cdn.dev.platform.linuxfoundation.org/lfx-header-v2.js',
@@ -54,7 +59,8 @@ function generateCSP(env, isDevServer) {
     'https://cdn.dev.platform.linuxfoundation.org/lfx-footer-no-zone.js',
     'https://cdn.staging.platform.linuxfoundation.org/lfx-footer-no-zone.js',
     'https://cdn.platform.linuxfoundation.org/lfx-footer-no-zone.js',
-    'https://cmp.osano.com' // Cookie consent
+    'https://cmp.osano.com', // Cookie consent
+    'https://www.googletagmanager.com' // Google Tag Manager for Osano
   ];
 
   const styleSources = [SELF, UNSAFE_INLINE, 'https://use.fontawesome.com/', 'https://communitybridge.org/'];
@@ -106,7 +112,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://cmp.osano.com' // Cookie consent UI iframe
     ],
     'child-src': [],
     'media-src': [],

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

@@ -56,7 +56,9 @@ export class ClaContributorService {
 
 
   getUser(userId: string): Observable<UserModel> {
-    const url = this.getV3Endpoint('/v3/user-compat/' + userId);
+    // LG:TODO
+    const url = this.getV2Endpoint('/v2/user/' + userId);
+    // const url = this.getV3Endpoint('/v3/user-compat/' + userId);
     return this.httpClient.get<UserModel>(url);
   }
 
@@ -71,12 +73,16 @@ export class ClaContributorService {
   }
 
   getProject(projectId: string): Observable<ProjectModel> {
-    const url = this.getV4Endpoint('/v4/project-compat/' + projectId);
+    // LG:TODO
+    const url = this.getV2Endpoint('/v2/project/' + projectId);
+    // const url = this.getV4Endpoint('/v4/project-compat/' + projectId);
     return this.httpClient.get<ProjectModel>(url);
   }
 
   getUserActiveSignature(userId: string): Observable<ActiveSignatureModel> {
-    const url = this.getV4Endpoint('/v4/user/' + userId + '/active-signature');
+    // LG:TODO
+    const url = this.getV2Endpoint('/v2/user/' + userId + '/active-signature');
+    // const url = this.getV4Endpoint('/v4/user/' + userId + '/active-signature');
     return this.httpClient.get<ActiveSignatureModel>(url);
   }
 
@@ -144,7 +150,9 @@ export class ClaContributorService {
   }
 
   getGerritProjectInfo(projectId: string): Observable<ProjectModel> {
-    const url = this.getV4Endpoint('/v4/project-compat/' + projectId);
+    // LG:TODO
+    const url = this.getV2Endpoint('/v2/project/' + projectId);
+    // const url = this.getV4Endpoint('/v4/project-compat/' + projectId);
     return this.httpClient.get<ProjectModel>(url);
   }