Compare commits

..
6 Commits
7 changed files with 18 additions and 29 deletions
@@ -11,7 +11,7 @@
<!-- Quartz Scheduler--> <!-- Quartz Scheduler-->
<ItemGroup> <ItemGroup>
<PackageReference Include="Bogus" Version="35.6.5" /> <PackageReference Include="Bogus" Version="35.6.5" />
<PackageReference Include="Meziantou.Analyzer" Version="3.0.98"> <PackageReference Include="Meziantou.Analyzer" Version="3.0.101">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
@@ -116,8 +116,8 @@
<!-- Amazon S3 SDK --> <!-- Amazon S3 SDK -->
<ItemGroup> <ItemGroup>
<PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.3" /> <PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.4" />
<PackageReference Include="AWSSDK.S3" Version="4.0.24" /> <PackageReference Include="AWSSDK.S3" Version="4.0.24.1" />
<ProjectReference Include="..\LiteCharms.Features\LiteCharms.Features.csproj" /> <ProjectReference Include="..\LiteCharms.Features\LiteCharms.Features.csproj" />
<!-- global Usings --> <!-- global Usings -->
@@ -32,7 +32,7 @@
<!-- Quartz Scheduler--> <!-- Quartz Scheduler-->
<ItemGroup> <ItemGroup>
<PackageReference Include="Humanizer" Version="3.0.10" /> <PackageReference Include="Humanizer" Version="3.0.10" />
<PackageReference Include="Meziantou.Analyzer" Version="3.0.98"> <PackageReference Include="Meziantou.Analyzer" Version="3.0.101">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
@@ -136,8 +136,8 @@
<!-- Amazon S3 SDK --> <!-- Amazon S3 SDK -->
<ItemGroup> <ItemGroup>
<PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.3" /> <PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.4" />
<PackageReference Include="AWSSDK.S3" Version="4.0.24" /> <PackageReference Include="AWSSDK.S3" Version="4.0.24.1" />
<ProjectReference Include="..\LiteCharms.Features\LiteCharms.Features.csproj" /> <ProjectReference Include="..\LiteCharms.Features\LiteCharms.Features.csproj" />
<!-- global Usings --> <!-- global Usings -->
@@ -136,8 +136,8 @@
<!-- Amazon S3 SDK --> <!-- Amazon S3 SDK -->
<ItemGroup> <ItemGroup>
<PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.3" /> <PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.4" />
<PackageReference Include="AWSSDK.S3" Version="4.0.24" /> <PackageReference Include="AWSSDK.S3" Version="4.0.24.1" />
<ProjectReference Include="..\LiteCharms.Features\LiteCharms.Features.csproj" /> <ProjectReference Include="..\LiteCharms.Features\LiteCharms.Features.csproj" />
<!-- global Usings --> <!-- global Usings -->
@@ -2,8 +2,8 @@
"uat": { "uat": {
"authority": "https://sts.security.khongisa.co.za", "authority": "https://sts.security.khongisa.co.za",
"grantType": "client_credentials", "grantType": "client_credentials",
"clientId": "midrandbooks-api-uat", "clientId": "midrandbooks-api-scaler-uat",
"clientSecret": "secret_5a36d0024980544c875447a4b052938becc3fbbb10b8b2c097310c1a53ba3c0a", "clientSecret": "secret_0a8dc1f99061590a52b1272db3a1871d2761c79fbd058b2a968911029e4b208a",
"scope": "midrandbooks-api" "scope": "midrandbooks-api"
} }
} }
@@ -9,8 +9,4 @@ public sealed class LiteCharmsSettings
public string? ClientSecret { get; set; } public string? ClientSecret { get; set; }
public string? Audience { get; set; } public string? Audience { get; set; }
public string? RequiredClaimName { get; set; }
public string? RequiredClaimNameValue { get; set; }
} }
-7
View File
@@ -76,13 +76,6 @@ public static class Api
}; };
}); });
if (!string.IsNullOrWhiteSpace(authOptions.RequiredClaimName) && !string.IsNullOrWhiteSpace(authOptions.RequiredClaimNameValue))
{
services.AddAuthorizationBuilder()
.AddPolicy("RequiredScope", policy =>
policy.RequireClaim(authOptions.RequiredClaimName, authOptions.RequiredClaimNameValue));
}
else
services.AddAuthorization(); services.AddAuthorization();
return services; return services;
@@ -67,7 +67,7 @@
<!-- Quartz Scheduler--> <!-- Quartz Scheduler-->
<ItemGroup> <ItemGroup>
<PackageReference Include="Hashids.net" Version="1.7.0" /> <PackageReference Include="Hashids.net" Version="1.7.0" />
<PackageReference Include="Meziantou.Analyzer" Version="3.0.98"> <PackageReference Include="Meziantou.Analyzer" Version="3.0.101">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
@@ -171,8 +171,8 @@
<!-- Amazon S3 SDK --> <!-- Amazon S3 SDK -->
<ItemGroup> <ItemGroup>
<PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.3" /> <PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.4" />
<PackageReference Include="AWSSDK.S3" Version="4.0.24" /> <PackageReference Include="AWSSDK.S3" Version="4.0.24.1" />
<!-- global Usings --> <!-- global Usings -->
<Using Include="Amazon.S3" /> <Using Include="Amazon.S3" />