Skip to content

Commit 924a020

Browse files
eben-rouxeben-roux
committed
JwtService / npm update.
1 parent aaccdbc commit 924a020

File tree

24 files changed

+1323
-941
lines changed

24 files changed

+1323
-941
lines changed

‎.package/dockerfile-linux-sqlserver-demo

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ USER root
55

66
RUN mkdir /tmp/db && chown -R mssql /tmp/db
77

8-
COPY ./deployment/efbundle-linux /tmp/db/efbundle-linux
8+
COPY ./deployment/efbundle-linux-x64 /tmp/db/efbundle-linux-x64
99
COPY ./data-appsettings.json tmp/db/appsettings.json
1010

1111
# Configure external build arguments to allow configurability.
@@ -19,7 +19,7 @@ ENV SA_PASSWORD=$PASSWORD
1919
# Launch SQL Server, confirm startup is complete, deploy the DACPAC, then terminate SQL Server.
2020
# See https://stackoverflow.com/a/51589787/488695
2121
RUN ( /opt/mssql/bin/sqlservr & ) | grep -q "Service Broker manager has started" \
22-
&& /tmp/db/efbundle-linux --connection "Data Source=.;Initial Catalog=Access;user id=sa;password=Pass!000;TrustServerCertificate=true" --verbose \
22+
&& /tmp/db/efbundle-linux-x64 --connection "Data Source=.;Initial Catalog=Access;user id=sa;password=Pass!000;TrustServerCertificate=true" --verbose \
2323
&& rm -r /tmp/db \
2424
&& pkill sqlservr
2525

‎.package/package.msbuild

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Package" ToolsVersion="15">
22
<PropertyGroup>
3-
<RuntimeIdentifier>linux-x64</RuntimeIdentifier>
3+
<LinuxRuntimeIdentifier>linux-x64</LinuxRuntimeIdentifier>
4+
<WindowsRuntimeIdentifier>win-x64</WindowsRuntimeIdentifier>
45
<Version>$(Version)</Version>
56
</PropertyGroup>
67

@@ -18,14 +19,19 @@
1819
</DockerFile>
1920
</ItemGroup>
2021

21-
<Target Name="Package">
22+
<Target Name="EfBundle">
23+
<Exec
24+
Command="dotnet ef migrations bundle -p ../Shuttle.Access.Data/Shuttle.Access.Data.csproj -r $(LinuxRuntimeIdentifier) --self-contained --output $(MSBuildProjectDirectory)/deployment/efbundle-linux-x64 --force -- -c Release -f net8.0" />
25+
<Exec
26+
Command="dotnet ef migrations bundle -p ../Shuttle.Access.Data/Shuttle.Access.Data.csproj -r $(WindowsRuntimeIdentifier) --self-contained --output $(MSBuildProjectDirectory)/deployment/efbundle-win-x64.exe --force -- -c Release -f net8.0" />
27+
</Target>
28+
29+
<Target Name="Package" DependsOnTargets="EfBundle">
2230
<Error Condition="'$(Version)' == ''" Text="Version property is required. Use /p:Version={version}" />
2331

24-
<Exec
25-
Command="dotnet ef migrations bundle -p ../Shuttle.Access.Data/Shuttle.Access.Data.csproj -r $(RuntimeIdentifier) --self-contained --output $(MSBuildProjectDirectory)/deployment/efbundle-linux --force -- -c Release -f net8.0" />
2632

2733
<Exec
28-
Command="dotnet publish %(ProjectReference.Identity) -c Release -f net8.0 -r $(RuntimeIdentifier) --self-contained false --output $(MSBuildProjectDirectory)/deployment/%(ProjectReference.Filename)" />
34+
Command="dotnet publish %(ProjectReference.Identity) -c Release -f net8.0 -r $(LinuxRuntimeIdentifier) --self-contained false --output $(MSBuildProjectDirectory)/deployment/%(ProjectReference.Filename)" />
2935

3036
<Copy SourceFiles="%(ProjectReference.ConfigFile)"
3137
DestinationFiles="$(MSBuildProjectDirectory)/deployment/%(ProjectReference.Filename)/%(ProjectReference.ConfigFile)"

‎Shuttle.Access.Application/.package/package.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<package>
44
<metadata>
55
<id>Shuttle.Access.Application</id>
6-
<version>7.2.1</version>
6+
<version>7.2.2</version>
77
<authors>Eben Roux</authors>
88
<owners>Eben Roux</owners>
99
<license type="expression">BSD-3-Clause</license>

‎Shuttle.Access.Application/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
[assembly: AssemblyTitle(".NET Unified Platform")]
1010
#endif
1111

12-
[assembly: AssemblyVersion("7.2.1.0")]
12+
[assembly: AssemblyVersion("7.2.2.0")]
1313
[assembly: AssemblyCopyright("Copyright (c) 2025, Eben Roux")]
1414
[assembly: AssemblyProduct("Shuttle.Access.Application")]
1515
[assembly: AssemblyCompany("Eben Roux")]
1616
[assembly: AssemblyConfiguration("Release")]
17-
[assembly: AssemblyInformationalVersion("7.2.1")]
17+
[assembly: AssemblyInformationalVersion("7.2.2")]
1818
[assembly: ComVisible(false)]

‎Shuttle.Access.AspNetCore/.package/package.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<package>
44
<metadata>
55
<id>Shuttle.Access.AspNetCore</id>
6-
<version>7.2.1</version>
6+
<version>7.2.2</version>
77
<authors>Eben Roux</authors>
88
<owners>Eben Roux</owners>
99
<license type="expression">BSD-3-Clause</license>
@@ -17,7 +17,7 @@
1717
<tags>iam middleware authorization permissions</tags>
1818
<dependencies>
1919
<dependency id="Microsoft.IdentityModel.JsonWebTokens" version="8.7.0" />
20-
<dependency id="Shuttle.Access" version="7.1.2" />
20+
<dependency id="Shuttle.Access" version="7.2.2" />
2121
<dependency id="Shuttle.Core.Contract" version="20.0.1" />
2222
</dependencies>
2323
</metadata>

‎Shuttle.Access.AspNetCore/JwtService.cs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -102,16 +102,8 @@ private async Task<IEnumerable<SecurityKey>> GetSigningKeysAsync(IssuerOptions o
102102
: options.SigningKeyCacheDuration;
103103

104104
var jwksContent = await response.Content.ReadAsStringAsync();
105-
var jwks = JsonDocument.Parse(jwksContent);
106-
var keys = new List<SecurityKey>();
107105

108-
foreach (var key in jwks.RootElement.GetProperty("keys").EnumerateArray())
109-
{
110-
var e = Base64UrlEncoder.DecodeBytes(key.GetProperty("e").GetString());
111-
var n = Base64UrlEncoder.DecodeBytes(key.GetProperty("n").GetString());
112-
var rsa = new RSAParameters { Exponent = e, Modulus = n };
113-
keys.Add(new RsaSecurityKey(rsa));
114-
}
106+
var keys = new JsonWebKeySet(jwksContent).GetSigningKeys();
115107

116108
Cache.Set(options.JwksUri, keys, cacheDuration);
117109

‎Shuttle.Access.AspNetCore/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
[assembly: AssemblyTitle(".NET Unified Platform")]
1010
#endif
1111

12-
[assembly: AssemblyVersion("7.2.1.0")]
12+
[assembly: AssemblyVersion("7.2.2.0")]
1313
[assembly: AssemblyCopyright("Copyright (c) 2025, Eben Roux")]
1414
[assembly: AssemblyProduct("Shuttle.Access.AspNetCore")]
1515
[assembly: AssemblyCompany("Eben Roux")]
1616
[assembly: AssemblyConfiguration("Release")]
17-
[assembly: AssemblyInformationalVersion("7.2.1")]
17+
[assembly: AssemblyInformationalVersion("7.2.2")]
1818
[assembly: ComVisible(false)]

‎Shuttle.Access.AspNetCore/Shuttle.Access.AspNetCore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
<ItemGroup>
1515
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.7.0" />
16-
<PackageReference Include="Shuttle.Access" Version="7.2.1" />
16+
<PackageReference Include="Shuttle.Access" Version="7.2.2" />
1717
<PackageReference Include="Shuttle.Core.Contract" Version="20.0.1" />
1818
</ItemGroup>
1919

‎Shuttle.Access.Messages/.package/package.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<package>
44
<metadata>
55
<id>Shuttle.Access.Messages</id>
6-
<version>7.2.1</version>
6+
<version>7.2.2</version>
77
<authors>Eben Roux</authors>
88
<owners>Eben Roux</owners>
99
<license type="expression">BSD-3-Clause</license>

‎Shuttle.Access.Messages/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
[assembly: AssemblyTitle(".NET Unified Platform")]
1010
#endif
1111

12-
[assembly: AssemblyVersion("7.2.1.0")]
12+
[assembly: AssemblyVersion("7.2.2.0")]
1313
[assembly: AssemblyCopyright("Copyright (c) 2025, Eben Roux")]
1414
[assembly: AssemblyProduct("Shuttle.Access.Messages")]
1515
[assembly: AssemblyCompany("Eben Roux")]
1616
[assembly: AssemblyConfiguration("Release")]
17-
[assembly: AssemblyInformationalVersion("7.2.1")]
17+
[assembly: AssemblyInformationalVersion("7.2.2")]
1818
[assembly: ComVisible(false)]

‎Shuttle.Access.RestClient/.package/package.nuspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<package>
44
<metadata>
55
<id>Shuttle.Access.RestClient</id>
6-
<version>7.2.1</version>
6+
<version>7.2.2</version>
77
<authors>Eben Roux</authors>
88
<owners>Eben Roux</owners>
99
<license type="expression">BSD-3-Clause</license>
@@ -18,8 +18,8 @@
1818
<dependencies>
1919
<dependency id="Refit" version="8.0.0" />
2020
<dependency id="Refit.HttpClientFactory" version="8.0.0" />
21-
<dependency id="Shuttle.Access" version="7.1.2" />
22-
<dependency id="Shuttle.Access.AspNetCore" version="7.1.3" />
21+
<dependency id="Shuttle.Access" version="7.2.2" />
22+
<dependency id="Shuttle.Access.AspNetCore" version="7.2.2" />
2323
<dependency id="Shuttle.Core.Contract" version="20.0.1" />
2424
</dependencies>
2525
</metadata>

‎Shuttle.Access.RestClient/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
[assembly: AssemblyTitle(".NET Unified Platform")]
1010
#endif
1111

12-
[assembly: AssemblyVersion("7.2.1.0")]
12+
[assembly: AssemblyVersion("7.2.2.0")]
1313
[assembly: AssemblyCopyright("Copyright (c) 2025, Eben Roux")]
1414
[assembly: AssemblyProduct("Shuttle.Access.RestClient")]
1515
[assembly: AssemblyCompany("Eben Roux")]
1616
[assembly: AssemblyConfiguration("Release")]
17-
[assembly: AssemblyInformationalVersion("7.2.1")]
17+
[assembly: AssemblyInformationalVersion("7.2.2")]
1818
[assembly: ComVisible(false)]

‎Shuttle.Access.RestClient/Shuttle.Access.RestClient.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<ItemGroup>
1414
<PackageReference Include="Refit" Version="8.0.0" />
1515
<PackageReference Include="Refit.HttpClientFactory" Version="8.0.0" />
16-
<PackageReference Include="Shuttle.Access" Version="7.2.1" />
17-
<PackageReference Include="Shuttle.Access.AspNetCore" Version="7.2.1" />
16+
<PackageReference Include="Shuttle.Access" Version="7.2.2" />
17+
<PackageReference Include="Shuttle.Access.AspNetCore" Version="7.2.2" />
1818
<PackageReference Include="Shuttle.Core.Contract" Version="20.0.1" />
1919
</ItemGroup>
2020

‎Shuttle.Access.Sql/.package/package.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<package>
44
<metadata>
55
<id>Shuttle.Access.Sql</id>
6-
<version>7.2.1</version>
6+
<version>7.2.2</version>
77
<authors>Eben Roux</authors>
88
<owners></owners>
99
<license type="expression">BSD-3-Clause</license>

‎Shuttle.Access.Sql/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
[assembly: AssemblyTitle(".NET Unified Platform")]
1010
#endif
1111

12-
[assembly: AssemblyVersion("7.2.1.0")]
12+
[assembly: AssemblyVersion("7.2.2.0")]
1313
[assembly: AssemblyCopyright("Copyright (c) 2025, Eben Roux")]
1414
[assembly: AssemblyProduct("Shuttle.Access.Sql")]
1515
[assembly: AssemblyCompany("Eben Roux")]
1616
[assembly: AssemblyConfiguration("Release")]
17-
[assembly: AssemblyInformationalVersion("7.2.1")]
17+
[assembly: AssemblyInformationalVersion("7.2.2")]
1818
[assembly: ComVisible(false)]

‎Shuttle.Access.Vue/.eslintrc-auto-import.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@
7171
"watch": true,
7272
"watchEffect": true,
7373
"watchPostEffect": true,
74-
"watchSyncEffect": true
74+
"watchSyncEffect": true,
75+
"Slot": true,
76+
"Slots": true
7577
}
7678
}

‎Shuttle.Access.Vue/components.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// @ts-nocheck
33
// Generated by unplugin-vue-components
44
// Read more: https://github.com/vuejs/core/pull/3399
5+
// biome-ignore lint: disable
56
export {}
67

78
/* prettier-ignore */

0 commit comments

Comments
 (0)