From 734fba49904f500d6b2cfc7f5f4e04fe53d869fc Mon Sep 17 00:00:00 2001
From: Galip Tolga Erdem <galiperdem@gmail.com>
Date: Tue, 2 Nov 2021 17:20:32 +0300
Subject: [PATCH] angular dockerfile and nginx update

---
 apps/angular/Dockerfile                       |  4 ++-
 apps/angular/dynamic-env.json                 | 21 +++++++++++++
 apps/angular/nginx.conf                       | 30 +++++++++++++++++++
 .../src/environments/environment.prod.ts      |  6 +++-
 4 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 apps/angular/dynamic-env.json
 create mode 100644 apps/angular/nginx.conf

diff --git a/apps/angular/Dockerfile b/apps/angular/Dockerfile
index 6912e62c..5f83f0de 100644
--- a/apps/angular/Dockerfile
+++ b/apps/angular/Dockerfile
@@ -1,3 +1,5 @@
 FROM nginx:alpine
 WORKDIR /app
-COPY dist/EShopOnAbp /usr/share/nginx/html
\ No newline at end of file
+COPY dist/EShopOnAbp /usr/share/nginx/html
+COPY dynamic-env.json /usr/share/nginx/html
+COPY /nginx.conf  /etc/nginx/conf.d/default.conf
\ No newline at end of file
diff --git a/apps/angular/dynamic-env.json b/apps/angular/dynamic-env.json
new file mode 100644
index 00000000..1a1ff42a
--- /dev/null
+++ b/apps/angular/dynamic-env.json
@@ -0,0 +1,21 @@
+{
+  "production": true,
+  "application": {
+    "baseUrl":"https://eshop-st-web",
+    "name": "EShopOnAbp",
+    "logoUrl": ""
+  },
+  "oAuthConfig": {
+    "issuer": "https://eshop-st-authserver",
+    "redirectUri": "https://eshop-st-web",
+    "clientId": "EShopOnAbp_App",
+    "responseType": "code",
+    "scope": "offline_access openid profile email phone IdentityService AdministrationService SaasService"
+  },
+  "apis": {
+    "default": {
+      "url": "https://eshop-st-gateway-web",
+      "rootNamespace": "EShopOnAbp"
+    }
+  }
+}
\ No newline at end of file
diff --git a/apps/angular/nginx.conf b/apps/angular/nginx.conf
new file mode 100644
index 00000000..11f9847a
--- /dev/null
+++ b/apps/angular/nginx.conf
@@ -0,0 +1,30 @@
+server {
+    listen       80;
+    listen  [::]:80;
+    server_name  _;
+
+    #access_log  /var/log/nginx/host.access.log  main;
+    
+	location / {
+        root   /usr/share/nginx/html;        
+        index  index.html index.htm;
+        try_files $uri $uri/ /index.html =404;		
+	}
+	
+	location /getEnvConfig {
+		default_type 'application/json';
+        add_header 'Access-Control-Allow-Origin' '*' always;
+        add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS' always;
+        add_header 'Content-Type' 'application/json';
+		try_files $uri /dynamic-env.json;
+    }
+
+    #error_page  404              /404.html;
+
+    # redirect server error pages to the static page /50x.html
+    #
+    error_page   500 502 503 504  /50x.html;
+    location = /50x.html {
+        root   /usr/share/nginx/html;
+    }
+}
\ No newline at end of file
diff --git a/apps/angular/src/environments/environment.prod.ts b/apps/angular/src/environments/environment.prod.ts
index b5ede0c0..934f1283 100644
--- a/apps/angular/src/environments/environment.prod.ts
+++ b/apps/angular/src/environments/environment.prod.ts
@@ -14,7 +14,7 @@ export const environment = {
     redirectUri: baseUrl,
     clientId: 'EShopOnAbp_App',
     responseType: 'code',
-    scope: 'offline_access EShopOnAbp',
+    scope: 'offline_access openid profile email phone IdentityService AdministrationService SaasService',
   },
   apis: {
     default: {
@@ -22,4 +22,8 @@ export const environment = {
       rootNamespace: 'EShopOnAbp',
     },
   },
+  remoteEnv:{
+    url: "/getEnvConfig",
+    mergeStrategy:'deepmerge'
+  }
 } as Environment;