Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.
TypeScript i18nextnext-authnextjspostgresqlprismareact-emailt3-stacktailwindcsstrpcturborepotypescriptzod
♻️ Use absoluteUrl for OAuth callback and redirect URLs
Luke Velladcb9ec68a3b7
diff --git a/apps/web/src/app/api/integrations/[...connection]/route.ts b/apps/web/src/app/api/integrations/[...connection]/route.tsindex 2a8c8dafa..29cf364d7 100644--- a/apps/web/src/app/api/integrations/[...connection]/route.ts+++ b/apps/web/src/app/api/integrations/[...connection]/route.ts@@ -11,7 +11,7 @@ import { OAuthIntegration } from "@/lib/oauth/server";type Integration = "google-calendar" | "outlook-calendar";const { handler } = OAuthIntegration<Integration>({- baseUrl: "/api/integrations",+ basePath: "/api/integrations",getIntegration: ({ integrationId, callbackUrl }) => {switch (integrationId) {case "google-calendar": {diff --git a/apps/web/src/lib/oauth/server.ts b/apps/web/src/lib/oauth/server.tsindex fc3b23f3c..711d1c638 100644--- a/apps/web/src/lib/oauth/server.ts+++ b/apps/web/src/lib/oauth/server.ts@@ -2,6 +2,7 @@ import "server-only";import { zValidator } from "@hono/zod-validator";import { createLogger } from "@rallly/logger";+import { absoluteUrl } from "@rallly/utils/absolute-url";import { generateCodeVerifier, generateState } from "arctic";import { Hono } from "hono";import { getCookie, setCookie } from "hono/cookie";@@ -16,7 +17,7 @@ export function OAuthIntegration<T extends string>(options: CreateOAuthOptions<T>,) {const {- baseUrl,+ basePath,getIntegration,cookieConfig = {prefix: "oauth.",@@ -31,7 +32,7 @@ export function OAuthIntegration<T extends string>(const REDIRECT_TO = `${prefix}redirect-to`;const STATE = `${prefix}state`;- const app = new Hono().basePath(baseUrl);+ const app = new Hono().basePath(basePath);// Create schema with available provider namesconst validateParams = zValidator(@@ -46,11 +47,9 @@ export function OAuthIntegration<T extends string>(try {const { id } = c.req.valid("param");- const callbackUrl = new URL(`${baseUrl}/callback/${id}`, c.req.url);-const integration = getIntegration({integrationId: id as T,- callbackUrl: callbackUrl.toString(),+ callbackUrl: absoluteUrl(`${basePath}/callback/${id}`),});if (!integration) {@@ -104,11 +103,9 @@ export function OAuthIntegration<T extends string>(try {const { id } = c.req.valid("param");- const callbackUrl = new URL(`${baseUrl}/callback/${id}`, c.req.url);-const integration = getIntegration({integrationId: id as T,- callbackUrl: callbackUrl.toString(),+ callbackUrl: absoluteUrl(`${basePath}/callback/${id}`),});if (!integration) {@@ -131,7 +128,7 @@ export function OAuthIntegration<T extends string>(state !== storedState ||!codeVerifier) {- const errorUrl = new URL(redirectTo, c.req.url);+ const errorUrl = new URL(redirectTo, absoluteUrl());errorUrl.searchParams.set("error", "invalid_request");return c.redirect(errorUrl.toString());}@@ -149,7 +146,7 @@ export function OAuthIntegration<T extends string>(});// Redirect with success- const successUrl = new URL(redirectTo, c.req.url);+ const successUrl = new URL(redirectTo, absoluteUrl());successUrl.searchParams.set("connected", "true");successUrl.searchParams.set("integration", id);@@ -158,7 +155,7 @@ export function OAuthIntegration<T extends string>(logger.error({ error }, "OAuth connection failed");const redirectTo = getCookie(c, REDIRECT_TO) || "/";- const errorUrl = new URL(redirectTo, c.req.url);+ const errorUrl = new URL(redirectTo, absoluteUrl());errorUrl.searchParams.set("error", "connection_failed");return c.redirect(errorUrl.toString());}diff --git a/apps/web/src/lib/oauth/types.ts b/apps/web/src/lib/oauth/types.tsindex be2485242..f0c738fef 100644--- a/apps/web/src/lib/oauth/types.ts+++ b/apps/web/src/lib/oauth/types.ts@@ -41,7 +41,7 @@ export interface OAuthClient {}export interface CreateOAuthOptions<T extends string> {- baseUrl: string;+ basePath: string;getIntegration: ({integrationId,callbackUrl,