From 525a83bfc5a58db2477e87adacb81b104ce4d0c5 Mon Sep 17 00:00:00 2001
From: Galip Tolga Erdem <galiperdem@gmail.com>
Date: Mon, 6 Jun 2022 14:55:14 +0300
Subject: [PATCH] fixed angular login problem

---
 apps/angular/src/index.html                   | 28 +++++++++++--------
 .../EShopOnAbpAuthServerModule.cs             |  1 +
 etc/docker/nginx/dynamic-env.json             |  1 -
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/apps/angular/src/index.html b/apps/angular/src/index.html
index 1e325c50..54ba34c2 100644
--- a/apps/angular/src/index.html
+++ b/apps/angular/src/index.html
@@ -1,16 +1,20 @@
 <!DOCTYPE html>
 <html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <title>EShopOnAbp</title>
-    <base href="/" />
 
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <link rel="icon" type="image/x-icon" href="favicon.ico" />
-  </head>
-  <body class="bg-light">
-    <app-root>
-      <div class="donut centered"></div>
-    </app-root>
-  </body>
+<head>
+  <meta charset="utf-8" />
+  <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
+  <title>EShopOnAbp</title>
+  <base href="/" />
+
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <link rel="icon" type="image/x-icon" href="favicon.ico" />
+</head>
+
+<body class="bg-light">
+  <app-root>
+    <div class="donut centered"></div>
+  </app-root>
+</body>
+
 </html>
diff --git a/apps/auth-server/src/EShopOnAbp.AuthServer/EShopOnAbpAuthServerModule.cs b/apps/auth-server/src/EShopOnAbp.AuthServer/EShopOnAbpAuthServerModule.cs
index 05c20b0d..3f1ebc6b 100644
--- a/apps/auth-server/src/EShopOnAbp.AuthServer/EShopOnAbpAuthServerModule.cs
+++ b/apps/auth-server/src/EShopOnAbp.AuthServer/EShopOnAbpAuthServerModule.cs
@@ -78,6 +78,7 @@ public class EShopOnAbpAuthServerModule : AbpModule
         var hostingEnvironment = context.Services.GetHostingEnvironment();
         var configuration = context.Services.GetConfiguration();
 
+        ConfigureSameSiteCookiePolicy(context);
         ConfigureSwagger(context, configuration);
 
         context.Services.AddAuthentication()
diff --git a/etc/docker/nginx/dynamic-env.json b/etc/docker/nginx/dynamic-env.json
index c9127782..56c559a2 100644
--- a/etc/docker/nginx/dynamic-env.json
+++ b/etc/docker/nginx/dynamic-env.json
@@ -12,7 +12,6 @@
     "responseType": "code",
     "scope": "offline_access openid profile email phone AccountService IdentityService AdministrationService CatalogService OrderingService",
     "strictDiscoveryDocumentValidation": false,
-    "skipIssuerCheck": true,
     "requireHttps": false
   },
   "apis": {