Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ app.MapRazorComponents<App>()
```

### 4) Add UAuth Script
Place this in `App.razor` or `index.html`
Place this in `App.razor` or `index.html` in your Blazor client application:
```csharp
<script src="_content/CodeBeam.UltimateAuth.Client.Blazor/uauth.min.js"></script>
```
Expand Down Expand Up @@ -281,7 +281,7 @@ LogoutAll But Keep Current Device

private async Task LogoutOthersAsync()
{
var result = await UAuthClient.Flows.LogoutOtherDevicesSelfAsync();
var result = await UAuthClient.Flows.LogoutMyOtherDevicesAsync();
Console.WriteLine(result.IsSuccess);
}
```
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ You can still active your account later.
return;
}

ChangeUserStatusSelfRequest request = new() { NewStatus = SelfUserStatus.SelfSuspended };
var result = await UAuthClient.Users.ChangeStatusSelfAsync(request);
ChangeUserStatusSelfRequest request = new() { NewStatus = SelfAssignableUserStatus.SelfSuspended };
var result = await UAuthClient.Users.ChangeMyStatusAsync(request);
if (result.IsSuccess)
{
Snackbar.Add("Your account suspended successfully.", Severity.Success);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ private async Task CreateUserAsync()
Password = _password
};

var result = await UAuthClient.Users.CreateAdminAsync(request);
var result = await UAuthClient.Users.CreateAsAdminAsync(request);

if (!result.IsSuccess)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ private async Task ChangePasswordAsync()
}
else
{
result = await UAuthClient.Credentials.ChangeCredentialAsync(UserKey.Value, request);
result = await UAuthClient.Credentials.ChangeUserAsync(UserKey.Value, request);
}

if (result.IsSuccess)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ protected override async Task OnAfterRenderAsync(bool firstRender)

if (firstRender)
{
var result = await UAuthClient.Identifiers.GetMyIdentifiersAsync();
var result = await UAuthClient.Identifiers.GetMyAsync();
if (result != null && result.IsSuccess && result.Value != null)
{
await ReloadAsync();
Expand All @@ -56,11 +56,11 @@ private async Task<GridData<UserIdentifierInfo>> LoadServerData(GridState<UserId

if (UserKey is null)
{
res = await UAuthClient.Identifiers.GetMyIdentifiersAsync(req);
res = await UAuthClient.Identifiers.GetMyAsync(req);
}
else
{
res = await UAuthClient.Identifiers.GetUserIdentifiersAsync(UserKey.Value, req);
res = await UAuthClient.Identifiers.GetUserAsync(UserKey.Value, req);
}

if (!res.IsSuccess || res.Value is null)
Expand Down Expand Up @@ -126,20 +126,20 @@ private async Task<DataGridEditFormAction> CommittedItemChanges(UserIdentifierIn

if (UserKey is null)
{
result = await UAuthClient.Identifiers.UpdateSelfAsync(updateRequest);
result = await UAuthClient.Identifiers.UpdateMyAsync(updateRequest);
}
else
{
result = await UAuthClient.Identifiers.UpdateAdminAsync(UserKey.Value, updateRequest);
result = await UAuthClient.Identifiers.UpdateUserAsync(UserKey.Value, updateRequest);
}

if (result.IsSuccess)
{
Snackbar.Add("Identifier updated successfully", Severity.Success);
Snackbar.Add("Identifier updated successfully.", Severity.Success);
}
else
{
Snackbar.Add(result?.ErrorText ?? "Failed to update identifier", Severity.Error);
Snackbar.Add(result?.ErrorText ?? "Failed to update identifier.", Severity.Error);
}

await ReloadAsync();
Expand All @@ -165,29 +165,29 @@ private async Task AddNewIdentifier()

if (UserKey is null)
{
result = await UAuthClient.Identifiers.AddSelfAsync(request);
result = await UAuthClient.Identifiers.AddMyAsync(request);
}
else
{
result = await UAuthClient.Identifiers.AddAdminAsync(UserKey.Value, request);
result = await UAuthClient.Identifiers.AddUserAsync(UserKey.Value, request);
}

if (result.IsSuccess)
{
Snackbar.Add("Identifier added successfully", Severity.Success);
Snackbar.Add("Identifier added successfully.", Severity.Success);
await ReloadAsync();
StateHasChanged();
}
else
{
Snackbar.Add(result?.ErrorText ?? "Failed to add identifier", Severity.Error);
Snackbar.Add(result?.ErrorText ?? "Failed to add identifier.", Severity.Error);
}
}

private async Task VerifyAsync(Guid id)
{
var demoInfo = await DialogService.ShowMessageBoxAsync(
title: "Demo verification",
title: "Demo Verification",
markupMessage: (MarkupString)
"""
This is a <b>demo</b> action.<br/><br/>
Expand All @@ -203,105 +203,105 @@ This will only mark the identifier as verified in UltimateAuth.
return;
}

VerifyUserIdentifierRequest request = new() { IdentifierId = id };
VerifyUserIdentifierRequest request = new() { Id = id };
UAuthResult result;

if (UserKey is null)
{
result = await UAuthClient.Identifiers.VerifySelfAsync(request);
result = await UAuthClient.Identifiers.VerifyMyAsync(request);
}
else
{
result = await UAuthClient.Identifiers.VerifyAdminAsync(UserKey.Value, request);
result = await UAuthClient.Identifiers.VerifyUserAsync(UserKey.Value, request);
}

if (result.IsSuccess)
{
Snackbar.Add("Identifier verified successfully", Severity.Success);
Snackbar.Add("Identifier verified successfully.", Severity.Success);
await ReloadAsync();
StateHasChanged();
}
else
{
Snackbar.Add(result?.ErrorText ?? "Failed to verify primary identifier", Severity.Error);
Snackbar.Add(result?.ErrorText ?? "Failed to verify primary identifier.", Severity.Error);
}
}

private async Task SetPrimaryAsync(Guid id)
{
SetPrimaryUserIdentifierRequest request = new() { IdentifierId = id };
SetPrimaryUserIdentifierRequest request = new() { Id = id };
UAuthResult result;

if (UserKey is null)
{
result = await UAuthClient.Identifiers.SetPrimarySelfAsync(request);
result = await UAuthClient.Identifiers.SetMyPrimaryAsync(request);
}
else
{
result = await UAuthClient.Identifiers.SetPrimaryAdminAsync(UserKey.Value, request);
result = await UAuthClient.Identifiers.SetUserPrimaryAsync(UserKey.Value, request);
}

if (result.IsSuccess)
{
Snackbar.Add("Primary identifier set successfully", Severity.Success);
Snackbar.Add("Primary identifier set successfully.", Severity.Success);
await ReloadAsync();
StateHasChanged();
}
else
{
Snackbar.Add(result?.ErrorText ?? "Failed to set primary identifier", Severity.Error);
Snackbar.Add(result?.ErrorText ?? "Failed to set primary identifier.", Severity.Error);
}
}

private async Task UnsetPrimaryAsync(Guid id)
{
UnsetPrimaryUserIdentifierRequest request = new() { IdentifierId = id };
UnsetPrimaryUserIdentifierRequest request = new() { Id = id };
UAuthResult result;

if (UserKey is null)
{
result = await UAuthClient.Identifiers.UnsetPrimarySelfAsync(request);
result = await UAuthClient.Identifiers.UnsetMyPrimaryAsync(request);
}
else
{
result = await UAuthClient.Identifiers.UnsetPrimaryAdminAsync(UserKey.Value, request);
result = await UAuthClient.Identifiers.UnsetUserPrimaryAsync(UserKey.Value, request);
}

if (result.IsSuccess)
{
Snackbar.Add("Primary identifier unset successfully", Severity.Success);
Snackbar.Add("Primary identifier unset successfully.", Severity.Success);
await ReloadAsync();
StateHasChanged();
}
else
{
Snackbar.Add(result?.ErrorText ?? "Failed to unset primary identifier", Severity.Error);
Snackbar.Add(result?.ErrorText ?? "Failed to unset primary identifier.", Severity.Error);
}
}

private async Task DeleteIdentifier(Guid id)
{
DeleteUserIdentifierRequest request = new() { IdentifierId = id };
DeleteUserIdentifierRequest request = new() { Id = id };
UAuthResult result;

if (UserKey is null)
{
result = await UAuthClient.Identifiers.DeleteSelfAsync(request);
result = await UAuthClient.Identifiers.DeleteMyAsync(request);
}
else
{
result = await UAuthClient.Identifiers.DeleteAdminAsync(UserKey.Value, request);
result = await UAuthClient.Identifiers.DeleteUserAsync(UserKey.Value, request);
}

if (result.IsSuccess)
{
Snackbar.Add("Identifier deleted successfully", Severity.Success);
Snackbar.Add("Identifier deleted successfully.", Severity.Success);
await ReloadAsync();
StateHasChanged();
}
else
{
Snackbar.Add(result?.ErrorText ?? "Failed to delete identifier", Severity.Error);
Snackbar.Add(result?.ErrorText ?? "Failed to delete identifier.", Severity.Error);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,13 @@ private async Task Save()
{
var permissions = _groups.SelectMany(g => g.Items).Where(x => x.Selected).Select(x => Permission.From(x.Value)).ToList();

var req = new SetPermissionsRequest
var req = new SetRolePermissionsRequest
{
RoleId = Role.Id,
Permissions = permissions
};

var result = await UAuthClient.Authorization.SetPermissionsAsync(Role.Id, req);
var result = await UAuthClient.Authorization.SetRolePermissionsAsync(req);

if (!result.IsSuccess)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ protected override async Task OnInitializedAsync()
}
else
{
result = await UAuthClient.Users.GetProfileAsync(UserKey.Value);
result = await UAuthClient.Users.GetUserAsync(UserKey.Value);
}

if (result.IsSuccess && result.Value is not null)
Expand Down Expand Up @@ -96,7 +96,7 @@ private async Task SaveAsync()
}
else
{
result = await UAuthClient.Users.UpdateProfileAsync(UserKey.Value, request);
result = await UAuthClient.Users.UpdateUserAsync(UserKey.Value, request);
}

if (result.IsSuccess)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public partial class ResetDialog

private async Task RequestResetAsync()
{
var request = new BeginCredentialResetRequest
var request = new BeginResetCredentialRequest
{
CredentialType = CredentialType.Password,
ResetCodeType = ResetCodeType.Code,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,11 @@ private async Task<DataGridEditFormAction> CommittedItemChanges(RoleInfo role)
{
var req = new RenameRoleRequest
{
Id = role.Id,
Name = role.Name
};

var result = await UAuthClient.Authorization.RenameRoleAsync(role.Id, req);
var result = await UAuthClient.Authorization.RenameRoleAsync(req);

if (result.IsSuccess)
{
Expand Down Expand Up @@ -109,8 +110,8 @@ private async Task DeleteRole(RoleId roleId)
if (confirm != true)
return;

var req = new DeleteRoleRequest();
var result = await UAuthClient.Authorization.DeleteRoleAsync(roleId, req);
var req = new DeleteRoleRequest() { Id = roleId };
var result = await UAuthClient.Authorization.DeleteRoleAsync(req);

if (result.IsSuccess)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,11 @@ private async Task LogoutAllAsync()

if (UserKey is null)
{
result = await UAuthClient.Flows.LogoutAllDevicesSelfAsync();
result = await UAuthClient.Flows.LogoutAllMyDevicesAsync();
}
else
{
result = await UAuthClient.Flows.LogoutAllDevicesAdminAsync(UserKey.Value);
result = await UAuthClient.Flows.LogoutAllUserDevicesAsync(UserKey.Value);
}

if (result.IsSuccess)
Expand All @@ -139,7 +139,7 @@ private async Task LogoutAllAsync()

private async Task LogoutOthersAsync()
{
var result = await UAuthClient.Flows.LogoutOtherDevicesSelfAsync();
var result = await UAuthClient.Flows.LogoutMyOtherDevicesAsync();

if (result.IsSuccess)
{
Expand All @@ -158,11 +158,11 @@ private async Task LogoutDeviceAsync(SessionChainId chainId)

if (UserKey is null)
{
result = await UAuthClient.Flows.LogoutDeviceSelfAsync(request);
result = await UAuthClient.Flows.LogoutMyDeviceAsync(request);
}
else
{
result = await UAuthClient.Flows.LogoutDeviceAdminAsync(UserKey.Value, request);
result = await UAuthClient.Flows.LogoutUserDeviceAsync(UserKey.Value, request);
}

if (result.IsSuccess)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
<MudText Typo="Typo.subtitle2">Status</MudText>
<MudChip T="string" Color="@GetStatusColor(_user?.Status)" Variant="Variant.Filled">@_user?.Status</MudChip>
<MudStack Row="true" AlignItems="AlignItems.Center" Spacing="2">
<MudSelect T="UserStatus" @bind-Value="_status" Dense="true" Variant="Variant.Outlined">
@foreach (var s in Enum.GetValues<UserStatus>())
<MudSelect T="AdminAssignableUserStatus" @bind-Value="_status" Dense="true" Variant="Variant.Outlined">
@foreach (var s in Enum.GetValues<AdminAssignableUserStatus>())
{
<MudSelectItem Value="@s">@s</MudSelectItem>
}
Expand Down
Loading
Loading