ook inloggen afdwingen op minimal api endpoints

GPP-Woo · Nov 28, 2024 · 69e872d · 69e872d
1 parent 49778ca
commit 69e872d
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/ODPC.Server/Authentication/AuthenticationExtensions.cs b/ODPC.Server/Authentication/AuthenticationExtensions.cs
@@ -106,7 +106,8 @@ public static void AddAuth(this IServiceCollection services, Action<AuthOptions>
                 });
             }
             services.AddAuthorizationBuilder()
-                .AddPolicy(AdminPolicy.Name, policy => policy.RequireRole(authOptions.AdminRole));
+                .AddPolicy(AdminPolicy.Name, policy => policy.RequireRole(authOptions.AdminRole))
+                .AddFallbackPolicy("LoggedIn", policy => policy.RequireAuthenticatedUser());
             services.AddDistributedMemoryCache();
             services.AddOpenIdConnectAccessTokenManagement();
         }

diff --git a/ODPC.Server/Features/Documenten/DocumentDownload/DocumentDownloadResult.cs b/ODPC.Server/Features/Documenten/DocumentDownload/DocumentDownloadResult.cs
@@ -12,12 +12,11 @@ public async Task ExecuteResultAsync(ActionContext context)
 
             var config = context.HttpContext.RequestServices.GetRequiredService<IConfiguration>();
             using var client = context.HttpContext.RequestServices.GetRequiredService<IOdrcClientFactory>().Create(reason);
-            var timeoutInMinutes = int.TryParse(config["ODRC_DOWNLOAD_TIMEOUT_MINUTES"], out var m)
+            var timeoutInMinutes = int.TryParse(config["DOWNLOAD_TIMEOUT_MINUTES"], out var m)
                 ? m
                 : 10;
             client.Timeout = TimeSpan.FromMinutes(timeoutInMinutes);
-            using var requestMessage = new HttpRequestMessage(HttpMethod.Get, path) { Version = new Version(2, 0) };
-            using var httpResponse = await client.GetAsync(path, HttpCompletionOption.ResponseHeadersRead, token); ;
+            using var httpResponse = await client.GetAsync(path, HttpCompletionOption.ResponseHeadersRead, token);
 
             response.StatusCode = (int)httpResponse.StatusCode;
             response.Headers.ContentLength = httpResponse.Content.Headers.ContentLength;

diff --git a/ODPC.Server/Features/Documenten/UploadBestandsdeel/UploadBestandsdeelEndpoint.cs b/ODPC.Server/Features/Documenten/UploadBestandsdeel/UploadBestandsdeelEndpoint.cs
@@ -10,7 +10,7 @@ public static void Map(IEndpointRouteBuilder builder) => builder.MapPut(
             async (HttpRequest request, IOdrcClientFactory clientFactory, IConfiguration config, CancellationToken token) =>
             {
                 using var client = clientFactory.Create("Upload bestandsdeel");
-                var timeoutInMinutes = int.TryParse(config["ODRC_UPLOAD_TIMEOUT_MINUTES"], out var m)
+                var timeoutInMinutes = int.TryParse(config["UPLOAD_TIMEOUT_MINUTES"], out var m)
                     ? m
                     : 10;
                 client.Timeout = TimeSpan.FromMinutes(timeoutInMinutes);

diff --git a/ODPC.Server/Program.cs b/ODPC.Server/Program.cs
@@ -62,7 +62,7 @@ string GetRequiredConfig(string key)
 
     app.UseAuthorization();
 
-    app.MapControllers().RequireAuthorization();
+    app.MapControllers();
 
     app.MapOdpcAuthEndpoints();
     app.MapHealthChecks("/healthz").AllowAnonymous();

diff --git a/ODPC.Server/appsettings.json b/ODPC.Server/appsettings.json
@@ -20,6 +20,6 @@
   "ODRC_BASE_URL": "",
   "ODRC_API_KEY": "",
   "OIDC_ADMIN_ROLE": "",
-  "ODRC_UPLOAD_TIMEOUT_MINUTES": "",
-  "ODRC_DOWNLOAD_TIMEOUT_MINUTES": ""
+  "UPLOAD_TIMEOUT_MINUTES": "",
+  "DOWNLOAD_TIMEOUT_MINUTES": ""
 }