fix: TTA-180 fixing environment variables

Makefile

@@ -11,15 +11,15 @@ help: ## Show this help message.
 
 .PHONY: build
 build: ## Create docker image with dependencies needed for development.
-	docker-compose build timetracker_ui
+	docker-compose --env-file=.dev.env build timetracker_ui
 
 .PHONY: cleanup
 cleanup: ## Delete image timetracker_ui
 	docker rmi timetracker_ui
 
 .PHONY: run
 run: ## Execute timetracker_ui dev docker containe.
-	docker-compose --env-file=.dev.env  up  -d  timetracker_ui
+	docker-compose --env-file=.dev.env up -d timetracker_ui
 
 .PHONY: logs
 logs: ## Show logs of timetracker_ui.
@@ -41,7 +41,7 @@ remove: ## Delete container timetracker_ui.
 .PHONY: test
 test: ## Run all tests on docker container timetracker_ui at the CLI.
 	docker-compose build timetracker_ui_test
-	docker-compose up -d timetracker_ui_test
+	docker-compose --env-file=.dev.env up -d timetracker_ui_test
 	docker logs -f timetracker_ui_test
 
 .PHONY: testdev

docker-compose.yml

@@ -15,6 +15,7 @@ services:
       CLIENT_ID: ${CLIENT_ID}
       CLIENT_URL: ${CLIENT_URL}
       AUTH_URL: ${AUTH_URL}
+      AUTH_APP_NAME: ${AUTH_APP_NAME}
       SCOPES: ${SCOPES}
       STACK_EXCHANGE_ID: ${STACK_EXCHANGE_ID}
       STACK_EXCHANGE_ACCESS_TOKEN: ${STACK_EXCHANGE_ACCESS_TOKEN}

scripts/populate-keys.sh

@@ -5,6 +5,8 @@ echo "API_URL='$API_URL'" >> .env
 echo "AUTHORITY='$AUTHORITY'" >> .env
 echo "CLIENT_ID='$CLIENT_ID'" >> .env
 echo "CLIENT_URL='$CLIENT_URL'" >> .env
+echo "AUTH_URL='$AUTH_URL'" >> .env
+echo "AUTH_APP_NAME='$AUTH_APP_NAME'" >> .env
 echo "SCOPES='$SCOPES'" >> .env
 echo "STACK_EXCHANGE_ID='$STACK_EXCHANGE_ID'" >> .env
 echo "STACK_EXCHANGE_ACCESS_TOKEN='$STACK_EXCHANGE_ACCESS_TOKEN'" >> .env

src/app/modules/login/services/login.service.spec.ts

@@ -1,11 +1,11 @@
 import { HttpClient } from '@angular/common/http';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
-import { RouterTestingModule } from '@angular/router/testing';
 import { TestBed } from '@angular/core/testing';
-import { Router } from '@angular/router';
 import { JwtHelperService } from '@auth0/angular-jwt';
 import { SocialAuthService } from 'angularx-social-login';
 import { CookieService } from 'ngx-cookie-service';
+import { Router } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
 import { of } from 'rxjs';
 
 import { LoginService } from './login.service';
@@ -125,7 +125,6 @@ describe('LoginService', () => {
   });
 
   it('should logout with social angularx-social-login', () => {
-    service.router = router;
     spyOn(cookieService, 'deleteAll').and.returnValue();
     spyOn(service, 'invalidateSessionCookie').and.returnValue(of(true));
 

src/app/modules/login/services/login.service.ts

@@ -1,5 +1,5 @@
 import { HttpClient } from '@angular/common/http';
-import { Injectable } from '@angular/core';
+import { Injectable, NgZone } from '@angular/core';
 import { CookieService } from 'ngx-cookie-service';
 import { EnvironmentType, UserEnum } from 'src/environments/enum';
 import { environment } from 'src/environments/environment';
@@ -16,21 +16,25 @@ export class LoginService {
   helper: JwtHelperService;
   isLegacyProd: boolean = environment.production === EnvironmentType.TT_PROD_LEGACY;
   localStorageKey = this.isLegacyProd ? 'user2' : 'user';
-  router: Router;
+  ngZone?: NgZone;
+
 
   constructor(
     private http?: HttpClient,
     private cookieService?: CookieService,
+    private router?: Router,
   ) {
     this.baseUrl = `${environment.timeTrackerApiUrl}/users`;
     this.helper = new JwtHelperService();
+    this.router = router;
   }
 
   logout() {
     localStorage.clear();
     this.cookieService.deleteAll();
-    this.invalidateSessionCookie().subscribe(() => {
+    this.invalidateSessionCookie().toPromise().then(() => {
       this.router.navigate(['login']);
+      console.log()
     });
   }
 

src/app/modules/shared/components/dark-mode/dark-mode.component.spec.ts

@@ -7,17 +7,20 @@ import { FeatureToggleGeneralService } from '../../feature-toggles/feature-toggl
 import { FeatureToggleModel } from '../../feature-toggles/feature-toggle.model';
 import { FeatureFilterModel } from '../../feature-toggles/filters/feature-filter.model';
 import { DarkModeComponent } from './dark-mode.component';
+import { Router } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
 
 describe('DarkModeComponent', () => {
   let component: DarkModeComponent;
   let fixture: ComponentFixture<DarkModeComponent>;
   let html: HTMLElement;
   let featureToggleGeneralService: FeatureToggleGeneralService;
+  let router: Router;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       declarations: [DarkModeComponent],
-      imports: [HttpClientTestingModule],
+      imports: [HttpClientTestingModule, RouterTestingModule.withRoutes([])],
       providers: [{ provide: SocialAuthService, useValue: socialAuthServiceStub }]
     }).compileComponents();
   });
@@ -28,6 +31,7 @@ describe('DarkModeComponent', () => {
     component = fixture.componentInstance;
     html = document.documentElement;
     featureToggleGeneralService = TestBed.inject(FeatureToggleGeneralService);
+    router = TestBed.inject(Router);
     fixture.detectChanges();
   });
 

src/app/modules/shared/feature-toggles/feature-toggle-cookies/feature-toggle-cookies.service.spec.ts

@@ -7,23 +7,27 @@ import { FeatureToggleGeneralService } from '../feature-toggle-general/feature-t
 import { FeatureToggleModel } from '../feature-toggle.model';
 import { TargetingFeatureFilterModel } from '../filters/targeting/targeting-feature-filter.model';
 import { FeatureToggleCookiesService } from './feature-toggle-cookies.service';
+import { Router } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
 
 describe('FeatureToggleCookiesService', () => {
   let cookieService: CookieService;
   let featureToggleGeneralService: FeatureToggleGeneralService;
   let service: FeatureToggleCookiesService;
+  let router: Router;
 
   const socialAuthServiceStub = jasmine.createSpyObj('SocialAuthService', ['authState']);
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule],
+      imports: [HttpClientTestingModule, RouterTestingModule.withRoutes([])],
       providers: [CookieService, FeatureToggleGeneralService,
         { provide: SocialAuthService, useValue: socialAuthServiceStub }
       ]
     });
     cookieService = TestBed.inject(CookieService);
     featureToggleGeneralService = TestBed.inject(FeatureToggleGeneralService);
     service = TestBed.inject(FeatureToggleCookiesService);
+    router = TestBed.inject(Router);
   });
 
   it('should be created', () => {

src/app/modules/shared/feature-toggles/feature-toggle-general/feature-toggle-general.service.spec.ts

@@ -6,23 +6,27 @@ import { FeatureToggleModel } from '../feature-toggle.model';
 import { TargetingFeatureFilterModel } from '../filters/targeting/targeting-feature-filter.model';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { SocialAuthService } from 'angularx-social-login';
+import { Router } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
 
 
 describe('FeatureToggleGeneralService', () => {
   let featureToggleGeneralService: FeatureToggleGeneralService;
   let featureManagerService: FeatureManagerService;
+  let router: Router;
 
   const socialAuthServiceStub = jasmine.createSpyObj('SocialAuthService', ['authState']);
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule],
+      imports: [HttpClientTestingModule, RouterTestingModule.withRoutes([])],
       providers: [
         { provide: FeatureManagerService },
         { provide: SocialAuthService, useValue: socialAuthServiceStub }
       ],
     });
     featureToggleGeneralService = TestBed.inject(FeatureToggleGeneralService);
     featureManagerService = TestBed.inject(FeatureManagerService);
+    router = TestBed.inject(Router);
   });
 
   it('should be created', () => {

src/app/modules/time-clock/pages/time-clock.component.spec.ts

@@ -14,11 +14,14 @@ import { EntryFieldsComponent } from '../components/entry-fields/entry-fields.co
 import { ToastrService } from 'ngx-toastr';
 import { LoginService } from '../../login/services/login.service';
 import { SocialAuthService } from 'angularx-social-login';
+import { Router } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
 
 describe('TimeClockComponent', () => {
   let component: TimeClockComponent;
   let fixture: ComponentFixture<TimeClockComponent>;
   let store: MockStore<ProjectState>;
+  let router: Router;
   let azureAdB2CService: AzureAdB2CService;
   const actionSub: ActionsSubject = new ActionsSubject();
 
@@ -55,7 +58,7 @@ describe('TimeClockComponent', () => {
   beforeEach(
     waitForAsync(() => {
       TestBed.configureTestingModule({
-        imports: [HttpClientTestingModule],
+        imports: [HttpClientTestingModule, RouterTestingModule],
         declarations: [TimeClockComponent, ProjectListHoverComponent, FilterProjectPipe, EntryFieldsComponent],
         providers: [
           FormBuilder,
@@ -68,6 +71,7 @@ describe('TimeClockComponent', () => {
         ],
       }).compileComponents();
       store = TestBed.inject(MockStore);
+      router = TestBed.inject(Router);
     })
   );
 

src/app/modules/users/components/users-list/users-list.component.spec.ts

@@ -9,6 +9,8 @@ import { DataTablesModule } from 'angular-datatables';
 import { GrantUserRole, RevokeUserRole } from '../../store/user.actions';
 import { ROLES } from '../../../../../environments/environment';
 import { LoginService } from '../../../login/services/login.service';
+import { Router } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
 import { of } from 'rxjs';
 import { UserInfoService } from 'src/app/modules/user/services/user-info.service';
 
@@ -17,6 +19,7 @@ describe('UsersListComponent', () => {
   let component: UsersListComponent;
   let fixture: ComponentFixture<UsersListComponent>;
   let store: MockStore<UserState>;
+  let router: Router;
   let httpMock: HttpTestingController;
   const actionSub: ActionsSubject = new ActionsSubject();
   let loginService: LoginService;
@@ -44,7 +47,7 @@ describe('UsersListComponent', () => {
   beforeEach(
     waitForAsync(() => {
       TestBed.configureTestingModule({
-        imports: [NgxPaginationModule, DataTablesModule, HttpClientTestingModule],
+        imports: [NgxPaginationModule, DataTablesModule, HttpClientTestingModule, RouterTestingModule.withRoutes([])],
         declarations: [UsersListComponent],
         providers: [provideMockStore({ initialState: state }),
           { provide: ActionsSubject, useValue: actionSub },
@@ -60,6 +63,7 @@ describe('UsersListComponent', () => {
     httpMock = TestBed.inject(HttpTestingController);
     loginService = TestBed.inject(LoginService);
     userInfoService = TestBed.inject(UserInfoService);
+    router = TestBed.inject(Router);
     store.setState(state);
     fixture.detectChanges();
   });

webpack.config.js

@@ -13,6 +13,8 @@ module.exports = (config) => {
         'process.env.AUTHORITY': JSON.stringify(process.env["AUTHORITY"]),
         'process.env.API_URL':JSON.stringify(process.env["API_URL"]),
         'process.env.CLIENT_ID':JSON.stringify(process.env["CLIENT_ID"]),
+        'process.env.AUTH_URL':JSON.stringify(process.env["AUTH_URL"]),
+        'process.env.AUTH_APP_NAME':JSON.stringify(process.env["AUTH_APP_NAME"]),
         'process.env.CLIENT_URL':JSON.stringify(process.env["CLIENT_URL"]),
         'process.env.SCOPES':JSON.stringify(process.env["SCOPES"]),
         'process.env.STACK_EXCHANGE_ID':JSON.stringify(process.env["STACK_EXCHANGE_ID"]),