Skip to content

Commit 3ca3c6e

Browse files
mckaragozmckaragoz
committed
Reviewed User Client API
1 parent bbd10f4 commit 3ca3c6e

35 files changed

Lines changed: 233 additions & 168 deletions

File tree

‎samples/blazor-server/CodeBeam.UltimateAuth.Sample.BlazorServer.EFCore/Components/Dialogs/AccountStatusDialog.razor.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ You can still active your account later.
3131
return;
3232
}
3333

34-
ChangeUserStatusSelfRequest request = new() { NewStatus = SelfUserStatus.SelfSuspended };
35-
var result = await UAuthClient.Users.ChangeStatusSelfAsync(request);
34+
ChangeUserStatusSelfRequest request = new() { NewStatus = SelfAssignableUserStatus.SelfSuspended };
35+
var result = await UAuthClient.Users.ChangeMyStatusAsync(request);
3636
if (result.IsSuccess)
3737
{
3838
Snackbar.Add("Your account suspended successfully.", Severity.Success);

‎samples/blazor-server/CodeBeam.UltimateAuth.Sample.BlazorServer.EFCore/Components/Dialogs/CreateUserDialog.razor.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ private async Task CreateUserAsync()
3737
Password = _password
3838
};
3939

40-
var result = await UAuthClient.Users.CreateAdminAsync(request);
40+
var result = await UAuthClient.Users.CreateAsAdminAsync(request);
4141

4242
if (!result.IsSuccess)
4343
{

‎samples/blazor-server/CodeBeam.UltimateAuth.Sample.BlazorServer.EFCore/Components/Dialogs/IdentifierDialog.razor.cs‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
3131

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

5757
if (UserKey is null)
5858
{
59-
res = await UAuthClient.Identifiers.GetMyIdentifiersAsync(req);
59+
res = await UAuthClient.Identifiers.GetMyAsync(req);
6060
}
6161
else
6262
{
63-
res = await UAuthClient.Identifiers.GetUserIdentifiersAsync(UserKey.Value, req);
63+
res = await UAuthClient.Identifiers.GetUserAsync(UserKey.Value, req);
6464
}
6565

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

127127
if (UserKey is null)
128128
{
129-
result = await UAuthClient.Identifiers.UpdateSelfAsync(updateRequest);
129+
result = await UAuthClient.Identifiers.UpdateMyAsync(updateRequest);
130130
}
131131
else
132132
{
133-
result = await UAuthClient.Identifiers.UpdateAdminAsync(UserKey.Value, updateRequest);
133+
result = await UAuthClient.Identifiers.UpdateUserAsync(UserKey.Value, updateRequest);
134134
}
135135

136136
if (result.IsSuccess)
137137
{
138-
Snackbar.Add("Identifier updated successfully", Severity.Success);
138+
Snackbar.Add("Identifier updated successfully.", Severity.Success);
139139
}
140140
else
141141
{
142-
Snackbar.Add(result?.ErrorText ?? "Failed to update identifier", Severity.Error);
142+
Snackbar.Add(result?.ErrorText ?? "Failed to update identifier.", Severity.Error);
143143
}
144144

145145
await ReloadAsync();
@@ -165,29 +165,29 @@ private async Task AddNewIdentifier()
165165

166166
if (UserKey is null)
167167
{
168-
result = await UAuthClient.Identifiers.AddSelfAsync(request);
168+
result = await UAuthClient.Identifiers.AddMyAsync(request);
169169
}
170170
else
171171
{
172-
result = await UAuthClient.Identifiers.AddAdminAsync(UserKey.Value, request);
172+
result = await UAuthClient.Identifiers.AddUserAsync(UserKey.Value, request);
173173
}
174174

175175
if (result.IsSuccess)
176176
{
177-
Snackbar.Add("Identifier added successfully", Severity.Success);
177+
Snackbar.Add("Identifier added successfully.", Severity.Success);
178178
await ReloadAsync();
179179
StateHasChanged();
180180
}
181181
else
182182
{
183-
Snackbar.Add(result?.ErrorText ?? "Failed to add identifier", Severity.Error);
183+
Snackbar.Add(result?.ErrorText ?? "Failed to add identifier.", Severity.Error);
184184
}
185185
}
186186

187187
private async Task VerifyAsync(Guid id)
188188
{
189189
var demoInfo = await DialogService.ShowMessageBoxAsync(
190-
title: "Demo verification",
190+
title: "Demo Verification",
191191
markupMessage: (MarkupString)
192192
"""
193193
This is a <b>demo</b> action.<br/><br/>
@@ -208,22 +208,22 @@ This will only mark the identifier as verified in UltimateAuth.
208208

209209
if (UserKey is null)
210210
{
211-
result = await UAuthClient.Identifiers.VerifySelfAsync(request);
211+
result = await UAuthClient.Identifiers.VerifyMyAsync(request);
212212
}
213213
else
214214
{
215-
result = await UAuthClient.Identifiers.VerifyAdminAsync(UserKey.Value, request);
215+
result = await UAuthClient.Identifiers.VerifyUserAsync(UserKey.Value, request);
216216
}
217217

218218
if (result.IsSuccess)
219219
{
220-
Snackbar.Add("Identifier verified successfully", Severity.Success);
220+
Snackbar.Add("Identifier verified successfully.", Severity.Success);
221221
await ReloadAsync();
222222
StateHasChanged();
223223
}
224224
else
225225
{
226-
Snackbar.Add(result?.ErrorText ?? "Failed to verify primary identifier", Severity.Error);
226+
Snackbar.Add(result?.ErrorText ?? "Failed to verify primary identifier.", Severity.Error);
227227
}
228228
}
229229

@@ -234,22 +234,22 @@ private async Task SetPrimaryAsync(Guid id)
234234

235235
if (UserKey is null)
236236
{
237-
result = await UAuthClient.Identifiers.SetPrimarySelfAsync(request);
237+
result = await UAuthClient.Identifiers.SetMyPrimaryAsync(request);
238238
}
239239
else
240240
{
241-
result = await UAuthClient.Identifiers.SetPrimaryAdminAsync(UserKey.Value, request);
241+
result = await UAuthClient.Identifiers.SetUserPrimaryAsync(UserKey.Value, request);
242242
}
243243

244244
if (result.IsSuccess)
245245
{
246-
Snackbar.Add("Primary identifier set successfully", Severity.Success);
246+
Snackbar.Add("Primary identifier set successfully.", Severity.Success);
247247
await ReloadAsync();
248248
StateHasChanged();
249249
}
250250
else
251251
{
252-
Snackbar.Add(result?.ErrorText ?? "Failed to set primary identifier", Severity.Error);
252+
Snackbar.Add(result?.ErrorText ?? "Failed to set primary identifier.", Severity.Error);
253253
}
254254
}
255255

@@ -260,22 +260,22 @@ private async Task UnsetPrimaryAsync(Guid id)
260260

261261
if (UserKey is null)
262262
{
263-
result = await UAuthClient.Identifiers.UnsetPrimarySelfAsync(request);
263+
result = await UAuthClient.Identifiers.UnsetMyPrimaryAsync(request);
264264
}
265265
else
266266
{
267-
result = await UAuthClient.Identifiers.UnsetPrimaryAdminAsync(UserKey.Value, request);
267+
result = await UAuthClient.Identifiers.UnsetUserPrimaryAsync(UserKey.Value, request);
268268
}
269269

270270
if (result.IsSuccess)
271271
{
272-
Snackbar.Add("Primary identifier unset successfully", Severity.Success);
272+
Snackbar.Add("Primary identifier unset successfully.", Severity.Success);
273273
await ReloadAsync();
274274
StateHasChanged();
275275
}
276276
else
277277
{
278-
Snackbar.Add(result?.ErrorText ?? "Failed to unset primary identifier", Severity.Error);
278+
Snackbar.Add(result?.ErrorText ?? "Failed to unset primary identifier.", Severity.Error);
279279
}
280280
}
281281

@@ -286,22 +286,22 @@ private async Task DeleteIdentifier(Guid id)
286286

287287
if (UserKey is null)
288288
{
289-
result = await UAuthClient.Identifiers.DeleteSelfAsync(request);
289+
result = await UAuthClient.Identifiers.DeleteMyAsync(request);
290290
}
291291
else
292292
{
293-
result = await UAuthClient.Identifiers.DeleteAdminAsync(UserKey.Value, request);
293+
result = await UAuthClient.Identifiers.DeleteUserAsync(UserKey.Value, request);
294294
}
295295

296296
if (result.IsSuccess)
297297
{
298-
Snackbar.Add("Identifier deleted successfully", Severity.Success);
298+
Snackbar.Add("Identifier deleted successfully.", Severity.Success);
299299
await ReloadAsync();
300300
StateHasChanged();
301301
}
302302
else
303303
{
304-
Snackbar.Add(result?.ErrorText ?? "Failed to delete identifier", Severity.Error);
304+
Snackbar.Add(result?.ErrorText ?? "Failed to delete identifier.", Severity.Error);
305305
}
306306
}
307307

‎samples/blazor-server/CodeBeam.UltimateAuth.Sample.BlazorServer.EFCore/Components/Dialogs/ProfileDialog.razor.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ protected override async Task OnInitializedAsync()
3939
}
4040
else
4141
{
42-
result = await UAuthClient.Users.GetProfileAsync(UserKey.Value);
42+
result = await UAuthClient.Users.GetUserAsync(UserKey.Value);
4343
}
4444

4545
if (result.IsSuccess && result.Value is not null)
@@ -96,7 +96,7 @@ private async Task SaveAsync()
9696
}
9797
else
9898
{
99-
result = await UAuthClient.Users.UpdateProfileAsync(UserKey.Value, request);
99+
result = await UAuthClient.Users.UpdateUserAsync(UserKey.Value, request);
100100
}
101101

102102
if (result.IsSuccess)

‎samples/blazor-server/CodeBeam.UltimateAuth.Sample.BlazorServer.EFCore/Components/Dialogs/UserDetailDialog.razor‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
<MudText Typo="Typo.subtitle2">Status</MudText>
4545
<MudChip T="string" Color="@GetStatusColor(_user?.Status)" Variant="Variant.Filled">@_user?.Status</MudChip>
4646
<MudStack Row="true" AlignItems="AlignItems.Center" Spacing="2">
47-
<MudSelect T="UserStatus" @bind-Value="_status" Dense="true" Variant="Variant.Outlined">
48-
@foreach (var s in Enum.GetValues<UserStatus>())
47+
<MudSelect T="AdminAssignableUserStatus" @bind-Value="_status" Dense="true" Variant="Variant.Outlined">
48+
@foreach (var s in Enum.GetValues<AdminAssignableUserStatus>())
4949
{
5050
<MudSelectItem Value="@s">@s</MudSelectItem>
5151
}

‎samples/blazor-server/CodeBeam.UltimateAuth.Sample.BlazorServer.EFCore/Components/Dialogs/UserDetailDialog.razor.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace CodeBeam.UltimateAuth.Sample.BlazorServer.EFCore.Components.Dialogs;
1111
public partial class UserDetailDialog
1212
{
1313
private UserView? _user;
14-
private UserStatus _status;
14+
private AdminAssignableUserStatus _status;
1515

1616
[CascadingParameter]
1717
IMudDialogInstance MudDialog { get; set; } = default!;
@@ -25,12 +25,12 @@ public partial class UserDetailDialog
2525
protected override async Task OnInitializedAsync()
2626
{
2727
await base.OnInitializedAsync();
28-
var result = await UAuthClient.Users.GetProfileAsync(UserKey);
28+
var result = await UAuthClient.Users.GetUserAsync(UserKey);
2929

3030
if (result.IsSuccess)
3131
{
3232
_user = result.Value;
33-
_status = _user?.Status ?? UserStatus.Unknown;
33+
_status = _user?.Status.ToAdminAssignableUserStatus() ?? AdminAssignableUserStatus.Unknown;
3434
}
3535
}
3636

@@ -69,12 +69,12 @@ private async Task ChangeStatusAsync()
6969
NewStatus = _status
7070
};
7171

72-
var result = await UAuthClient.Users.ChangeStatusAdminAsync(_user.UserKey, request);
72+
var result = await UAuthClient.Users.ChangeUserStatusAsync(_user.UserKey, request);
7373

7474
if (result.IsSuccess)
7575
{
7676
Snackbar.Add("User status updated", Severity.Success);
77-
_user = _user with { Status = _status };
77+
_user = _user with { Status = _status.ToUserStatus() };
7878
}
7979
else
8080
{

‎samples/blazor-server/CodeBeam.UltimateAuth.Sample.BlazorServer.EFCore/Components/Dialogs/UsersDialog.razor.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ private async Task<GridData<UserSummary>> LoadUsers(GridState<UserSummary> state
3636
Descending = sort?.Descending ?? false
3737
};
3838

39-
var res = await UAuthClient.Users.QueryUsersAsync(req);
39+
var res = await UAuthClient.Users.QueryAsync(req);
4040

4141
if (!res.IsSuccess || res.Value == null)
4242
{

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,8 @@ private DialogParameters GetDialogParameters()
200200

201201
private async Task SetAccountActiveAsync()
202202
{
203-
ChangeUserStatusSelfRequest request = new() { NewStatus = SelfUserStatus.Active };
204-
var result = await UAuthClient.Users.ChangeStatusSelfAsync(request);
203+
ChangeUserStatusSelfRequest request = new() { NewStatus = SelfAssignableUserStatus.Active };
204+
var result = await UAuthClient.Users.ChangeMyStatusAsync(request);
205205

206206
if (result.IsSuccess)
207207
{

‎samples/blazor-server/CodeBeam.UltimateAuth.Sample.BlazorServer/Components/Dialogs/AccountStatusDialog.razor.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ You can still active your account later.
3131
return;
3232
}
3333

34-
ChangeUserStatusSelfRequest request = new() { NewStatus = SelfUserStatus.SelfSuspended };
35-
var result = await UAuthClient.Users.ChangeStatusSelfAsync(request);
34+
ChangeUserStatusSelfRequest request = new() { NewStatus = SelfAssignableUserStatus.SelfSuspended };
35+
var result = await UAuthClient.Users.ChangeMyStatusAsync(request);
3636
if (result.IsSuccess)
3737
{
3838
Snackbar.Add("Your account suspended successfully.", Severity.Success);

‎samples/blazor-server/CodeBeam.UltimateAuth.Sample.BlazorServer/Components/Dialogs/CreateUserDialog.razor.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ private async Task CreateUserAsync()
3737
Password = _password
3838
};
3939

40-
var result = await UAuthClient.Users.CreateAdminAsync(request);
40+
var result = await UAuthClient.Users.CreateAsAdminAsync(request);
4141

4242
if (!result.IsSuccess)
4343
{

0 commit comments

Comments
 (0)