From fe89d57d3fca659cf7f382d3c8f848cb1f15b1e6 Mon Sep 17 00:00:00 2001
From: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date: Mon, 2 Aug 2021 09:20:41 +0200
Subject: [PATCH] Added open-shift configuration for api-route

---
 angular.json                                           |  8 ++++++++
 .../src/environments/environment.open-shift.ts         | 10 ++++++++++
 config/proxy.conf.api.json                             |  3 +--
 nginx/nginx.conf                                       |  1 -
 openshift/dev/Jenkinsfile                              |  2 +-
 package.json                                           |  1 +
 6 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 apps/dafa-web/src/environments/environment.open-shift.ts

diff --git a/angular.json b/angular.json
index cd622ea..203f457 100644
--- a/angular.json
+++ b/angular.json
@@ -90,6 +90,14 @@
                   "with": "apps/dafa-web/src/environments/environment.api.ts"
                 }
               ]
+            },
+            "open-shift": {
+              "fileReplacements": [
+                {
+                  "replace": "apps/dafa-web/src/environments/environment.ts",
+                  "with": "apps/dafa-web/src/environments/environment.open-shift.ts"
+                }
+              ]
             }
           }
         },
diff --git a/apps/dafa-web/src/environments/environment.open-shift.ts b/apps/dafa-web/src/environments/environment.open-shift.ts
new file mode 100644
index 0000000..acc332b
--- /dev/null
+++ b/apps/dafa-web/src/environments/environment.open-shift.ts
@@ -0,0 +1,10 @@
+export const environment = {
+  environment: 'api',
+  clientId: '5d08c2e4-763e-42f6-b858-24e4773bb83d',
+  loginUrl: 'https://ciam-test.arbetsformedlingen.se:8443/uas/oauth2/authorization?response_type=code&scope=openid',
+  production: false,
+  api: {
+    url: 'https://mina-sidor-fa-test-api.tocp.arbetsformedlingen.se/api',
+    headers: {},
+  },
+};
diff --git a/config/proxy.conf.api.json b/config/proxy.conf.api.json
index 1c2c64b..a426df3 100644
--- a/config/proxy.conf.api.json
+++ b/config/proxy.conf.api.json
@@ -1,7 +1,6 @@
 {
   "/api": {
-    // "target": "http://dafa-api-test.tocp.arbetsformedlingen.se",
-    "target": "http://mina-sidor-fa-test-api.tocp.arbetsformedlingen.se",
+    "target": "https://mina-sidor-fa-test-api.tocp.arbetsformedlingen.se",
     "secure": false,
     "changeOrigin": true
   }
diff --git a/nginx/nginx.conf b/nginx/nginx.conf
index 1b8d0eb..2ae2e5b 100644
--- a/nginx/nginx.conf
+++ b/nginx/nginx.conf
@@ -72,7 +72,6 @@ http {
         #   proxy_pass $JWT_URL;
         # }
 
-
         error_page 404 /404.html;
         location = /40x.html {
 
diff --git a/openshift/dev/Jenkinsfile b/openshift/dev/Jenkinsfile
index c994c63..b5dd2db 100644
--- a/openshift/dev/Jenkinsfile
+++ b/openshift/dev/Jenkinsfile
@@ -95,7 +95,7 @@ pipeline {
         echo '### Building application... ###'
 
          sh '''
-          npm run build:api
+          npm run build:open-shift
           cp -r nginx/* ${NGINX_PATH}
         '''
 
diff --git a/package.json b/package.json
index b077fe1..15a4277 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
     "start:api": "ng serve dafa-web --configuration api",
     "build": "ng build dafa-web",
     "build:api": "ng build dafa-web --configuration api",
+    "build:open-shift": "ng build dafa-web --configuration open-shift",
     "test": "ng test dafa-web",
     "release": "bash ./tools/release.sh",
     "release:dry": "bash ./tools/release.sh dry",