Merge pull request #233 from abpframework/gterdem/k8s_swagger_fix

Swagger Authentication problem on K8s production

etc/k8s/eshoponabp/charts/administration/templates/administration-deployment.yaml

@@ -43,8 +43,6 @@ spec:
           value: "{{ .Values.config.authServer.metadataAddress }}"
         - name: "AuthServer__SwaggerClientId"
           value: "{{ .Values.config.authServer.swaggerClientId }}"
-        - name: "AuthServer__SwaggerClientSecret"
-          value: "{{ .Values.config.authServer.swaggerClientSecret }}"
         - name: "StringEncryption__DefaultPassPhrase"
           value: "{{ .Values.config.stringEncryptionDefaultPassPhrase }}"
         - name: "RabbitMQ__Connections__Default__HostName"

etc/k8s/eshoponabp/charts/basket/templates/basket-deployment.yaml

@@ -42,9 +42,7 @@ spec:
         - name: "AuthServer__MetadataAddress"
           value: "{{ .Values.config.authServer.metadataAddress }}"
         - name: "AuthServer__SwaggerClientId"
-          value: "{{ .Values.config.swaggerClientId }}"
-        - name: "AuthServer__SwaggerClientSecret"
-          value: "{{ .Values.config.swaggerClientSecret }}"
+          value: "{{ .Values.config.authServer.swaggerClientId }}"
         - name: "StringEncryption__DefaultPassPhrase"
           value: "{{ .Values.config.stringEncryptionDefaultPassPhrase }}"
         - name: "RemoteServices__Catalog__BaseUrl"

etc/k8s/eshoponabp/charts/basket/values.yaml

@@ -8,7 +8,6 @@ config:
     requireHttpsMetadata: "false"
     metadataAddress: http://eshop-st-keycloak:8080
     swaggerClientId: "WebGateway_Swagger"
-    swaggerClientSecret: "1q2w3e*"
   dotnetEnv: Staging
   redisHost: eshop-st-redis
   rabbitmqHost: eshop-st-rabbitmq

etc/k8s/eshoponabp/charts/catalog/templates/catalog-deployment.yaml

@@ -51,8 +51,6 @@ spec:
           value: "{{ .Values.config.authServer.metadataAddress }}"
         - name: "AuthServer__SwaggerClientId"
           value: "{{ .Values.config.authServer.swaggerClientId }}"
-        - name: "AuthServer__SwaggerClientSecret"
-          value: "{{ .Values.config.authServer.swaggerClientSecret }}"
         - name: "StringEncryption__DefaultPassPhrase"
           value: "{{ .Values.config.stringEncryptionDefaultPassPhrase }}"
         - name: "Kestrel__Endpoints__Http__Url"

etc/k8s/eshoponabp/charts/catalog/values.yaml

@@ -9,7 +9,6 @@ config:
     requireHttpsMetadata: "false"
     metadataAddress: http://eshop-st-keycloak:8080
     swaggerClientId: WebGateway_Swagger
-    swaggerClientSecret: "1q2w3e*"
   dotnetEnv: Staging
   redisHost: eshop-st-redis
   rabbitmqHost: eshop-st-rabbitmq

etc/k8s/eshoponabp/charts/cmskit/templates/cmskit-deployment.yaml

@@ -45,8 +45,6 @@ spec:
           value: "{{ .Values.config.authServer.metadataAddress }}"
         - name: "AuthServer__SwaggerClientId"
           value: "{{ .Values.config.authServer.swaggerClientId }}"
-        - name: "AuthServer__SwaggerClientSecret"
-          value: "{{ .Values.config.authServer.swaggerClientSecret }}"
         - name: "StringEncryption__DefaultPassPhrase"
           value: "{{ .Values.config.stringEncryptionDefaultPassPhrase }}"
         - name: RemoteServices__AbpIdentity__BaseUrl

etc/k8s/eshoponabp/charts/cmskit/values.yaml

@@ -9,7 +9,6 @@ config:
     requireHttpsMetadata: "false"
     metadataAddress: http://eshop-st-keycloak:8080
     swaggerClientId: WebGateway_Swagger
-    swaggerClientSecret: "1q2w3e*"
   remoteServices:
     abpIdentityBaseUrl: #
   dotnetEnv: Staging

etc/k8s/eshoponabp/charts/gateway-web-public/templates/gateway-web-public-deployment.yaml

@@ -41,8 +41,6 @@ spec:
           value: "{{ .Values.config.authServer.requireHttpsMetadata }}"
         - name: "AuthServer__SwaggerClientId"
           value: "{{ .Values.config.authServer.swaggerClientId }}"
-        - name: "AuthServer__SwaggerClientSecret"
-          value: "{{ .Values.config.authServer.swaggerClientSecret }}"
         - name: "ElasticSearch__Url"
           value: "{{ .Values.config.elasticsearchHost }}"
           {{- if .Values.env }}

etc/k8s/eshoponabp/charts/gateway-web-public/values.yaml

@@ -5,7 +5,6 @@ config:
     authority: http://eshop-st-authserver
     requireHttpsMetadata: "false"
     swaggerClientId: WebGateway_Swagger
-    swaggerClientSecret: "1q2w3e*"
   dotnetEnv: Staging 
   redisHost: eshop-st-redis
   rabbitmqHost: eshop-st-rabbitmq

etc/k8s/eshoponabp/charts/gateway-web/templates/gateway-web-deployment.yaml

@@ -43,8 +43,6 @@ spec:
           value: "{{ .Values.config.authServer.requireHttpsMetadata }}"
         - name: "AuthServer__SwaggerClientId"
           value: "{{ .Values.config.authServer.swaggerClientId }}"
-        - name: "AuthServer__SwaggerClientSecret"
-          value: "{{ .Values.config.authServer.swaggerClientSecret }}"  
         - name: "ElasticSearch__Url"
           value: "{{ .Values.config.elasticsearchHost }}"          
         - name: "StringEncryption__DefaultPassPhrase"

etc/k8s/eshoponabp/charts/gateway-web/values.yaml

@@ -6,7 +6,6 @@ config:
     authority: http://eshop-st-authserver
     requireHttpsMetadata: "false"
     swaggerClientId: WebGateway_Swagger
-    swaggerClientSecret: "1q2w3e*"
   dotnetEnv: # 
   redisHost: #
   rabbitmqHost: #

etc/k8s/eshoponabp/charts/identity/templates/identity-deployment.yaml

@@ -53,8 +53,6 @@ spec:
           value: "{{ .Values.config.authServer.metadataAddress }}"
         - name: "AuthServer__SwaggerClientId"
           value: "{{ .Values.config.authServer.swaggerClientId }}"
-        - name: "AuthServer__SwaggerClientSecret"
-          value: "{{ .Values.config.authServer.swaggerClientSecret }}"  
         - name: "StringEncryption__DefaultPassPhrase"
           value: "{{ .Values.config.stringEncryptionDefaultPassPhrase }}"             
         - name: "Clients__Web__RootUrl"

etc/k8s/eshoponabp/charts/identity/values.yaml

@@ -9,7 +9,6 @@ config:
     requireHttpsMetadata: "false"
     metadataAddress: http://eshop-st-keycloak:8080
     swaggerClientId: WebGateway_Swagger
-    swaggerClientSecret: "1q2w3e*"
   keycloak:
     url: http://eshop-st-keycloak:8080
     adminUsername: admin

etc/k8s/eshoponabp/charts/ordering/templates/ordering-deployment.yaml

@@ -46,8 +46,6 @@ spec:
           value: "{{ .Values.config.authServer.metadataAddress }}"
         - name: "AuthServer__SwaggerClientId"
           value: "{{ .Values.config.authServer.swaggerClientId }}"
-        - name: "AuthServer__SwaggerClientSecret"
-          value: "{{ .Values.config.authServer.swaggerClientSecret }}"
         - name: "StringEncryption__DefaultPassPhrase"
           value: "{{ .Values.config.stringEncryptionDefaultPassPhrase }}"
         

etc/k8s/eshoponabp/charts/ordering/values.yaml

@@ -9,7 +9,6 @@ config:
     requireHttpsMetadata: "false"
     metadataAddress: http://eshop-st-keycloak:8080
     swaggerClientId: WebGateway_Swagger
-    swaggerClientSecret: "1q2w3e*"
   dotnetEnv: Staging
   redisHost: eshop-st-redis
   rabbitmqHost: eshop-st-rabbitmq

etc/k8s/eshoponabp/charts/payment/templates/payment-deployment.yaml

@@ -45,8 +45,6 @@ spec:
           value: "{{ .Values.config.authServer.metadataAddress }}"
         - name: "AuthServer__SwaggerClientId"
           value: "{{ .Values.config.authServer.swaggerClientId }}"
-        - name: "AuthServer__SwaggerClientSecret"
-          value: "{{ .Values.config.authServer.swaggerClientSecret }}"
         - name: "StringEncryption__DefaultPassPhrase"
           value: "{{ .Values.config.stringEncryptionDefaultPassPhrase }}"
           {{- if .Values.env }}

etc/k8s/eshoponabp/charts/payment/values.yaml

@@ -9,7 +9,6 @@ config:
     requireHttpsMetadata: "false"
     metadataAddress: http://eshop-st-keycloak:8080
     swaggerClientId: WebGateway_Swagger
-    swaggerClientSecret: "1q2w3e*"
   dotnetEnv: Staging
   redisHost: eshop-st-redis
   rabbitmqHost: eshop-st-rabbitmq

etc/k8s/eshoponabp/values.st.yaml

@@ -83,9 +83,8 @@ identity:
     authServer:
       authority: https://account.eshoponabp.dev/realms/master
       requireHttpsMetadata: "false"
-      metadataAddress: http://eshop-st-keycloak/realms/master
-      swaggerClientId: WebGateway_Swagger
-      swaggerClientSecret: "1q2w3e*"
+      metadataAddress: https://account.eshoponabp.dev/realms/master
+      swaggerClientId: SwaggerClient
     dotnetEnv: Staging
     redisHost: eshop-st-redis
     rabbitmqHost: eshop-st-rabbitmq
@@ -120,9 +119,8 @@ administration:
     authServer:
       authority: https://account.eshoponabp.dev/realms/master
       requireHttpsMetadata: "false"
-      metadataAddress: http://eshop-st-keycloak/realms/master
-      swaggerClientId: WebGateway_Swagger
-      swaggerClientSecret: "1q2w3e*"
+      metadataAddress: https://account.eshoponabp.dev/realms/master
+      swaggerClientId: SwaggerClient
     remoteServices:
       abpIdentityBaseUrl: http://identity.eshoponabp.dev
       useCurrentToken: "false"  
@@ -147,8 +145,7 @@ gateway-web:
     authServer:
       authority: http://account.eshoponabp.dev
       requireHttpsMetadata: "false"
-      swaggerClientId: WebGateway_Swagger
-      swaggerClientSecret: "1q2w3e*"
+      swaggerClientId: SwaggerClient
     dotnetEnv: Staging
     redisHost: eshop-st-redis
     rabbitmqHost: eshop-st-rabbitmq
@@ -181,10 +178,10 @@ gateway-web-public:
   config:
     selfUrl: https://gateway-public.eshoponabp.dev
     authServer:
-      authority: http://account.eshoponabp.dev
+      authority: https://account.eshoponabp.dev/realms/master
       requireHttpsMetadata: "false"
-      swaggerClientId: WebGateway_Swagger
-      swaggerClientSecret: "1q2w3e*"
+      metadataAddress: https://account.eshoponabp.dev/realms/master
+      swaggerClientId: SwaggerClient
     dotnetEnv: Staging
     redisHost: eshop-st-redis
     rabbitmqHost: eshop-st-rabbitmq
@@ -228,9 +225,8 @@ basket:
     authServer:
       authority: https://account.eshoponabp.dev/realms/master
       requireHttpsMetadata: "false"
-      metadataAddress: http://eshop-st-keycloak/realms/master
-      swaggerClientId: WebGateway_Swagger
-      swaggerClientSecret: "1q2w3e*"
+      metadataAddress: https://account.eshoponabp.dev/realms/master
+      swaggerClientId: SwaggerClient
     dotnetEnv: Staging
     redisHost: eshop-st-redis
     rabbitmqHost: eshop-st-rabbitmq
@@ -256,9 +252,8 @@ catalog:
     authServer:
       authority: https://account.eshoponabp.dev/realms/master
       requireHttpsMetadata: "false"
-      metadataAddress: http://eshop-st-keycloak/realms/master
-      swaggerClientId: WebGateway_Swagger
-      swaggerClientSecret: "1q2w3e*"
+      metadataAddress: https://account.eshoponabp.dev/realms/master
+      swaggerClientId: SwaggerClient
     dotnetEnv: Staging
     redisHost: eshop-st-redis
     rabbitmqHost: eshop-st-rabbitmq
@@ -286,9 +281,8 @@ ordering:
     authServer:
       authority: https://account.eshoponabp.dev/realms/master
       requireHttpsMetadata: "false"
-      metadataAddress: http://eshop-st-keycloak/realms/master
-      swaggerClientId: WebGateway_Swagger
-      swaggerClientSecret: "1q2w3e*"
+      metadataAddress: https://account.eshoponabp.dev/realms/master
+      swaggerClientId: SwaggerClient
     dotnetEnv: Staging
     redisHost: eshop-st-redis
     rabbitmqHost: eshop-st-rabbitmq
@@ -311,9 +305,8 @@ cmskit:
     authServer:
       authority: https://account.eshoponabp.dev/realms/master
       requireHttpsMetadata: "false"
-      metadataAddress: http://eshop-st-keycloak/realms/master
-      swaggerClientId: WebGateway_Swagger
-      swaggerClientSecret: "1q2w3e*"
+      metadataAddress: https://account.eshoponabp.dev/realms/master
+      swaggerClientId: SwaggerClient
     remoteServices:
       abpIdentityBaseUrl: https://identity.eshoponabp.dev
     dotnetEnv: Staging
@@ -340,9 +333,8 @@ payment:
     authServer:
       authority: http://account.eshoponabp.dev
       requireHttpsMetadata: "false"
-      metadataAddress: http://eshop-st-keycloak/realms/master
-      swaggerClientId: WebGateway_Swagger
-      swaggerClientSecret: "1q2w3e*"
+      metadataAddress: https://account.eshoponabp.dev/realms/master
+      swaggerClientId: SwaggerClient
     remoteServices:
       abpIdentityBaseUrl: https://identity.eshoponabp.dev
     dotnetEnv: Staging

services/basket/src/EShopOnAbp.BasketService/BasketServiceModule.cs

@@ -100,7 +100,6 @@ public class BasketServiceModule : AbpModule
             var configuration = context.ServiceProvider.GetRequiredService<IConfiguration>();
             options.SwaggerEndpoint("/swagger/v1/swagger.json", "Basket Service API");
             options.OAuthClientId(configuration["AuthServer:SwaggerClientId"]);
-            options.OAuthClientSecret(configuration["AuthServer:SwaggerClientSecret"]);
         });
         app.UseAbpSerilogEnrichers();
         app.UseAuditing();