adding CLIENT_URL(GOOGLE) and API_URL(target_backend) as env-vars

Author: rodolfoIOET

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

@@ -28,8 +28,10 @@ jobs:
 
     - name: Inject Secrets
       env:
+        API_URL: ${{ secrets.api_url }}
         SCOPES: ${{ secrets.scopes }}
         CLIENT_ID: ${{ secrets.client_id }}
+        CLIENT_URL: ${{ secrets.client_url }} #IMPORTANT THIS PROPERTY HAS TO BE REQUESTED FROM ALEXANDER ARCOS he is the owner and this secrets needs to be created in github-repo
         AUTHORITY: ${{ secrets.authority }}
         STACK_EXCHANGE_ID: ${{ secrets.stack_exchange_id }}
         STACK_EXCHANGE_ACCESS_TOKEN: ${{ secrets.stack_exchange_access_token }}

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

@@ -41,6 +41,8 @@ jobs:
 
     - name: Inject Secrets
       env:
+        API_URL : ${{ secrets.API_URL }}
+        CLIENT_URL : ${{ secrets.CLIENT_URL }}
         SCOPES: ${{ secrets.SCOPES }}
         CLIENT_ID: ${{ secrets.CLIENT_ID }}
         AUTHORITY: ${{ secrets.AUTHORITY }}

.github/workflows/time-tracker-ui-cd-stage.yml

@@ -35,6 +35,7 @@ jobs:
     - name: Inject Secrets
       env:
         SCOPES: ${{ secrets.SCOPES }}
+        API_URL: ${{ secrets.API_URL_STAGE }}
         CLIENT_ID: ${{ secrets.CLIENT_ID_STAGE }}
         CLIENT_URL: ${{ secrets.CLIENT_URL_STAGE }}
         AUTHORITY: ${{ secrets.AUTHORITY }}

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

@@ -35,6 +35,7 @@ jobs:
 
     - name: Inject Secrets
       env:
+        API_URL: ${{ secrets.API_URL_STAGE }}
         SCOPES: ${{ secrets.SCOPES }}
         CLIENT_ID: ${{ secrets.CLIENT_ID_STAGE }}
         CLIENT_URL: ${{ secrets.CLIENT_URL_STAGE }}

docker-compose.yml

@@ -10,6 +10,7 @@ services:
       - 4200:4200
       - 9876:9876
     environment:
+      API_URL: ${API_URL}
       AUTHORITY: ${AUTHORITY}
       CLIENT_ID: ${CLIENT_ID}
       CLIENT_URL: ${CLIENT_URL}
@@ -40,7 +41,9 @@ services:
       - 9876:9876
     environment:
       CHROME_BIN: /opt/google/chrome/google-chrome
+      API_URL: ${API_URL}
       AUTHORITY: ${AUTHORITY}
+      CLIENT_URL: ${CLIENT_URL}
       CLIENT_ID: ${CLIENT_ID}
       SCOPES: ${SCOPES}
       STACK_EXCHANGE_ID: ${STACK_EXCHANGE_ID}

scripts/populate-keys.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 > .env
+echo "API_URL='$API_URL'" >> .env
 echo "AUTHORITY='$AUTHORITY'" >> .env
 echo "CLIENT_ID='$CLIENT_ID'" >> .env
 echo "CLIENT_URL='$CLIENT_URL'" >> .env

src/environments/environment.prod.ts

@@ -1,7 +1,7 @@
 
 export const environment = {
   production: true,
-  timeTrackerApiUrl: 'https://timetracker-api.azurewebsites.net',
+  timeTrackerApiUrl: process.env["API_URL"],
   stackexchangeApiUrl: 'https://api.stackexchange.com',
 };
 

src/environments/environment.ts

@@ -4,7 +4,7 @@
 
 export const environment = {
   production: false,
-  timeTrackerApiUrl: 'http://localhost:7071/api',
+  timeTrackerApiUrl: process.env["API_URL"],
   stackexchangeApiUrl: 'https://api.stackexchange.com',
 };
 

webpack.config.js

@@ -9,6 +9,7 @@ module.exports = (config) => {
       ...config.plugins,
       new webpack.DefinePlugin({
         '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.CLIENT_URL':JSON.stringify(process.env["CLIENT_URL"]),
         'process.env.SCOPES':JSON.stringify(process.env["SCOPES"]),