From 8be6388a66b004ea4896c249c65d48e3fc45d8b1 Mon Sep 17 00:00:00 2001
From: Developer 02 <developer02@didaloghe.onmicrosoft.com>
Date: Mon, 1 Jul 2024 12:01:08 +0200
Subject: [PATCH] =?UTF-8?q?Proxy-Konfiguration=20hinzuf=C3=BCgen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    | 19 ++-----------------
 .../DigitalData.UserManager.API.csproj        |  1 +
 .../ClientApp/angular.json                    |  2 +-
 .../ClientApp/proxy.conf.js                   | 19 -------------------
 .../ClientApp/proxy.conf.json                 |  7 +++++++
 .../ClientApp/src/index.html                  |  3 +--
 DigitalData.UserManager.sln                   |  4 ++--
 7 files changed, 14 insertions(+), 41 deletions(-)
 delete mode 100644 DigitalData.UserManager.NgWebUI/ClientApp/proxy.conf.js
 create mode 100644 DigitalData.UserManager.NgWebUI/ClientApp/proxy.conf.json

diff --git a/.gitignore b/.gitignore
index 21bfa10..5660110 100644
--- a/.gitignore
+++ b/.gitignore
@@ -144,20 +144,5 @@
 /DigitalData.UserManager.API/bin/Debug/net7.0/System.IdentityModel.Tokens.Jwt.dll
 /DigitalData.UserManager.API/obj/DigitalData.UserManager.API.csproj.nuget.g.targets
 /DigitalData.UserManager.Infrastructure/obj/DigitalData.UserManager.Infrastructure.csproj.nuget.g.targets
-/DigitalData.UserManager.DTO/obj/Release/net7.0/.NETCoreApp,Version=v7.0.AssemblyAttributes.cs
-/DigitalData.UserManager.DTO/obj/Release/net7.0/DigitalData.UserManager.DTO.AssemblyInfo.cs
-/DigitalData.UserManager.DTO/obj/Release/net7.0/DigitalData.UserManager.DTO.AssemblyInfoInputs.cache
-/DigitalData.UserManager.DTO/obj/Release/net7.0/DigitalData.UserManager.DTO.GeneratedMSBuildEditorConfig.editorconfig
-/DigitalData.UserManager.DTO/obj/Release/net7.0/DigitalData.UserManager.DTO.GlobalUsings.g.cs
-/DigitalData.UserManager.NgWebUI/ClientApp/.angular/cache/17.3.0/angular-webpack/44ffeaee4ec489caba19f1787368b39f82c7abf2/0.pack
-/DigitalData.UserManager.NgWebUI/ClientApp/.angular/cache/17.3.0/angular-webpack/44ffeaee4ec489caba19f1787368b39f82c7abf2/1.pack
-/DigitalData.UserManager.NgWebUI/ClientApp/.angular/cache/17.3.0/angular-webpack/44ffeaee4ec489caba19f1787368b39f82c7abf2/2.pack
-/DigitalData.UserManager.NgWebUI/ClientApp/.angular/cache/17.3.0/angular-webpack/44ffeaee4ec489caba19f1787368b39f82c7abf2/3.pack
-/DigitalData.UserManager.NgWebUI/ClientApp/.angular/cache/17.3.0/angular-webpack/44ffeaee4ec489caba19f1787368b39f82c7abf2/index.pack
-/DigitalData.UserManager.NgWebUI/ClientApp/.angular/cache/17.3.0/angular-webpack/44ffeaee4ec489caba19f1787368b39f82c7abf2/index.pack.old
-/DigitalData.UserManager.NgWebUI/ClientApp/.angular/cache/17.3.0/angular-webpack/6603e8a029ad083f2dcc3e0b243fad03431d6f00/0.pack
-/DigitalData.UserManager.NgWebUI/ClientApp/.angular/cache/17.3.0/angular-webpack/6603e8a029ad083f2dcc3e0b243fad03431d6f00/index.pack
-/DigitalData.UserManager.NgWebUI/ClientApp/.angular/cache/17.3.0/angular-webpack/889ffca4668347d26cb7a8867b69f88141b4c849/10.pack
-/DigitalData.UserManager.NgWebUI/ClientApp/.angular/cache/17.3.0/angular-webpack/889ffca4668347d26cb7a8867b69f88141b4c849/4.pack
-/DigitalData.UserManager.NgWebUI/ClientApp/.angular/cache/17.3.0/angular-webpack/88ef665edee69b8c009fd0fe977a3cb227b273fd/0.pack
-/DigitalData.UserManager.NgWebUI/ClientApp/.angular/cache/17.3.0/angular-webpack/88ef665edee69b8c009fd0fe977a3cb227b273fd/index.pack
+/DigitalData.UserManager.DTO/obj/
+/DigitalData.UserManager.NgWebUI/ClientApp/.angular/cache/
diff --git a/DigitalData.UserManager.API/DigitalData.UserManager.API.csproj b/DigitalData.UserManager.API/DigitalData.UserManager.API.csproj
index 86f40b7..165fc9f 100644
--- a/DigitalData.UserManager.API/DigitalData.UserManager.API.csproj
+++ b/DigitalData.UserManager.API/DigitalData.UserManager.API.csproj
@@ -34,6 +34,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Folder Include="ClientApp\" />
     <Folder Include="wwwroot\" />
   </ItemGroup>
 
diff --git a/DigitalData.UserManager.NgWebUI/ClientApp/angular.json b/DigitalData.UserManager.NgWebUI/ClientApp/angular.json
index 3b4166f..88250fb 100644
--- a/DigitalData.UserManager.NgWebUI/ClientApp/angular.json
+++ b/DigitalData.UserManager.NgWebUI/ClientApp/angular.json
@@ -80,7 +80,7 @@
               "buildTarget": "DigitalData.UserManager.NgWebUI:build:production"
             },
             "development": {
-              "proxyConfig": "proxy.conf.js",
+              "proxyConfig": "proxy.conf.json",
               "buildTarget": "DigitalData.UserManager.NgWebUI:build:development"
             }
           },
diff --git a/DigitalData.UserManager.NgWebUI/ClientApp/proxy.conf.js b/DigitalData.UserManager.NgWebUI/ClientApp/proxy.conf.js
deleted file mode 100644
index ca26f90..0000000
--- a/DigitalData.UserManager.NgWebUI/ClientApp/proxy.conf.js
+++ /dev/null
@@ -1,19 +0,0 @@
-const { env } = require('process');
-
-const target = env.ASPNETCORE_HTTPS_PORT ? `https://localhost:${env.ASPNETCORE_HTTPS_PORT}` :
-  env.ASPNETCORE_URLS ? env.ASPNETCORE_URLS.split(';')[0] : 'http://localhost:62037';
-
-const PROXY_CONFIG = [
-  {
-    context: [
-      "/weatherforecast",
-   ],
-    target: target,
-    secure: false,
-    headers: {
-      Connection: 'Keep-Alive'
-    }
-  }
-]
-
-module.exports = PROXY_CONFIG;
diff --git a/DigitalData.UserManager.NgWebUI/ClientApp/proxy.conf.json b/DigitalData.UserManager.NgWebUI/ClientApp/proxy.conf.json
new file mode 100644
index 0000000..84ee36d
--- /dev/null
+++ b/DigitalData.UserManager.NgWebUI/ClientApp/proxy.conf.json
@@ -0,0 +1,7 @@
+{
+    "/api": {
+        "target": "https://localhost:7202",
+        "secure": false,
+        "changeOrigin": true
+    }
+}
\ No newline at end of file
diff --git a/DigitalData.UserManager.NgWebUI/ClientApp/src/index.html b/DigitalData.UserManager.NgWebUI/ClientApp/src/index.html
index dd6169f..1b71f3e 100644
--- a/DigitalData.UserManager.NgWebUI/ClientApp/src/index.html
+++ b/DigitalData.UserManager.NgWebUI/ClientApp/src/index.html
@@ -4,8 +4,7 @@
 <head>
   <meta charset="utf-8" />
   <title>User Manager Portal</title>
-  <base href="/" />
-  <user-manager-api href="https://localhost:7202/api/" user-route="user" group-route="group" module-route="module"
+  <user-manager-api href="/api/" user-route="user" group-route="group" module-route="module"
     module-of-user-route="moduleOfUser" group-of-user-route="groupOfUser" user-representation-route="userRep"
     dir-group-route="directory/Group?propName=samaccountname" dir-user-route="directory/user" dir-route="directory"
     login-route="auth/login" , logout-route="auth/logout" , login-check-route="auth/check" />
diff --git a/DigitalData.UserManager.sln b/DigitalData.UserManager.sln
index 83321f9..f346e46 100644
--- a/DigitalData.UserManager.sln
+++ b/DigitalData.UserManager.sln
@@ -27,8 +27,8 @@ Global
 		{0634853C-C515-48AF-8E27-E5CBF592BCE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0634853C-C515-48AF-8E27-E5CBF592BCE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0634853C-C515-48AF-8E27-E5CBF592BCE7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BFBD26C1-2E95-41EC-A5CC-F334CB2309A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BFBD26C1-2E95-41EC-A5CC-F334CB2309A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BFBD26C1-2E95-41EC-A5CC-F334CB2309A8}.Debug|Any CPU.ActiveCfg = Release|Any CPU
+		{BFBD26C1-2E95-41EC-A5CC-F334CB2309A8}.Debug|Any CPU.Build.0 = Release|Any CPU
 		{BFBD26C1-2E95-41EC-A5CC-F334CB2309A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BFBD26C1-2E95-41EC-A5CC-F334CB2309A8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1DD81373-82F9-4872-95C6-888624DB1797}.Debug|Any CPU.ActiveCfg = Debug|Any CPU