Skip to content

Commit 4462e71

Browse files
committed
fix: update google auth and minor updates
1 parent 2eb32f0 commit 4462e71

36 files changed

Lines changed: 237 additions & 232 deletions

.env.example

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
VITE_API_BASE_URL=
2-
VITE_GOOGLE_CLIENT_ID=

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
"@radix-ui/react-select": "^2.2.5",
3232
"@radix-ui/react-slot": "^1.2.3",
3333
"@radix-ui/react-tabs": "^1.1.12",
34-
"@react-oauth/google": "^0.12.2",
3534
"@tanstack/react-query": "^5.81.5",
3635
"@tanstack/react-router": "1.125.3",
3736
"@vercel/analytics": "^1.5.0",

src/app/providers/GoogleProvider.tsx

Lines changed: 0 additions & 11 deletions
This file was deleted.

src/app/providers/index.tsx

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
1-
import { GoogleProvider } from './GoogleProvider'
21
import { QueryClientProvider } from './QueryClientProvider'
32
import { RouterProvider } from './RouteProvider'
43
import { ToastProvider } from './ToastProvider'
54

65
export const Providers = () => (
7-
<GoogleProvider>
8-
<QueryClientProvider>
9-
<RouterProvider />
10-
<ToastProvider />
11-
</QueryClientProvider>
12-
</GoogleProvider>
6+
<QueryClientProvider>
7+
<RouterProvider />
8+
<ToastProvider />
9+
</QueryClientProvider>
1310
)

src/app/routes/(auth)/signin.tsx

Lines changed: 0 additions & 6 deletions
This file was deleted.

src/app/routes/(auth)/signup.tsx

Lines changed: 0 additions & 6 deletions
This file was deleted.

src/app/routes/__root.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const RootRoute = () => {
1616
attachInternalApiMemoryStorage({
1717
accessToken: tokens.accessToken,
1818
refreshToken: tokens.refreshToken,
19-
getTokens: sessionService.getTokens,
19+
refreshTokens: sessionService.refreshTokens,
2020
setTokens,
2121
logout
2222
})
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import { GoogleCallbackPage } from '@/pages/auth'
2+
import { createFileRoute } from '@tanstack/react-router'
3+
4+
import { SessionContracts } from '@/entities/session'
5+
6+
export const Route = createFileRoute('/auth/google/callback')({
7+
component: GoogleCallbackPage,
8+
validateSearch: SessionContracts.GoogleCallbackSearchSchema
9+
})
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
import { createFileRoute, Outlet, redirect } from '@tanstack/react-router'
22

3-
import { AuthTabs } from '@/widgets/auth-tabs'
4-
5-
export const Route = createFileRoute('/(auth)')({
3+
export const Route = createFileRoute('/auth')({
64
beforeLoad: ({ context: { session } }) => {
75
if (session.isAuthenticated) throw redirect({ to: '/dashboard' })
86
},
97
component: () => (
108
<div className='bg-soft-green flex h-dvh items-center justify-center'>
11-
<AuthTabs>
12-
<Outlet />
13-
</AuthTabs>
9+
<Outlet />
1410
</div>
1511
)
1612
})

src/app/routes/auth/signin.tsx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import { AuthPage } from '@/pages/auth'
2+
import { createFileRoute } from '@tanstack/react-router'
3+
4+
export const Route = createFileRoute('/auth/signin')({
5+
component: AuthPage
6+
})

0 commit comments

Comments
 (0)