Merge 1ccac53 into c21ed5a

Author: Reihtw

package-lock.json

@@ -26,6 +26,7 @@
     "@angular/platform-browser": "10.2.2",
     "@angular/platform-browser-dynamic": "10.2.2",
     "@angular/router": "10.2.2",
+    "@auth0/angular-jwt": "^5.0.2",
     "@azure/app-configuration": "1.1.0",
     "@azure/identity": "1.1.0",
     "@ng-select/ng-select": "7.2.0",

package.json

@@ -48,7 +48,7 @@ import { ActivityEffects } from './modules/activities-management/store/activity-
 import { ProjectEffects } from './modules/customer-management/components/projects/components/store/project.effects';
 import { TechnologyEffects } from './modules/shared/store/technology.effects';
 import { ProjectTypeEffects } from './modules/customer-management/components/projects-type/store/project-type.effects';
-import { reducers, metaReducers } from './reducers';
+import { reducers } from './reducers';
 import { CLIENT_URL, environment } from '../environments/environment';
 import { EnvironmentType } from '../environments/enum';
 import { CustomerComponent } from './modules/customer-management/pages/customer.component';
@@ -179,7 +179,6 @@ const maskConfig: Partial<IConfig> = {
     MatIconModule,
     MatListModule,
     StoreModule.forRoot(reducers, {
-      metaReducers,
     }),
     environment.production === EnvironmentType.TT_DEV
       ? StoreDevtoolsModule.instrument({

src/app/app.module.ts

@@ -7,6 +7,7 @@ import { LoginGuard } from './login.guard';
 import { LoginService } from '../../modules/login/services/login.service';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { SocialAuthService } from 'angularx-social-login';
+import { of } from 'rxjs';
 
 
 describe('LoginGuard', () => {
@@ -15,13 +16,13 @@ describe('LoginGuard', () => {
   let azureAdB2CService: AzureAdB2CService;
   const azureAdB2CServiceStub = {
     isLogin() {
-      return true;
+      return of(true);
     }
   };
   let loginService: LoginService;
   const loginServiceStub = {
     isLogin() {
-      return true;
+      return of(true);
     }
   };
   const socialAuthServiceStub = jasmine.createSpyObj('SocialAuthService', ['']);
@@ -45,37 +46,41 @@ describe('LoginGuard', () => {
 
   it('can activate the route when user is logged-in on Production', () => {
     loginGuard.isProduction = true;
-    spyOn(azureAdB2CService, 'isLogin').and.returnValue(true);
-    const canActivate = loginGuard.canActivate();
+    spyOn(azureAdB2CService, 'isLogin').and.returnValue(of(true));
+    loginGuard.canActivate().subscribe(isLogin => {
+      expect(isLogin).toEqual(true);
+    });
     expect(azureAdB2CService.isLogin).toHaveBeenCalled();
-    expect(canActivate).toEqual(true);
   });
 
   it('can activate the route when user is logged-in Locally', () => {
     loginGuard.isProduction = false;
-    spyOn(loginService, 'isLogin').and.returnValue(true);
-    const canActivate = loginGuard.canActivate();
+    spyOn(loginService, 'isLogin').and.returnValue(of(true));
+    loginGuard.canActivate().subscribe(isLogin => {
+      expect(isLogin).toEqual(true);
+    });
     expect(loginService.isLogin).toHaveBeenCalled();
-    expect(canActivate).toEqual(true);
   });
 
   it('can not active the route and is redirected to login if user is not logged-in on Production', inject([Router],  (router: Router) => {
     loginGuard.isProduction = true;
-    spyOn(azureAdB2CService, 'isLogin').and.returnValue(false);
+    spyOn(azureAdB2CService, 'isLogin').and.returnValue(of(false));
     spyOn(router, 'navigate').and.stub();
-    const canActivate = loginGuard.canActivate();
+    loginGuard.canActivate().subscribe(isLogin => {
+      expect(isLogin).toEqual(false);
+    });
     expect(azureAdB2CService.isLogin).toHaveBeenCalled();
-    expect(canActivate).toEqual(false);
     expect(router.navigate).toHaveBeenCalledWith(['login']);
   }));
 
   it('can not active the route and is redirected to login if user is not logged-in Locally', inject([Router],  (router: Router) => {
     loginGuard.isProduction = false;
-    spyOn(loginService, 'isLogin').and.returnValue(false);
+    spyOn(loginService, 'isLogin').and.returnValue(of(false));
     spyOn(router, 'navigate').and.stub();
-    const canActivate = loginGuard.canActivate();
+    loginGuard.canActivate().subscribe(isLogin => {
+      expect(isLogin).toEqual(false);
+    });
     expect(loginService.isLogin).toHaveBeenCalled();
-    expect(canActivate).toEqual(false);
     expect(router.navigate).toHaveBeenCalledWith(['login']);
   }));
 

src/app/guards/login-guard/login.guard.spec.ts

@@ -3,6 +3,7 @@ import { Router, CanActivate } from '@angular/router';
 import { AzureAdB2CService } from '../../modules/login/services/azure.ad.b2c.service';
 import { LoginService } from '../../modules/login/services/login.service';
 import { environment } from 'src/environments/environment';
+import { map } from 'rxjs/operators';
 import { EnvironmentType } from 'src/environments/enum';
 
 
@@ -19,21 +20,27 @@ export class LoginGuard implements CanActivate {
 
   canActivate() {
     if (this.isProduction) {
-      if (this.azureAdB2CService.isLogin()) {
-        this.azureAdB2CService.setCookies();
-        return true;
-      } else {
-        this.router.navigate(['login']);
-        return false;
-      }
+      return this.azureAdB2CService.isLogin().pipe(
+        map(isLogin => {
+          if (!isLogin) {
+            this.router.navigate(['login']);
+            return false;
+          }
+          this.azureAdB2CService.setCookies();
+          return true;
+        })
+      );
     } else {
-      if (this.loginService.isLogin()) {
-        this.loginService.setCookies();
-        return true;
-      } else {
-        this.router.navigate(['login']);
-        return false;
-      }
+      return this.loginService.isLogin().pipe(
+        map(isLogin => {
+          if (!isLogin) {
+            this.router.navigate(['login']);
+            return false;
+          }
+          this.loginService.setCookies();
+          return true;
+        })
+      );
     }
   }
 }

src/app/guards/login-guard/login.guard.ts

@@ -18,7 +18,7 @@ describe('LoginComponent', () => {
 
   const azureAdB2CServiceStub = {
     isLogin() {
-      return true;
+      return of(true);
     },
     signIn() {
       return of();
@@ -29,7 +29,7 @@ describe('LoginComponent', () => {
 
   const loginServiceStub = {
     isLogin() {
-      return true;
+      return of(true);
     },
     signIn() {
       return of();
@@ -86,7 +86,7 @@ describe('LoginComponent', () => {
   });
 
   it('should sign up or login with google if is not logged-in into the app on Production', inject([Router],  (router: Router) => {
-    spyOn(azureAdB2CService, 'isLogin').and.returnValue(false);
+    spyOn(azureAdB2CService, 'isLogin').and.returnValue(of(false));
     spyOn(azureAdB2CService, 'setCookies').and.returnValue();
     spyOn(azureAdB2CService, 'signIn').and.returnValue(of(() => {}));
     spyOn(featureToggleCookiesService, 'setCookies').and.returnValue(featureToggleCookiesService.setCookies());
@@ -99,7 +99,7 @@ describe('LoginComponent', () => {
   }));
 
   it('should sign up or login with google if is not logged-in into the app Locally', inject([Router],  (router: Router) => {
-    spyOn(loginService, 'isLogin').and.returnValue(false);
+    spyOn(loginService, 'isLogin').and.returnValue(of(false));
     spyOn(loginService, 'setLocalStorage').and.returnValue();
     spyOn(loginService, 'getUser').and.returnValue(of(() => {}));
     spyOn(loginService, 'setCookies').and.returnValue();
@@ -115,15 +115,15 @@ describe('LoginComponent', () => {
   }));
 
   it('should not sign-up or login with google if is already logged-in into the app on Production', inject([Router],  (router: Router) => {
-    spyOn(azureAdB2CService, 'isLogin').and.returnValue(true);
+    spyOn(azureAdB2CService, 'isLogin').and.returnValue(of(true));
     spyOn(router, 'navigate').and.stub();
     component.login();
     expect(azureAdB2CService.isLogin).toHaveBeenCalled();
     expect(router.navigate).toHaveBeenCalledWith(['']);
   }));
 
   it('should not sign-up or login with google if is already logged-in into the app Locally', inject([Router],  (router: Router) => {
-    spyOn(loginService, 'isLogin').and.returnValue(true);
+    spyOn(loginService, 'isLogin').and.returnValue(of(true));
     spyOn(router, 'navigate').and.stub();
     component.loginWithGoogle();
     expect(loginService.isLogin).toHaveBeenCalled();

src/app/modules/login/login.component.spec.ts

@@ -7,6 +7,7 @@ import { SocialAuthService, SocialUser } from 'angularx-social-login';
 import { environment } from 'src/environments/environment';
 import { EnvironmentType } from 'src/environments/enum';
 import { LoginService } from './services/login.service';
+
 @Component({
   selector: 'app-login',
   templateUrl: './login.component.html',
@@ -31,29 +32,36 @@ export class LoginComponent implements OnInit {
         this.loginService.setLocalStorage('idToken', user.idToken);
         this.loginService.getUser(user.idToken).subscribe((response) => {
           this.loginService.setCookies();
-          this.loginService.setLocalStorage('user2', JSON.stringify(response));
+          const tokenObject = JSON.stringify(response);
+          const tokenJson = JSON.parse(tokenObject);
+          this.loginService.setLocalStorage('user', tokenJson.token);
           this.router.navigate(['']);
         });
       }
     });
   }
 
-  login(): void {
-    if (this.azureAdB2CService.isLogin()) {
-      this.router.navigate(['']);
-    } else {
-      this.azureAdB2CService.signIn().subscribe(() => {
-        this.featureToggleCookiesService.setCookies();
-        this.azureAdB2CService.setCookies();
+  login() {
+    this.azureAdB2CService.isLogin().subscribe(isLogin => {
+      if (isLogin) {
         this.router.navigate(['']);
-      });
-    }
+      } else {
+        this.azureAdB2CService.signIn().subscribe(() => {
+          this.featureToggleCookiesService.setCookies();
+          this.azureAdB2CService.setCookies();
+          this.router.navigate(['']);
+        });
+      }
+    });
   }
+
   loginWithGoogle() {
-    if (this.loginService.isLogin()) {
-      this.router.navigate(['']);
-    } else {
-      this.loginService.signIn();
-    }
+    this.loginService.isLogin().subscribe(isLogin => {
+      if (isLogin) {
+        this.router.navigate(['']);
+      } else {
+        this.loginService.signIn();
+      }
+    });
   }
 }

src/app/modules/login/login.component.ts

@@ -1,7 +1,10 @@
+import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { inject, TestBed } from '@angular/core/testing';
 import { Account, UserAgentApplication } from 'msal';
 import { AzureAdB2CService } from './azure.ad.b2c.service';
 import { CookieService } from 'ngx-cookie-service';
+import { of } from 'rxjs';
+
 
 describe('AzureAdB2CService', () => {
   let service: AzureAdB2CService;
@@ -10,7 +13,7 @@ describe('AzureAdB2CService', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [],
+      imports: [HttpClientTestingModule],
     });
     service = TestBed.inject(AzureAdB2CService);
     cookieService = TestBed.inject(CookieService);
@@ -46,12 +49,12 @@ describe('AzureAdB2CService', () => {
   it('on logout should call msal logout and verify if user localStorage is removed', () => {
     spyOn(UserAgentApplication.prototype, 'logout').and.returnValue();
     spyOn(cookieService, 'deleteAll');
-    spyOn(localStorage, 'removeItem').withArgs('user');
+    spyOn(localStorage, 'clear');
 
     service.logout();
 
     expect(cookieService.deleteAll).toHaveBeenCalled();
-    expect(localStorage.removeItem).toHaveBeenCalledWith('user');
+    expect(localStorage.clear).toHaveBeenCalled();
     expect(UserAgentApplication.prototype.logout).toHaveBeenCalled();
   });
 
@@ -84,56 +87,54 @@ describe('AzureAdB2CService', () => {
   });
 
   it('isLogin returns true if UserAgentApplication has a defined Account and token cookie exist', () => {
-    spyOn(UserAgentApplication.prototype, 'getAccount').and.returnValue(account);
     spyOn(cookieService, 'check').and.returnValue(true);
+    spyOn(service, 'isValidToken').and.returnValue(of(true));
 
-    const isLogin = service.isLogin();
-
-    expect(UserAgentApplication.prototype.getAccount).toHaveBeenCalled();
-    expect(cookieService.check).toHaveBeenCalled();
-    expect(isLogin).toEqual(true);
+    service.isLogin().subscribe(isLogin => {
+      expect(isLogin).toEqual(true);
+    });
   });
 
   it('isLogin returns false if UserAgentApplication has a defined Account and token cookie does not exist', () => {
-    spyOn(UserAgentApplication.prototype, 'getAccount').and.returnValue(account);
-    spyOn(cookieService, 'check').and.returnValue(false);
+    spyOn(service, 'isValidToken').and.returnValue(of(false));
 
-    const isLogin = service.isLogin();
 
-    expect(UserAgentApplication.prototype.getAccount).toHaveBeenCalled();
-    expect(cookieService.check).toHaveBeenCalled();
-    expect(isLogin).toEqual(false);
+    service.isLogin().subscribe(isLogin => {
+      expect(isLogin).toEqual(false);
+    });
   });
 
   it('isLogin returns false if UserAgentApplication has a null value for Account', () => {
     spyOn(UserAgentApplication.prototype, 'getAccount').and.returnValue(null);
+    spyOn(service, 'isValidToken').and.returnValue(of(false));
 
-    const isLogin = service.isLogin();
-
-    expect(UserAgentApplication.prototype.getAccount).toHaveBeenCalled();
-    expect(isLogin).toEqual(false);
+    service.isLogin().subscribe(isLogin => {
+      expect(isLogin).toEqual(false);
+    });
   });
 
   it('setTenantId should save a tenantId in local storage', () => {
     spyOn(UserAgentApplication.prototype, 'getAccount').and.returnValue(account);
-    spyOn(cookieService, 'check').and.returnValue(true);
+    spyOn(service, 'isValidToken').and.returnValue(of(true));
     spyOn(localStorage, 'setItem').withArgs('tenant_id', '12345');
 
-    const isLogin = service.isLogin();
+    service.isLogin().subscribe(isLogin => {
+      expect(isLogin).toEqual(true);
+    });
+
     service.setTenantId();
 
     expect(UserAgentApplication.prototype.getAccount).toHaveBeenCalled();
-    expect(cookieService.check).toHaveBeenCalled();
-    expect(isLogin).toEqual(true);
     expect(localStorage.setItem).toHaveBeenCalledWith('tenant_id', '12345');
   });
 
   it('setTenantId should not save tenantId if login is false ', () => {
-    spyOn(UserAgentApplication.prototype, 'getAccount').and.returnValue(null);
+    spyOn(service, 'isValidToken').and.returnValue(of(false));
     spyOn(localStorage, 'setItem');
-    const isLogin = service.isLogin();
-    expect(UserAgentApplication.prototype.getAccount).toHaveBeenCalled();
-    expect(isLogin).toEqual(false);
+
+    service.isLogin().subscribe(isLogin => {
+      expect(isLogin).toEqual(false);
+    });
     expect(localStorage.setItem).not.toHaveBeenCalled();
   });