Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Send user back to oauth flow after login #100

Merged
merged 8 commits into from
Sep 20, 2023
Merged

Send user back to oauth flow after login #100

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6d243b3
Send user back to oauth flow after login
tmeasday Sep 14, 2023
d1f96d8
Apply @ghengeveld's suggestions
tmeasday Sep 15, 2023
8f02b3e
WIP single handler
tmeasday Sep 15, 2023
10adbb7
Make progress on types for dialog handler
tmeasday Sep 15, 2023
f0cb480
Merge remote-tracking branch 'origin/main' into tom/ap-3575-chromatic…
tmeasday Sep 18, 2023
ecefb0c
Merge branch 'tom/ap-3630-add-workflow-for-creating-a-new-project' in…
tmeasday Sep 19, 2023
b9acf4a
Add comment
tmeasday Sep 19, 2023
b09c8e2
Merge remote-tracking branch 'origin/main' into tom/ap-3575-chromatic…
tmeasday Sep 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions src/screens/Authentication/Verify.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,19 @@ interface VerifyProps {
}

export const Verify = ({ onBack, userCode, verificationUrl }: VerifyProps) => {
const [openDialog, closeDialog] = useChromaticDialog();
// Close the dialog on unmount
const [openDialog, closeDialog] = useChromaticDialog((event) => {
// If the user logs in as part of the grant process, don't close the dialog,
// instead redirect us back to where we were trying to go.
if (event.message === "login") {
openDialog(verificationUrl);
}
});

// Close the dialog on unmount, which happens automatically when poll for a token.
// Later (https://linear.app/chromaui/issue/AP-3549/onboarding-flow-for-new-users-to-create-a-project)
// we'll actually wait for the grant event and:
// - grab a token immediately
// - check if the user has projects, if not redirect to new project screen.
useEffect(() => () => closeDialog(), [closeDialog]);

return (
Expand Down
Loading