From a6df344e80f7db603828e0af9fa1f0b4fd0aa027 Mon Sep 17 00:00:00 2001 From: Grae Jones Date: Sun, 22 Mar 2026 21:02:03 -0700 Subject: [PATCH] Clean up --- .../appInsights1.arm.json | 4 +- .../profile.arm.json | 2 +- .../storage1.arm.json | 0 ...ies.ps-adp-registration - Zip Deploy.json} | 2 +- Registration/appsettings.json | 38 +++---------------- Registration/host.json | 3 +- Registration/local.settings.json | 10 ++--- 7 files changed, 17 insertions(+), 42 deletions(-) rename Registration/Properties/ServiceDependencies/{usim-adp-registration - Zip Deploy => ps-adp-registration - Zip Deploy}/appInsights1.arm.json (94%) rename Registration/Properties/ServiceDependencies/{usim-adp-registration - Zip Deploy => ps-adp-registration - Zip Deploy}/profile.arm.json (99%) rename Registration/Properties/ServiceDependencies/{usim-adp-registration - Zip Deploy => ps-adp-registration - Zip Deploy}/storage1.arm.json (100%) rename Registration/Properties/{serviceDependencies.usim-adp-registration - Zip Deploy.json => serviceDependencies.ps-adp-registration - Zip Deploy.json} (91%) diff --git a/Registration/Properties/ServiceDependencies/usim-adp-registration - Zip Deploy/appInsights1.arm.json b/Registration/Properties/ServiceDependencies/ps-adp-registration - Zip Deploy/appInsights1.arm.json similarity index 94% rename from Registration/Properties/ServiceDependencies/usim-adp-registration - Zip Deploy/appInsights1.arm.json rename to Registration/Properties/ServiceDependencies/ps-adp-registration - Zip Deploy/appInsights1.arm.json index 49901ad..3f9e5de 100644 --- a/Registration/Properties/ServiceDependencies/usim-adp-registration - Zip Deploy/appInsights1.arm.json +++ b/Registration/Properties/ServiceDependencies/ps-adp-registration - Zip Deploy/appInsights1.arm.json @@ -36,7 +36,7 @@ }, { "type": "Microsoft.Resources/deployments", - "name": "[concat(parameters('resourceGroupName'), 'Deployment', uniqueString(concat('usim-adp-registration', subscription().subscriptionId)))]", + "name": "[concat(parameters('resourceGroupName'), 'Deployment', uniqueString(concat('ps-adp-registration', subscription().subscriptionId)))]", "resourceGroup": "[parameters('resourceGroupName')]", "apiVersion": "2019-10-01", "dependsOn": [ @@ -50,7 +50,7 @@ "resources": [ { "kind": "web", - "name": "usim-adp-registration", + "name": "ps-adp-registration", "type": "microsoft.insights/components", "location": "[parameters('resourceLocation')]", "properties": {}, diff --git a/Registration/Properties/ServiceDependencies/usim-adp-registration - Zip Deploy/profile.arm.json b/Registration/Properties/ServiceDependencies/ps-adp-registration - Zip Deploy/profile.arm.json similarity index 99% rename from Registration/Properties/ServiceDependencies/usim-adp-registration - Zip Deploy/profile.arm.json rename to Registration/Properties/ServiceDependencies/ps-adp-registration - Zip Deploy/profile.arm.json index 7a9cd08..64f3e39 100644 --- a/Registration/Properties/ServiceDependencies/usim-adp-registration - Zip Deploy/profile.arm.json +++ b/Registration/Properties/ServiceDependencies/ps-adp-registration - Zip Deploy/profile.arm.json @@ -21,7 +21,7 @@ }, "resourceName": { "type": "string", - "defaultValue": "usim-adp-registration", + "defaultValue": "ps-adp-registration", "metadata": { "description": "Name of the main resource to be created by this template." } diff --git a/Registration/Properties/ServiceDependencies/usim-adp-registration - Zip Deploy/storage1.arm.json b/Registration/Properties/ServiceDependencies/ps-adp-registration - Zip Deploy/storage1.arm.json similarity index 100% rename from Registration/Properties/ServiceDependencies/usim-adp-registration - Zip Deploy/storage1.arm.json rename to Registration/Properties/ServiceDependencies/ps-adp-registration - Zip Deploy/storage1.arm.json diff --git a/Registration/Properties/serviceDependencies.usim-adp-registration - Zip Deploy.json b/Registration/Properties/serviceDependencies.ps-adp-registration - Zip Deploy.json similarity index 91% rename from Registration/Properties/serviceDependencies.usim-adp-registration - Zip Deploy.json rename to Registration/Properties/serviceDependencies.ps-adp-registration - Zip Deploy.json index 95eeeb5..1ca6f5f 100644 --- a/Registration/Properties/serviceDependencies.usim-adp-registration - Zip Deploy.json +++ b/Registration/Properties/serviceDependencies.ps-adp-registration - Zip Deploy.json @@ -6,7 +6,7 @@ "connectionId": "AzureWebJobsStorage" }, "appInsights1": { - "resourceId": "/subscriptions/[parameters('subscriptionId')]/resourceGroups/[parameters('resourceGroupName')]/providers/microsoft.insights/components/usim-adp-registration", + "resourceId": "/subscriptions/[parameters('subscriptionId')]/resourceGroups/[parameters('resourceGroupName')]/providers/microsoft.insights/components/ps-adp-registration", "type": "appInsights.azure", "connectionId": "APPLICATIONINSIGHTS_CONNECTION_STRING" } diff --git a/Registration/appsettings.json b/Registration/appsettings.json index 9edeee2..5c93ed6 100644 --- a/Registration/appsettings.json +++ b/Registration/appsettings.json @@ -1,49 +1,23 @@ { - // ── Connection Strings ─────────────────────────────────────────────────── - // Override via docker-compose env var: - // ConnectionStrings__Sql=Server=10.10.99.212;Database=dbRegistration;... "ConnectionStrings": { - "Sql": "Server=10.10.99.212;Database=dbRegistration;User Id=appAdPlatformReg;Password=CHANGE_ME;TrustServerCertificate=True;" + "Sql": "Server=10.10.99.212;Database=dbRegistration;User Id=appAdPlatformReg;Password=REPLACE_ME;TrustServerCertificate=True;" }, - // ── Entra External ID (CIAM) ───────────────────────────────────────────── - // Tenant: Positive Spend Clients (cbf8b7d7-1e13-486d-b5b0-287ba79fdf0b) - // SPA App: AdPlatform Client SPA (c426967f-bfcc-46af-b4e5-d69dc01cbf75) - // - // This is the CLIENT-facing CIAM tenant — NOT the internal positivespend.com - // org tenant used by the Management/Admin console (f56a3c51). - // - // Tokens are issued by PositiveSpendClients.ciamlogin.com. - // Microsoft.Identity.Web validates issuer, audience, and signature automatically. - // - // Override via env vars (docker-compose .env): - // AzureAd__Instance=https://PositiveSpendClients.ciamlogin.com/ - // AzureAd__TenantId=cbf8b7d7-1e13-486d-b5b0-287ba79fdf0b - // AzureAd__ClientId=c426967f-bfcc-46af-b4e5-d69dc01cbf75 "AzureAd": { - "Instance": "https://PositiveSpendClients.ciamlogin.com/", - "TenantId": "cbf8b7d7-1e13-486d-b5b0-287ba79fdf0b", - "ClientId": "c426967f-bfcc-46af-b4e5-d69dc01cbf75", - "Audience": "c426967f-bfcc-46af-b4e5-d69dc01cbf75" + "Instance": "https://REPLACE_WITH_CIAM_SUBDOMAIN.ciamlogin.com/", + "TenantId": "REPLACE_WITH_CIAM_TENANT_ID", + "ClientId": "REPLACE_WITH_CIAM_CLIENT_ID", + "Audience": "REPLACE_WITH_CIAM_CLIENT_ID" }, - // ── CORS ───────────────────────────────────────────────────────────────── - // Comma-separated allowed origins. - // Override via env var: CORS__AllowedOrigins (already in docker-compose .env) "CORS": { - "AllowedOrigins": "https://client.positivespend.com,https://portal.positivespend.com" + "AllowedOrigins": "https://register.positivespend.com,https://client.positivespend.com,https://portal.positivespend.com" }, - // ── Admin API Key ──────────────────────────────────────────────────────── - // Used by ApiKeyAuthFilter on admin endpoints (pending / item / reject / complete). - // Replaces Azure Functions AuthorizationLevel.Function in self-hosted mode. - // Must match Registration__FunctionKey in docker-compose .env. - // Override via env var: Registration__FunctionKey "Registration": { "FunctionKey": "" }, - // ── Logging ────────────────────────────────────────────────────────────── "Logging": { "LogLevel": { "Default": "Information", diff --git a/Registration/host.json b/Registration/host.json index 85e95ab..de0f25b 100644 --- a/Registration/host.json +++ b/Registration/host.json @@ -18,7 +18,8 @@ "routePrefix": "api", "cors": { "allowedOrigins": [ - "https://adpregist.usimdev.com", + "https://register.positivespend.com", + "https://client.positivespend.com", "http://localhost:3001" ], "allowedHeaders": [ "*" ], diff --git a/Registration/local.settings.json b/Registration/local.settings.json index c35489f..5b5c8a9 100644 --- a/Registration/local.settings.json +++ b/Registration/local.settings.json @@ -5,12 +5,12 @@ "FUNCTIONS_WORKER_RUNTIME": "dotnet-isolated" }, "ConnectionStrings": { - "Sql": "Server=usimdev.database.windows.net;Database=dbRegistration;User Id=appAdPlatformReg;Password=YOUR_PASSWORD_HERE;TrustServerCertificate=True;" + "Sql": "Server=10.10.99.212;Database=dbRegistration;User Id=appAdPlatformReg;Password=REPLACE_ME;TrustServerCertificate=True;" }, "AzureAd": { - "Instance": "https://usimclients.ciamlogin.com/", - "TenantId": "891f98f1-ed34-42a1-9b6c-28b0554d92c2", - "ClientId": "154c9111-14a0-4c0f-8132-7bc68254a74e", - "Audience": "154c9111-14a0-4c0f-8132-7bc68254a74e" + "Instance": "https://REPLACE_WITH_CIAM_SUBDOMAIN.ciamlogin.com/", + "TenantId": "REPLACE_WITH_CIAM_TENANT_ID", + "ClientId": "REPLACE_WITH_CIAM_CLIENT_ID", + "Audience": "REPLACE_WITH_CIAM_CLIENT_ID" } }