Skip to content

Commit 0f7c3d9

Browse files
authored
Code Review (#28)
* Reviewed Credential Client API * Reviewed Authorization Client API * Reviewed Flow Client API * Reviewed User Client API
1 parent e7649da commit 0f7c3d9

157 files changed

Lines changed: 656 additions & 620 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.

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ app.MapRazorComponents<App>()
186186
```
187187

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

282282
private async Task LogoutOthersAsync()
283283
{
284-
var result = await UAuthClient.Flows.LogoutOtherDevicesSelfAsync();
284+
var result = await UAuthClient.Flows.LogoutMyOtherDevicesAsync();
285285
Console.WriteLine(result.IsSuccess);
286286
}
287287
```

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/CredentialDialog.razor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ private async Task ChangePasswordAsync()
6969
}
7070
else
7171
{
72-
result = await UAuthClient.Credentials.ChangeCredentialAsync(UserKey.Value, request);
72+
result = await UAuthClient.Credentials.ChangeUserAsync(UserKey.Value, request);
7373
}
7474

7575
if (result.IsSuccess)

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

Lines changed: 32 additions & 32 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/>
@@ -203,105 +203,105 @@ This will only mark the identifier as verified in UltimateAuth.
203203
return;
204204
}
205205

206-
VerifyUserIdentifierRequest request = new() { IdentifierId = id };
206+
VerifyUserIdentifierRequest request = new() { Id = id };
207207
UAuthResult result;
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

230230
private async Task SetPrimaryAsync(Guid id)
231231
{
232-
SetPrimaryUserIdentifierRequest request = new() { IdentifierId = id };
232+
SetPrimaryUserIdentifierRequest request = new() { Id = id };
233233
UAuthResult result;
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

256256
private async Task UnsetPrimaryAsync(Guid id)
257257
{
258-
UnsetPrimaryUserIdentifierRequest request = new() { IdentifierId = id };
258+
UnsetPrimaryUserIdentifierRequest request = new() { Id = id };
259259
UAuthResult result;
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

282282
private async Task DeleteIdentifier(Guid id)
283283
{
284-
DeleteUserIdentifierRequest request = new() { IdentifierId = id };
284+
DeleteUserIdentifierRequest request = new() { Id = id };
285285
UAuthResult result;
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/PermissionDialog.razor.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,13 @@ private async Task Save()
6363
{
6464
var permissions = _groups.SelectMany(g => g.Items).Where(x => x.Selected).Select(x => Permission.From(x.Value)).ToList();
6565

66-
var req = new SetPermissionsRequest
66+
var req = new SetRolePermissionsRequest
6767
{
68+
RoleId = Role.Id,
6869
Permissions = permissions
6970
};
7071

71-
var result = await UAuthClient.Authorization.SetPermissionsAsync(Role.Id, req);
72+
var result = await UAuthClient.Authorization.SetRolePermissionsAsync(req);
7273

7374
if (!result.IsSuccess)
7475
{

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/ResetDialog.razor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public partial class ResetDialog
2020

2121
private async Task RequestResetAsync()
2222
{
23-
var request = new BeginCredentialResetRequest
23+
var request = new BeginResetCredentialRequest
2424
{
2525
CredentialType = CredentialType.Password,
2626
ResetCodeType = ResetCodeType.Code,

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,11 @@ private async Task<DataGridEditFormAction> CommittedItemChanges(RoleInfo role)
5353
{
5454
var req = new RenameRoleRequest
5555
{
56+
Id = role.Id,
5657
Name = role.Name
5758
};
5859

59-
var result = await UAuthClient.Authorization.RenameRoleAsync(role.Id, req);
60+
var result = await UAuthClient.Authorization.RenameRoleAsync(req);
6061

6162
if (result.IsSuccess)
6263
{
@@ -109,8 +110,8 @@ private async Task DeleteRole(RoleId roleId)
109110
if (confirm != true)
110111
return;
111112

112-
var req = new DeleteRoleRequest();
113-
var result = await UAuthClient.Authorization.DeleteRoleAsync(roleId, req);
113+
var req = new DeleteRoleRequest() { Id = roleId };
114+
var result = await UAuthClient.Authorization.DeleteRoleAsync(req);
114115

115116
if (result.IsSuccess)
116117
{

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,11 @@ private async Task LogoutAllAsync()
118118

119119
if (UserKey is null)
120120
{
121-
result = await UAuthClient.Flows.LogoutAllDevicesSelfAsync();
121+
result = await UAuthClient.Flows.LogoutAllMyDevicesAsync();
122122
}
123123
else
124124
{
125-
result = await UAuthClient.Flows.LogoutAllDevicesAdminAsync(UserKey.Value);
125+
result = await UAuthClient.Flows.LogoutAllUserDevicesAsync(UserKey.Value);
126126
}
127127

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

140140
private async Task LogoutOthersAsync()
141141
{
142-
var result = await UAuthClient.Flows.LogoutOtherDevicesSelfAsync();
142+
var result = await UAuthClient.Flows.LogoutMyOtherDevicesAsync();
143143

144144
if (result.IsSuccess)
145145
{
@@ -158,11 +158,11 @@ private async Task LogoutDeviceAsync(SessionChainId chainId)
158158

159159
if (UserKey is null)
160160
{
161-
result = await UAuthClient.Flows.LogoutDeviceSelfAsync(request);
161+
result = await UAuthClient.Flows.LogoutMyDeviceAsync(request);
162162
}
163163
else
164164
{
165-
result = await UAuthClient.Flows.LogoutDeviceAdminAsync(UserKey.Value, request);
165+
result = await UAuthClient.Flows.LogoutUserDeviceAsync(UserKey.Value, request);
166166
}
167167

168168
if (result.IsSuccess)

0 commit comments

Comments
 (0)