Skip to content

Commit

Permalink
Merge pull request #1286 from Aguafrommars/master
Browse files Browse the repository at this point in the history
8.1 preview
  • Loading branch information
aguacongas authored Nov 3, 2024
2 parents ec587a4 + 9f510a8 commit 7837ae2
Show file tree
Hide file tree
Showing 155 changed files with 10,400 additions and 1,738 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/deploy-to-heroku.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,11 @@ on:
workflow_dispatch:

jobs:
# Build job
# Deployment job
deploy:
environment:
name: heroku
url: https://theidserver-duende.herokuapp.com/
runs-on: ubuntu-latest
steps:
- name: Checkout
Expand All @@ -34,5 +37,5 @@ jobs:
heroku_api_key: ${{ secrets.HEROKU_API_KEY }}
heroku_app_name: "theidserver-duende"
heroku_email: "[email protected]"
buildpack: https://github.com/Aguafrommars/theidserver-buildpack
buildpack: https://github.com/Aguafrommars/theidserverbuildpack

198 changes: 198 additions & 0 deletions CHANGELOG.md

Large diffs are not rendered by default.

13 changes: 7 additions & 6 deletions GitVersion.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
mode: ContinuousDelivery
branches:
master:
tag: ci
is-mainline: false
regex: master
label: ci
is-main-branch: false
release:
regex: release/
tag: ''
is-mainline: true
label: ''
is-main-branch: true
preview:
regex: preview/
tag: 'preview'
is-mainline: true
label: 'preview'
is-main-branch: true
source-branches: ['master']
ignore:
sha: []
10 changes: 5 additions & 5 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ services:
environment:
GITHUB_TOKEN:
secure: /o9VAhx5ewGmdLR9qcgFJMzBaCuzOmGlsXAHu7khUJLdQzsv4gJzLUfYDghcRPHd
donetsdk: 8.0.100
donetsdk: 8.0.403
JAVA_HOME: C:\Program Files\Java\jdk19
PATH: $(JAVA_HOME)\bin;$(PATH)
init:
- cmd: git config --global core.autocrlf true
install:
- ps: Install-Product node 18 x64
- ps: .\dotnet-install.ps1 -Version 7.0.11 -Runtime dotnet -Architecture x64 -InstallDir "C:\Program Files\dotnet"
- ps: .\dotnet-install.ps1 -Version 7.0.11 -Runtime aspnetcore -Architecture x64 -InstallDir "C:\Program Files\dotnet"
- ps: Install-Product node 20 x64
- ps: .\dotnet-install.ps1 -Version 7.0.16 -Runtime dotnet -Architecture x64 -InstallDir "C:\Program Files\dotnet"
- ps: .\dotnet-install.ps1 -Version 7.0.16 -Runtime aspnetcore -Architecture x64 -InstallDir "C:\Program Files\dotnet"
- ps: .\dotnet-install.ps1 -Version $env:donetsdk -InstallDir "C:\Program Files\dotnet"
- ps: dotnet tool install --global GitVersion.Tool
- ps: dotnet gitversion /l console /output buildserver
Expand All @@ -48,7 +48,7 @@ artifacts:
deploy:
- provider: NuGet
api_key:
secure: L5Ol2yiygLW8nUF6j5/rwx4feonMPly+S69GjoX1ilEUklPMixlX5RW2l8FJScNK
secure: UCcGrUEujBVjkw4G9l6ebB4iWv8EBGNNP8FdzZQDT0GpGgCnaBRmmfdS+5ejk5EB
on:
branch:
- /^preview\/\d+.\d+.\d+$/
Expand Down
25 changes: 0 additions & 25 deletions doc/OPEN_TELEMETRY.md
Original file line number Diff line number Diff line change
Expand Up @@ -188,31 +188,6 @@ To enable the [OTLP endpoint or Collector](https://opentelemetry.io/docs/collect

`OpenTelemetryProtocol` is deserialized into a [`OtlpExporterOptions`](https://github.com/open-telemetry/opentelemetry-dotnet/blob/4b3ee96ffc39bc24c3b8377455b2c099bd9da6b0/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OtlpExporterOptions.cs) instance.

#### Jaeger

To enable the [Jaeger](https://www.jaegertracing.io/) exporter setup the `Jaeger` node:

```json
{
"OpenTelemetryOptions": {
"Trace": {
"Jaeger": {
"AgentHost": "exemple.com", //required
"AgentPort": 443 ,
"ExportProcessorType": "Batch",
"BatchExportProcessorOptions": {
"BatchExportProcessorOptions": 2048,
"ScheduledDelayMilliseconds": 5000,
"ExporterTimeoutMilliseconds": 30000,
"MaxExportBatchSize": 512
}
}
}
}
}
```

`Jaeger` is deserialized into a [`JaegerExporterOptions`](https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/src/OpenTelemetry.Exporter.Jaeger/JaegerExporterOptionsExtensions.cs) instance.

#### Zipkin

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.0" />
<PackageReference Include="Serilog" Version="3.1.1" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.10" />
<PackageReference Include="Serilog" Version="4.1.0" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="IdentityModel" Version="6.2.0" />
<PackageReference Include="IdentityModel" Version="7.0.0" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="IdentityModel" Version="6.2.0" />
<PackageReference Include="IdentityModel" Version="7.0.0" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="IdentityModel" Version="6.2.0" />
<PackageReference Include="IdentityModel" Version="7.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="IdentityModel" Version="6.2.0" />
<PackageReference Include="IdentityModel" Version="7.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="IdentityModel" Version="6.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.0" />
<PackageReference Include="Serilog" Version="3.1.1" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
<PackageReference Include="IdentityModel" Version="7.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.10" />
<PackageReference Include="Serilog" Version="4.1.0" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
</ItemGroup>


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Authentication.WsFederation" Version="8.0.0" />
<PackageReference Include="Serilog" Version="3.1.1" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.WsFederation" Version="8.0.10" />
<PackageReference Include="Serilog" Version="4.1.0" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="8.0.0" />
<PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.10" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.10" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="8.0.10" />
<PackageReference Include="System.Net.Http.Json" Version="8.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions sample/DPoP/Api/ApiHost.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="IdentityModel" Version="6.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.0" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
<PackageReference Include="IdentityModel" Version="7.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.10" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
</ItemGroup>

</Project>
6 changes: 3 additions & 3 deletions sample/DPoP/ClientCredentials/ClientCredentials.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Duende.AccessTokenManagement" Version="2.0.3"></PackageReference>
<PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="7.0.3" />
<PackageReference Include="Duende.AccessTokenManagement" Version="3.0.0"></PackageReference>
<PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.2.0" />
</ItemGroup>
</Project>
6 changes: 3 additions & 3 deletions sample/DPoP/WebClient/WebClient.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Duende.AccessTokenManagement.OpenIdConnect" Version="2.0.3" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.0" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
<PackageReference Include="Duende.AccessTokenManagement.OpenIdConnect" Version="3.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.10" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -35,24 +35,29 @@
<NoWarn>1701;1702;NU1603</NoWarn>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Aguacongas.IdentityServer.Admin.Duende" Version="7.4.6" />
<PackageReference Include="Aguacongas.IdentityServer.EntityFramework.Store.Duende" Version="7.4.6" />
<PackageReference Include="Aguacongas.TheIdServer.Migrations.SqlServer" Version="7.4.6" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.0">
<PackageReference Include="Aguacongas.IdentityServer.Admin.Duende" Version="8.0.1" />
<PackageReference Include="Aguacongas.IdentityServer.EntityFramework.Store.Duende" Version="8.0.1" />
<PackageReference Include="Aguacongas.TheIdServer.Migrations.SqlServer" Version="8.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.0.10" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.10">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.0" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.0" PrivateAssets="All" />
<PackageReference Include="Serilog" Version="3.1.1" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
<PackageReference Include="Serilog.Sinks.Seq" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.10" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.6" PrivateAssets="All" />
<PackageReference Include="Serilog" Version="4.1.0" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
<PackageReference Include="Serilog.Sinks.Seq" Version="8.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\src\IdentityServer\Duende\Aguacongas.IdentityServer.Admin.Duende\Aguacongas.IdentityServer.Admin.Duende.csproj" />
<ProjectReference Include="..\..\..\src\IdentityServer\Duende\Aguacongas.IdentityServer.EntityFramework.Store.Duende\Aguacongas.IdentityServer.EntityFramework.Store.Duende.csproj" />
<ProjectReference Include="..\..\..\src\IdentityServer\Migrations\Aguacongas.TheIdServer.Migrations.SqlServer\Aguacongas.TheIdServer.Migrations.SqlServer.csproj" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
using Duende.IdentityServer.Validation;
using System.Threading.Tasks;

namespace Aguacongas.TheIdServer.Api;

public class EmptyClientConfigurationValidator : IClientConfigurationValidator
{
public Task ValidateAsync(ClientConfigurationValidationContext context)
=> Task.CompletedTask;
}
11 changes: 11 additions & 0 deletions sample/MultiTiers/Aguacongas.TheIdServer.Api/Clock.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// Project: Aguafrommars/TheIdServer
// Copyright (c) 2023 @Olivier Lefebvre
using Duende.IdentityServer;
using System;

namespace Aguacongas.TheIdServer.Api;

internal class Clock : IClock
{
public DateTimeOffset UtcNow => DateTime.UtcNow;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
using Aguacongas.IdentityServer.Abstractions;
using Microsoft.AspNetCore.Http;
using System.Collections.Generic;
using System.Threading.Tasks;

namespace Aguacongas.TheIdServer.Api;

public class CreatePersonalAccessTokenServvice : ICreatePersonalAccessToken
{
public Task<string> CreatePersonalAccessTokenAsync(HttpContext context, bool isRefenceToken, int lifetimeDays, IEnumerable<string> apis, IEnumerable<string> scopes, IEnumerable<string> claimTypes)
{
throw new System.NotImplementedException();
}
}
14 changes: 14 additions & 0 deletions sample/MultiTiers/Aguacongas.TheIdServer.Api/EventService.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
using Duende.IdentityServer.Events;
using Duende.IdentityServer.Services;
using System.Threading.Tasks;

namespace Aguacongas.TheIdServer.Api;

public class EmptyEventService : IEventService
{
public bool CanRaiseEventType(EventTypes evtType)
=> true;

public Task RaiseAsync(Event evt)
=> Task.CompletedTask;
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// Project: Aguafrommars/TheIdServer
// Copyright (c) 2023 @Olivier Lefebvre
using Aguacongas.IdentityServer.Admin.Configuration;
using Aguacongas.TheIdServer.Admin.Hubs;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Hosting;
Expand All @@ -22,6 +23,7 @@ public static IApplicationBuilder UseTheIdServerApi(this IApplicationBuilder app
.UseHsts();
}

ApiBasePath.Value = "/api";
app.UseSerilogRequestLogging()
.UseHttpsRedirection()
.UseResponseCompression()
Expand Down
Loading

0 comments on commit 7837ae2

Please sign in to comment.