diff options
| author | fathisiddiqi <service.fathisiddiqi@gmail.com> | 2025-06-24 20:15:13 +0700 |
|---|---|---|
| committer | fathisiddiqi <service.fathisiddiqi@gmail.com> | 2025-06-26 09:33:47 +0700 |
| commit | 6626a8c41355904e59ffd2598b6bfaa761a7ea15 (patch) | |
| tree | e9fc8a11c562cea2bca519d44ff5d18e4eaf66ae | |
| parent | a8d6bbd03a4c5a89075d75ea37b61afa5efe373a (diff) | |
| download | opencut-6626a8c41355904e59ffd2598b6bfaa761a7ea15.tar.gz | |
fix: set redirect uri for google login and prevent router push when login by google
| -rw-r--r-- | .github/CONTRIBUTING.md | 1 | ||||
| -rw-r--r-- | apps/web/.env.example | 1 | ||||
| -rw-r--r-- | apps/web/src/app/(auth)/login/page.tsx | 2 | ||||
| -rw-r--r-- | packages/auth/src/server.ts | 5 |
4 files changed, 6 insertions, 3 deletions
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index b9e22759..120a3ce4 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -87,6 +87,7 @@ Thank you for your interest in contributing to OpenCut! This document provides g # Only needed if you want to test Google login GOOGLE_CLIENT_ID="your-google-client-id" GOOGLE_CLIENT_SECRET="your-google-client-secret" + GOOGLE_REDIRECT_URI="http://localhost:3000/api/auth/callback/google" ``` 5. Run database migrations: `bun run db:migrate` diff --git a/apps/web/.env.example b/apps/web/.env.example index 0b4c649b..70c48e2a 100644 --- a/apps/web/.env.example +++ b/apps/web/.env.example @@ -10,6 +10,7 @@ BETTER_AUTH_SECRET=your-secret-key-here #Google Clients GOOGLE_CLIENT_ID= GOOGLE_CLIENT_SECRET= +GOOGLE_REDIRECT_URI=http://localhost:3000/api/auth/callback/google # Development Environment NODE_ENV=development diff --git a/apps/web/src/app/(auth)/login/page.tsx b/apps/web/src/app/(auth)/login/page.tsx index 73c34e1e..755784fa 100644 --- a/apps/web/src/app/(auth)/login/page.tsx +++ b/apps/web/src/app/(auth)/login/page.tsx @@ -52,8 +52,8 @@ function LoginForm() { try { await signIn.social({ provider: "google", + callbackURL: "/editor", }); - router.push("/editor"); } catch (error) { setError("Failed to sign in with Google. Please try again."); setIsGoogleLoading(false); diff --git a/packages/auth/src/server.ts b/packages/auth/src/server.ts index f6c68dc5..7c32fbf5 100644 --- a/packages/auth/src/server.ts +++ b/packages/auth/src/server.ts @@ -16,14 +16,15 @@ export const auth = betterAuth({ emailAndPassword: { enabled: true, }, - socialProviders: { + socialProviders: { google: { clientId: process.env.GOOGLE_CLIENT_ID as string, clientSecret: process.env.GOOGLE_CLIENT_SECRET as string, + redirectURI: process.env.GOOGLE_REDIRECT_URI as string, }, }, appName: "OpenCut", trustedOrigins: ["http://localhost:3000"], }); -export type Auth = typeof auth;
\ No newline at end of file +export type Auth = typeof auth; |