fix: login issue for private window

Signed-off-by: Amol Sontakke <amols@proximabiz.com>

Author: amolsontakke3576

package.json

@@ -54,13 +54,14 @@
     "@angular/router": "~11.2.14",
     "@auth0/auth0-angular": "1.5.1",
     "@fortawesome/fontawesome-free": "^6.4.0",
+    "@linuxfoundation/lfx-ui-core": "^0.0.12",
     "@ng-bootstrap/ng-bootstrap": "^6.1.0",
     "@silvermine/serverless-plugin-cloudfront-lambda-edge": "^2.1.1",
-    "@linuxfoundation/lfx-ui-core": "^0.0.12",
-    "aws-sdk": "2.1558.0",
     "@types/node": "^18.16.0",
     "auth0-spa-js": "^1.6.5",
+    "aws-sdk": "2.1558.0",
     "bootstrap": "^4.4.0",
+    "detectincognitojs": "^1.5.0",
     "file-saver": "^2.0.5",
     "query-string": "^6.13.8",
     "rxjs": "~6.6.3",

src/app/app.component.ts

@@ -25,7 +25,6 @@ export class AppComponent {
   ngOnInit() {
     this.mountHeader();
     this.hasExpanded = true;
-    console.log(this.isIncognito())
   }
 
   private mountHeader(): void {
@@ -34,14 +33,4 @@ export class AppComponent {
     script.setAttribute('async', 'true');
     document.head.appendChild(script);
   }
-
-  private isIncognito():boolean {
-    try {
-      localStorage.setItem('test', 'test');
-      localStorage.removeItem('test');
-      return false; // If no error, likely not incognito
-    } catch (e) {
-      return true; // If an error occurs, likely incognito
-    }
-  }
 }

src/app/modules/dashboard/container/auth-dashboard/auth-dashboard.component.ts

@@ -17,7 +17,7 @@ export class AuthDashboardComponent implements OnInit {
     const userId = JSON.parse(this.storageService.getItem(AppSettings.USER_ID));
     const redirectUrl = JSON.parse(this.storageService.getItem(AppSettings.REDIRECT));
 
-    this.router.navigate([`/cla/project/${projectId}/user/${userId}`], { queryParams: { redirect:redirectUrl, loggedIn: true} })
+    this.router.navigate([`/cla/project/${projectId}/user/${userId}`], { queryParams: { redirect:redirectUrl} })
   }
 
 }

src/app/modules/dashboard/container/cla-dashboard/cla-dashboard.component.html

@@ -1,9 +1,8 @@
 <!-- Copyright The Linux Foundation and each contributor to CommunityBridge.
  SPDX-License-Identifier: MIT -->
+ <app-project-title (successEmitter)="setProject($event)" (errorEmitter)="hasErrorPresent($event)"></app-project-title>
 
 <div class="container-fluid dashboard-container">
-    <app-project-title (successEmitter)="setProject($event)" (errorEmitter)="hasErrorPresent($event)"></app-project-title>
-
     <div class="contributor-type-container">
         <div class="container">
             <div class="row">

src/app/modules/dashboard/container/cla-dashboard/cla-dashboard.component.ts

@@ -9,6 +9,7 @@ import { AlertService } from 'src/app/shared/services/alert.service';
 import { AppSettings } from 'src/app/config/app-settings';
 import { ClaContributorService } from 'src/app/core/services/cla-contributor.service';
 import { AuthService } from 'src/app/shared/services/auth.service';
+import detectIncognito from 'detectincognitojs';
 
 @Component({
   selector: 'app-cla-dashboard',
@@ -24,8 +25,10 @@ export class ClaDashboardComponent implements OnInit {
   individualContributor = 'Individual Contributor';
   exitEasyCLA = 'exitEasyCLA';
   hasError: boolean;
+  hasPrivateWindow: boolean;
   project = new ProjectModel();
 
+
   constructor(
     private route: ActivatedRoute,
     private router: Router,
@@ -55,8 +58,6 @@ export class ClaDashboardComponent implements OnInit {
     this.projectId = this.route.snapshot.paramMap.get('projectId');
     this.userId = this.route.snapshot.paramMap.get('userId');
     const redirect = this.route.snapshot.queryParamMap.get('redirect');
-    const loggedIn = this.route.snapshot.queryParamMap.get('loggedIn');
-
 
     this.project = JSON.parse(this.storageService.getItem(AppSettings.PROJECT));
     this.storageService.setItem(AppSettings.REDIRECT, redirect);
@@ -65,11 +66,17 @@ export class ClaDashboardComponent implements OnInit {
 
     this.hasErrorPresent();
 
+    detectIncognito().then((result) => {
+      this.hasPrivateWindow = result.isPrivate;
+      if(this.hasPrivateWindow){
+        this.alertService.error('There are some features that will not work in a private window, as this site requires cookies');
+      }
+    });
+
     this.authService.loading$.subscribe((loading) => {
       if (!loading) {
         this.authService.isAuthenticated$.subscribe((authenticated) => {
-          console.log(authenticated, loggedIn);
-          if (!authenticated) {
+          if (!authenticated && !this.hasPrivateWindow) {
             this.authService.login();
           }
         });

src/app/shared/components/alert/alert.component.scss

@@ -3,7 +3,6 @@
 
 .alert {
   left: 0;
-  position: fixed;
   width: 100%;
   z-index: 1000;
 }

src/app/shared/components/page-not-found/page-not-found.component.html

@@ -3,7 +3,8 @@
 
 <div class="container-fluid">
     <div class="row justify-content-center align-items-center">
-        <div class="col-auto not-found ">The page you are looking for was not found.</div>
+        <div class="col-auto not-found ">The page you are looking for was not found. Please <a [href]="redirectUrl" class="">click here</a>
+            to go back on main page or contact the administrator.</div>
     </div>
 </div>
 

src/app/shared/services/auth.service.ts

@@ -237,16 +237,6 @@ export class AuthService {
     return '';
   }
 
-  private getTargetRouteFromAppState(appState) {
-    if (!appState) {
-      return '/';
-    }
-    const { returnTo, target, targetUrl } = appState;
-    return (
-      this.getTargetRouteFromReturnTo(returnTo) || target || targetUrl || '/'
-    );
-  }
-
   private getTargetRouteFromReturnTo(returnTo) {
     if (!returnTo) {
       return '';

yarn.lock

@@ -4214,6 +4214,11 @@ detect-node@^2.0.4:
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1"
   integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==
 
+detectincognitojs@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/detectincognitojs/-/detectincognitojs-1.5.0.tgz#0f2691d601ed3437a8bfaa0f1fde0dfdab67e2b4"
+  integrity sha512-O4tgjDp41GnOYZNMVK0XhSeMQN7AGHez2Wz+tVf4VO0Zkn3isAxADjZBwGvL1BRw4ueNEQ6x+1gBHrWElXoBqA==
+
 dezalgo@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.4.tgz#751235260469084c132157dfa857f386d4c33d81"