Skip to content

Commit de7cd32

Browse files
Rename to ApiScopes
1 parent 312d87f commit de7cd32

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

src/ServiceControl.Audit/App.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ These settings are only here so that we can debug ServiceControl while developin
4242
<!-- <add key="ServiceControl/Authentication.ServicePulse.Enabled" value="false" />
4343
<add key="ServiceControl/Authentication.ServicePulse.ClientId" value="" />
4444
<add key="ServiceControl/Authentication.ServicePulse.Authority" value="" />
45-
<add key="ServiceControl/Authentication.ServicePulse.ApiScope" value="" /> -->
45+
<add key="ServiceControl/Authentication.ServicePulse.ApiScopes" value="" /> -->
4646
</appSettings>
4747
<connectionStrings>
4848
<!-- DEVS - Pick a transport connection string to match chosen transport above -->

src/ServiceControl.Infrastructure/OpenIdConnectSettings.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public OpenIdConnectSettings(SettingsRootNamespace rootNamespace, bool validateC
2626
ValidateIssuerSigningKey = SettingsReader.Read(rootNamespace, "Authentication.ValidateIssuerSigningKey", true);
2727
RequireHttpsMetadata = SettingsReader.Read(rootNamespace, "Authentication.RequireHttpsMetadata", true);
2828
ServicePulseClientId = SettingsReader.Read<string>(rootNamespace, "Authentication.ServicePulse.ClientId");
29-
ServicePulseApiScope = SettingsReader.Read<string>(rootNamespace, "Authentication.ServicePulse.ApiScope");
29+
ServicePulseApiScopes = SettingsReader.Read<string>(rootNamespace, "Authentication.ServicePulse.ApiScopes");
3030
ServicePulseAuthority = SettingsReader.Read<string>(rootNamespace, "Authentication.ServicePulse.Authority");
3131

3232
if (validateConfiguration)
@@ -65,8 +65,8 @@ public OpenIdConnectSettings(SettingsRootNamespace rootNamespace, bool validateC
6565
[JsonPropertyName("servicePulseClientId")]
6666
public string ServicePulseClientId { get; }
6767

68-
[JsonPropertyName("servicePulseApiScope")]
69-
public string ServicePulseApiScope { get; }
68+
[JsonPropertyName("servicePulseApiScopes")]
69+
public string ServicePulseApiScopes { get; }
7070

7171
void Validate()
7272
{
@@ -128,9 +128,9 @@ void Validate()
128128
throw new Exception("Authentication.ServicePulse.ClientId is required when Authentication.ServicePulse.Enabled is true.");
129129
}
130130

131-
if (string.IsNullOrWhiteSpace(ServicePulseApiScope))
131+
if (string.IsNullOrWhiteSpace(ServicePulseApiScopes))
132132
{
133-
throw new Exception("Authentication.ServicePulse.ApiScope is required when Authentication.ServicePulse.Enabled is true.");
133+
throw new Exception("Authentication.ServicePulse.ApiScopes is required when Authentication.ServicePulse.Enabled is true.");
134134
}
135135

136136
if (ServicePulseAuthority != null && !Uri.TryCreate(ServicePulseAuthority, UriKind.Absolute, out _))
@@ -148,6 +148,6 @@ void Validate()
148148
logger.LogInformation(" RequireHttpsMetadata: {RequireHttpsMetadata}", RequireHttpsMetadata);
149149
logger.LogInformation(" ServicePulseClientId: {ServicePulseClientId}", ServicePulseClientId);
150150
logger.LogInformation(" ServicePulseAuthority: {ServicePulseAuthority}", ServicePulseAuthority);
151-
logger.LogInformation(" ServicePulseApiScope: {ServicePulseApiScope}", ServicePulseApiScope);
151+
logger.LogInformation(" ServicePulseApiScopes: {ServicePulseApiScopes}", ServicePulseApiScopes);
152152
}
153153
}

src/ServiceControl.Monitoring/App.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ These settings are only here so that we can debug ServiceControl while developin
3939
<!-- <add key="ServiceControl/Authentication.ServicePulse.Enabled" value="false" />
4040
<add key="ServiceControl/Authentication.ServicePulse.ClientId" value="" />
4141
<add key="ServiceControl/Authentication.ServicePulse.Authority" value="" />
42-
<add key="ServiceControl/Authentication.ServicePulse.ApiScope" value="" /> -->
42+
<add key="ServiceControl/Authentication.ServicePulse.ApiScopes" value="" /> -->
4343
</appSettings>
4444
<connectionStrings>
4545
<!-- DEVS - Pick a transport connection string to match chosen transport above -->

src/ServiceControl.UnitTests/ApprovalFiles/APIApprovals.PlatformSampleSettings.approved.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"requireHttpsMetadata": false,
5252
"servicePulseAuthority": null,
5353
"servicePulseClientId": null,
54-
"servicePulseApiScope": null
54+
"servicePulseApiScopes": null
5555
},
5656
"ShutdownTimeout": "00:00:05"
5757
}

0 commit comments

Comments
 (0)