first comit

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

@@ -28,9 +28,11 @@ jobs:
 
     - name: Inject Secrets
       env:
+        AUTHORITY: ${{ secrets.authority }}
+        API_URL: ${{ secrets.api_url }}
         SCOPES: ${{ secrets.scopes }}
         CLIENT_ID: ${{ secrets.client_id }}
-        AUTHORITY: ${{ secrets.authority }}
+        CLIENT_URL: ${{ secrets.client_url }}
         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

@@ -41,9 +41,11 @@ jobs:
 
     - name: Inject Secrets
       env:
+        AUTHORITY: ${{ secrets.AUTHORITY }}
+        API_URL : ${{ secrets.API_URL }}
         SCOPES: ${{ secrets.SCOPES }}
         CLIENT_ID: ${{ secrets.CLIENT_ID }}
-        AUTHORITY: ${{ secrets.AUTHORITY }}
+        CLIENT_URL : ${{ secrets.CLIENT_URL }}
         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/time-tracker-ui-ci.yml

@@ -35,11 +35,13 @@ jobs:
 
     - name: Inject Secrets
       env:
-        SCOPES: ${{ secrets.SCOPES }}
-        CLIENT_ID: ${{ secrets.CLIENT_ID }}
         AUTHORITY: ${{ secrets.AUTHORITY }}
-        STACK_EXCHANGE_ID: ${{ secrets.STACK_EXCHANGE_ID }}
-        STACK_EXCHANGE_ACCESS_TOKEN: ${{ secrets.STACK_EXCHANGE_ACCESS_TOKEN }}
+        API_URL: ${{ secrets.STAGE_API_URL}}
+        SCOPES: ${{ secrets.SCOPES }}
+        CLIENT_ID: ${{ secrets.STAGE_CLIENT_ID }}
+        CLIENT_URL: ${{ secrets.STAGE_CLIENT_URL }}
+        STACK_EXCHANGE_ID: ${{ secrets.STAGE_STACK_EXCHANGE_ID }}
+        STACK_EXCHANGE_ACCESS_TOKEN: ${{ secrets.STAGE_STACK_EXCHANGE_ACCESS_TOKEN }}
         AZURE_APP_CONFIGURATION_CONNECTION_STRING: ${{ secrets.AZURE_APP_CONFIGURATION_CONNECTION_STRING }}
       run: |
         chmod +x ./scripts/populate-keys.sh

docker-compose.yml

@@ -11,14 +11,13 @@ services:
       - 9876:9876
     environment:
       AUTHORITY: ${AUTHORITY}
+      API_URL: ${API_URL}
       CLIENT_ID: ${CLIENT_ID}
+      CLIENT_URL: ${CLIENT_URL}
       SCOPES: ${SCOPES}
       STACK_EXCHANGE_ID: ${STACK_EXCHANGE_ID}
       STACK_EXCHANGE_ACCESS_TOKEN: ${STACK_EXCHANGE_ACCESS_TOKEN}
       AZURE_APP_CONFIGURATION_CONNECTION_STRING: ${AZURE_APP_CONFIGURATION_CONNECTION_STRING}
-      AUTHORITY_JSON: ${AUTHORITY_JSON}
-      CLIENT_ID_JSON: ${CLIENT_ID_JSON}
-      SCOPES_JSON: ${SCOPES_JSON}
     volumes:
       - ./src:/home/timetracker/time-tracker-ui/src/
       - ./scripts:/home/timetracker/time-tracker-ui/scripts/
@@ -40,11 +39,10 @@ services:
     environment:
       CHROME_BIN: /opt/google/chrome/google-chrome
       AUTHORITY: ${AUTHORITY}
+      API_URL: ${API_URL}
       CLIENT_ID: ${CLIENT_ID}
+      CLIENT_URL: ${CLIENT_URL}
       SCOPES: ${SCOPES}
       STACK_EXCHANGE_ID: ${STACK_EXCHANGE_ID}
       STACK_EXCHANGE_ACCESS_TOKEN: ${STACK_EXCHANGE_ACCESS_TOKEN}
-      AZURE_APP_CONFIGURATION_CONNECTION_STRING: ${AZURE_APP_CONFIGURATION_CONNECTION_STRING}
-      AUTHORITY_JSON: ${AUTHORITY_JSON}
-      CLIENT_ID_JSON: ${CLIENT_ID_JSON}
-      SCOPES_JSON: ${SCOPES_JSON}
+      AZURE_APP_CONFIGURATION_CONNECTION_STRING: ${AZURE_APP_CONFIGURATION_CONNECTION_STRING}

scripts/populate-keys.sh

@@ -2,7 +2,9 @@
 
 > .env
 echo "AUTHORITY='$AUTHORITY'" >> .env
+echo "API_URL='$API_URL'" >> .env
 echo "CLIENT_ID='$CLIENT_ID'" >> .env
+echo "CLIENT_URL='$CLIENT_URL'" >> .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/app.module.ts

@@ -46,7 +46,7 @@ import { ProjectEffects } from './modules/customer-management/components/project
 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 { environment } from '../environments/environment';
+import { environment, CLIENT_URL } from '../environments/environment';
 import { CustomerComponent } from './modules/customer-management/pages/customer.component';
 // tslint:disable-next-line: max-line-length
 import { CustomerListComponent } from './modules/customer-management/components/customer-info/components/customer-list/customer-list.component';
@@ -207,7 +207,7 @@ const maskConfig: Partial<IConfig> = {
           {
             id: GoogleLoginProvider.PROVIDER_ID,
             provider: new GoogleLoginProvider(
-              '565556796659-hscrj9e6m2krc41cfng898793ocfnb8j.apps.googleusercontent.com'
+              CLIENT_URL
             )
           }
         ]

src/environments/environment.prod.ts

@@ -1,12 +1,13 @@
 
 export const environment = {
   production: true,
-  timeTrackerApiUrl: 'https://timetracker-api.azurewebsites.net',
+  timeTrackerApiUrl: process.env["API_URL"],
   stackexchangeApiUrl: 'https://api.stackexchange.com',
 };
 
 export const AUTHORITY = process.env["AUTHORITY"];
 export const CLIENT_ID = process.env["CLIENT_ID"];
+export const CLIENT_URL = process.env["CLIENT_URL"];
 export const SCOPES = process.env["SCOPES"].split(",");
 export const ITEMS_PER_PAGE = 5;
 export const STACK_EXCHANGE_ID = process.env["STACK_EXCHANGE_ID"];

src/environments/environment.ts

@@ -4,12 +4,13 @@
 
 export const environment = {
   production: false,
-  timeTrackerApiUrl: 'http://localhost:7071/api',
+  timeTrackerApiUrl: process.env["API_URL"],
   stackexchangeApiUrl: 'https://api.stackexchange.com',
 };
 
 export const AUTHORITY = process.env["AUTHORITY"];
 export const CLIENT_ID = process.env["CLIENT_ID"];
+export const CLIENT_URL = process.env["CLIENT_URL"];
 export const SCOPES = process.env["SCOPES"].split(",");
 export const ITEMS_PER_PAGE = 5;
 export const STACK_EXCHANGE_ID = process.env["STACK_EXCHANGE_ID"];

webpack.config.js

@@ -9,7 +9,9 @@ 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"]),
         'process.env.STACK_EXCHANGE_ID':JSON.stringify(process.env["STACK_EXCHANGE_ID"]),
         'process.env.STACK_EXCHANGE_ACCESS_TOKEN':JSON.stringify(process.env["STACK_EXCHANGE_ACCESS_TOKEN"]),