SWC-7237 #1549
Merged
SWC-7237 #1549
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
nickgros
commented
Feb 3, 2025
| @@ -42,21 +42,20 @@ function LoggedInRedirector() { | |||
| const isProviderSearchParam = getSearchParam('provider') !== undefined | |||
| const isInSSOFlow = isCodeSearchParam && isProviderSearchParam | |||
|
|
|||
| const { mayRedirect: mayRedirectToSignToS } = | |||
| useMaybeRedirectToSignTermsOfService() | |||
| const { mayPromptTermsOfUse } = useMaybeRedirectToSignTermsOfService() | |||
There was a problem hiding this comment.
Renamed the variable for clarity. It still indicates that we may force the user to see the ToU page.
For the case where the user is on the ToU page, this should (and will) be true, but we will not 'redirect' them since they are already there.
nickgros
commented
Feb 3, 2025
apps/SageAccountWeb/src/hooks/useMaybeRedirectToSignTermsOfService.test.ts
Outdated
Show resolved
Hide resolved
nickgros
commented
Feb 3, 2025
Comment on lines
141
to
161
| it('redirects to signTermsOfUse when user ToS is MUST_AGREE_NOW and has signed ToU', async () => { | ||
| mockUseApplicationSessionContext.mockReturnValue({ | ||
| hasInitializedSession: true, | ||
| refreshSession: vi.fn(), | ||
| clearSession: vi.fn(), | ||
| isLoadingSSO: false, | ||
| termsOfServiceStatus: { | ||
| userId: '1234', | ||
| userCurrentTermsOfServiceState: TermsOfServiceState.MUST_AGREE_NOW, | ||
| lastAgreementDate: new Date().toISOString(), | ||
| }, | ||
| }) | ||
|
|
||
| const hook = renderHook(() => useMaybeRedirectToSignTermsOfService()) | ||
| await waitFor(() => { | ||
| expect(hook.result.current.mayPromptTermsOfUse).toBe(true) | ||
| expect(mockNavigate).toHaveBeenCalledWith( | ||
| '/authenticated/signUpdatedTermsOfUse', | ||
| ) | ||
| }) | ||
| }) |
There was a problem hiding this comment.
This case is closest to the scenario reported by the user. The assertion expect(hook.result.current.mayPromptTermsOfUse).toBe(true) fails with the old logic and passes with the new logic.
nickgros
commented
Feb 3, 2025
Comment on lines
+49
to
52
| } else { | ||
| setMayPromptTermsOfUse(false) | ||
| } | ||
| setMayRedirect(false) | ||
| } |
There was a problem hiding this comment.
Wrapping in else fixes the bug.
nickgros
commented
Feb 3, 2025
Comment on lines
+140
to
+157
| it('redirects to signTermsOfUse when user ToS is MUST_AGREE_NOW and has signed ToU', async () => { | ||
| mockUseApplicationSessionContext.mockReturnValue({ | ||
| ...mockApplicationSessionContext, | ||
| termsOfServiceStatus: { | ||
| userId: '1234', | ||
| userCurrentTermsOfServiceState: TermsOfServiceState.MUST_AGREE_NOW, | ||
| lastAgreementDate: new Date().toISOString(), | ||
| }, | ||
| }) | ||
|
|
||
| const hook = renderHook(() => useMaybeRedirectToSignTermsOfService()) | ||
| await waitFor(() => { | ||
| expect(hook.result.current.mayPromptTermsOfUse).toBe(true) | ||
| expect(mockNavigate).toHaveBeenCalledWith( | ||
| '/authenticated/signUpdatedTermsOfUse', | ||
| ) | ||
| }) | ||
| }) |
There was a problem hiding this comment.
This case is closest to the scenario reported by the user. The assertion expect(hook.result.current.mayPromptTermsOfUse).toBe(true) fails with the old logic and passes with the new logic.
jay-hodgson
approved these changes
Feb 3, 2025
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.
Fix issue where we improperly indicated that we will not force the user to re-accept the ToU after they are redirected to show the ToU.