Added tenant settings API

Author: FrostyApeOne

src/GovUK.Dfe.FlexForms.Api.Client/Generated/Client.g.cs

@@ -6533,6 +6533,126 @@ public string BaseUrl
             }
         }
 
+        /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
+        /// <summary>
+        /// Returns decrypted TenantConfig settings rows for the caller's own tenant.
+        /// <br/>Restricted to interactive SuperAdmin users.
+        /// </summary>
+        /// <returns>Tenant settings.</returns>
+        /// <exception cref="ExternalApplicationsException">A server side error occurred.</exception>
+        public virtual async System.Threading.Tasks.Task<GetTenantSettingsResponse> GetTenantSettingsAsync(System.Guid tenantId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        {
+            if (tenantId == null)
+                throw new System.ArgumentNullException("tenantId");
+
+            var client_ = _httpClient;
+            var disposeClient_ = false;
+            try
+            {
+                using (var request_ = new System.Net.Http.HttpRequestMessage())
+                {
+                    request_.Method = new System.Net.Http.HttpMethod("GET");
+                    request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
+
+                    var urlBuilder_ = new System.Text.StringBuilder();
+                    if (!string.IsNullOrEmpty(_baseUrl)) urlBuilder_.Append(_baseUrl);
+                    // Operation Path: "v1/admin/tenants/{tenantId}/settings"
+                    urlBuilder_.Append("v1/admin/tenants/");
+                    urlBuilder_.Append(System.Uri.EscapeDataString(ConvertToString(tenantId, System.Globalization.CultureInfo.InvariantCulture)));
+                    urlBuilder_.Append("/settings");
+
+                    PrepareRequest(client_, request_, urlBuilder_);
+
+                    var url_ = urlBuilder_.ToString();
+                    request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute);
+
+                    PrepareRequest(client_, request_, url_);
+
+                    var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false);
+                    var disposeResponse_ = true;
+                    try
+                    {
+                        var headers_ = new System.Collections.Generic.Dictionary<string, System.Collections.Generic.IEnumerable<string>>();
+                        foreach (var item_ in response_.Headers)
+                            headers_[item_.Key] = item_.Value;
+                        if (response_.Content != null && response_.Content.Headers != null)
+                        {
+                            foreach (var item_ in response_.Content.Headers)
+                                headers_[item_.Key] = item_.Value;
+                        }
+
+                        ProcessResponse(client_, response_);
+
+                        var status_ = (int)response_.StatusCode;
+                        if (status_ == 200)
+                        {
+                            var objectResponse_ = await ReadObjectResponseAsync<GetTenantSettingsResponse>(response_, headers_, cancellationToken).ConfigureAwait(false);
+                            if (objectResponse_.Object == null)
+                            {
+                                throw new ExternalApplicationsException("Response was null which was not expected.", status_, objectResponse_.Text, headers_, null);
+                            }
+                            return objectResponse_.Object;
+                        }
+                        else
+                        if (status_ == 401)
+                        {
+                            var objectResponse_ = await ReadObjectResponseAsync<ExceptionResponse>(response_, headers_, cancellationToken).ConfigureAwait(false);
+                            if (objectResponse_.Object == null)
+                            {
+                                throw new ExternalApplicationsException("Response was null which was not expected.", status_, objectResponse_.Text, headers_, null);
+                            }
+                            throw new ExternalApplicationsException<ExceptionResponse>("Unauthorized.", status_, objectResponse_.Text, headers_, objectResponse_.Object, null);
+                        }
+                        else
+                        if (status_ == 403)
+                        {
+                            var objectResponse_ = await ReadObjectResponseAsync<ExceptionResponse>(response_, headers_, cancellationToken).ConfigureAwait(false);
+                            if (objectResponse_.Object == null)
+                            {
+                                throw new ExternalApplicationsException("Response was null which was not expected.", status_, objectResponse_.Text, headers_, null);
+                            }
+                            throw new ExternalApplicationsException<ExceptionResponse>("Forbidden - interactive SuperAdmin of own tenant required.", status_, objectResponse_.Text, headers_, objectResponse_.Object, null);
+                        }
+                        else
+                        if (status_ == 404)
+                        {
+                            var objectResponse_ = await ReadObjectResponseAsync<ExceptionResponse>(response_, headers_, cancellationToken).ConfigureAwait(false);
+                            if (objectResponse_.Object == null)
+                            {
+                                throw new ExternalApplicationsException("Response was null which was not expected.", status_, objectResponse_.Text, headers_, null);
+                            }
+                            throw new ExternalApplicationsException<ExceptionResponse>("Tenant not found.", status_, objectResponse_.Text, headers_, objectResponse_.Object, null);
+                        }
+                        else
+                        if (status_ == 500)
+                        {
+                            var objectResponse_ = await ReadObjectResponseAsync<ExceptionResponse>(response_, headers_, cancellationToken).ConfigureAwait(false);
+                            if (objectResponse_.Object == null)
+                            {
+                                throw new ExternalApplicationsException("Response was null which was not expected.", status_, objectResponse_.Text, headers_, null);
+                            }
+                            throw new ExternalApplicationsException<ExceptionResponse>("Internal server error.", status_, objectResponse_.Text, headers_, objectResponse_.Object, null);
+                        }
+                        else
+                        {
+                            var responseData_ = response_.Content == null ? null : await ReadAsStringAsync(response_.Content, cancellationToken).ConfigureAwait(false);
+                            throw new ExternalApplicationsException("The HTTP status code of the response was not expected (" + status_ + ").", status_, responseData_, headers_, null);
+                        }
+                    }
+                    finally
+                    {
+                        if (disposeResponse_)
+                            response_.Dispose();
+                    }
+                }
+            }
+            finally
+            {
+                if (disposeClient_)
+                    client_.Dispose();
+            }
+        }
+
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Adds or updates a configuration section for the caller's own tenant only.

src/GovUK.Dfe.FlexForms.Api.Client/Generated/Contracts.g.cs

@@ -427,6 +427,15 @@ public partial interface ITenantAdminClient
         /// <exception cref="ExternalApplicationsException">A server side error occurred.</exception>
         System.Threading.Tasks.Task<SeedTenantsResponse> SeedFromAppSettingsAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
+        /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
+        /// <summary>
+        /// Returns decrypted TenantConfig settings rows for the caller's own tenant.
+        /// <br/>Restricted to interactive SuperAdmin users.
+        /// </summary>
+        /// <returns>Tenant settings.</returns>
+        /// <exception cref="ExternalApplicationsException">A server side error occurred.</exception>
+        System.Threading.Tasks.Task<GetTenantSettingsResponse> GetTenantSettingsAsync(System.Guid tenantId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Adds or updates a configuration section for the caller's own tenant only.

src/GovUK.Dfe.FlexForms.Api.Client/Generated/swagger.json

@@ -3500,6 +3500,77 @@
       }
     },
     "/v1/admin/tenants/{tenantId}/settings": {
+      "get": {
+        "tags": [
+          "TenantAdmin"
+        ],
+        "summary": "Returns decrypted TenantConfig settings rows for the caller's own tenant.\nRestricted to interactive SuperAdmin users.",
+        "operationId": "TenantAdmin_GetTenantSettings",
+        "parameters": [
+          {
+            "name": "tenantId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "guid"
+            },
+            "x-position": 1
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Tenant settings.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/GetTenantSettingsResponse"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Unauthorized.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ExceptionResponse"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "Forbidden - interactive SuperAdmin of own tenant required.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ExceptionResponse"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Tenant not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ExceptionResponse"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "Internal server error.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ExceptionResponse"
+                }
+              }
+            }
+          }
+        }
+      },
       "put": {
         "tags": [
           "TenantAdmin"
@@ -5591,6 +5662,51 @@
           }
         }
       },
+      "GetTenantSettingsResponse": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "tenantId": {
+            "type": "string",
+            "format": "guid"
+          },
+          "tenantName": {
+            "type": "string"
+          },
+          "settings": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/TenantSettingDto"
+            }
+          }
+        }
+      },
+      "TenantSettingDto": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "settingId": {
+            "type": "string",
+            "format": "guid"
+          },
+          "category": {
+            "type": "string"
+          },
+          "target": {
+            "type": "string"
+          },
+          "settingsJson": {
+            "type": "string"
+          },
+          "isSecret": {
+            "type": "boolean"
+          },
+          "updatedAtUtc": {
+            "type": "string",
+            "format": "date-time"
+          }
+        }
+      },
       "UpsertTenantSettingResponse": {
         "type": "object",
         "additionalProperties": false,

src/GovUK.Dfe.FlexForms.Api.Client/GovUK.Dfe.FlexForms.Api.Client.csproj

@@ -19,7 +19,7 @@
 
 	<ItemGroup>
 		<FrameworkReference Include="Microsoft.AspNetCore.App" />
-		<PackageReference Include="GovUK.Dfe.CoreLibs.Contracts" Version="1.0.82" />
+		<PackageReference Include="GovUK.Dfe.CoreLibs.Contracts" Version="1.0.83" />
 		<PackageReference Include="GovUK.Dfe.CoreLibs.Http" Version="1.0.10" />
 		<PackageReference Include="GovUK.Dfe.CoreLibs.Security" Version="1.1.29-prerelease.5" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />

src/GovUK.Dfe.FlexForms.Api.Client/TenantAdminClientJsonSettings.cs

@@ -0,0 +1,15 @@
+using System.Text.Json;
+
+namespace GovUK.Dfe.FlexForms.Api.Client;
+
+/// <summary>
+/// Ensures tenant-admin DTOs deserialize camelCase JSON from the API
+/// (same pattern as <see cref="RolesClient"/>).
+/// </summary>
+public partial class TenantAdminClient
+{
+    static partial void UpdateJsonSerializerSettings(JsonSerializerOptions settings)
+    {
+        settings.PropertyNameCaseInsensitive = true;
+    }
+}

src/GovUK.Dfe.FlexForms.Api/Controllers/TenantAdminController.cs

@@ -1,4 +1,5 @@
 using Asp.Versioning;
+using GovUK.Dfe.FlexForms.Application.TenantAdmin;
 using GovUK.Dfe.FlexForms.Application.TenantAdmin.Commands;
 using GovUK.Dfe.FlexForms.Application.TenantAdmin.Queries;
 using GovUK.Dfe.FlexForms.Infrastructure.Security;
@@ -90,6 +91,29 @@ public async Task<IActionResult> SeedFromAppSettings(CancellationToken cancellat
         };
     }
 
+    /// <summary>
+    /// Returns decrypted TenantConfig settings rows for the caller's own tenant.
+    /// Restricted to interactive SuperAdmin users.
+    /// </summary>
+    [HttpGet("{tenantId:guid}/settings")]
+    [Authorize(Policy = AuthConstants.TenantAdminUserPolicy)]
+    [SwaggerResponse(200, "Tenant settings.", typeof(GetTenantSettingsResponse))]
+    [SwaggerResponse(401, "Unauthorized.", typeof(ExceptionResponse))]
+    [SwaggerResponse(403, "Forbidden - interactive SuperAdmin of own tenant required.", typeof(ExceptionResponse))]
+    [SwaggerResponse(404, "Tenant not found.", typeof(ExceptionResponse))]
+    [SwaggerResponse(500, "Internal server error.", typeof(ExceptionResponse))]
+    public async Task<IActionResult> GetTenantSettings(
+        Guid tenantId,
+        CancellationToken cancellationToken)
+    {
+        var result = await sender.Send(new GetTenantSettingsQuery(tenantId), cancellationToken);
+
+        if (!result.IsSuccess)
+            return MapFailure(result);
+
+        return new ObjectResult(result) { StatusCode = StatusCodes.Status200OK };
+    }
+
     /// <summary>
     /// Adds or updates a configuration section for the caller's own tenant only.
     /// Requires an interactive Admin user JWT; the route <paramref name="tenantId"/> must

src/GovUK.Dfe.FlexForms.Api/Program.cs

@@ -117,6 +117,7 @@ public static async Task Main(string[] args)
             builder.Services.AddSingleton<ITenantSettingsEncryptor>(encryptor);
             builder.Services.AddScoped<ITenantConfigSeeder, GovUK.Dfe.FlexForms.Infrastructure.Services.TenantConfigSeederService>();
             builder.Services.AddScoped<ITenantSettingsWriter, GovUK.Dfe.FlexForms.Infrastructure.Services.TenantSettingsWriterService>();
+            builder.Services.AddScoped<ITenantSettingsQuery, GovUK.Dfe.FlexForms.Infrastructure.Services.TenantSettingsQueryService>();
             builder.Services.AddScoped<ITenantPrincipalResolver, GovUK.Dfe.FlexForms.Infrastructure.Services.TenantPrincipalResolver>();
             builder.Services.AddScoped<ITenantSettingsReader, GovUK.Dfe.FlexForms.Infrastructure.Services.TenantSettingsReader>();
             builder.Services.AddScoped<ITenantHostnameResolver, GovUK.Dfe.FlexForms.Infrastructure.Services.TenantHostnameResolver>();

src/GovUK.Dfe.FlexForms.Application/Services/ClaimBasedPermissionCheckerService.cs

@@ -125,6 +125,15 @@ public bool IsInteractiveTenantAdmin()
         return PermissionClaimEvaluator.IsInteractiveTenantAdmin(user);
     }
 
+    /// <inheritdoc />
+    public bool IsInteractivePlatformAdmin()
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
+        if (user == null) return false;
+
+        return PermissionClaimEvaluator.IsInteractivePlatformAdmin(user);
+    }
+
     /// <inheritdoc />
     public bool CanReadAllApplications()
     {

src/GovUK.Dfe.FlexForms.Application/TenantAdmin/Commands/UpsertTenantSettingCommandHandler.cs

@@ -19,7 +19,8 @@ public sealed record UpsertTenantSettingCommand(
 public sealed class UpsertTenantSettingCommandHandler(
     ITenantSettingsWriter settingsWriter,
     ITenantContextAccessor tenantContextAccessor,
-    IPermissionCheckerService permissionChecker)
+    IPermissionCheckerService permissionChecker,
+    ITenantConfigurationProvider tenantConfigProvider)
     : IRequestHandler<UpsertTenantSettingCommand, Result<UpsertTenantSettingResponse>>
 {
     public async Task<Result<UpsertTenantSettingResponse>> Handle(
@@ -56,6 +57,8 @@ public async Task<Result<UpsertTenantSettingResponse>> Handle(
                 request.IsSecret,
                 cancellationToken);
 
+            await tenantConfigProvider.RefreshAsync(cancellationToken);
+
             var verb = result.WasCreated ? "created" : "updated";
 
             return Result<UpsertTenantSettingResponse>.Success(