Merge pull request #595 from knowit/fix/9-opprette-opprette-AD-pålogging

[Fix] Opprette AD pålogging
knowit · Jun 11, 2024 · fe066f1 · fe066f1
2 parents 48448b5 + 8c65687
commit fe066f1
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 3 deletions.
diff --git a/.github/workflows/deploy-dev-force.yml b/.github/workflows/deploy-dev-force.yml
@@ -4,30 +4,39 @@ name: Deploy - Dev Force
 on:
   workflow_dispatch:
 
+env:
+  REACT_APP_ENV: development
+
 jobs:
   deploy_server:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:
           ref: master
+
       - name: Set up node 18
         uses: actions/setup-node@v3
         with:
           node-version: "18"
+
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v1
         with:
           aws-access-key-id: ${{ secrets.DEV_AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.DEV_AWS_SECRET_ACCESS_KEY }}
           aws-region: eu-central-1
+
       - name: Install serverless
         run: npm install -g serverless@3.25.1
+
       - name: Install server dependencies
         run: yarn workspaces focus server
+
       - uses: softprops/turnstyle@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Deploy server
         run: serverless deploy --stage dev --force
 
@@ -38,28 +47,39 @@ jobs:
       - uses: actions/checkout@v4
         with:
           ref: master
+
       - name: Set up node 18
         uses: actions/setup-node@v3
         with:
           node-version: "18"
+
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v1
         with:
           aws-access-key-id: ${{ secrets.DEV_AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.DEV_AWS_SECRET_ACCESS_KEY }}
           aws-region: eu-central-1
+
+      - name: Add env variable to .env file
+        working-directory: ./apps/web
+        run: echo "REACT_APP_ENV=$REACT_APP_ENV" >> .env
+
       - name: Install dependencies
         working-directory: apps/web
         run: yarn install
+
       - uses: softprops/turnstyle@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Build web
         working-directory: apps/web
         run: yarn predeploy:dev
+
       - name: Deploy web
         working-directory: apps/web
         run: yarn deploy:dev
+
       - name: Update invalidation
         working-directory: apps/web
         run: yarn postdeploy:dev
diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml
@@ -5,28 +5,37 @@ on:
     types: [published]
   workflow_dispatch:
 
+env:
+  REACT_APP_ENV: production
+
 jobs:
   deploy_server:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+
       - name: Set up node 18
         uses: actions/setup-node@v3
         with:
           node-version: "18"
+
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v1
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws-region: eu-central-1
+
       - name: Install serverless
         run: npm install -g serverless@3.25.1
+
       - name: Install server dependencies
         run: yarn workspaces focus server
+
       - uses: softprops/turnstyle@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Deploy server
         run: serverless deploy --stage prod
 
@@ -35,28 +44,39 @@ jobs:
     needs: deploy_server
     steps:
       - uses: actions/checkout@v2
+
       - name: Set up node 18
         uses: actions/setup-node@v3
         with:
           node-version: "18"
+
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v1
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws-region: eu-central-1
+
+      - name: Add env variable to .env file
+        working-directory: ./apps/web
+        run: echo "REACT_APP_ENV=$REACT_APP_ENV" >> .env
+
       - name: Install dependencies
         working-directory: apps/web
         run: yarn install
+
       - uses: softprops/turnstyle@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Build web
         working-directory: apps/web
         run: yarn predeploy:prod
+
       - name: Deploy web
         working-directory: apps/web
         run: yarn deploy:prod
+
       - name: Update invalidation
         working-directory: apps/web
         run: yarn postdeploy:prod
@@ -68,6 +88,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+
       - name: Slack Notification
         uses: rtCamp/action-slack-notify@v2
         env:

diff --git a/apps/web/src/config/envs/prod.ts b/apps/web/src/config/envs/prod.ts
@@ -3,7 +3,7 @@ import { defineConfig } from '../defineConfig'
 export function createProdConfig() {
   return defineConfig({
     env: 'production',
-    oauthDomain: 'https://auth.knowit.no/',
+    oauthDomain: 'prod-folk-user-pool.auth.eu-central-1.amazoncognito.com',
     redirectUrls: ['https://folk.knowit.no/'],
     userPoolClientId: '4447oe7lraspnfmetdd5bv431c',
     userPoolId: 'eu-central-1_774ftywyI',

diff --git a/apps/web/src/config/index.ts b/apps/web/src/config/index.ts
@@ -4,8 +4,6 @@ import { createProdConfig } from './envs/prod'
 export const appConfig = getConfig()
 
 function getConfig() {
-  console.log('NODE_ENV:', process.env.NODE_ENV)
-  console.log('Environment:', process.env.REACT_APP_ENV)
   switch (process.env.REACT_APP_ENV) {
     case 'production':
       return createProdConfig()