Skip to content

Commit 3089e8e

Browse files
mckaragozmckaragoz
authored
Fail-Fast Strategy & Options Improvement (#17)
* Fail-Fast Strategy & Options Improvement * Added Lockout Mechanism & Bind LoginOptions * Session & Token Options and Validators * Bind Login & Logout Events With Options * Improved PKCE and MultiTenant Options & Fixed Path Tenant Resolver Logic * Completed Core Options & Improved AuthFlowContext and AccessContext Creation Security * Change Mode Option to AllowedModes * Server Options Improvements * Complete Checking Server Options * Improved ServiceCollectionExtensions * Enhanced Redirect Options & Handling * Added ReturnUrl Resolving * Fix Absolute Uri Platform Differencies * Try Another Fix * Complete Client Options Draft * Added Auth Invariants
1 parent cd6331b commit 3089e8e

211 files changed

Lines changed: 4466 additions & 1568 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎samples/UAuthHub/CodeBeam.UltimateAuth.Sample.UAuthHub/Components/Pages/Home.razor‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
@using CodeBeam.UltimateAuth.Core.Domain
1010
@using CodeBeam.UltimateAuth.Core.Runtime
1111
@using CodeBeam.UltimateAuth.Server.Abstractions
12-
@using CodeBeam.UltimateAuth.Server.Cookies
1312
@using CodeBeam.UltimateAuth.Server.Infrastructure
1413
@using CodeBeam.UltimateAuth.Server.Services
1514
@using CodeBeam.UltimateAuth.Server.Stores
@@ -53,7 +52,6 @@
5352

5453
<MudStack Spacing="0">
5554
<MudText><b>@ProductInfo.Get().ProductName</b> v @ProductInfo.Get().Version</MudText>
56-
<MudText>Client Profile: @ProductInfo.Get().ClientProfile.ToString()</MudText>
5755
</MudStack>
5856

5957
<MudStack Spacing="0">

‎samples/blazor-server/CodeBeam.UltimateAuth.Sample.BlazorServer/CodeBeam.UltimateAuth.Sample.BlazorServer.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net10.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Version>0.0.1-preview</Version>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.1" />
11+
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.1" />
1212
<PackageReference Include="MudBlazor" Version="9.0.0-preview.1" />
1313
<PackageReference Include="CodeBeam.MudBlazor.Extensions" Version="9.0.0-preview.2" />
1414
<PackageReference Include="Scalar.AspNetCore" Version="2.12.18" />

‎samples/blazor-server/CodeBeam.UltimateAuth.Sample.BlazorServer/Components/Pages/Home.razor‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
@using CodeBeam.UltimateAuth.Client.Authentication
55
@using CodeBeam.UltimateAuth.Client.Device
66
@using CodeBeam.UltimateAuth.Client.Diagnostics
7+
@using CodeBeam.UltimateAuth.Client.Runtime
78
@using CodeBeam.UltimateAuth.Core.Abstractions
89
@using CodeBeam.UltimateAuth.Core.Runtime
910
@using CodeBeam.UltimateAuth.Server.Abstractions
10-
@using CodeBeam.UltimateAuth.Server.Cookies
1111
@using CodeBeam.UltimateAuth.Server.Infrastructure
1212
@using CodeBeam.UltimateAuth.Server.Services
1313
@inject IUAuthStateManager StateManager
@@ -20,7 +20,7 @@
2020
@inject IHttpContextAccessor HttpContextAccessor
2121
@inject IUAuthClient UAuth
2222
@inject NavigationManager Nav
23-
@inject IUAuthProductInfoProvider ProductInfo
23+
@inject IUAuthClientProductInfoProvider ClientProductInfo
2424
@inject AuthenticationStateProvider AuthStateProvider
2525
@inject UAuthClientDiagnostics Diagnostics
2626
@inject IDeviceIdProvider DeviceIdProvider
@@ -50,8 +50,8 @@
5050
</MudStack>
5151

5252
<MudStack Spacing="0">
53-
<MudText><b>@ProductInfo.Get().ProductName</b> v @ProductInfo.Get().Version</MudText>
54-
<MudText>Client Profile: @ProductInfo.Get().ClientProfile.ToString()</MudText>
53+
<MudText><b>@ClientProductInfo.Get().ProductName</b> v @ClientProductInfo.Get().Version</MudText>
54+
<MudText>Client Profile: @ClientProductInfo.Get().ClientProfile.ToString()</MudText>
5555
</MudStack>
5656

5757
<MudStack Spacing="0">

‎samples/blazor-server/CodeBeam.UltimateAuth.Sample.BlazorServer/Components/Pages/Home.razor.cs‎

Lines changed: 103 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -1,146 +1,144 @@
11
using CodeBeam.UltimateAuth.Client;
2-
using CodeBeam.UltimateAuth.Client.Device;
32
using CodeBeam.UltimateAuth.Core.Contracts;
43
using CodeBeam.UltimateAuth.Core.Domain;
54
using CodeBeam.UltimateAuth.Users.Contracts;
65
using Microsoft.AspNetCore.Components.Authorization;
76
using MudBlazor;
87

9-
namespace CodeBeam.UltimateAuth.Sample.BlazorServer.Components.Pages
8+
namespace CodeBeam.UltimateAuth.Sample.BlazorServer.Components.Pages;
9+
10+
public partial class Home
1011
{
11-
public partial class Home
12-
{
13-
private string? _username;
14-
private string? _password;
12+
private string? _username;
13+
private string? _password;
1514

16-
private UALoginForm _form = null!;
15+
private UALoginForm _form = null!;
1716

18-
private AuthenticationState _authState = null!;
17+
private AuthenticationState _authState = null!;
1918

20-
protected override async Task OnInitializedAsync()
21-
{
22-
Diagnostics.Changed += OnDiagnosticsChanged;
23-
}
19+
protected override async Task OnInitializedAsync()
20+
{
21+
Diagnostics.Changed += OnDiagnosticsChanged;
22+
}
2423

25-
protected override async Task OnAfterRenderAsync(bool firstRender)
24+
protected override async Task OnAfterRenderAsync(bool firstRender)
25+
{
26+
if (firstRender)
2627
{
27-
if (firstRender)
28-
{
29-
await StateManager.EnsureAsync();
30-
_authState = await AuthStateProvider.GetAuthenticationStateAsync();
31-
StateHasChanged();
32-
}
28+
await StateManager.EnsureAsync();
29+
_authState = await AuthStateProvider.GetAuthenticationStateAsync();
30+
StateHasChanged();
3331
}
32+
}
3433

35-
private void OnDiagnosticsChanged()
36-
{
37-
InvokeAsync(StateHasChanged);
38-
}
34+
private void OnDiagnosticsChanged()
35+
{
36+
InvokeAsync(StateHasChanged);
37+
}
3938

40-
private async Task ProgrammaticLogin()
39+
private async Task ProgrammaticLogin()
40+
{
41+
var deviceId = await DeviceIdProvider.GetOrCreateAsync();
42+
var request = new LoginRequest
4143
{
42-
var deviceId = await DeviceIdProvider.GetOrCreateAsync();
43-
var request = new LoginRequest
44-
{
45-
Identifier = "admin",
46-
Secret = "admin",
47-
Device = DeviceContext.FromDeviceId(deviceId),
48-
};
49-
await UAuth.Flows.LoginAsync(request);
50-
_authState = await AuthStateProvider.GetAuthenticationStateAsync();
51-
}
44+
Identifier = "admin",
45+
Secret = "admin",
46+
Device = DeviceContext.FromDeviceId(deviceId),
47+
};
48+
await UAuth.Flows.LoginAsync(request);
49+
_authState = await AuthStateProvider.GetAuthenticationStateAsync();
50+
}
5251

53-
private async Task ValidateAsync()
54-
{
55-
var result = await UAuth.Flows.ValidateAsync();
52+
private async Task ValidateAsync()
53+
{
54+
var result = await UAuth.Flows.ValidateAsync();
5655

57-
Snackbar.Add(
58-
result.IsValid ? "Session is valid ✅" : $"Session invalid ❌ ({result.State})",
59-
result.IsValid ? Severity.Success : Severity.Error);
60-
}
56+
Snackbar.Add(
57+
result.IsValid ? "Session is valid ✅" : $"Session invalid ❌ ({result.State})",
58+
result.IsValid ? Severity.Success : Severity.Error);
59+
}
6160

62-
private async Task LogoutAsync()
61+
private async Task LogoutAsync()
62+
{
63+
await UAuth.Flows.LogoutAsync();
64+
Snackbar.Add("Logged out", Severity.Success);
65+
}
66+
67+
private async Task RefreshAsync()
68+
{
69+
await UAuth.Flows.RefreshAsync();
70+
}
71+
72+
private async Task HandleGetMe()
73+
{
74+
var profileResult = await UAuth.Users.GetMeAsync();
75+
if (profileResult.Ok)
6376
{
64-
await UAuth.Flows.LogoutAsync();
65-
Snackbar.Add("Logged out", Severity.Success);
77+
var profile = profileResult.Value;
78+
Snackbar.Add($"User Profile: {profile?.UserName} ({profile?.DisplayName})", Severity.Info);
6679
}
67-
68-
private async Task RefreshAsync()
80+
else
6981
{
70-
await UAuth.Flows.RefreshAsync();
82+
Snackbar.Add($"Failed to get profile: {profileResult.Error}", Severity.Error);
7183
}
84+
}
7285

73-
private async Task HandleGetMe()
86+
private async Task ChangeUserInactive()
87+
{
88+
ChangeUserStatusAdminRequest request = new ChangeUserStatusAdminRequest
7489
{
75-
var profileResult = await UAuth.Users.GetMeAsync();
76-
if (profileResult.Ok)
77-
{
78-
var profile = profileResult.Value;
79-
Snackbar.Add($"User Profile: {profile?.UserName} ({profile?.DisplayName})", Severity.Info);
80-
}
81-
else
82-
{
83-
Snackbar.Add($"Failed to get profile: {profileResult.Error}", Severity.Error);
84-
}
90+
UserKey = UserKey.FromString("user"),
91+
NewStatus = UserStatus.Disabled
92+
};
93+
var result = await UAuth.Users.ChangeStatusAdminAsync(request);
94+
if (result.Ok)
95+
{
96+
Snackbar.Add($"User is disabled.", Severity.Info);
8597
}
86-
87-
private async Task ChangeUserInactive()
98+
else
8899
{
89-
ChangeUserStatusAdminRequest request = new ChangeUserStatusAdminRequest
90-
{
91-
UserKey = UserKey.FromString("user"),
92-
NewStatus = UserStatus.Disabled
93-
};
94-
var result = await UAuth.Users.ChangeStatusAdminAsync(request);
95-
if (result.Ok)
96-
{
97-
Snackbar.Add($"User is disabled.", Severity.Info);
98-
}
99-
else
100-
{
101-
Snackbar.Add($"Failed to change user status.", Severity.Error);
102-
}
100+
Snackbar.Add($"Failed to change user status.", Severity.Error);
103101
}
102+
}
104103

105-
protected override void OnAfterRender(bool firstRender)
104+
protected override void OnAfterRender(bool firstRender)
105+
{
106+
if (firstRender)
106107
{
107-
if (firstRender)
108+
var uri = Nav.ToAbsoluteUri(Nav.Uri);
109+
var query = Microsoft.AspNetCore.WebUtilities.QueryHelpers.ParseQuery(uri.Query);
110+
111+
if (query.TryGetValue("error", out var error))
108112
{
109-
var uri = Nav.ToAbsoluteUri(Nav.Uri);
110-
var query = Microsoft.AspNetCore.WebUtilities.QueryHelpers.ParseQuery(uri.Query);
111-
112-
if (query.TryGetValue("error", out var error))
113-
{
114-
ShowLoginError(error.ToString());
115-
ClearQueryString();
116-
}
113+
ShowLoginError(error.ToString());
114+
ClearQueryString();
117115
}
118116
}
117+
}
119118

120-
private void ShowLoginError(string code)
119+
private void ShowLoginError(string code)
120+
{
121+
var message = code switch
121122
{
122-
var message = code switch
123-
{
124-
"invalid" => "Invalid username or password.",
125-
"locked" => "Your account is locked.",
126-
"mfa" => "Multi-factor authentication required.",
127-
_ => "Login failed."
128-
};
123+
"invalid" => "Invalid username or password.",
124+
"locked" => "Your account is locked.",
125+
"mfa" => "Multi-factor authentication required.",
126+
_ => "Login failed."
127+
};
129128

130-
Snackbar.Add(message, Severity.Error);
131-
}
132-
133-
private void ClearQueryString()
134-
{
135-
var uri = new Uri(Nav.Uri);
136-
var clean = uri.GetLeftPart(UriPartial.Path);
137-
Nav.NavigateTo(clean, replace: true);
138-
}
129+
Snackbar.Add(message, Severity.Error);
130+
}
139131

140-
public void Dispose()
141-
{
142-
Diagnostics.Changed -= OnDiagnosticsChanged;
143-
}
132+
private void ClearQueryString()
133+
{
134+
var uri = new Uri(Nav.Uri);
135+
var clean = uri.GetLeftPart(UriPartial.Path);
136+
Nav.NavigateTo(clean, replace: true);
137+
}
144138

139+
public void Dispose()
140+
{
141+
Diagnostics.Changed -= OnDiagnosticsChanged;
145142
}
143+
146144
}

‎samples/blazor-server/CodeBeam.UltimateAuth.Sample.BlazorServer/Program.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
using CodeBeam.UltimateAuth.Server.Authentication;
1616
using CodeBeam.UltimateAuth.Server.Defaults;
1717
using CodeBeam.UltimateAuth.Server.Extensions;
18+
using CodeBeam.UltimateAuth.Server.Options;
1819
using CodeBeam.UltimateAuth.Sessions.InMemory;
1920
using CodeBeam.UltimateAuth.Tokens.InMemory;
2021
using CodeBeam.UltimateAuth.Users.InMemory;
@@ -54,11 +55,13 @@
5455

5556
builder.Services.AddUltimateAuth();
5657

57-
builder.Services.AddUltimateAuthServer(o => {
58+
builder.Services.AddUltimateAuthServer(o =>
59+
{
5860
o.Diagnostics.EnableRefreshHeaders = true;
5961
//o.Session.MaxLifetime = TimeSpan.FromSeconds(32);
6062
//o.Session.TouchInterval = TimeSpan.FromSeconds(9);
6163
//o.Session.IdleTimeout = TimeSpan.FromSeconds(15);
64+
o.AuthResponse.Login.AllowReturnUrlOverride = true;
6265
})
6366
.AddUltimateAuthUsersInMemory()
6467
.AddUltimateAuthUsersReference()

‎samples/blazor-standalone-wasm/CodeBeam.UltimateAuth.Sample.BlazorStandaloneWasm/Pages/Home.razor‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
@inject ISnackbar Snackbar
1313
@inject IUAuthClient UAuthClient
1414
@inject NavigationManager Nav
15-
@inject IUAuthProductInfoProvider ProductInfo
15+
@inject IUAuthClientProductInfoProvider ClientProductInfo
1616
@inject AuthenticationStateProvider AuthStateProvider
1717
@inject UAuthClientDiagnostics Diagnostics
1818
@inject IUAuthClientBootstrapper Bootstrapper
@@ -41,8 +41,8 @@
4141
</MudStack>
4242

4343
<MudStack Spacing="0">
44-
<MudText><b>@ProductInfo.Get().ProductName</b> v @ProductInfo.Get().Version</MudText>
45-
<MudText>Client Profile: @ProductInfo.Get().ClientProfile.ToString()</MudText>
44+
<MudText><b>@ClientProductInfo.Get().ProductName</b> v @ClientProductInfo.Get().Version</MudText>
45+
<MudText>Client Profile: @ClientProductInfo.Get().ClientProfile.ToString()</MudText>
4646
</MudStack>
4747

4848
<MudStack Spacing="0">

‎samples/blazor-standalone-wasm/CodeBeam.UltimateAuth.Sample.BlazorStandaloneWasm/Program.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
builder.Services.AddUltimateAuth();
1616
builder.Services.AddUltimateAuthClient(o =>
1717
{
18-
o.Endpoints.Authority = "https://localhost:6110";
18+
o.Endpoints.BasePath = "https://localhost:6110";
1919
});
2020

2121
//builder.Services.AddScoped<AuthenticationStateProvider, UAuthAuthenticationStateProvider>();

‎src/CodeBeam.UltimateAuth.Client/Components/UALoginForm.razor‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
@using CodeBeam.UltimateAuth.Core.Options
88
@using Microsoft.Extensions.Options
99
@inject IJSRuntime JS
10-
@inject IOptions<UAuthOptions> CoreOptions
1110
@inject IOptions<UAuthClientOptions> Options
1211
@inject NavigationManager Navigation
1312

‎src/CodeBeam.UltimateAuth.Client/Components/UALoginForm.razor.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public async Task SubmitAsync()
115115
await JS.InvokeVoidAsync("uauth.submitForm", _form);
116116
}
117117

118-
private string ClientProfileValue => CoreOptions.Value.ClientProfile.ToString();
118+
private string ClientProfileValue => Options.Value.ClientProfile.ToString();
119119

120120
private string EffectiveEndpoint => LoginType == UAuthLoginType.Pkce
121121
? Options.Value.Endpoints.PkceComplete
@@ -130,7 +130,7 @@ private string ResolvedEndpoint
130130
? EffectiveEndpoint
131131
: Endpoint;
132132

133-
var baseUrl = UAuthUrlBuilder.Combine(Options.Value.Endpoints.Authority, loginPath);
133+
var baseUrl = UAuthUrlBuilder.Build(Options.Value.Endpoints.BasePath, loginPath, Options.Value.MultiTenant);
134134
var returnUrl = EffectiveReturnUrl;
135135

136136
if (string.IsNullOrWhiteSpace(returnUrl))

0 commit comments

Comments
 (0)