Allow for bulk processing new login device requests #4064
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #4064 +/- ##
==========================================
+ Coverage 39.09% 39.31% +0.22%
==========================================
Files 1202 1210 +8
Lines 58110 58335 +225
Branches 5349 5369 +20
==========================================
+ Hits 22717 22934 +217
+ Misses 34323 34321 -2
- Partials 1070 1080 +10 ☔ View full report in Codecov by Sentry. |
addisonbeck
force-pushed
the
ac/addison/ac-2301/bulk-device-approval-service
branch
7 times, most recently
from
640de72
to
a1777e5
Compare
addisonbeck
changed the base branch from
main
to
ac/addison/ac-2301/service-bulk-device-approval-endpoint-api
addisonbeck
force-pushed
the
ac/addison/ac-2301/bulk-device-approval-service
branch
16 times, most recently
from
bc7770c
to
e9cb44f
Compare
addisonbeck
force-pushed
the
ac/addison/ac-2301/bulk-device-approval-service
branch
2 times, most recently
from
fc353d3
to
a42b1da
Compare
addisonbeck
requested review from
r-tome and
eliykat
and removed request for
jlf0dev
eliykat
requested changes
May 23, 2024
src/Core/AdminConsole/OrganizationAuth/Models/ApprovedAuthRequestIsMissingKeyException.cs
Outdated
Show resolved
Hide resolved
src/Core/AdminConsole/OrganizationAuth/UpdateOrganizationAuthRequestCommand.cs
Outdated
Show resolved
Hide resolved
src/Core/AdminConsole/OrganizationAuth/UpdateOrganizationAuthRequestCommand.cs
Show resolved
Hide resolved
src/Core/AdminConsole/OrganizationAuth/UpdateOrganizationAuthRequestCommand.cs
Outdated
Show resolved
Hide resolved
| await _eventService.LogOrganizationUserEventsAsync( | ||
| organizationUsers.Select(ou => | ||
| { | ||
| var e = events.FirstOrDefault(e => e.AuthRequest.OrganizationId == ou.Id); |
There was a problem hiding this comment.
I think this is a typo:
Suggested change
| var e = events.FirstOrDefault(e => e.AuthRequest.OrganizationId == ou.Id); | |
| var e = events.FirstOrDefault(e => e.AuthRequest.OrganizationUserId == ou.Id); |
Is there any way tests could've picked this up?
There was a problem hiding this comment.
This got caught by being more terse on 51a837a
Resolved!
src/Core/AdminConsole/OrganizationAuth/Models/AuthRequestUpdateProcessor.cs
Outdated
Show resolved
Hide resolved
src/Core/AdminConsole/OrganizationAuth/Models/AuthRequestUpdateProcessor.cs
Outdated
Show resolved
Hide resolved
test/Core.Test/AdminConsole/OrganizationAuth/Models/AuthRequestUpdateProcessorTests.cs
Outdated
Show resolved
Hide resolved
test/Core.Test/AdminConsole/OrganizationAuth/UpdateOrganizationAuthRequestCommandTests.cs
Show resolved
Hide resolved
Comment on lines
+195
to
+207
| // Assert that because we passed in good data we call a save | ||
| // operation and raise all events | ||
| await sutProvider.GetDependency<IAuthRequestRepository>().ReceivedWithAnyArgs().UpdateManyAsync(Arg.Any<IEnumerable<OrganizationAdminAuthRequest>>()); | ||
| await sutProvider.GetDependency<IPushNotificationService>().DidNotReceiveWithAnyArgs().PushAuthRequestResponseAsync(Arg.Any<AuthRequest>()); | ||
| await sutProvider.GetDependency<IMailService>().DidNotReceiveWithAnyArgs().SendTrustedDeviceAdminApprovalEmailAsync( | ||
| Arg.Any<string>(), | ||
| Arg.Any<DateTime>(), | ||
| Arg.Any<string>(), | ||
| Arg.Any<string>() | ||
| ); | ||
| await sutProvider.GetDependency<IEventService>().ReceivedWithAnyArgs().LogOrganizationUserEventsAsync( | ||
| Arg.Any<IEnumerable<(OrganizationUser, EventType, DateTime?)>>() | ||
| ); |
There was a problem hiding this comment.
Please use Arg.Is to assert some basic values here - I think that asserting calls with Arg.Any is not very precise. And while the processor tests test that the callbacks are called, you want to make sure that the callback has passed on the arguments to the dependency correctly.
There was a problem hiding this comment.
I didn't really know how to do this, but appreciate the push to do it because it was fun. The test is more precise as of 51a837a.
I left the denied specific test alone, since it's really just a big test to make sure notifications don't ever get sent.
addisonbeck
force-pushed
the
ac/addison/ac-2301/bulk-device-approval-service
branch
from
9059960
to
aa56cac
Compare
addisonbeck
force-pushed
the
ac/addison/ac-2301/bulk-device-approval-service
branch
from
aa56cac
to
456fdb3
Compare
addisonbeck
force-pushed
the
ac/addison/ac-2301/bulk-device-approval-service
branch
from
996bbd1
to
44af01f
Compare
addisonbeck
force-pushed
the
ac/addison/ac-2301/bulk-device-approval-service
branch
2 times, most recently
from
2b31eb4
to
7f17510
Compare
addisonbeck
force-pushed
the
ac/addison/ac-2301/bulk-device-approval-service
branch
from
7f17510
to
cdb5a32
Compare
eliykat
requested changes
May 24, 2024
| var isExpired = DateTime.UtcNow > | ||
| _unprocessedAuthRequest.CreationDate | ||
| .Add(_configuration.AuthRequestExpiresAfter); | ||
| var isSpent = _unprocessedAuthRequest == null || |
There was a problem hiding this comment.
This null check is now unnecessary because it's already checked above.
There was a problem hiding this comment.
Implemented as suggested on 23b60d4
eliykat
approved these changes
May 27, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Type of change
Objective
To facilitate a new bulk device login request in the admin console server
logic needs to be written that can bulk approve and deny new device login
requests safely. This logic will need to accept a list of ids, keys, and
approval states and process those requests to apply the keys and approval
states.
Code changes
See the commits tab
References
database functionality needed to bulk update
AuthRequesttable records.UpdateManyAsynccommand written here.