Skip to content

armgit / dub

Public Imported from GitHub
0

The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.

Use APP_DOMAIN instead of NEXTAUTH_URL

Rafidc7f98f97127
diff --git a/apps/web/app/api/user/set-password/route.ts b/apps/web/app/api/user/set-password/route.ts
index 3ce9735973..21f6c42f7a 100644
--- a/apps/web/app/api/user/set-password/route.ts
+++ b/apps/web/app/api/user/set-password/route.ts
@@ -4,6 +4,7 @@ import { PASSWORD_RESET_TOKEN_EXPIRY } from "@/lib/auth/constants";
import { prisma } from "@/lib/prisma";
import { sendEmail } from "@dub/email";
import ResetPasswordLink from "@dub/email/templates/reset-password-link";
+import { APP_DOMAIN } from "@dub/utils";
import { randomBytes } from "crypto";
import { NextResponse } from "next/server";
@@ -42,14 +43,14 @@ export const POST = withSession(async ({ session }) => {
to: session.user.email,
react: ResetPasswordLink({
email: session.user.email,
- url: `${process.env.NEXTAUTH_URL}/auth/reset-password/${token}`,
+ url: `${APP_DOMAIN}/auth/reset-password/${token}`,
}),
});
if (process.env.NODE_ENV === "development") {
console.info(
"Password reset URL:",
- `${process.env.NEXTAUTH_URL}/auth/reset-password/${token}`,
+ `${APP_DOMAIN}/auth/reset-password/${token}`,
);
}
diff --git a/apps/web/app/api/workspaces/[idOrSlug]/saml/route.ts b/apps/web/app/api/workspaces/[idOrSlug]/saml/route.ts
index f55bff8632..b628a5e0e0 100644
--- a/apps/web/app/api/workspaces/[idOrSlug]/saml/route.ts
+++ b/apps/web/app/api/workspaces/[idOrSlug]/saml/route.ts
@@ -3,7 +3,7 @@ import { withWorkspace } from "@/lib/auth";
import { isGenericEmail } from "@/lib/email/is-generic-email";
import { jackson, samlAudience } from "@/lib/jackson";
import { prisma } from "@/lib/prisma";
-import { APP_DOMAIN_WITH_NGROK } from "@dub/utils";
+import { APP_DOMAIN, APP_DOMAIN_WITH_NGROK } from "@dub/utils";
import { NextResponse } from "next/server";
import * as z from "zod/v4";
@@ -73,8 +73,8 @@ export const POST = withWorkspace(
const data = await apiController.createSAMLConnection({
encodedRawMetadata: encodedRawMetadata!,
metadataUrl: metadataUrl!,
- defaultRedirectUrl: `${process.env.NEXTAUTH_URL}/auth/saml`,
- redirectUrl: process.env.NEXTAUTH_URL as string,
+ defaultRedirectUrl: `${APP_DOMAIN}/auth/saml`,
+ redirectUrl: APP_DOMAIN,
tenant: workspace.id,
product: "Dub",
});
diff --git a/apps/web/lib/actions/request-password-reset.ts b/apps/web/lib/actions/request-password-reset.ts
index 78076a2d9b..1b2886552e 100644
--- a/apps/web/lib/actions/request-password-reset.ts
+++ b/apps/web/lib/actions/request-password-reset.ts
@@ -5,6 +5,7 @@ import { assertRateLimit } from "@/lib/upstash/assert-rate-limit";
import { RATELIMIT_POLICIES } from "@/lib/upstash/ratelimit-policies";
import { sendEmail } from "@dub/email";
import ResetPasswordLink from "@dub/email/templates/reset-password-link";
+import { APP_DOMAIN } from "@dub/utils";
import { randomBytes } from "crypto";
import { flattenValidationErrors } from "next-safe-action";
import { PASSWORD_RESET_TOKEN_EXPIRY } from "../auth/constants";
@@ -63,7 +64,7 @@ export const requestPasswordResetAction = actionClient
to: email,
react: ResetPasswordLink({
email,
- url: `${process.env.NEXTAUTH_URL}/auth/reset-password/${token}`,
+ url: `${APP_DOMAIN}/auth/reset-password/${token}`,
}),
});
diff --git a/apps/web/lib/api/users.ts b/apps/web/lib/api/users.ts
index a9c79b9fce..042c79fbd5 100644
--- a/apps/web/lib/api/users.ts
+++ b/apps/web/lib/api/users.ts
@@ -3,7 +3,7 @@ import { prisma } from "@/lib/prisma";
import { WorkspaceWithUsers } from "@/lib/types";
import { sendEmail } from "@dub/email";
import WorkspaceInvite from "@dub/email/templates/workspace-invite";
-import { TWO_WEEKS_IN_SECONDS } from "@dub/utils";
+import { APP_DOMAIN, TWO_WEEKS_IN_SECONDS } from "@dub/utils";
import { WorkspaceRole } from "@prisma/client";
import { randomBytes } from "crypto";
import { DubApiError } from "./errors";
@@ -53,12 +53,12 @@ export async function inviteUser({
});
const params = new URLSearchParams({
- callbackUrl: `${process.env.NEXTAUTH_URL}/${workspace.slug}/invite`,
+ callbackUrl: `${APP_DOMAIN}/${workspace.slug}/invite`,
email,
token,
});
- const url = `${process.env.NEXTAUTH_URL}/api/auth/callback/email?${params}`;
+ const url = `${APP_DOMAIN}/api/auth/callback/email?${params}`;
return await sendEmail({
subject: "You've been invited to join a workspace on Dub",
diff --git a/apps/web/lib/auth/options.ts b/apps/web/lib/auth/options.ts
index 22f0f13b88..49f3d1aaa8 100644
--- a/apps/web/lib/auth/options.ts
+++ b/apps/web/lib/auth/options.ts
@@ -133,7 +133,7 @@ export const authOptions: NextAuthOptions = {
version: "2.0",
checks: ["pkce", "state"],
authorization: {
- url: `${process.env.NEXTAUTH_URL}/api/auth/saml/authorize`,
+ url: `${APP_DOMAIN}/api/auth/saml/authorize`,
params: {
scope: "",
response_type: "code",
@@ -141,10 +141,10 @@ export const authOptions: NextAuthOptions = {
},
},
token: {
- url: `${process.env.NEXTAUTH_URL}/api/auth/saml/token`,
+ url: `${APP_DOMAIN}/api/auth/saml/token`,
params: { grant_type: "authorization_code" },
},
- userinfo: `${process.env.NEXTAUTH_URL}/api/auth/saml/userinfo`,
+ userinfo: `${APP_DOMAIN}/api/auth/saml/userinfo`,
profile: async (profile) => {
let existingUser = await prisma.user.findUnique({
where: { email: profile.email },
@@ -204,7 +204,7 @@ export const authOptions: NextAuthOptions = {
const { access_token } = await oauthController.token({
code,
grant_type: "authorization_code",
- redirect_uri: process.env.NEXTAUTH_URL as string,
+ redirect_uri: APP_DOMAIN,
client_id: "dummy",
client_secret: process.env.NEXTAUTH_SECRET as string,
});