Guillim
7cacccf0b8
# Gmail OAuth authentication flow issues ### TLDR This error is not an error and therefore should be treated as a simple redirect with a snackbar. ### More details Fixing incomplete OAuth token exchange processes and improving error handling for empty Gmail inboxes. The changes include modifications to OAuth guards, to ensure that if a user clicks "cancel" instead of completing the authentication workflow if fails ## Before: Redirection from `/settings/accounts` to `app.twenty.com` with an `UNAUTHORIZED` error ## After : <img width="948" alt="Screenshot 2025-05-26 at 18 04 37" src="https://github.com/user-attachments/assets/62c8721e-c2b3-4e3d-ad0b-e4059dfb7a98" /> Fixes https://github.com/twentyhq/twenty/issues/11895 --------- Co-authored-by: Charles Bochet <charles@twenty.com>
80 lines
4.3 KiB
TypeScript
80 lines
4.3 KiB
TypeScript
import { ApolloProvider } from '@/apollo/components/ApolloProvider';
|
|
import { GotoHotkeysEffectsProvider } from '@/app/effect-components/GotoHotkeysEffectsProvider';
|
|
import { PageChangeEffect } from '@/app/effect-components/PageChangeEffect';
|
|
import { AuthProvider } from '@/auth/components/AuthProvider';
|
|
import { CaptchaProvider } from '@/captcha/components/CaptchaProvider';
|
|
import { ChromeExtensionSidecarEffect } from '@/chrome-extension-sidecar/components/ChromeExtensionSidecarEffect';
|
|
import { ChromeExtensionSidecarProvider } from '@/chrome-extension-sidecar/components/ChromeExtensionSidecarProvider';
|
|
import { ClientConfigProvider } from '@/client-config/components/ClientConfigProvider';
|
|
import { ClientConfigProviderEffect } from '@/client-config/components/ClientConfigProviderEffect';
|
|
import { MainContextStoreProvider } from '@/context-store/components/MainContextStoreProvider';
|
|
import { ErrorMessageEffect } from '@/error-handler/components/ErrorMessageEffect';
|
|
import { PromiseRejectionEffect } from '@/error-handler/components/PromiseRejectionEffect';
|
|
import { ApolloMetadataClientProvider } from '@/object-metadata/components/ApolloMetadataClientProvider';
|
|
import { ObjectMetadataItemsLoadEffect } from '@/object-metadata/components/ObjectMetadataItemsLoadEffect';
|
|
import { ObjectMetadataItemsProvider } from '@/object-metadata/components/ObjectMetadataItemsProvider';
|
|
import { PrefetchDataProvider } from '@/prefetch/components/PrefetchDataProvider';
|
|
import { DialogManager } from '@/ui/feedback/dialog-manager/components/DialogManager';
|
|
import { DialogManagerScope } from '@/ui/feedback/dialog-manager/scopes/DialogManagerScope';
|
|
import { SnackBarProvider } from '@/ui/feedback/snack-bar-manager/components/SnackBarProvider';
|
|
import { BaseThemeProvider } from '@/ui/theme/components/BaseThemeProvider';
|
|
import { UserThemeProviderEffect } from '@/ui/theme/components/UserThemeProviderEffect';
|
|
import { PageFavicon } from '@/ui/utilities/page-favicon/components/PageFavicon';
|
|
import { PageTitle } from '@/ui/utilities/page-title/components/PageTitle';
|
|
import { UserProvider } from '@/users/components/UserProvider';
|
|
import { UserProviderEffect } from '@/users/components/UserProviderEffect';
|
|
import { WorkspaceProviderEffect } from '@/workspace/components/WorkspaceProviderEffect';
|
|
import { StrictMode } from 'react';
|
|
import { Outlet, useLocation } from 'react-router-dom';
|
|
import { getPageTitleFromPath } from '~/utils/title-utils';
|
|
|
|
export const AppRouterProviders = () => {
|
|
const { pathname } = useLocation();
|
|
const pageTitle = getPageTitleFromPath(pathname);
|
|
|
|
return (
|
|
<CaptchaProvider>
|
|
<ApolloProvider>
|
|
<BaseThemeProvider>
|
|
<ClientConfigProviderEffect />
|
|
<ClientConfigProvider>
|
|
<ChromeExtensionSidecarEffect />
|
|
<ChromeExtensionSidecarProvider>
|
|
<UserProviderEffect />
|
|
<WorkspaceProviderEffect />
|
|
<UserProvider>
|
|
<AuthProvider>
|
|
<ApolloMetadataClientProvider>
|
|
<ObjectMetadataItemsLoadEffect />
|
|
<ObjectMetadataItemsProvider>
|
|
<PrefetchDataProvider>
|
|
<UserThemeProviderEffect />
|
|
<SnackBarProvider>
|
|
<ErrorMessageEffect />
|
|
<DialogManagerScope dialogManagerScopeId="dialog-manager">
|
|
<DialogManager>
|
|
<StrictMode>
|
|
<PromiseRejectionEffect />
|
|
<GotoHotkeysEffectsProvider />
|
|
<PageTitle title={pageTitle} />
|
|
<PageFavicon />
|
|
<Outlet />
|
|
</StrictMode>
|
|
</DialogManager>
|
|
</DialogManagerScope>
|
|
</SnackBarProvider>
|
|
<MainContextStoreProvider />
|
|
</PrefetchDataProvider>
|
|
<PageChangeEffect />
|
|
</ObjectMetadataItemsProvider>
|
|
</ApolloMetadataClientProvider>
|
|
</AuthProvider>
|
|
</UserProvider>
|
|
</ChromeExtensionSidecarProvider>
|
|
</ClientConfigProvider>
|
|
</BaseThemeProvider>
|
|
</ApolloProvider>
|
|
</CaptchaProvider>
|
|
);
|
|
};
|