diff --git a/packages/server/src/api/user/user-router.ts b/packages/server/src/api/user/user-router.ts index 4d243a66..a2285439 100644 --- a/packages/server/src/api/user/user-router.ts +++ b/packages/server/src/api/user/user-router.ts @@ -72,19 +72,15 @@ export const userRouter = router({ ) .query(async ({ input: { code }, ctx: { oauth, env, db } }) => { try { - console.error(1) const { access_token } = await oauth.validateAuthorizationCode(code, { credentials: env.AUTH_GOOGLE_CLIENT_SECRET, authenticateWith: "request_body", }) - console.error(2) const userInfoRequest = await fetch( `https://www.googleapis.com/oauth2/v1/userinfo?access_token=${access_token}`, ) - console.error(3) - if (!userInfoRequest.ok) { throw new TRPCError({ code: "BAD_REQUEST", @@ -92,8 +88,6 @@ export const userRouter = router({ }) } - console.error(4) - const userInfo = z .object({ email: z.string(), diff --git a/packages/server/src/framework/trpc.ts b/packages/server/src/framework/trpc.ts index 52c5d2ee..8270e992 100644 --- a/packages/server/src/framework/trpc.ts +++ b/packages/server/src/framework/trpc.ts @@ -18,7 +18,7 @@ export const createContext = "https://accounts.google.com/o/oauth2/auth", "https://accounts.google.com/o/oauth2/token", { - redirectURI: env.CLIENT_URL, + redirectURI: env.CLIENT_URL.split(",").at(-1), }, ), env, diff --git a/packages/server/wrangler.toml b/packages/server/wrangler.toml index bebe82a7..175b1053 100644 --- a/packages/server/wrangler.toml +++ b/packages/server/wrangler.toml @@ -11,6 +11,7 @@ port = 3002 [vars] CLIENT_URL = "https://new.rocketgame.app,https://rust-game.rocket-game.pages.dev,https://polyburn.com" +API_URL="https://api.polyburn.com" [[d1_databases]] migrations_dir = "drizzle"