8 Commits

Author SHA1 Message Date
90a0751d09 chore: Upgrade auf 1.1.0 2025-07-22 15:57:39 +02:00
d2793f476a feat(gateway): Unterstützung für 3-stufig verschachtelte API-Routen hinzugefügt
- Routenzuordnung für /api/{route1}/{route2}/{route3} hinzugefügt
- Ermöglicht Downstream-Routing zur Unterstützung komplexerer API-Strukturen
2025-07-22 15:55:48 +02:00
a6140cab92 feat(ocelot.json): Aktualisierung der ocelot.json-Routen für verbesserte Weiterleitung und Frontend-Integration
- Aktualisierte bestehende Routen für Swagger und API-Endpunkte
- Ersetzte /swagger/{route} durch /swagger/auth/{route} für den Auth-Dienst
- Modifizierter Routenabgleich zur Unterstützung verschachtelter Routen (z. B. /api/{route1}/{route2})
- Hinzufügen von Routen für die Frontend-Angular-Anwendung, die auf Port 4200 läuft
2025-07-22 10:16:30 +02:00
Developer 02
97a20fdb8f feat(IISProfile): Konfiguration eines bestimmten IIS-Verzeichnisses für UserManager 2025-03-25 15:44:55 +01:00
Developer 02
4da1bc7617 feat(ocelet): Add Auth/user endpoint 2025-03-25 14:14:30 +01:00
Developer 02
78a58568fc feat(ocelot): add logout endpoint 2025-03-25 13:53:58 +01:00
Developer 02
9844cd16e8 fix(ocelot): Update DownstreamPathTemplate for authentication 2025-03-25 13:51:21 +01:00
Developer 02
896eee35bd refactor(ocelot.Development.json): Port 7120 auf 7103 aktualisiert 2025-03-24 15:26:58 +01:00
6 changed files with 218 additions and 204 deletions

View File

@@ -1,13 +0,0 @@
{
"version": 1,
"isRoot": true,
"tools": {
"dotnet-ef": {
"version": "9.0.3",
"commands": [
"dotnet-ef"
],
"rollForward": false
}
}
}

View File

@@ -1,19 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
<TargetFramework>net7.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Version>1.2.0</Version>
<AssemblyVersion>1.2.0</AssemblyVersion>
<FileVersion>1.2.0</FileVersion>
<Version>1.1.0</Version>
<AssemblyVersion>1.1.0</AssemblyVersion>
<FileVersion>1.1.0</FileVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NLog" Version="5.4.0" />
<PackageReference Include="NLog.Extensions.Logging" Version="5.4.0" />
<PackageReference Include="NLog.Web.AspNetCore" Version="5.4.0" />
<PackageReference Include="Ocelot" Version="23.4.3" />
<PackageReference Include="Ocelot" Version="22.0.1" />
</ItemGroup>
</Project>

View File

@@ -10,14 +10,6 @@ try
{
var builder = WebApplication.CreateBuilder(args);
builder.Logging.SetMinimumLevel(Microsoft.Extensions.Logging.LogLevel.Trace);
if (!builder.Environment.IsDevelopment())
{
builder.Logging.ClearProviders();
builder.Host.UseNLog();
}
// Make sure to add the Ocelot configuration file
var suffix = builder.Environment.IsDevelopment() ? ".Development" : "";
builder.Configuration.AddJsonFile($"ocelot{suffix}.json");

View File

@@ -11,12 +11,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
<ExcludeApp_Data>false</ExcludeApp_Data>
<ProjectGuid>329f45bf-4c79-4a7b-9086-d6205617aa42</ProjectGuid>
<DesktopBuildPackageLocation>P:\Install .Net\0 DD - Smart UP\Gateway\EnvelopeGeneratorGen\Net9Win64\$(Version)\$(Version).zip</DesktopBuildPackageLocation>
<DesktopBuildPackageLocation>P:\Install .Net\0 DD - Smart UP\Gateway\UserManager\$(Version)\$(Version).zip</DesktopBuildPackageLocation>
<PackageAsSingleFile>true</PackageAsSingleFile>
<DeployIisAppPath>Gateway</DeployIisAppPath>
<_TargetId>IISWebDeployPackage</_TargetId>
<TargetFramework>net9.0</TargetFramework>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<SelfContained>false</SelfContained>
</PropertyGroup>
</Project>

View File

@@ -6,87 +6,16 @@
"DownstreamHostAndPorts": [
{
"Host": "localhost",
"Port": 8088
"Port": 7103
}
],
"UpstreamPathTemplate": "/swagger/{route}",
"UpstreamHttpMethod": [
"Get",
"Post",
"Put",
"Delete"
"UpstreamhttpsMethod": [
"Get"
]
},
{
"DownstreamPathTemplate": "/swagger/{route1}/{route2}",
"DownstreamScheme": "https",
"DownstreamHostAndPorts": [
{
"Host": "localhost",
"Port": 8088
}
],
"UpstreamPathTemplate": "/swagger/{route1}/{route2}",
"UpstreamHttpMethod": [
"Get",
"Post",
"Put",
"Delete"
]
},
{
"DownstreamPathTemplate": "/scalar",
"DownstreamScheme": "https",
"DownstreamHostAndPorts": [
{
"Host": "localhost",
"Port": 8088
}
],
"UpstreamPathTemplate": "/scalar",
"UpstreamHttpMethod": [
"Get",
"Post",
"Put",
"Delete"
]
},
{
"DownstreamPathTemplate": "/scalar/{route}",
"DownstreamScheme": "https",
"DownstreamHostAndPorts": [
{
"Host": "localhost",
"Port": 8088
}
],
"UpstreamPathTemplate": "/scalar/{route}",
"UpstreamHttpMethod": [
"Get",
"Post",
"Put",
"Delete"
]
},
{
"DownstreamPathTemplate": "/scalar/{route1}/{route2}",
"DownstreamScheme": "https",
"DownstreamHostAndPorts": [
{
"Host": "localhost",
"Port": 8088
}
],
"UpstreamPathTemplate": "/scalar/{route1}/{route2}",
"UpstreamHttpMethod": [
"Get",
"Post",
"Put",
"Delete"
]
},
{
"DownstreamPathTemplate": "/api/Auth/sign-flow-gen?cookie={cookie}",
"DownstreamPathTemplate": "/swagger/auth/{route}",
"DownstreamScheme": "https",
"DownstreamHostAndPorts": [
{
@@ -94,11 +23,13 @@
"Port": 7192
}
],
"UpstreamPathTemplate": "/api/Auth?cookie={cookie}",
"UpstreamHttpMethod": [ "Post" ]
"UpstreamPathTemplate": "/swagger/auth/{route}",
"UpstreamhttpsMethod": [
"Get"
]
},
{
"DownstreamPathTemplate": "/api/Auth/sign-flow-gen?cookie=false",
"DownstreamPathTemplate": "/api/Auth/user-manager?cookie=true",
"DownstreamScheme": "https",
"DownstreamHostAndPorts": [
{
@@ -106,20 +37,32 @@
"Port": 7192
}
],
"UpstreamPathTemplate": "/api/Auth",
"UpstreamHttpMethod": [ "Post" ]
"UpstreamPathTemplate": "/api/Auth/login",
"UpstreamhttpsMethod": [ "Post" ]
},
{
"DownstreamPathTemplate": "/api/Auth/sign-flow-gen/login",
"DownstreamPathTemplate": "/api/Auth/check",
"DownstreamScheme": "https",
"DownstreamHostAndPorts": [
{
"Host": "localhost",
"Port": 7192
"Port": 7103
}
],
"UpstreamPathTemplate": "/api/Auth/form",
"UpstreamHttpMethod": [ "Post" ]
"UpstreamPathTemplate": "/api/Auth/check",
"UpstreamhttpsMethod": [ "Get" ]
},
{
"DownstreamPathTemplate": "/api/Auth/logout",
"DownstreamScheme": "https",
"DownstreamHostAndPorts": [
{
"Host": "localhost",
"Port": 7103
}
],
"UpstreamPathTemplate": "/api/Auth/logout",
"UpstreamhttpsMethod": [ "Post" ]
},
{
"DownstreamPathTemplate": "/api/{route}",
@@ -127,11 +70,11 @@
"DownstreamHostAndPorts": [
{
"Host": "localhost",
"Port": 8088
"Port": 7103
}
],
"UpstreamPathTemplate": "/api/{route}",
"UpstreamHttpMethod": [
"UpstreamhttpsMethod": [
"Get",
"Post",
"Put",
@@ -139,17 +82,87 @@
]
},
{
"DownstreamPathTemplate": "/api/{route}/{id}",
"DownstreamPathTemplate": "/api/{route1}/{route2}",
"DownstreamScheme": "https",
"DownstreamHostAndPorts": [
{
"Host": "localhost",
"Port": 8088
"Port": 7103
}
],
"UpstreamPathTemplate": "/api/{route}{id}",
"UpstreamHttpMethod": [
"UpstreamPathTemplate": "/api/{route1}/{route2}",
"UpstreamhttpsMethod": [
"Get",
"Post",
"Put",
"Delete"
]
},
{
"DownstreamPathTemplate": "/api/{route1}/{route2}/{route3}",
"DownstreamScheme": "https",
"DownstreamHostAndPorts": [
{
"Host": "localhost",
"Port": 7103
}
],
"UpstreamPathTemplate": "/api/{route1}/{route2}/{route3}",
"UpstreamhttpsMethod": [
"Get",
"Post",
"Put",
"Delete"
]
},
{
"DownstreamPathTemplate": "/",
"DownstreamScheme": "http",
"DownstreamHostAndPorts": [
{
"Host": "localhost",
"Port": 4200
}
],
"UpstreamPathTemplate": "/",
"UpstreamhttpsMethod": [
"Get",
"Post",
"Put",
"Delete"
]
},
{
"DownstreamPathTemplate": "/{route}",
"DownstreamScheme": "http",
"DownstreamHostAndPorts": [
{
"Host": "localhost",
"Port": 4200
}
],
"UpstreamPathTemplate": "/{route}",
"UpstreamhttpsMethod": [
"Get",
"Post",
"Put",
"Delete"
]
},
{
"DownstreamPathTemplate": "/{route1}/{route2}",
"DownstreamScheme": "http",
"DownstreamHostAndPorts": [
{
"Host": "localhost",
"Port": 4200
}
],
"UpstreamPathTemplate": "/{route1}/{route2}",
"UpstreamhttpsMethod": [
"Get",
"Post",
"Put",
"Delete"
]
}

View File

@@ -2,124 +2,79 @@
"Routes": [
{
"DownstreamPathTemplate": "/swagger/{route}",
"DownstreamScheme": "http",
"DownstreamScheme": "https",
"DownstreamHostAndPorts": [
{
"Host": "localhost",
"Port": 8088
"Port": 7103
}
],
"UpstreamPathTemplate": "/swagger/{route}",
"UpstreamHttpMethod": [
"Get",
"Post",
"Put",
"Delete"
"UpstreamhttpsMethod": [
"Get"
]
},
{
"DownstreamPathTemplate": "/swagger/{route1}/{route2}",
"DownstreamScheme": "http",
"DownstreamPathTemplate": "/swagger/auth/{route}",
"DownstreamScheme": "https",
"DownstreamHostAndPorts": [
{
"Host": "localhost",
"Port": 8088
"Port": 7192
}
],
"UpstreamPathTemplate": "/swagger/{route1}/{route2}",
"UpstreamHttpMethod": [
"Get",
"Post",
"Put",
"Delete"
"UpstreamPathTemplate": "/swagger/auth/{route}",
"UpstreamhttpsMethod": [
"Get"
]
},
{
"DownstreamPathTemplate": "/scalar",
"DownstreamScheme": "http",
"DownstreamPathTemplate": "/api/Auth/user-manager?cookie=true",
"DownstreamScheme": "https",
"DownstreamHostAndPorts": [
{
"Host": "localhost",
"Port": 8088
"Port": 7192
}
],
"UpstreamPathTemplate": "/scalar",
"UpstreamHttpMethod": [
"Get",
"Post",
"Put",
"Delete"
]
},
{
"DownstreamPathTemplate": "/scalar/{route}",
"DownstreamScheme": "http",
"DownstreamHostAndPorts": [
{
"Host": "localhost",
"Port": 8088
}
],
"UpstreamPathTemplate": "/scalar/{route}",
"UpstreamHttpMethod": [
"Get",
"Post",
"Put",
"Delete"
]
},
{
"DownstreamPathTemplate": "/scalar/{route1}/{route2}",
"DownstreamScheme": "http",
"DownstreamHostAndPorts": [
{
"Host": "localhost",
"Port": 8088
}
],
"UpstreamPathTemplate": "/scalar/{route1}/{route2}",
"UpstreamHttpMethod": [
"Get",
"Post",
"Put",
"Delete"
]
},
{
"DownstreamPathTemplate": "/api/Auth/work-flow?cookie=false",
"DownstreamScheme": "http",
"DownstreamHostAndPorts": [
{
"Host": "localhost",
"Port": 8088
}
],
"UpstreamPathTemplate": "/api/Auth",
"UpstreamHttpMethod": [ "Post" ]
"UpstreamPathTemplate": "/api/Auth/login",
"UpstreamhttpsMethod": [ "Post" ]
},
{
"DownstreamPathTemplate": "/api/Auth/check",
"DownstreamScheme": "http",
"DownstreamScheme": "https",
"DownstreamHostAndPorts": [
{
"Host": "localhost",
"Port": 8088
"Port": 7103
}
],
"UpstreamPathTemplate": "/api/Auth/check",
"UpstreamHttpMethod": [ "Post" ]
"UpstreamhttpsMethod": [ "Get" ]
},
{
"DownstreamPathTemplate": "/api/{route}",
"DownstreamScheme": "http",
"DownstreamPathTemplate": "/api/Auth/logout",
"DownstreamScheme": "https",
"DownstreamHostAndPorts": [
{
"Host": "localhost",
"Port": 8088
"Port": 7103
}
],
"UpstreamPathTemplate": "/api/Auth/logout",
"UpstreamhttpsMethod": [ "Post" ]
},
{
"DownstreamPathTemplate": "/api/{route}",
"DownstreamScheme": "https",
"DownstreamHostAndPorts": [
{
"Host": "localhost",
"Port": 7103
}
],
"UpstreamPathTemplate": "/api/{route}",
"UpstreamHttpMethod": [
"UpstreamhttpsMethod": [
"Get",
"Post",
"Put",
@@ -127,17 +82,87 @@
]
},
{
"DownstreamPathTemplate": "/api/{route}/{id}",
"DownstreamPathTemplate": "/api/{route1}/{route2}",
"DownstreamScheme": "https",
"DownstreamHostAndPorts": [
{
"Host": "localhost",
"Port": 7103
}
],
"UpstreamPathTemplate": "/api/{route1}/{route2}",
"UpstreamhttpsMethod": [
"Get",
"Post",
"Put",
"Delete"
]
},
{
"DownstreamPathTemplate": "/api/{route1}/{route2}/{route3}",
"DownstreamScheme": "https",
"DownstreamHostAndPorts": [
{
"Host": "localhost",
"Port": 7103
}
],
"UpstreamPathTemplate": "/api/{route1}/{route2}/{route3}",
"UpstreamhttpsMethod": [
"Get",
"Post",
"Put",
"Delete"
]
},
{
"DownstreamPathTemplate": "/",
"DownstreamScheme": "http",
"DownstreamHostAndPorts": [
{
"Host": "localhost",
"Port": 8088
"Port": 4200
}
],
"UpstreamPathTemplate": "/api/{route}{id}",
"UpstreamHttpMethod": [
"UpstreamPathTemplate": "/",
"UpstreamhttpsMethod": [
"Get",
"Post",
"Put",
"Delete"
]
},
{
"DownstreamPathTemplate": "/{route}",
"DownstreamScheme": "http",
"DownstreamHostAndPorts": [
{
"Host": "localhost",
"Port": 4200
}
],
"UpstreamPathTemplate": "/{route}",
"UpstreamhttpsMethod": [
"Get",
"Post",
"Put",
"Delete"
]
},
{
"DownstreamPathTemplate": "/{route1}/{route2}",
"DownstreamScheme": "http",
"DownstreamHostAndPorts": [
{
"Host": "localhost",
"Port": 4200
}
],
"UpstreamPathTemplate": "/{route1}/{route2}",
"UpstreamhttpsMethod": [
"Get",
"Post",
"Put",
"Delete"
]
}