Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/web/lib/middleware/admin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { DUB_WORKSPACE_ID } from "@dub/utils";
import { NextRequest, NextResponse } from "next/server";
import { getUserViaToken } from "./utils/get-user-via-token";

export default async function AdminMiddleware(req: NextRequest) {
export async function AdminMiddleware(req: NextRequest) {
const { path } = parse(req);

const user = await getUserViaToken(req);
Expand Down
2 changes: 1 addition & 1 deletion apps/web/lib/middleware/api.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { parse } from "@/lib/middleware/utils";
import { NextRequest, NextResponse } from "next/server";

export default function ApiMiddleware(req: NextRequest) {
export function ApiMiddleware(req: NextRequest) {
const { fullPath } = parse(req);

// redirect to dub.co for /metatags
Expand Down
8 changes: 4 additions & 4 deletions apps/web/lib/middleware/app.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import { parse } from "@/lib/middleware/utils";
import { NextRequest, NextResponse } from "next/server";
import EmbedMiddleware from "./embed";
import NewLinkMiddleware from "./new-link";
import { EmbedMiddleware } from "./embed";
import { NewLinkMiddleware } from "./new-link";
import { appRedirect } from "./utils/app-redirect";
import { getDefaultWorkspace } from "./utils/get-default-workspace";
import { getOnboardingStep } from "./utils/get-onboarding-step";
import { getUserViaToken } from "./utils/get-user-via-token";
import { isTopLevelSettingsRedirect } from "./utils/is-top-level-settings-redirect";
import WorkspacesMiddleware from "./workspaces";
import { WorkspacesMiddleware } from "./workspaces";

export default async function AppMiddleware(req: NextRequest) {
export async function AppMiddleware(req: NextRequest) {
const { path, fullPath, searchParamsString } = parse(req);

if (path.startsWith("/embed")) {
Expand Down
2 changes: 1 addition & 1 deletion apps/web/lib/middleware/axiom.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Logger } from "next-axiom";
import { NextFetchEvent, NextRequest } from "next/server";

export default function AxiomMiddleware(req: NextRequest, ev: NextFetchEvent) {
export function AxiomMiddleware(req: NextRequest, ev: NextFetchEvent) {
const logger = new Logger({ source: "middleware" }); // traffic, request
logger.middleware(req);
ev.waitUntil(logger.flush());
Expand Down
2 changes: 1 addition & 1 deletion apps/web/lib/middleware/create-link.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { parse } from "@/lib/middleware/utils";
import { APP_DOMAIN, getUrlFromString } from "@dub/utils";
import { NextRequest, NextResponse } from "next/server";

export default function CreateLinkMiddleware(req: NextRequest) {
export function CreateLinkMiddleware(req: NextRequest) {
const { domain, fullPath } = parse(req);

const url = getUrlFromString(fullPath.slice(1));
Expand Down
2 changes: 1 addition & 1 deletion apps/web/lib/middleware/embed.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { NextRequest, NextResponse } from "next/server";
import { parse } from "./utils";

export default function EmbedMiddleware(req: NextRequest) {
export function EmbedMiddleware(req: NextRequest) {
const { searchParamsObj, fullPath } = parse(req);

if (searchParamsObj.token) {
Expand Down
12 changes: 6 additions & 6 deletions apps/web/lib/middleware/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
export { default as AdminMiddleware } from "./admin";
export { default as ApiMiddleware } from "./api";
export { default as AppMiddleware } from "./app";
export { default as AxiomMiddleware } from "./axiom";
export { default as CreateLinkMiddleware } from "./create-link";
export { default as LinkMiddleware } from "./link";
export { AdminMiddleware } from "./admin";
export { ApiMiddleware } from "./api";
export { AppMiddleware } from "./app";
export { AxiomMiddleware } from "./axiom";
export { CreateLinkMiddleware } from "./create-link";
export { LinkMiddleware } from "./link";
5 changes: 1 addition & 4 deletions apps/web/lib/middleware/link.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,7 @@ import { isIosAppStoreUrl } from "./utils/is-ios-app-store-url";
import { isSingularTrackingUrl } from "./utils/is-singular-tracking-url";
import { resolveABTestURL } from "./utils/resolve-ab-test-url";

export default async function LinkMiddleware(
req: NextRequest,
ev: NextFetchEvent,
) {
export async function LinkMiddleware(req: NextRequest, ev: NextFetchEvent) {
let { domain, fullKey: originalKey } = parse(req);

if (!domain) {
Expand Down
5 changes: 1 addition & 4 deletions apps/web/lib/middleware/new-link.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@ import { UserProps } from "../types";
import { parse } from "./utils";
import { getDefaultWorkspace } from "./utils/get-default-workspace";

export default async function NewLinkMiddleware(
req: NextRequest,
user: UserProps,
) {
export async function NewLinkMiddleware(req: NextRequest, user: UserProps) {
const { fullPath } = parse(req);

const defaultWorkspace = await getDefaultWorkspace(user);
Expand Down
2 changes: 1 addition & 1 deletion apps/web/lib/middleware/partners.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const AUTHENTICATED_PATHS = [
"/invite",
];

export default async function PartnersMiddleware(req: NextRequest) {
export async function PartnersMiddleware(req: NextRequest) {
const { path, fullPath, searchParamsObj, searchParamsString } = parse(req);

const user = await getUserViaToken(req);
Expand Down
5 changes: 1 addition & 4 deletions apps/web/lib/middleware/workspaces.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,7 @@ import { getDefaultWorkspace } from "./utils/get-default-workspace";
import { getWorkspaceProduct } from "./utils/get-workspace-product";
import { isTopLevelSettingsRedirect } from "./utils/is-top-level-settings-redirect";

export default async function WorkspacesMiddleware(
req: NextRequest,
user: UserProps,
) {
export async function WorkspacesMiddleware(req: NextRequest, user: UserProps) {
const { path, searchParamsObj, searchParamsString } = parse(req);

// Handle ?next= query param with proper validation to prevent open redirects
Expand Down
2 changes: 1 addition & 1 deletion apps/web/middleware.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {
} from "@dub/utils";
import { PARTNERS_HOSTNAMES } from "@dub/utils/src/constants";
import { NextFetchEvent, NextRequest, NextResponse } from "next/server";
import PartnersMiddleware from "./lib/middleware/partners";
import { PartnersMiddleware } from "./lib/middleware/partners";
import { supportedWellKnownFiles } from "./lib/well-known";

export const config = {
Expand Down