DCJ-668: Bug Fixes for Terms of Service Acceptance #2671
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
rushtong
commented
Sep 11, 2024
| @@ -118,13 +128,6 @@ export const SignInButton = (props: SignInButtonProps) => { | |||
|
|
|||
| const shouldRedirectTo = (page: string): boolean => page !== '/' && page !== '/home'; | |||
|
|
|||
| const attemptSignInCheckToSAndRedirect = async (redirectTo:string, shouldRedirect: boolean) => { | |||
| await checkToSAndRedirect(shouldRedirect ? redirectTo : null); | |||
There was a problem hiding this comment.
I moved this line to onSuccess to simplify the logic checks
rushtong
commented
Sep 11, 2024
Comment on lines
-123
to
-125
| Metrics.identify(Storage.getAnonymousId()); | ||
| Metrics.syncProfile(); | ||
| Metrics.captureEvent(eventList.userSignIn); |
There was a problem hiding this comment.
I moved these to checkToSAndRedirect in the place where we know the user is authenticated and accepted ToS.
rushtong
commented
Sep 11, 2024
Comment on lines
-85
to
+90
| await Auth.signOut(); | ||
| // User has authenticated, but has not accepted ToS | ||
| Storage.setUserIsLogged(false); |
There was a problem hiding this comment.
This is the fix that allows for an authenticated user to access /tos_acceptance
rushtong
commented
Sep 11, 2024
Comment on lines
-27
to
-31
| if (oidcUser !== null) { | ||
| Storage.setUserIsLogged(true); | ||
| } else { | ||
| await Auth.signOut(); | ||
| } |
There was a problem hiding this comment.
This fix allows for page refreshes without signing out the user.
s-rubenstein
approved these changes
Sep 13, 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.
Addresses
https://broadworkbench.atlassian.net/browse/DCJ-668
Summary
#2657 introduced a couple of regressions that this PR fixes.
Suggested that you hide whitespace changes due to the large number of lint fixes.
Have you read Terra's Contributing Guide lately? If not, do that first.