Skip to content

Commit ec21afb

Browse files
committed
Update Config stuff
1 parent 92be713 commit ec21afb

3 files changed

Lines changed: 6 additions & 5 deletions

File tree

application/CohortManager/src/Functions/Shared/Common/Authentication/AuthConfig.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ namespace Common;
55
public class AuthConfig
66
{
77
[Required]
8-
public required string MetaDataUrl { get; init; }
8+
public required string AuthMetaDataUrl { get; init; }
99
[Required]
10-
public required string ClientId { get; init; }
10+
public required string AuthClientId { get; init; }
1111

1212
}
1313

application/CohortManager/src/Functions/Shared/Common/Authentication/JwtAuthentication.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public JWTAuthentication(IOptions<AuthConfig> authConfig, ILogger<JWTAuthenticat
1919
_authConfig = authConfig.Value;
2020
_logger = logger;
2121
_configurationManager = new ConfigurationManager<OpenIdConnectConfiguration>(
22-
_authConfig.MetaDataUrl,
22+
_authConfig.AuthMetaDataUrl,
2323
new OpenIdConnectConfigurationRetriever(),
2424
new HttpDocumentRetriever()
2525
);
@@ -48,7 +48,7 @@ public async Task<bool> ValidateTokenAsync(string token)
4848
ValidateIssuer = true,
4949
ValidIssuer = oidcConfig.Issuer,
5050
ValidateAudience = true,
51-
ValidAudience = _authConfig.ClientId,
51+
ValidAudience = _authConfig.AuthClientId,
5252
ValidateIssuerSigningKey = true,
5353
IssuerSigningKeys = oidcConfig.SigningKeys,
5454
ValidateLifetime = true,

infrastructure/tf-core/environments/development.tfvars

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -564,6 +564,7 @@ function_apps = {
564564
function_endpoint_name = "GetValidationExceptions"
565565
app_service_plan_key = "NonScaling"
566566
db_connection_string = "DtOsDatabaseConnectionString"
567+
key_vault_url = "KeyVaultConnectionString"
567568
app_urls = [
568569
{
569570
env_var_name = "DemographicDataServiceURL"
@@ -965,7 +966,7 @@ function_apps = {
965966
# ServiceNowRefreshAccessTokenUrl = "https://ca-wiremock-uksouth.jollyriver-9baa4a9a.uksouth.azurecontainerapps.io/oauth_token.do"
966967
# ServiceNowUpdateUrl = "https://ca-wiremock-uksouth.jollyriver-9baa4a9a.uksouth.azurecontainerapps.io/api/x_nhsd_intstation/nhs_integration/9c78f87c97912e10dd80f2df9153aff5/CohortCaseUpdate"
967968
# ServiceNowResolutionUrl = "https://ca-wiremock-uksouth.jollyriver-9baa4a9a.uksouth.azurecontainerapps.io/api/x_nhsd_intstation/nhs_integration/9c78f87c97912e10dd80f2df9153aff5/CohortCaseResolution"
968-
969+
969970
# Connect to ServiceNow Integration Instance (can be swapped for Wiremock for testing, or to ServiceNow Dev Instance if we want to align the environments correctly)
970971
ServiceNowRefreshAccessTokenUrl = "https://nhsdigitaltraining.service-now.com/oauth_token.do"
971972
ServiceNowUpdateUrl = "https://nhsdigitaltraining.service-now.com/api/x_nhsd_intstation/nhs_integration/9c78f87c97912e10dd80f2df9153aff5/CohortCaseUpdate"

0 commit comments

Comments
 (0)