Skip to content

feat: add full OAuth2 flows and login UI #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
scottgerring merged 17 commits into from
Jul 23, 2025
Merged

feat: add full OAuth2 flows and login UI #62

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
7f50a3e
feat: add first version of login UI
jeastham1993 Jul 21, 2025
b86caf7
feat: add OAuth 2 implementation
jeastham1993 Jul 22, 2025
07c4041
fix: remove redundant Bootstrap static assets
jeastham1993 Jul 22, 2025
349a3b7
chore: update auth docs
jeastham1993 Jul 22, 2025
b0bcd6b
feat: resolve integration test issues
jeastham1993 Jul 22, 2025
13f4e28
Delete .github/.DS_Store
jeastham1993 Jul 22, 2025
543f143
Delete .DS_Store
jeastham1993 Jul 22, 2025
82a2d23
chore: fix integrationt test issues
jeastham1993 Jul 22, 2025
803570d
chore: remove redundant integration test
jeastham1993 Jul 22, 2025
63a98af
Merge branch 'feat/add-login-ui' of github.com:DataDog/stickerlandia …
jeastham1993 Jul 22, 2025
9e79b68
chore: update docs for auth controller
jeastham1993 Jul 22, 2025
a42f981
chore: update integration tests to remove consent and HTML parsing
jeastham1993 Jul 22, 2025
63b2787
chore: cleanup code
jeastham1993 Jul 22, 2025
0798a43
chore: readd user updated event publish
jeastham1993 Jul 22, 2025
3681b8c
fix: resolve test issue
jeastham1993 Jul 22, 2025
66041d7
chore: update docs and endpoints
jeastham1993 Jul 22, 2025
998bfb6
feat: update login/register page paths
jeastham1993 Jul 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
View file
Open in desktop
Comment thread
jeastham1993 marked this conversation as resolved.
Outdated
Binary file not shown.
Binary file added .github/.DS_Store
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions user-management/src/Stickerlandia.UserManagement.AWS/ServiceExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ namespace Stickerlandia.UserManagement.AWS;

public static class ServiceExtensions
{
public static IServiceCollection AddAwsAdapters(this IServiceCollection services, IConfiguration configuration)
public static IServiceCollection AddAwsAdapters(this IServiceCollection services, IConfiguration configuration, bool enableDefaultUi = true)
{
ArgumentNullException.ThrowIfNull(configuration);

services.AddPostgresAuthServices(configuration);
services.AddPostgresAuthServices(configuration, enableDefaultUi: enableDefaultUi);

services.Configure<AwsConfiguration>(
configuration.GetSection("Aws"));
Expand Down
15 changes: 11 additions & 4 deletions user-management/src/Stickerlandia.UserManagement.Agnostic/ServiceExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;
using Stickerlandia.UserManagement.Auth;
using Stickerlandia.UserManagement.Core;
using Stickerlandia.UserManagement.Core.Outbox;
Expand All @@ -15,10 +16,10 @@ namespace Stickerlandia.UserManagement.Agnostic;

public static class ServiceExtensions
{
public static IServiceCollection AddAgnosticAdapters(this IServiceCollection services, IConfiguration configuration)
public static IServiceCollection AddAgnosticAdapters(this IServiceCollection services, IConfiguration configuration, bool enableDefaultUi = true)
{
services.AddKafkaMessaging(configuration);
services.AddPostgresAuthServices(configuration);
services.AddPostgresAuthServices(configuration, enableDefaultUi);

return services;
}
Expand Down Expand Up @@ -56,7 +57,8 @@ public static IServiceCollection AddKafkaMessaging(this IServiceCollection servi
}

public static IServiceCollection AddPostgresAuthServices(this IServiceCollection services,
IConfiguration configuration)
IConfiguration configuration,
bool enableDefaultUi = true)
{
services.AddDbContext<UserManagementDbContext>(options =>
{
Expand All @@ -65,10 +67,15 @@ public static IServiceCollection AddPostgresAuthServices(this IServiceCollection
options.UseOpenIddict();
});

services.AddIdentityCore<PostgresUserAccount>()
var identityOptions = services.AddIdentity<PostgresUserAccount, IdentityRole>()
.AddEntityFrameworkStores<UserManagementDbContext>()
.AddDefaultTokenProviders();

if (enableDefaultUi)
{
identityOptions.AddDefaultUI();
}

var disableSsl = false;

if (configuration.GetValue<bool>("DISABLE_SSL")) disableSsl = true;
Expand Down
1 change: 1 addition & 0 deletions ...nt/src/Stickerlandia.UserManagement.Agnostic/Stickerlandia.UserManagement.Agnostic.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
</PackageReference>
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.11" />
<PackageReference Include="OpenIddict.Validation.AspNetCore" Version="6.3.0" />
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="8.0.18" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.16" />
<PackageReference Include="OpenIddict.AspNetCore" Version="6.3.0" />
<PackageReference Include="OpenIddict.Server.AspNetCore" Version="6.3.0" />
Expand Down
34 changes: 34 additions & 0 deletions ...ent/src/Stickerlandia.UserManagement.Api/Areas/Identity/Pages/Shared/_LoginPartial.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
@using Microsoft.AspNetCore.Identity
@using Stickerlandia.UserManagement.Agnostic
@inject SignInManager<PostgresUserAccount> SignInManager
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers

@{
var returnUrl = "/";
if (Context.Request.Query.TryGetValue("returnUrl", out var existingUrl)) {
returnUrl = existingUrl;
}
}

<ul class="navbar-nav">
@if (SignInManager.IsSignedIn(User))
{
<li class="nav-item">
<a class="nav-link text-dark" asp-area="Identity" asp-page="/Account/Manage/Index" title="Manage">Hello @User.Identity!.Name!</a>
</li>
<li class="nav-item">
<form class="form-inline" asp-area="Identity" asp-page="/Account/Logout" asp-route-returnUrl="/" method="post">
<button type="submit" class="nav-link btn btn-link text-dark">Logout</button>
</form>
</li>
}
else
{
<li class="nav-item">
<a class="nav-link text-dark" asp-area="Identity" asp-page="/Account/Register" asp-route-returnUrl="@returnUrl">Register</a>
</li>
<li class="nav-item">
<a class="nav-link text-dark" asp-area="Identity" asp-page="/Account/Login" asp-route-returnUrl="@returnUrl">Login</a>
</li>
}
</ul>
Loading