From 424c48ac3d94689275b732ea293ff23eae9947c0 Mon Sep 17 00:00:00 2001
From: Galip Tolga Erdem <galiperdem@gmail.com>
Date: Mon, 15 Jan 2024 14:52:36 -0500
Subject: [PATCH] Updated angular keycloak integration

---
 etc/k8s/eshoponabp/charts/web/templates/web-configmap.yaml | 2 +-
 etc/k8s/eshoponabp/values.st.yaml                          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/etc/k8s/eshoponabp/charts/web/templates/web-configmap.yaml b/etc/k8s/eshoponabp/charts/web/templates/web-configmap.yaml
index 0884be6e..6f42a385 100644
--- a/etc/k8s/eshoponabp/charts/web/templates/web-configmap.yaml
+++ b/etc/k8s/eshoponabp/charts/web/templates/web-configmap.yaml
@@ -18,7 +18,7 @@ data:
             "clientId": "Web",
             "responseType": "code",
             "responseType": "{{ .Values.config.authServer.responseType }}",
-            "scope": "offline_access openid profile email phone AccountService IdentityService AdministrationService CatalogService OrderingService",
+            "scope": "offline_access openid profile email phone roles AdministrationService IdentityService BasketService CatalogService OrderingService PaymentService CmskitService",
             "strictDiscoveryDocumentValidation": {{ .Values.config.authServer.strictDiscoveryDocumentValidation }},
             "skipIssuerCheck": {{ .Values.config.authServer.skipIssuerCheck }}
         },
diff --git a/etc/k8s/eshoponabp/values.st.yaml b/etc/k8s/eshoponabp/values.st.yaml
index 4761c48e..a778b7fe 100644
--- a/etc/k8s/eshoponabp/values.st.yaml
+++ b/etc/k8s/eshoponabp/values.st.yaml
@@ -33,7 +33,7 @@ web:
     selfUrl: https://admin.eshoponabp.dev
     gatewayUrl: https://gateway-web.eshoponabp.dev
     authServer:
-      authority: https://account.eshoponabp.dev
+      authority: https://account.eshoponabp.dev/realms/master
       requireHttpsMetadata: false
       responseType: "code"
       strictDiscoveryDocumentValidation: false
@@ -112,7 +112,7 @@ identity:
 administration:
   config:
     selfUrl: https://administration.eshoponabp.dev
-    corsOrigins: https://gateway-web.eshoponabp.dev,https://gateway-public.eshoponabp.dev
+    corsOrigins: https://gateway-web.eshoponabp.dev,https://gateway-public.eshoponabp.dev,https://admin.eshoponabp.dev
     connectionStrings:
       administrationService: "Host=eshop-st-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false"
     authServer: