Tta 180 integrate time tracker with auth app (#940)

* refactor: TTA-180 change  Client URL for Auth URL

* TTA-180: fixing endpoints to send credentials

* refactor: TTA-115 refactor backend URL for dev

* refactor: TTA-115 pass the environment auth variable link to the a tag

* fix: TTA-115 fix error Type 'string' is not assignable to type 'void in login.component

* feat: TTA-180 creating logout

* fix: TTA-180 fixing tests

* fix: TTA-180 fixing environment variables

* fix: TTA-180 fixing environment variables

* fix: TTA-180 fixing environment variables

* fix: TTA-180 fixing environment variables

* fix: TTA-180 fixing environment variables

* fix: TTA-180 fixing environment variables

* feat: TTA-180 updating README.md

* fix: TTA-180 removing unused variables

* fix: TTA-180 increasing test coveragew

* fix: TTA-180 increasing test coveragew

* fix: TTA-180 CR fixes

Co-authored-by: Abigail Cabascango <sacabascango1espe.edu.ec>

Author: Reihtw

.dev.env

@@ -34,6 +34,8 @@ jobs:
         CLIENT_ID: ${{ secrets.client_id }}
         CLIENT_URL: ${{ secrets.client_url }}
         STACK_EXCHANGE_ID: ${{ secrets.stack_exchange_id }}
+        AUTH_URL: ${{ secrets.AUTH_URL }}
+        AUTH_APP_NAME: ${{ secrets.AUTH_APP_NAME }}
         STACK_EXCHANGE_ACCESS_TOKEN: ${{ secrets.stack_exchange_access_token }}
         AZURE_APP_CONFIGURATION_CONNECTION_STRING: ${{ secrets.azure_app_configuration_connection_string }}
       run: |

.github/workflows/CD-time-tracker-ui.yml

@@ -46,6 +46,8 @@ jobs:
         SCOPES: ${{ secrets.SCOPES }}
         CLIENT_ID: ${{ secrets.CLIENT_ID }}
         CLIENT_URL : ${{ secrets.CLIENT_URL }}
+        AUTH_URL: ${{ secrets.AUTH_URL }}
+        AUTH_APP_NAME: ${{ secrets.AUTH_APP_NAME }}
         STACK_EXCHANGE_ID: ${{ secrets.STACK_EXCHANGE_ID }}
         STACK_EXCHANGE_ACCESS_TOKEN: ${{ secrets.STACK_EXCHANGE_ACCESS_TOKEN }}
         AZURE_APP_CONFIGURATION_CONNECTION_STRING: ${{ secrets.AZURE_APP_CONFIGURATION_CONNECTION_STRING }}

.github/workflows/CI-time-tracker-ui.yml

@@ -29,12 +29,16 @@ jobs:
       with:
         ssh-private-key: ${{ secrets.INFRA_TERRAFORM_MODULES_SSH_PRIV_KEY }}
 
+    - name: Unlock DEV secrets
+      uses: sliteteam/[email protected]
+      env:
+        GIT_CRYPT_KEY: ${{ secrets.GIT_CRYPT_KEY_DEFAULT }}
+
     - name: build docker
       run: make build
 
     - name: Running tests
       run: |
-        chmod -R 777 ./$home
         make test
     - name: Generate coverage report
       env:

.github/workflows/time-tracker-ui-ci.yml

@@ -19,7 +19,7 @@ cleanup: ## Delete image 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

Makefile

@@ -59,6 +59,13 @@ In project path, open your favourite command line and run `npm install` in order
 
 # Prepare your environment
 
+### **Local DNS Configuration**
+
+To test the application in a local environment please modify you `/etc/hosts` on Linux/Mac. In Windows `C:\Windows\System32\Drivers\etc\hosts` and add this line:
+```text
+127.0.0.1 timetracker-dev.ioet.com
+```
+
 ### Set environment variables
 **1**. Using GPG create your key by running this command in your favourite command shell: `gpg --generate-key`.
 

README.md

@@ -3,6 +3,8 @@ services:
   timetracker_ui:
     container_name: timetracker_ui
     image: timetracker_ui
+    env_file:
+      - .dev.env
     build:
       context: .
       dockerfile: ./Docker/Dockerfile.dev
@@ -14,6 +16,8 @@ services:
       API_URL: ${API_URL}
       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}

docker-compose.yml

@@ -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

scripts/populate-keys.sh

@@ -14,7 +14,7 @@ export class ActivityService {
   constructor(private http: HttpClient) {}
 
   getActivities(): Observable<Activity[]> {
-    return this.http.get<Activity[]>(this.baseUrl);
+    return this.http.get<Activity[]>(this.baseUrl, { withCredentials: true });
   }
 
   createActivity(activityData): Observable<any> {
@@ -23,12 +23,12 @@ export class ActivityService {
       tenant_id: '4225ab1e-1033-4a5f-8650-0dd4950f38c8',
     };
 
-    return this.http.post(this.baseUrl, body);
+    return this.http.post(this.baseUrl, body, { withCredentials: true });
   }
 
   deleteActivity(acitivityId: string): Observable<any> {
     const url = `${this.baseUrl}/${acitivityId}`;
-    return this.http.delete(url);
+    return this.http.delete(url, { withCredentials: true });
   }
 
   updateActivity(activityData): Observable<any> {
@@ -38,6 +38,6 @@ export class ActivityService {
       ...activityData,
     };
 
-    return this.http.put(url, body);
+    return this.http.put(url, body, { withCredentials: true });
   }
 }

src/app/modules/activities-management/services/activity.service.ts

@@ -15,20 +15,20 @@ export class ProjectTypeService {
 
   getProjectTypes(customerId: any): Observable<ProjectType[]> {
     const params = new HttpParams().set('customer_id', customerId.customerId);
-    return this.http.get<ProjectType[]>(this.baseUrl, { params });
+    return this.http.get<ProjectType[]>(this.baseUrl, { params, withCredentials: true });
   }
 
   createProjectType(projectTypeData): Observable<any> {
-    return this.http.post(this.baseUrl, projectTypeData);
+    return this.http.post(this.baseUrl, projectTypeData, { withCredentials: true });
   }
 
   deleteProjectType(projectTypeId: string): Observable<any> {
     const url = `${this.baseUrl}/${projectTypeId}`;
-    return this.http.delete(url);
+    return this.http.delete(url, { withCredentials: true });
   }
 
   updateProjectType(projectTypeData): Observable<any> {
     const url = `${this.baseUrl}/${projectTypeData.id}`;
-    return this.http.put(url, projectTypeData);
+    return this.http.put(url, projectTypeData, { withCredentials: true });
   }
 }