diff --git a/src/LiteCharmsSecurity.Admin.Api/Dockerfile b/src/LiteCharmsSecurity.Admin.Api/Dockerfile
index e5d46d5..ce608b3 100644
--- a/src/LiteCharmsSecurity.Admin.Api/Dockerfile
+++ b/src/LiteCharmsSecurity.Admin.Api/Dockerfile
@@ -9,10 +9,10 @@ WORKDIR /app_source
COPY . .
-RUN dotnet restore "LiteCharmsSecurity.AdminUI.sln" --ignore-failed-sources --source "https://nexus.khongisa.co.za/repository/nuget-group/index.json"
+RUN dotnet restore "LiteCharmsSecurity.AdminUI.sln"
WORKDIR "/app_source/src/LiteCharmsSecurity.Admin.Api"
-RUN dotnet build "LiteCharmsSecurity.Admin.Api.csproj" -c Release -o /app/build --source "https://nexus.khongisa.co.za/repository/nuget-group/index.json"
+RUN dotnet build "LiteCharmsSecurity.Admin.Api.csproj" -c Release -o /app/build
FROM build AS publish
RUN dotnet publish "LiteCharmsSecurity.Admin.Api.csproj" -c Release --no-restore -o /app/publish
diff --git a/src/LiteCharmsSecurity.Admin.Api/LiteCharmsSecurity.Admin.Api.csproj b/src/LiteCharmsSecurity.Admin.Api/LiteCharmsSecurity.Admin.Api.csproj
index 110f272..eca0479 100644
--- a/src/LiteCharmsSecurity.Admin.Api/LiteCharmsSecurity.Admin.Api.csproj
+++ b/src/LiteCharmsSecurity.Admin.Api/LiteCharmsSecurity.Admin.Api.csproj
@@ -17,11 +17,11 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
@@ -35,7 +35,7 @@
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
diff --git a/src/LiteCharmsSecurity.Admin.EntityFramework.PostgreSQL/LiteCharmsSecurity.Admin.EntityFramework.PostgreSQL.csproj b/src/LiteCharmsSecurity.Admin.EntityFramework.PostgreSQL/LiteCharmsSecurity.Admin.EntityFramework.PostgreSQL.csproj
index 4656abe..739f688 100644
--- a/src/LiteCharmsSecurity.Admin.EntityFramework.PostgreSQL/LiteCharmsSecurity.Admin.EntityFramework.PostgreSQL.csproj
+++ b/src/LiteCharmsSecurity.Admin.EntityFramework.PostgreSQL/LiteCharmsSecurity.Admin.EntityFramework.PostgreSQL.csproj
@@ -6,9 +6,9 @@
-
-
-
+
+
+
diff --git a/src/LiteCharmsSecurity.Admin.EntityFramework.Shared/LiteCharmsSecurity.Admin.EntityFramework.Shared.csproj b/src/LiteCharmsSecurity.Admin.EntityFramework.Shared/LiteCharmsSecurity.Admin.EntityFramework.Shared.csproj
index d9b2e9b..fc1808e 100644
--- a/src/LiteCharmsSecurity.Admin.EntityFramework.Shared/LiteCharmsSecurity.Admin.EntityFramework.Shared.csproj
+++ b/src/LiteCharmsSecurity.Admin.EntityFramework.Shared/LiteCharmsSecurity.Admin.EntityFramework.Shared.csproj
@@ -6,14 +6,14 @@
-
-
+
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
-
-
+
+
diff --git a/src/LiteCharmsSecurity.Admin.EntityFramework.SqlServer/LiteCharmsSecurity.Admin.EntityFramework.SqlServer.csproj b/src/LiteCharmsSecurity.Admin.EntityFramework.SqlServer/LiteCharmsSecurity.Admin.EntityFramework.SqlServer.csproj
index 7f10ab7..43e751d 100644
--- a/src/LiteCharmsSecurity.Admin.EntityFramework.SqlServer/LiteCharmsSecurity.Admin.EntityFramework.SqlServer.csproj
+++ b/src/LiteCharmsSecurity.Admin.EntityFramework.SqlServer/LiteCharmsSecurity.Admin.EntityFramework.SqlServer.csproj
@@ -6,9 +6,9 @@
-
-
-
+
+
+
diff --git a/src/LiteCharmsSecurity.Admin/Dockerfile b/src/LiteCharmsSecurity.Admin/Dockerfile
index 23a0170..a411904 100644
--- a/src/LiteCharmsSecurity.Admin/Dockerfile
+++ b/src/LiteCharmsSecurity.Admin/Dockerfile
@@ -18,10 +18,10 @@ RUN ln -s /usr/local/lib/node_modules/npm/bin/npm-cli.js /usr/local/bin/npm \
COPY . .
-RUN dotnet restore "LiteCharmsSecurity.AdminUI.sln" --ignore-failed-sources --source "https://nexus.khongisa.co.za/repository/nuget-group/index.json"
+RUN dotnet restore "LiteCharmsSecurity.AdminUI.sln"
WORKDIR "/app_source/src/LiteCharmsSecurity.Admin"
-RUN dotnet build "LiteCharmsSecurity.Admin.csproj" -c Release -o /app/build --source "https://nexus.khongisa.co.za/repository/nuget-group/index.json"
+RUN dotnet build "LiteCharmsSecurity.Admin.csproj" -c Release -o /app/build
FROM build AS publish
RUN dotnet publish "LiteCharmsSecurity.Admin.csproj" -c Release --no-restore -o /app/publish
diff --git a/src/LiteCharmsSecurity.Admin/LiteCharmsSecurity.Admin.csproj b/src/LiteCharmsSecurity.Admin/LiteCharmsSecurity.Admin.csproj
index 8d77384..98a0104 100644
--- a/src/LiteCharmsSecurity.Admin/LiteCharmsSecurity.Admin.csproj
+++ b/src/LiteCharmsSecurity.Admin/LiteCharmsSecurity.Admin.csproj
@@ -9,12 +9,12 @@
-
-
+
+
-
-
-
+
+
+
diff --git a/src/LiteCharmsSecurity.STS.Identity/Dockerfile b/src/LiteCharmsSecurity.STS.Identity/Dockerfile
index 44e2eab..ec57dd7 100644
--- a/src/LiteCharmsSecurity.STS.Identity/Dockerfile
+++ b/src/LiteCharmsSecurity.STS.Identity/Dockerfile
@@ -9,10 +9,10 @@ WORKDIR /app_source
COPY . .
-RUN dotnet restore "LiteCharmsSecurity.AdminUI.sln" --ignore-failed-sources --source "https://nexus.khongisa.co.za/repository/nuget-group/index.json"
+RUN dotnet restore "LiteCharmsSecurity.AdminUI.sln"
WORKDIR "/app_source/src/LiteCharmsSecurity.STS.Identity"
-RUN dotnet build "LiteCharmsSecurity.STS.Identity.csproj" -c Release -o /app/build --source "https://nexus.khongisa.co.za/repository/nuget-group/index.json"
+RUN dotnet build "LiteCharmsSecurity.STS.Identity.csproj" -c Release -o /app/build
FROM build AS publish
RUN dotnet publish "LiteCharmsSecurity.STS.Identity.csproj" -c Release --no-restore -o /app/publish
diff --git a/src/LiteCharmsSecurity.STS.Identity/LiteCharmsSecurity.STS.Identity.csproj b/src/LiteCharmsSecurity.STS.Identity/LiteCharmsSecurity.STS.Identity.csproj
index 1a1d63a..51e3d47 100644
--- a/src/LiteCharmsSecurity.STS.Identity/LiteCharmsSecurity.STS.Identity.csproj
+++ b/src/LiteCharmsSecurity.STS.Identity/LiteCharmsSecurity.STS.Identity.csproj
@@ -17,34 +17,34 @@
-
-
-
-
-
-
+
+
+
+
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
+
+
-
-
-
-
+
+
+
+
-
+
-
-
+
+
-
-
+
+
diff --git a/src/LiteCharmsSecurity.STS.Identity/Services/ClaimsInjectorProfileService.cs b/src/LiteCharmsSecurity.STS.Identity/Services/ClaimsInjectorProfileService.cs
new file mode 100644
index 0000000..1264c8c
--- /dev/null
+++ b/src/LiteCharmsSecurity.STS.Identity/Services/ClaimsInjectorProfileService.cs
@@ -0,0 +1,39 @@
+using Duende.IdentityServer.Models;
+using Duende.IdentityServer.Services;
+using LiteCharmsSecurity.Admin.EntityFramework.Shared.Entities.Identity;
+using Microsoft.AspNetCore.Identity;
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace LiteCharmsSecurity.STS.Identity.Services;
+
+public sealed class ClaimsInjectorProfileService(UserManager userManager) : IProfileService
+{
+ public Task GetProfileDataAsync(ProfileDataRequestContext context)
+ => GetProfileDataAsync(context, CancellationToken.None);
+
+ public async Task GetProfileDataAsync(ProfileDataRequestContext context, CancellationToken ct)
+ {
+ var user = await userManager.GetUserAsync(context.Subject);
+ if (user != null && !string.IsNullOrEmpty(user.Email))
+ {
+ context.IssuedClaims.Add(new Claim("email", user.Email));
+ context.IssuedClaims.Add(new Claim("email_verified", user.EmailConfirmed ? "true" : "false"));
+
+ if (!string.IsNullOrEmpty(user.UserName))
+ {
+ context.IssuedClaims.Add(new Claim("preferred_username", user.UserName));
+ }
+ }
+ }
+
+ public Task IsActiveAsync(IsActiveContext context)
+ => IsActiveAsync(context, CancellationToken.None);
+
+ public async Task IsActiveAsync(IsActiveContext context, CancellationToken ct)
+ {
+ var user = await userManager.GetUserAsync(context.Subject);
+ context.IsActive = user != null;
+ }
+}
\ No newline at end of file
diff --git a/src/LiteCharmsSecurity.STS.Identity/Startup.cs b/src/LiteCharmsSecurity.STS.Identity/Startup.cs
index bafa4b2..e0d7e42 100644
--- a/src/LiteCharmsSecurity.STS.Identity/Startup.cs
+++ b/src/LiteCharmsSecurity.STS.Identity/Startup.cs
@@ -1,24 +1,25 @@
-using System;
-using System.Threading.Tasks;
-using HealthChecks.UI.Client;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Diagnostics.HealthChecks;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using IdentityModel;
using Duende.IdentityServer;
using Duende.IdentityServer.Configuration;
+using HealthChecks.UI.Client;
+using IdentityModel;
using LiteCharmsSecurity.Admin.EntityFramework.Shared.DbContexts;
using LiteCharmsSecurity.Admin.EntityFramework.Shared.Entities.Identity;
-using Skoruba.Duende.IdentityServer.Shared.Configuration.Helpers;
using LiteCharmsSecurity.STS.Identity.Configuration;
using LiteCharmsSecurity.STS.Identity.Configuration.Constants;
using LiteCharmsSecurity.STS.Identity.Configuration.Interfaces;
using LiteCharmsSecurity.STS.Identity.Helpers;
using LiteCharmsSecurity.STS.Identity.Passkeys;
+using LiteCharmsSecurity.STS.Identity.Services;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Diagnostics.HealthChecks;
+using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Identity;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Skoruba.Duende.IdentityServer.Shared.Configuration.Helpers;
+using System;
+using System.Threading.Tasks;
namespace LiteCharmsSecurity.STS.Identity
{
@@ -129,7 +130,8 @@ namespace LiteCharmsSecurity.STS.Identity
public virtual void RegisterAuthentication(IServiceCollection services)
{
services.AddAuthenticationServices(Configuration);
- services.AddIdentityServer(Configuration);
+ services.AddIdentityServer(Configuration)
+ .AddProfileService();
}
public virtual void RegisterAuthorization(IServiceCollection services)
diff --git a/src/LiteCharmsSecurity.Shared/LiteCharmsSecurity.Shared.csproj b/src/LiteCharmsSecurity.Shared/LiteCharmsSecurity.Shared.csproj
index 6afe539..aae17b4 100644
--- a/src/LiteCharmsSecurity.Shared/LiteCharmsSecurity.Shared.csproj
+++ b/src/LiteCharmsSecurity.Shared/LiteCharmsSecurity.Shared.csproj
@@ -6,14 +6,14 @@
-
-
+
+
-
-
-
+
+
+
-
+