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
5 changes: 5 additions & 0 deletions .changeset/fuzzy-rockets-smash.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/nextjs': patch
---

Improve error messages when `clerkMiddleware` is missing by suggesting the correct path to place the `middleware.ts` file.
10 changes: 1 addition & 9 deletions packages/nextjs/src/app-router/server/ClerkProvider.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import { getDynamicAuthData } from '../../server/buildClerkProps';
import type { NextClerkProviderProps } from '../../types';
import { canUseKeyless } from '../../utils/feature-flags';
import { mergeNextClerkPropsWithEnv } from '../../utils/mergeNextClerkPropsWithEnv';
import { onlyTry } from '../../utils/only-try';
import { isNext13 } from '../../utils/sdk-versions';
import { ClientClerkProvider } from '../client/ClerkProvider';
import { deleteKeylessAction } from '../keyless-actions';
Expand All@@ -23,15 +24,6 @@ const getNonceFromCSPHeader = React.cache(async function getNonceFromCSPHeader()
return getScriptNonceFromHeader((await headers()).get('Content-Security-Policy') || '') || '';
});

/** Discards errors thrown by attempted code */
const onlyTry = (cb: () => unknown) => {
try {
cb();
} catch {
// ignore
}
};

export async function ClerkProvider(
props: Without<NextClerkProviderProps, '__unstable_invokeMiddlewareOnAuthStateChange'>,
) {
Expand Down
22 changes: 19 additions & 3 deletions packages/nextjs/src/app-router/server/auth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,12 +3,13 @@ import { constants, createClerkRequest, createRedirect, type RedirectFun } from
import { notFound, redirect } from 'next/navigation';

import { PUBLISHABLE_KEY, SIGN_IN_URL, SIGN_UP_URL } from '../../server/constants';
import { createGetAuth } from '../../server/createGetAuth';
import { createAsyncGetAuth } from '../../server/createGetAuth';
import { authAuthHeaderMissing } from '../../server/errors';
import { getAuthKeyFromRequest, getHeader } from '../../server/headers-utils';
import type { AuthProtect } from '../../server/protect';
import { createProtect } from '../../server/protect';
import { decryptClerkRequestData } from '../../server/utils';
import { isNextWithUnstableServerActions } from '../../utils/sdk-versions';
import { buildRequestLike } from './utils';

/**
Expand All@@ -25,8 +26,10 @@ type Auth = AuthObject & {
*/
redirectToSignIn: RedirectFun<ReturnType<typeof redirect>>;
};

export interface AuthFn {
(): Promise<Auth>;

/**
* `auth` includes a single property, the `protect()` method, which you can use in two ways:
* - to check if a user is authenticated (signed in)
Expand DownExpand Up@@ -60,9 +63,22 @@ export const auth: AuthFn = async () => {
require('server-only');

const request = await buildRequestLike();
const authObject = createGetAuth({

const stepsBasedOnSrcDirectory = async () => {
if (isNextWithUnstableServerActions) {
return [];
}

try {
const isSrcAppDir = await import('../../server/keyless-node.js').then(m => m.hasSrcAppDir());
return [`Your Middleware exists at ./${isSrcAppDir ? 'src/' : ''}middleware.ts`];
} catch {
return [];
}
};
const authObject = await createAsyncGetAuth({
debugLoggerName: 'auth()',
noAuthStatusMessage: authAuthHeaderMissing(),
noAuthStatusMessage: authAuthHeaderMissing('auth', await stepsBasedOnSrcDirectory()),
})(request);

const clerkUrl = getAuthKeyFromRequest(request, 'ClerkUrl');
Expand Down
2 changes: 1 addition & 1 deletion packages/nextjs/src/app-router/server/utils.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@ export async function buildRequestLike(): Promise<NextRequest> {
}

throw new Error(
`Clerk: auth()and currentUser() are only supported in App Router (/app directory).\nIf you're using /pages, try getAuth() instead.\nOriginal error: ${e}`,
`Clerk: auth(), currentUser() and clerkClient(), are only supported in App Router (/app directory).\nIf you're using /pages, try getAuth() instead.\nOriginal error: ${e}`,

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Our relatively new clerkClient() also depends on headers()

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch

);
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/nextjs/src/server/__tests__/createGetAuth.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import hmacSHA1 from 'crypto-js/hmac-sha1';
import { NextRequest } from 'next/server';
import { describe, expect, it } from 'vitest';

import { createGetAuth, getAuth } from '../createGetAuth';
import { createSyncGetAuth, getAuth } from '../createGetAuth';

const mockSecretKey = 'sk_test_mock';

Expand All@@ -16,7 +16,7 @@ const mockTokenSignature = hmacSHA1(mockToken, 'sk_test_mock').toString();

describe('createGetAuth(opts)', () => {
it('returns a getAuth function', () => {
expect(createGetAuth({ debugLoggerName: 'test', noAuthStatusMessage: 'test' })).toBeInstanceOf(Function);
expect(createSyncGetAuth({ debugLoggerName: 'test', noAuthStatusMessage: 'test' })).toBeInstanceOf(Function);
});
});

Expand Down
46 changes: 40 additions & 6 deletions packages/nextjs/src/server/createGetAuth.ts
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,63 @@
import type { AuthObject } from '@clerk/backend';
import { constants } from '@clerk/backend/internal';
import { isTruthy } from '@clerk/shared/underscore';

import { withLogger } from '../utils/debugLogger';
import { isNextWithUnstableServerActions } from '../utils/sdk-versions';
import { getAuthDataFromRequest } from './data/getAuthDataFromRequest';
import { getAuthAuthHeaderMissing } from './errors';
import { getHeader } from './headers-utils';
import { detectClerkMiddleware, getHeader } from './headers-utils';
import type { RequestLike } from './types';
import { assertAuthStatus } from './utils';

export const createGetAuth = ({
export const createAsyncGetAuth = ({
debugLoggerName,
noAuthStatusMessage,
}: {
debugLoggerName: string;
noAuthStatusMessage: string;
}) =>
withLogger(debugLoggerName, logger => {
return async (req: RequestLike, opts?: { secretKey?: string }) => {
if (isTruthy(getHeader(req, constants.Headers.EnableDebug))) {
logger.enable();
}

if (!detectClerkMiddleware(req)) {
// Keep the same behaviour for versions that may have issues with bundling `node:fs`
if (isNextWithUnstableServerActions) {
assertAuthStatus(req, noAuthStatusMessage);
}

const missConfiguredMiddlewareLocation = await import('./keyless-node.js')
.then(m => m.suggestMiddlewareLocation())
.catch(() => undefined);

if (missConfiguredMiddlewareLocation) {
throw new Error(missConfiguredMiddlewareLocation);
}

// still throw there is no suggested move location
assertAuthStatus(req, noAuthStatusMessage);
}

return getAuthDataFromRequest(req, { ...opts, logger });
};
});

export const createSyncGetAuth = ({
debugLoggerName,
noAuthStatusMessage,
}: {
debugLoggerName: string;
noAuthStatusMessage: string;
}) =>
withLogger(debugLoggerName, logger => {
return (req: RequestLike, opts?: { secretKey?: string }): AuthObject => {
return (req: RequestLike, opts?: { secretKey?: string }) => {
if (isTruthy(getHeader(req, constants.Headers.EnableDebug))) {
logger.enable();
}

assertAuthStatus(req, noAuthStatusMessage);

return getAuthDataFromRequest(req, { ...opts, logger });
};
});
Expand DownExpand Up@@ -107,7 +141,7 @@ export const createGetAuth = ({
* }
* ```
*/
export const getAuth = createGetAuth({
export const getAuth = createSyncGetAuth({
debugLoggerName: 'getAuth()',
noAuthStatusMessage: getAuthAuthHeaderMissing(),
});
4 changes: 2 additions & 2 deletions packages/nextjs/src/server/errors.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,9 +20,9 @@ Check if signInUrl is missing from your configuration or if it is not an absolut

export const getAuthAuthHeaderMissing = () => authAuthHeaderMissing('getAuth');

export const authAuthHeaderMissing = (helperName = 'auth') =>
export const authAuthHeaderMissing = (helperName = 'auth', prefixSteps?: string[]) =>
`Clerk: ${helperName}() was called but Clerk can't detect usage of clerkMiddleware(). Please ensure the following:
- clerkMiddleware() is used in your Next.js Middleware.
- ${prefixSteps ? [...prefixSteps, ''].join('\n- ') : ' '}clerkMiddleware() is used in your Next.js Middleware.
- Your Middleware matcher is configured to match this route or page.
- If you are using the src directory, make sure the Middleware file is inside of it.

Expand Down
45 changes: 44 additions & 1 deletion packages/nextjs/src/server/keyless-node.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -209,4 +209,47 @@ function removeKeyless() {
unlockFileWriting();
}

export { createOrReadKeyless, removeKeyless };
function hasSrcAppDir() {
const { existsSync } = safeNodeRuntimeFs();
const path = safeNodeRuntimePath();

const projectWithAppSrc = path.join(process.cwd(), 'src', 'app');

return !!existsSync(projectWithAppSrc);
}

function suggestMiddlewareLocation() {
const suggestionMessage = (to?: 'src/', from?: 'src/app/' | 'app/') =>
`Clerk: Move your middleware file to ./${to || ''}middleware.ts. Currently located at ./${from || ''}middleware.ts`;

const { existsSync } = safeNodeRuntimeFs();
const path = safeNodeRuntimePath();

const projectWithAppSrcPath = path.join(process.cwd(), 'src', 'app');
const projectWithAppPath = path.join(process.cwd(), 'app');

if (existsSync(projectWithAppSrcPath)) {
if (existsSync(path.join(projectWithAppSrcPath, 'middleware.ts'))) {
return suggestionMessage('src/', 'src/app/');
}

if (existsSync(path.join(process.cwd(), 'middleware.ts'))) {
return suggestionMessage('src/');
}

// default error
return undefined;
}

if (existsSync(projectWithAppPath)) {
if (existsSync(path.join(projectWithAppPath, 'middleware.ts'))) {
return suggestionMessage(undefined, 'app/');
}
// default error
return undefined;
}

return undefined;
}

export { createOrReadKeyless, removeKeyless, suggestMiddlewareLocation, hasSrcAppDir };
12 changes: 12 additions & 0 deletions packages/nextjs/src/utils/only-try.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
/**
* Discards errors thrown by attempted code
*/
const onlyTry = (cb: () => unknown) => {
try {
cb();
} catch {
// ignore
}
};

export { onlyTry };
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
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
5 changes: 5 additions & 0 deletions .changeset/fuzzy-rockets-smash.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/nextjs': patch
---

Improve error messages when `clerkMiddleware` is missing by suggesting the correct path to place the `middleware.ts` file.
10 changes: 1 addition & 9 deletions packages/nextjs/src/app-router/server/ClerkProvider.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import { getDynamicAuthData } from '../../server/buildClerkProps';
import type { NextClerkProviderProps } from '../../types';
import { canUseKeyless } from '../../utils/feature-flags';
import { mergeNextClerkPropsWithEnv } from '../../utils/mergeNextClerkPropsWithEnv';
import { onlyTry } from '../../utils/only-try';
import { isNext13 } from '../../utils/sdk-versions';
import { ClientClerkProvider } from '../client/ClerkProvider';
import { deleteKeylessAction } from '../keyless-actions';
Expand All@@ -23,15 +24,6 @@ const getNonceFromCSPHeader = React.cache(async function getNonceFromCSPHeader()
return getScriptNonceFromHeader((await headers()).get('Content-Security-Policy') || '') || '';
});

/** Discards errors thrown by attempted code */
const onlyTry = (cb: () => unknown) => {
try {
cb();
} catch {
// ignore
}
};

export async function ClerkProvider(
props: Without<NextClerkProviderProps, '__unstable_invokeMiddlewareOnAuthStateChange'>,
) {
Expand Down
22 changes: 19 additions & 3 deletions packages/nextjs/src/app-router/server/auth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,12 +3,13 @@ import { constants, createClerkRequest, createRedirect, type RedirectFun } from
import { notFound, redirect } from 'next/navigation';

import { PUBLISHABLE_KEY, SIGN_IN_URL, SIGN_UP_URL } from '../../server/constants';
import { createGetAuth } from '../../server/createGetAuth';
import { createAsyncGetAuth } from '../../server/createGetAuth';
import { authAuthHeaderMissing } from '../../server/errors';
import { getAuthKeyFromRequest, getHeader } from '../../server/headers-utils';
import type { AuthProtect } from '../../server/protect';
import { createProtect } from '../../server/protect';
import { decryptClerkRequestData } from '../../server/utils';
import { isNextWithUnstableServerActions } from '../../utils/sdk-versions';
import { buildRequestLike } from './utils';

/**
Expand All@@ -25,8 +26,10 @@ type Auth = AuthObject & {
*/
redirectToSignIn: RedirectFun<ReturnType<typeof redirect>>;
};

export interface AuthFn {
(): Promise<Auth>;

/**
* `auth` includes a single property, the `protect()` method, which you can use in two ways:
* - to check if a user is authenticated (signed in)
Expand DownExpand Up@@ -60,9 +63,22 @@ export const auth: AuthFn = async () => {
require('server-only');

const request = await buildRequestLike();
const authObject = createGetAuth({

const stepsBasedOnSrcDirectory = async () => {
if (isNextWithUnstableServerActions) {
return [];
}

try {
const isSrcAppDir = await import('../../server/keyless-node.js').then(m => m.hasSrcAppDir());
return [`Your Middleware exists at ./${isSrcAppDir ? 'src/' : ''}middleware.ts`];
} catch {
return [];
}
};
const authObject = await createAsyncGetAuth({
debugLoggerName: 'auth()',
noAuthStatusMessage: authAuthHeaderMissing(),
noAuthStatusMessage: authAuthHeaderMissing('auth', await stepsBasedOnSrcDirectory()),
})(request);

const clerkUrl = getAuthKeyFromRequest(request, 'ClerkUrl');
Expand Down
2 changes: 1 addition & 1 deletion packages/nextjs/src/app-router/server/utils.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@ export async function buildRequestLike(): Promise<NextRequest> {
}

throw new Error(
`Clerk: auth()and currentUser() are only supported in App Router (/app directory).\nIf you're using /pages, try getAuth() instead.\nOriginal error: ${e}`,
`Clerk: auth(), currentUser() and clerkClient(), are only supported in App Router (/app directory).\nIf you're using /pages, try getAuth() instead.\nOriginal error: ${e}`,

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Our relatively new clerkClient() also depends on headers()

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch

);
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/nextjs/src/server/__tests__/createGetAuth.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import hmacSHA1 from 'crypto-js/hmac-sha1';
import { NextRequest } from 'next/server';
import { describe, expect, it } from 'vitest';

import { createGetAuth, getAuth } from '../createGetAuth';
import { createSyncGetAuth, getAuth } from '../createGetAuth';

const mockSecretKey = 'sk_test_mock';

Expand All@@ -16,7 +16,7 @@ const mockTokenSignature = hmacSHA1(mockToken, 'sk_test_mock').toString();

describe('createGetAuth(opts)', () => {
it('returns a getAuth function', () => {
expect(createGetAuth({ debugLoggerName: 'test', noAuthStatusMessage: 'test' })).toBeInstanceOf(Function);
expect(createSyncGetAuth({ debugLoggerName: 'test', noAuthStatusMessage: 'test' })).toBeInstanceOf(Function);
});
});

Expand Down
46 changes: 40 additions & 6 deletions packages/nextjs/src/server/createGetAuth.ts
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,63 @@
import type { AuthObject } from '@clerk/backend';
import { constants } from '@clerk/backend/internal';
import { isTruthy } from '@clerk/shared/underscore';

import { withLogger } from '../utils/debugLogger';
import { isNextWithUnstableServerActions } from '../utils/sdk-versions';
import { getAuthDataFromRequest } from './data/getAuthDataFromRequest';
import { getAuthAuthHeaderMissing } from './errors';
import { getHeader } from './headers-utils';
import { detectClerkMiddleware, getHeader } from './headers-utils';
import type { RequestLike } from './types';
import { assertAuthStatus } from './utils';

export const createGetAuth = ({
export const createAsyncGetAuth = ({
debugLoggerName,
noAuthStatusMessage,
}: {
debugLoggerName: string;
noAuthStatusMessage: string;
}) =>
withLogger(debugLoggerName, logger => {
return async (req: RequestLike, opts?: { secretKey?: string }) => {
if (isTruthy(getHeader(req, constants.Headers.EnableDebug))) {
logger.enable();
}

if (!detectClerkMiddleware(req)) {
// Keep the same behaviour for versions that may have issues with bundling `node:fs`
if (isNextWithUnstableServerActions) {
assertAuthStatus(req, noAuthStatusMessage);
}

const missConfiguredMiddlewareLocation = await import('./keyless-node.js')
.then(m => m.suggestMiddlewareLocation())
.catch(() => undefined);

if (missConfiguredMiddlewareLocation) {
throw new Error(missConfiguredMiddlewareLocation);
}

// still throw there is no suggested move location
assertAuthStatus(req, noAuthStatusMessage);
}

return getAuthDataFromRequest(req, { ...opts, logger });
};
});

export const createSyncGetAuth = ({
debugLoggerName,
noAuthStatusMessage,
}: {
debugLoggerName: string;
noAuthStatusMessage: string;
}) =>
withLogger(debugLoggerName, logger => {
return (req: RequestLike, opts?: { secretKey?: string }): AuthObject => {
return (req: RequestLike, opts?: { secretKey?: string }) => {
if (isTruthy(getHeader(req, constants.Headers.EnableDebug))) {
logger.enable();
}

assertAuthStatus(req, noAuthStatusMessage);

return getAuthDataFromRequest(req, { ...opts, logger });
};
});
Expand DownExpand Up@@ -107,7 +141,7 @@ export const createGetAuth = ({
* }
* ```
*/
export const getAuth = createGetAuth({
export const getAuth = createSyncGetAuth({
debugLoggerName: 'getAuth()',
noAuthStatusMessage: getAuthAuthHeaderMissing(),
});
4 changes: 2 additions & 2 deletions packages/nextjs/src/server/errors.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,9 +20,9 @@ Check if signInUrl is missing from your configuration or if it is not an absolut

export const getAuthAuthHeaderMissing = () => authAuthHeaderMissing('getAuth');

export const authAuthHeaderMissing = (helperName = 'auth') =>
export const authAuthHeaderMissing = (helperName = 'auth', prefixSteps?: string[]) =>
`Clerk: ${helperName}() was called but Clerk can't detect usage of clerkMiddleware(). Please ensure the following:
- clerkMiddleware() is used in your Next.js Middleware.
- ${prefixSteps ? [...prefixSteps, ''].join('\n- ') : ' '}clerkMiddleware() is used in your Next.js Middleware.
- Your Middleware matcher is configured to match this route or page.
- If you are using the src directory, make sure the Middleware file is inside of it.

Expand Down
45 changes: 44 additions & 1 deletion packages/nextjs/src/server/keyless-node.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -209,4 +209,47 @@ function removeKeyless() {
unlockFileWriting();
}

export { createOrReadKeyless, removeKeyless };
function hasSrcAppDir() {
const { existsSync } = safeNodeRuntimeFs();
const path = safeNodeRuntimePath();

const projectWithAppSrc = path.join(process.cwd(), 'src', 'app');

return !!existsSync(projectWithAppSrc);
}

function suggestMiddlewareLocation() {
const suggestionMessage = (to?: 'src/', from?: 'src/app/' | 'app/') =>
`Clerk: Move your middleware file to ./${to || ''}middleware.ts. Currently located at ./${from || ''}middleware.ts`;

const { existsSync } = safeNodeRuntimeFs();
const path = safeNodeRuntimePath();

const projectWithAppSrcPath = path.join(process.cwd(), 'src', 'app');
const projectWithAppPath = path.join(process.cwd(), 'app');

if (existsSync(projectWithAppSrcPath)) {
if (existsSync(path.join(projectWithAppSrcPath, 'middleware.ts'))) {
return suggestionMessage('src/', 'src/app/');
}

if (existsSync(path.join(process.cwd(), 'middleware.ts'))) {
return suggestionMessage('src/');
}

// default error
return undefined;
}

if (existsSync(projectWithAppPath)) {
if (existsSync(path.join(projectWithAppPath, 'middleware.ts'))) {
return suggestionMessage(undefined, 'app/');
}
// default error
return undefined;
}

return undefined;
}

export { createOrReadKeyless, removeKeyless, suggestMiddlewareLocation, hasSrcAppDir };
12 changes: 12 additions & 0 deletions packages/nextjs/src/utils/only-try.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
/**
* Discards errors thrown by attempted code
*/
const onlyTry = (cb: () => unknown) => {
try {
cb();
} catch {
// ignore
}
};

export { onlyTry };
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
5 changes: 5 additions & 0 deletions .changeset/fuzzy-rockets-smash.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/nextjs': patch
---

Improve error messages when `clerkMiddleware` is missing by suggesting the correct path to place the `middleware.ts` file.
10 changes: 1 addition & 9 deletions packages/nextjs/src/app-router/server/ClerkProvider.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import { getDynamicAuthData } from '../../server/buildClerkProps';
import type { NextClerkProviderProps } from '../../types';
import { canUseKeyless } from '../../utils/feature-flags';
import { mergeNextClerkPropsWithEnv } from '../../utils/mergeNextClerkPropsWithEnv';
import { onlyTry } from '../../utils/only-try';
import { isNext13 } from '../../utils/sdk-versions';
import { ClientClerkProvider } from '../client/ClerkProvider';
import { deleteKeylessAction } from '../keyless-actions';
Expand All@@ -23,15 +24,6 @@ const getNonceFromCSPHeader = React.cache(async function getNonceFromCSPHeader()
return getScriptNonceFromHeader((await headers()).get('Content-Security-Policy') || '') || '';
});

/** Discards errors thrown by attempted code */
const onlyTry = (cb: () => unknown) => {
try {
cb();
} catch {
// ignore
}
};

export async function ClerkProvider(
props: Without<NextClerkProviderProps, '__unstable_invokeMiddlewareOnAuthStateChange'>,
) {
Expand Down
22 changes: 19 additions & 3 deletions packages/nextjs/src/app-router/server/auth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,12 +3,13 @@ import { constants, createClerkRequest, createRedirect, type RedirectFun } from
import { notFound, redirect } from 'next/navigation';

import { PUBLISHABLE_KEY, SIGN_IN_URL, SIGN_UP_URL } from '../../server/constants';
import { createGetAuth } from '../../server/createGetAuth';
import { createAsyncGetAuth } from '../../server/createGetAuth';
import { authAuthHeaderMissing } from '../../server/errors';
import { getAuthKeyFromRequest, getHeader } from '../../server/headers-utils';
import type { AuthProtect } from '../../server/protect';
import { createProtect } from '../../server/protect';
import { decryptClerkRequestData } from '../../server/utils';
import { isNextWithUnstableServerActions } from '../../utils/sdk-versions';
import { buildRequestLike } from './utils';

/**
Expand All@@ -25,8 +26,10 @@ type Auth = AuthObject & {
*/
redirectToSignIn: RedirectFun<ReturnType<typeof redirect>>;
};

export interface AuthFn {
(): Promise<Auth>;

/**
* `auth` includes a single property, the `protect()` method, which you can use in two ways:
* - to check if a user is authenticated (signed in)
Expand DownExpand Up@@ -60,9 +63,22 @@ export const auth: AuthFn = async () => {
require('server-only');

const request = await buildRequestLike();
const authObject = createGetAuth({

const stepsBasedOnSrcDirectory = async () => {
if (isNextWithUnstableServerActions) {
return [];
}

try {
const isSrcAppDir = await import('../../server/keyless-node.js').then(m => m.hasSrcAppDir());
return [`Your Middleware exists at ./${isSrcAppDir ? 'src/' : ''}middleware.ts`];
} catch {
return [];
}
};
const authObject = await createAsyncGetAuth({
debugLoggerName: 'auth()',
noAuthStatusMessage: authAuthHeaderMissing(),
noAuthStatusMessage: authAuthHeaderMissing('auth', await stepsBasedOnSrcDirectory()),
})(request);

const clerkUrl = getAuthKeyFromRequest(request, 'ClerkUrl');
Expand Down
2 changes: 1 addition & 1 deletion packages/nextjs/src/app-router/server/utils.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@ export async function buildRequestLike(): Promise<NextRequest> {
}

throw new Error(
`Clerk: auth()and currentUser() are only supported in App Router (/app directory).\nIf you're using /pages, try getAuth() instead.\nOriginal error: ${e}`,
`Clerk: auth(), currentUser() and clerkClient(), are only supported in App Router (/app directory).\nIf you're using /pages, try getAuth() instead.\nOriginal error: ${e}`,

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Our relatively new clerkClient() also depends on headers()

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch

);
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/nextjs/src/server/__tests__/createGetAuth.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import hmacSHA1 from 'crypto-js/hmac-sha1';
import { NextRequest } from 'next/server';
import { describe, expect, it } from 'vitest';

import { createGetAuth, getAuth } from '../createGetAuth';
import { createSyncGetAuth, getAuth } from '../createGetAuth';

const mockSecretKey = 'sk_test_mock';

Expand All@@ -16,7 +16,7 @@ const mockTokenSignature = hmacSHA1(mockToken, 'sk_test_mock').toString();

describe('createGetAuth(opts)', () => {
it('returns a getAuth function', () => {
expect(createGetAuth({ debugLoggerName: 'test', noAuthStatusMessage: 'test' })).toBeInstanceOf(Function);
expect(createSyncGetAuth({ debugLoggerName: 'test', noAuthStatusMessage: 'test' })).toBeInstanceOf(Function);
});
});

Expand Down
46 changes: 40 additions & 6 deletions packages/nextjs/src/server/createGetAuth.ts
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,63 @@
import type { AuthObject } from '@clerk/backend';
import { constants } from '@clerk/backend/internal';
import { isTruthy } from '@clerk/shared/underscore';

import { withLogger } from '../utils/debugLogger';
import { isNextWithUnstableServerActions } from '../utils/sdk-versions';
import { getAuthDataFromRequest } from './data/getAuthDataFromRequest';
import { getAuthAuthHeaderMissing } from './errors';
import { getHeader } from './headers-utils';
import { detectClerkMiddleware, getHeader } from './headers-utils';
import type { RequestLike } from './types';
import { assertAuthStatus } from './utils';

export const createGetAuth = ({
export const createAsyncGetAuth = ({
debugLoggerName,
noAuthStatusMessage,
}: {
debugLoggerName: string;
noAuthStatusMessage: string;
}) =>
withLogger(debugLoggerName, logger => {
return async (req: RequestLike, opts?: { secretKey?: string }) => {
if (isTruthy(getHeader(req, constants.Headers.EnableDebug))) {
logger.enable();
}

if (!detectClerkMiddleware(req)) {
// Keep the same behaviour for versions that may have issues with bundling `node:fs`
if (isNextWithUnstableServerActions) {
assertAuthStatus(req, noAuthStatusMessage);
}

const missConfiguredMiddlewareLocation = await import('./keyless-node.js')
.then(m => m.suggestMiddlewareLocation())
.catch(() => undefined);

if (missConfiguredMiddlewareLocation) {
throw new Error(missConfiguredMiddlewareLocation);
}

// still throw there is no suggested move location
assertAuthStatus(req, noAuthStatusMessage);
}

return getAuthDataFromRequest(req, { ...opts, logger });
};
});

export const createSyncGetAuth = ({
debugLoggerName,
noAuthStatusMessage,
}: {
debugLoggerName: string;
noAuthStatusMessage: string;
}) =>
withLogger(debugLoggerName, logger => {
return (req: RequestLike, opts?: { secretKey?: string }): AuthObject => {
return (req: RequestLike, opts?: { secretKey?: string }) => {
if (isTruthy(getHeader(req, constants.Headers.EnableDebug))) {
logger.enable();
}

assertAuthStatus(req, noAuthStatusMessage);

return getAuthDataFromRequest(req, { ...opts, logger });
};
});
Expand DownExpand Up@@ -107,7 +141,7 @@ export const createGetAuth = ({
* }
* ```
*/
export const getAuth = createGetAuth({
export const getAuth = createSyncGetAuth({
debugLoggerName: 'getAuth()',
noAuthStatusMessage: getAuthAuthHeaderMissing(),
});
4 changes: 2 additions & 2 deletions packages/nextjs/src/server/errors.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,9 +20,9 @@ Check if signInUrl is missing from your configuration or if it is not an absolut

export const getAuthAuthHeaderMissing = () => authAuthHeaderMissing('getAuth');

export const authAuthHeaderMissing = (helperName = 'auth') =>
export const authAuthHeaderMissing = (helperName = 'auth', prefixSteps?: string[]) =>
`Clerk: ${helperName}() was called but Clerk can't detect usage of clerkMiddleware(). Please ensure the following:
- clerkMiddleware() is used in your Next.js Middleware.
- ${prefixSteps ? [...prefixSteps, ''].join('\n- ') : ' '}clerkMiddleware() is used in your Next.js Middleware.
- Your Middleware matcher is configured to match this route or page.
- If you are using the src directory, make sure the Middleware file is inside of it.

Expand Down
45 changes: 44 additions & 1 deletion packages/nextjs/src/server/keyless-node.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -209,4 +209,47 @@ function removeKeyless() {
unlockFileWriting();
}

export { createOrReadKeyless, removeKeyless };
function hasSrcAppDir() {
const { existsSync } = safeNodeRuntimeFs();
const path = safeNodeRuntimePath();

const projectWithAppSrc = path.join(process.cwd(), 'src', 'app');

return !!existsSync(projectWithAppSrc);
}

function suggestMiddlewareLocation() {
const suggestionMessage = (to?: 'src/', from?: 'src/app/' | 'app/') =>
`Clerk: Move your middleware file to ./${to || ''}middleware.ts. Currently located at ./${from || ''}middleware.ts`;

const { existsSync } = safeNodeRuntimeFs();
const path = safeNodeRuntimePath();

const projectWithAppSrcPath = path.join(process.cwd(), 'src', 'app');
const projectWithAppPath = path.join(process.cwd(), 'app');

if (existsSync(projectWithAppSrcPath)) {
if (existsSync(path.join(projectWithAppSrcPath, 'middleware.ts'))) {
return suggestionMessage('src/', 'src/app/');
}

if (existsSync(path.join(process.cwd(), 'middleware.ts'))) {
return suggestionMessage('src/');
}

// default error
return undefined;
}

if (existsSync(projectWithAppPath)) {
if (existsSync(path.join(projectWithAppPath, 'middleware.ts'))) {
return suggestionMessage(undefined, 'app/');
}
// default error
return undefined;
}

return undefined;
}

export { createOrReadKeyless, removeKeyless, suggestMiddlewareLocation, hasSrcAppDir };
12 changes: 12 additions & 0 deletions packages/nextjs/src/utils/only-try.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
/**
* Discards errors thrown by attempted code
*/
const onlyTry = (cb: () => unknown) => {
try {
cb();
} catch {
// ignore
}
};

export { onlyTry };
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
5 changes: 5 additions & 0 deletions .changeset/fuzzy-rockets-smash.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/nextjs': patch
---

Improve error messages when `clerkMiddleware` is missing by suggesting the correct path to place the `middleware.ts` file.
10 changes: 1 addition & 9 deletions packages/nextjs/src/app-router/server/ClerkProvider.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import { getDynamicAuthData } from '../../server/buildClerkProps';
import type { NextClerkProviderProps } from '../../types';
import { canUseKeyless } from '../../utils/feature-flags';
import { mergeNextClerkPropsWithEnv } from '../../utils/mergeNextClerkPropsWithEnv';
import { onlyTry } from '../../utils/only-try';
import { isNext13 } from '../../utils/sdk-versions';
import { ClientClerkProvider } from '../client/ClerkProvider';
import { deleteKeylessAction } from '../keyless-actions';
Expand All@@ -23,15 +24,6 @@ const getNonceFromCSPHeader = React.cache(async function getNonceFromCSPHeader()
return getScriptNonceFromHeader((await headers()).get('Content-Security-Policy') || '') || '';
});

/** Discards errors thrown by attempted code */
const onlyTry = (cb: () => unknown) => {
try {
cb();
} catch {
// ignore
}
};

export async function ClerkProvider(
props: Without<NextClerkProviderProps, '__unstable_invokeMiddlewareOnAuthStateChange'>,
) {
Expand Down
22 changes: 19 additions & 3 deletions packages/nextjs/src/app-router/server/auth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,12 +3,13 @@ import { constants, createClerkRequest, createRedirect, type RedirectFun } from
import { notFound, redirect } from 'next/navigation';

import { PUBLISHABLE_KEY, SIGN_IN_URL, SIGN_UP_URL } from '../../server/constants';
import { createGetAuth } from '../../server/createGetAuth';
import { createAsyncGetAuth } from '../../server/createGetAuth';
import { authAuthHeaderMissing } from '../../server/errors';
import { getAuthKeyFromRequest, getHeader } from '../../server/headers-utils';
import type { AuthProtect } from '../../server/protect';
import { createProtect } from '../../server/protect';
import { decryptClerkRequestData } from '../../server/utils';
import { isNextWithUnstableServerActions } from '../../utils/sdk-versions';
import { buildRequestLike } from './utils';

/**
Expand All@@ -25,8 +26,10 @@ type Auth = AuthObject & {
*/
redirectToSignIn: RedirectFun<ReturnType<typeof redirect>>;
};

export interface AuthFn {
(): Promise<Auth>;

/**
* `auth` includes a single property, the `protect()` method, which you can use in two ways:
* - to check if a user is authenticated (signed in)
Expand DownExpand Up@@ -60,9 +63,22 @@ export const auth: AuthFn = async () => {
require('server-only');

const request = await buildRequestLike();
const authObject = createGetAuth({

const stepsBasedOnSrcDirectory = async () => {
if (isNextWithUnstableServerActions) {
return [];
}

try {
const isSrcAppDir = await import('../../server/keyless-node.js').then(m => m.hasSrcAppDir());
return [`Your Middleware exists at ./${isSrcAppDir ? 'src/' : ''}middleware.ts`];
} catch {
return [];
}
};
const authObject = await createAsyncGetAuth({
debugLoggerName: 'auth()',
noAuthStatusMessage: authAuthHeaderMissing(),
noAuthStatusMessage: authAuthHeaderMissing('auth', await stepsBasedOnSrcDirectory()),
})(request);

const clerkUrl = getAuthKeyFromRequest(request, 'ClerkUrl');
Expand Down
2 changes: 1 addition & 1 deletion packages/nextjs/src/app-router/server/utils.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@ export async function buildRequestLike(): Promise<NextRequest> {
}

throw new Error(
`Clerk: auth()and currentUser() are only supported in App Router (/app directory).\nIf you're using /pages, try getAuth() instead.\nOriginal error: ${e}`,
`Clerk: auth(), currentUser() and clerkClient(), are only supported in App Router (/app directory).\nIf you're using /pages, try getAuth() instead.\nOriginal error: ${e}`,

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Our relatively new clerkClient() also depends on headers()

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch

);
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/nextjs/src/server/__tests__/createGetAuth.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import hmacSHA1 from 'crypto-js/hmac-sha1';
import { NextRequest } from 'next/server';
import { describe, expect, it } from 'vitest';

import { createGetAuth, getAuth } from '../createGetAuth';
import { createSyncGetAuth, getAuth } from '../createGetAuth';

const mockSecretKey = 'sk_test_mock';

Expand All@@ -16,7 +16,7 @@ const mockTokenSignature = hmacSHA1(mockToken, 'sk_test_mock').toString();

describe('createGetAuth(opts)', () => {
it('returns a getAuth function', () => {
expect(createGetAuth({ debugLoggerName: 'test', noAuthStatusMessage: 'test' })).toBeInstanceOf(Function);
expect(createSyncGetAuth({ debugLoggerName: 'test', noAuthStatusMessage: 'test' })).toBeInstanceOf(Function);
});
});

Expand Down
46 changes: 40 additions & 6 deletions packages/nextjs/src/server/createGetAuth.ts
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,63 @@
import type { AuthObject } from '@clerk/backend';
import { constants } from '@clerk/backend/internal';
import { isTruthy } from '@clerk/shared/underscore';

import { withLogger } from '../utils/debugLogger';
import { isNextWithUnstableServerActions } from '../utils/sdk-versions';
import { getAuthDataFromRequest } from './data/getAuthDataFromRequest';
import { getAuthAuthHeaderMissing } from './errors';
import { getHeader } from './headers-utils';
import { detectClerkMiddleware, getHeader } from './headers-utils';
import type { RequestLike } from './types';
import { assertAuthStatus } from './utils';

export const createGetAuth = ({
export const createAsyncGetAuth = ({
debugLoggerName,
noAuthStatusMessage,
}: {
debugLoggerName: string;
noAuthStatusMessage: string;
}) =>
withLogger(debugLoggerName, logger => {
return async (req: RequestLike, opts?: { secretKey?: string }) => {
if (isTruthy(getHeader(req, constants.Headers.EnableDebug))) {
logger.enable();
}

if (!detectClerkMiddleware(req)) {
// Keep the same behaviour for versions that may have issues with bundling `node:fs`
if (isNextWithUnstableServerActions) {
assertAuthStatus(req, noAuthStatusMessage);
}

const missConfiguredMiddlewareLocation = await import('./keyless-node.js')
.then(m => m.suggestMiddlewareLocation())
.catch(() => undefined);

if (missConfiguredMiddlewareLocation) {
throw new Error(missConfiguredMiddlewareLocation);
}

// still throw there is no suggested move location
assertAuthStatus(req, noAuthStatusMessage);
}

return getAuthDataFromRequest(req, { ...opts, logger });
};
});

export const createSyncGetAuth = ({
debugLoggerName,
noAuthStatusMessage,
}: {
debugLoggerName: string;
noAuthStatusMessage: string;
}) =>
withLogger(debugLoggerName, logger => {
return (req: RequestLike, opts?: { secretKey?: string }): AuthObject => {
return (req: RequestLike, opts?: { secretKey?: string }) => {
if (isTruthy(getHeader(req, constants.Headers.EnableDebug))) {
logger.enable();
}

assertAuthStatus(req, noAuthStatusMessage);

return getAuthDataFromRequest(req, { ...opts, logger });
};
});
Expand DownExpand Up@@ -107,7 +141,7 @@ export const createGetAuth = ({
* }
* ```
*/
export const getAuth = createGetAuth({
export const getAuth = createSyncGetAuth({
debugLoggerName: 'getAuth()',
noAuthStatusMessage: getAuthAuthHeaderMissing(),
});
4 changes: 2 additions & 2 deletions packages/nextjs/src/server/errors.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,9 +20,9 @@ Check if signInUrl is missing from your configuration or if it is not an absolut

export const getAuthAuthHeaderMissing = () => authAuthHeaderMissing('getAuth');

export const authAuthHeaderMissing = (helperName = 'auth') =>
export const authAuthHeaderMissing = (helperName = 'auth', prefixSteps?: string[]) =>
`Clerk: ${helperName}() was called but Clerk can't detect usage of clerkMiddleware(). Please ensure the following:
- clerkMiddleware() is used in your Next.js Middleware.
- ${prefixSteps ? [...prefixSteps, ''].join('\n- ') : ' '}clerkMiddleware() is used in your Next.js Middleware.
- Your Middleware matcher is configured to match this route or page.
- If you are using the src directory, make sure the Middleware file is inside of it.

Expand Down
45 changes: 44 additions & 1 deletion packages/nextjs/src/server/keyless-node.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -209,4 +209,47 @@ function removeKeyless() {
unlockFileWriting();
}

export { createOrReadKeyless, removeKeyless };
function hasSrcAppDir() {
const { existsSync } = safeNodeRuntimeFs();
const path = safeNodeRuntimePath();

const projectWithAppSrc = path.join(process.cwd(), 'src', 'app');

return !!existsSync(projectWithAppSrc);
}

function suggestMiddlewareLocation() {
const suggestionMessage = (to?: 'src/', from?: 'src/app/' | 'app/') =>
`Clerk: Move your middleware file to ./${to || ''}middleware.ts. Currently located at ./${from || ''}middleware.ts`;

const { existsSync } = safeNodeRuntimeFs();
const path = safeNodeRuntimePath();

const projectWithAppSrcPath = path.join(process.cwd(), 'src', 'app');
const projectWithAppPath = path.join(process.cwd(), 'app');

if (existsSync(projectWithAppSrcPath)) {
if (existsSync(path.join(projectWithAppSrcPath, 'middleware.ts'))) {
return suggestionMessage('src/', 'src/app/');
}

if (existsSync(path.join(process.cwd(), 'middleware.ts'))) {
return suggestionMessage('src/');
}

// default error
return undefined;
}

if (existsSync(projectWithAppPath)) {
if (existsSync(path.join(projectWithAppPath, 'middleware.ts'))) {
return suggestionMessage(undefined, 'app/');
}
// default error
return undefined;
}

return undefined;
}

export { createOrReadKeyless, removeKeyless, suggestMiddlewareLocation, hasSrcAppDir };
12 changes: 12 additions & 0 deletions packages/nextjs/src/utils/only-try.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
/**
* Discards errors thrown by attempted code
*/
const onlyTry = (cb: () => unknown) => {
try {
cb();
} catch {
// ignore
}
};

export { onlyTry };
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
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
5 changes: 5 additions & 0 deletions .changeset/fuzzy-rockets-smash.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/nextjs': patch
---

Improve error messages when `clerkMiddleware` is missing by suggesting the correct path to place the `middleware.ts` file.
10 changes: 1 addition & 9 deletions packages/nextjs/src/app-router/server/ClerkProvider.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import { getDynamicAuthData } from '../../server/buildClerkProps';
import type { NextClerkProviderProps } from '../../types';
import { canUseKeyless } from '../../utils/feature-flags';
import { mergeNextClerkPropsWithEnv } from '../../utils/mergeNextClerkPropsWithEnv';
import { onlyTry } from '../../utils/only-try';
import { isNext13 } from '../../utils/sdk-versions';
import { ClientClerkProvider } from '../client/ClerkProvider';
import { deleteKeylessAction } from '../keyless-actions';
Expand All@@ -23,15 +24,6 @@ const getNonceFromCSPHeader = React.cache(async function getNonceFromCSPHeader()
return getScriptNonceFromHeader((await headers()).get('Content-Security-Policy') || '') || '';
});

/** Discards errors thrown by attempted code */
const onlyTry = (cb: () => unknown) => {
try {
cb();
} catch {
// ignore
}
};

export async function ClerkProvider(
props: Without<NextClerkProviderProps, '__unstable_invokeMiddlewareOnAuthStateChange'>,
) {
Expand Down
22 changes: 19 additions & 3 deletions packages/nextjs/src/app-router/server/auth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,12 +3,13 @@ import { constants, createClerkRequest, createRedirect, type RedirectFun } from
import { notFound, redirect } from 'next/navigation';

import { PUBLISHABLE_KEY, SIGN_IN_URL, SIGN_UP_URL } from '../../server/constants';
import { createGetAuth } from '../../server/createGetAuth';
import { createAsyncGetAuth } from '../../server/createGetAuth';
import { authAuthHeaderMissing } from '../../server/errors';
import { getAuthKeyFromRequest, getHeader } from '../../server/headers-utils';
import type { AuthProtect } from '../../server/protect';
import { createProtect } from '../../server/protect';
import { decryptClerkRequestData } from '../../server/utils';
import { isNextWithUnstableServerActions } from '../../utils/sdk-versions';
import { buildRequestLike } from './utils';

/**
Expand All@@ -25,8 +26,10 @@ type Auth = AuthObject & {
*/
redirectToSignIn: RedirectFun<ReturnType<typeof redirect>>;
};

export interface AuthFn {
(): Promise<Auth>;

/**
* `auth` includes a single property, the `protect()` method, which you can use in two ways:
* - to check if a user is authenticated (signed in)
Expand DownExpand Up@@ -60,9 +63,22 @@ export const auth: AuthFn = async () => {
require('server-only');

const request = await buildRequestLike();
const authObject = createGetAuth({

const stepsBasedOnSrcDirectory = async () => {
if (isNextWithUnstableServerActions) {
return [];
}

try {
const isSrcAppDir = await import('../../server/keyless-node.js').then(m => m.hasSrcAppDir());
return [`Your Middleware exists at ./${isSrcAppDir ? 'src/' : ''}middleware.ts`];
} catch {
return [];
}
};
const authObject = await createAsyncGetAuth({
debugLoggerName: 'auth()',
noAuthStatusMessage: authAuthHeaderMissing(),
noAuthStatusMessage: authAuthHeaderMissing('auth', await stepsBasedOnSrcDirectory()),
})(request);

const clerkUrl = getAuthKeyFromRequest(request, 'ClerkUrl');
Expand Down
2 changes: 1 addition & 1 deletion packages/nextjs/src/app-router/server/utils.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@ export async function buildRequestLike(): Promise<NextRequest> {
}

throw new Error(
`Clerk: auth()and currentUser() are only supported in App Router (/app directory).\nIf you're using /pages, try getAuth() instead.\nOriginal error: ${e}`,
`Clerk: auth(), currentUser() and clerkClient(), are only supported in App Router (/app directory).\nIf you're using /pages, try getAuth() instead.\nOriginal error: ${e}`,

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Our relatively new clerkClient() also depends on headers()

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch

);
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/nextjs/src/server/__tests__/createGetAuth.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import hmacSHA1 from 'crypto-js/hmac-sha1';
import { NextRequest } from 'next/server';
import { describe, expect, it } from 'vitest';

import { createGetAuth, getAuth } from '../createGetAuth';
import { createSyncGetAuth, getAuth } from '../createGetAuth';

const mockSecretKey = 'sk_test_mock';

Expand All@@ -16,7 +16,7 @@ const mockTokenSignature = hmacSHA1(mockToken, 'sk_test_mock').toString();

describe('createGetAuth(opts)', () => {
it('returns a getAuth function', () => {
expect(createGetAuth({ debugLoggerName: 'test', noAuthStatusMessage: 'test' })).toBeInstanceOf(Function);
expect(createSyncGetAuth({ debugLoggerName: 'test', noAuthStatusMessage: 'test' })).toBeInstanceOf(Function);
});
});

Expand Down
46 changes: 40 additions & 6 deletions packages/nextjs/src/server/createGetAuth.ts
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,63 @@
import type { AuthObject } from '@clerk/backend';
import { constants } from '@clerk/backend/internal';
import { isTruthy } from '@clerk/shared/underscore';

import { withLogger } from '../utils/debugLogger';
import { isNextWithUnstableServerActions } from '../utils/sdk-versions';
import { getAuthDataFromRequest } from './data/getAuthDataFromRequest';
import { getAuthAuthHeaderMissing } from './errors';
import { getHeader } from './headers-utils';
import { detectClerkMiddleware, getHeader } from './headers-utils';
import type { RequestLike } from './types';
import { assertAuthStatus } from './utils';

export const createGetAuth = ({
export const createAsyncGetAuth = ({
debugLoggerName,
noAuthStatusMessage,
}: {
debugLoggerName: string;
noAuthStatusMessage: string;
}) =>
withLogger(debugLoggerName, logger => {
return async (req: RequestLike, opts?: { secretKey?: string }) => {
if (isTruthy(getHeader(req, constants.Headers.EnableDebug))) {
logger.enable();
}

if (!detectClerkMiddleware(req)) {
// Keep the same behaviour for versions that may have issues with bundling `node:fs`
if (isNextWithUnstableServerActions) {
assertAuthStatus(req, noAuthStatusMessage);
}

const missConfiguredMiddlewareLocation = await import('./keyless-node.js')
.then(m => m.suggestMiddlewareLocation())
.catch(() => undefined);

if (missConfiguredMiddlewareLocation) {
throw new Error(missConfiguredMiddlewareLocation);
}

// still throw there is no suggested move location
assertAuthStatus(req, noAuthStatusMessage);
}

return getAuthDataFromRequest(req, { ...opts, logger });
};
});

export const createSyncGetAuth = ({
debugLoggerName,
noAuthStatusMessage,
}: {
debugLoggerName: string;
noAuthStatusMessage: string;
}) =>
withLogger(debugLoggerName, logger => {
return (req: RequestLike, opts?: { secretKey?: string }): AuthObject => {
return (req: RequestLike, opts?: { secretKey?: string }) => {
if (isTruthy(getHeader(req, constants.Headers.EnableDebug))) {
logger.enable();
}

assertAuthStatus(req, noAuthStatusMessage);

return getAuthDataFromRequest(req, { ...opts, logger });
};
});
Expand DownExpand Up@@ -107,7 +141,7 @@ export const createGetAuth = ({
* }
* ```
*/
export const getAuth = createGetAuth({
export const getAuth = createSyncGetAuth({
debugLoggerName: 'getAuth()',
noAuthStatusMessage: getAuthAuthHeaderMissing(),
});
4 changes: 2 additions & 2 deletions packages/nextjs/src/server/errors.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,9 +20,9 @@ Check if signInUrl is missing from your configuration or if it is not an absolut

export const getAuthAuthHeaderMissing = () => authAuthHeaderMissing('getAuth');

export const authAuthHeaderMissing = (helperName = 'auth') =>
export const authAuthHeaderMissing = (helperName = 'auth', prefixSteps?: string[]) =>
`Clerk: ${helperName}() was called but Clerk can't detect usage of clerkMiddleware(). Please ensure the following:
- clerkMiddleware() is used in your Next.js Middleware.
- ${prefixSteps ? [...prefixSteps, ''].join('\n- ') : ' '}clerkMiddleware() is used in your Next.js Middleware.
- Your Middleware matcher is configured to match this route or page.
- If you are using the src directory, make sure the Middleware file is inside of it.

Expand Down
45 changes: 44 additions & 1 deletion packages/nextjs/src/server/keyless-node.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -209,4 +209,47 @@ function removeKeyless() {
unlockFileWriting();
}

export { createOrReadKeyless, removeKeyless };
function hasSrcAppDir() {
const { existsSync } = safeNodeRuntimeFs();
const path = safeNodeRuntimePath();

const projectWithAppSrc = path.join(process.cwd(), 'src', 'app');

return !!existsSync(projectWithAppSrc);
}

function suggestMiddlewareLocation() {
const suggestionMessage = (to?: 'src/', from?: 'src/app/' | 'app/') =>
`Clerk: Move your middleware file to ./${to || ''}middleware.ts. Currently located at ./${from || ''}middleware.ts`;

const { existsSync } = safeNodeRuntimeFs();
const path = safeNodeRuntimePath();

const projectWithAppSrcPath = path.join(process.cwd(), 'src', 'app');
const projectWithAppPath = path.join(process.cwd(), 'app');

if (existsSync(projectWithAppSrcPath)) {
if (existsSync(path.join(projectWithAppSrcPath, 'middleware.ts'))) {
return suggestionMessage('src/', 'src/app/');
}

if (existsSync(path.join(process.cwd(), 'middleware.ts'))) {
return suggestionMessage('src/');
}

// default error
return undefined;
}

if (existsSync(projectWithAppPath)) {
if (existsSync(path.join(projectWithAppPath, 'middleware.ts'))) {
return suggestionMessage(undefined, 'app/');
}
// default error
return undefined;
}

return undefined;
}

export { createOrReadKeyless, removeKeyless, suggestMiddlewareLocation, hasSrcAppDir };
12 changes: 12 additions & 0 deletions packages/nextjs/src/utils/only-try.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
/**
* Discards errors thrown by attempted code
*/
const onlyTry = (cb: () => unknown) => {
try {
cb();
} catch {
// ignore
}
};

export { onlyTry };
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
5 changes: 5 additions & 0 deletions .changeset/fuzzy-rockets-smash.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/nextjs': patch
---

Improve error messages when `clerkMiddleware` is missing by suggesting the correct path to place the `middleware.ts` file.
10 changes: 1 addition & 9 deletions packages/nextjs/src/app-router/server/ClerkProvider.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import { getDynamicAuthData } from '../../server/buildClerkProps';
import type { NextClerkProviderProps } from '../../types';
import { canUseKeyless } from '../../utils/feature-flags';
import { mergeNextClerkPropsWithEnv } from '../../utils/mergeNextClerkPropsWithEnv';
import { onlyTry } from '../../utils/only-try';
import { isNext13 } from '../../utils/sdk-versions';
import { ClientClerkProvider } from '../client/ClerkProvider';
import { deleteKeylessAction } from '../keyless-actions';
Expand All@@ -23,15 +24,6 @@ const getNonceFromCSPHeader = React.cache(async function getNonceFromCSPHeader()
return getScriptNonceFromHeader((await headers()).get('Content-Security-Policy') || '') || '';
});

/** Discards errors thrown by attempted code */
const onlyTry = (cb: () => unknown) => {
try {
cb();
} catch {
// ignore
}
};

export async function ClerkProvider(
props: Without<NextClerkProviderProps, '__unstable_invokeMiddlewareOnAuthStateChange'>,
) {
Expand Down
22 changes: 19 additions & 3 deletions packages/nextjs/src/app-router/server/auth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,12 +3,13 @@ import { constants, createClerkRequest, createRedirect, type RedirectFun } from
import { notFound, redirect } from 'next/navigation';

import { PUBLISHABLE_KEY, SIGN_IN_URL, SIGN_UP_URL } from '../../server/constants';
import { createGetAuth } from '../../server/createGetAuth';
import { createAsyncGetAuth } from '../../server/createGetAuth';
import { authAuthHeaderMissing } from '../../server/errors';
import { getAuthKeyFromRequest, getHeader } from '../../server/headers-utils';
import type { AuthProtect } from '../../server/protect';
import { createProtect } from '../../server/protect';
import { decryptClerkRequestData } from '../../server/utils';
import { isNextWithUnstableServerActions } from '../../utils/sdk-versions';
import { buildRequestLike } from './utils';

/**
Expand All@@ -25,8 +26,10 @@ type Auth = AuthObject & {
*/
redirectToSignIn: RedirectFun<ReturnType<typeof redirect>>;
};

export interface AuthFn {
(): Promise<Auth>;

/**
* `auth` includes a single property, the `protect()` method, which you can use in two ways:
* - to check if a user is authenticated (signed in)
Expand DownExpand Up@@ -60,9 +63,22 @@ export const auth: AuthFn = async () => {
require('server-only');

const request = await buildRequestLike();
const authObject = createGetAuth({

const stepsBasedOnSrcDirectory = async () => {
if (isNextWithUnstableServerActions) {
return [];
}

try {
const isSrcAppDir = await import('../../server/keyless-node.js').then(m => m.hasSrcAppDir());
return [`Your Middleware exists at ./${isSrcAppDir ? 'src/' : ''}middleware.ts`];
} catch {
return [];
}
};
const authObject = await createAsyncGetAuth({
debugLoggerName: 'auth()',
noAuthStatusMessage: authAuthHeaderMissing(),
noAuthStatusMessage: authAuthHeaderMissing('auth', await stepsBasedOnSrcDirectory()),
})(request);

const clerkUrl = getAuthKeyFromRequest(request, 'ClerkUrl');
Expand Down
2 changes: 1 addition & 1 deletion packages/nextjs/src/app-router/server/utils.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@ export async function buildRequestLike(): Promise<NextRequest> {
}

throw new Error(
`Clerk: auth()and currentUser() are only supported in App Router (/app directory).\nIf you're using /pages, try getAuth() instead.\nOriginal error: ${e}`,
`Clerk: auth(), currentUser() and clerkClient(), are only supported in App Router (/app directory).\nIf you're using /pages, try getAuth() instead.\nOriginal error: ${e}`,

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Our relatively new clerkClient() also depends on headers()

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch

);
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/nextjs/src/server/__tests__/createGetAuth.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import hmacSHA1 from 'crypto-js/hmac-sha1';
import { NextRequest } from 'next/server';
import { describe, expect, it } from 'vitest';

import { createGetAuth, getAuth } from '../createGetAuth';
import { createSyncGetAuth, getAuth } from '../createGetAuth';

const mockSecretKey = 'sk_test_mock';

Expand All@@ -16,7 +16,7 @@ const mockTokenSignature = hmacSHA1(mockToken, 'sk_test_mock').toString();

describe('createGetAuth(opts)', () => {
it('returns a getAuth function', () => {
expect(createGetAuth({ debugLoggerName: 'test', noAuthStatusMessage: 'test' })).toBeInstanceOf(Function);
expect(createSyncGetAuth({ debugLoggerName: 'test', noAuthStatusMessage: 'test' })).toBeInstanceOf(Function);
});
});

Expand Down
46 changes: 40 additions & 6 deletions packages/nextjs/src/server/createGetAuth.ts
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,63 @@
import type { AuthObject } from '@clerk/backend';
import { constants } from '@clerk/backend/internal';
import { isTruthy } from '@clerk/shared/underscore';

import { withLogger } from '../utils/debugLogger';
import { isNextWithUnstableServerActions } from '../utils/sdk-versions';
import { getAuthDataFromRequest } from './data/getAuthDataFromRequest';
import { getAuthAuthHeaderMissing } from './errors';
import { getHeader } from './headers-utils';
import { detectClerkMiddleware, getHeader } from './headers-utils';
import type { RequestLike } from './types';
import { assertAuthStatus } from './utils';

export const createGetAuth = ({
export const createAsyncGetAuth = ({
debugLoggerName,
noAuthStatusMessage,
}: {
debugLoggerName: string;
noAuthStatusMessage: string;
}) =>
withLogger(debugLoggerName, logger => {
return async (req: RequestLike, opts?: { secretKey?: string }) => {
if (isTruthy(getHeader(req, constants.Headers.EnableDebug))) {
logger.enable();
}

if (!detectClerkMiddleware(req)) {
// Keep the same behaviour for versions that may have issues with bundling `node:fs`
if (isNextWithUnstableServerActions) {
assertAuthStatus(req, noAuthStatusMessage);
}

const missConfiguredMiddlewareLocation = await import('./keyless-node.js')
.then(m => m.suggestMiddlewareLocation())
.catch(() => undefined);

if (missConfiguredMiddlewareLocation) {
throw new Error(missConfiguredMiddlewareLocation);
}

// still throw there is no suggested move location
assertAuthStatus(req, noAuthStatusMessage);
}

return getAuthDataFromRequest(req, { ...opts, logger });
};
});

export const createSyncGetAuth = ({
debugLoggerName,
noAuthStatusMessage,
}: {
debugLoggerName: string;
noAuthStatusMessage: string;
}) =>
withLogger(debugLoggerName, logger => {
return (req: RequestLike, opts?: { secretKey?: string }): AuthObject => {
return (req: RequestLike, opts?: { secretKey?: string }) => {
if (isTruthy(getHeader(req, constants.Headers.EnableDebug))) {
logger.enable();
}

assertAuthStatus(req, noAuthStatusMessage);

return getAuthDataFromRequest(req, { ...opts, logger });
};
});
Expand DownExpand Up@@ -107,7 +141,7 @@ export const createGetAuth = ({
* }
* ```
*/
export const getAuth = createGetAuth({
export const getAuth = createSyncGetAuth({
debugLoggerName: 'getAuth()',
noAuthStatusMessage: getAuthAuthHeaderMissing(),
});
4 changes: 2 additions & 2 deletions packages/nextjs/src/server/errors.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,9 +20,9 @@ Check if signInUrl is missing from your configuration or if it is not an absolut

export const getAuthAuthHeaderMissing = () => authAuthHeaderMissing('getAuth');

export const authAuthHeaderMissing = (helperName = 'auth') =>
export const authAuthHeaderMissing = (helperName = 'auth', prefixSteps?: string[]) =>
`Clerk: ${helperName}() was called but Clerk can't detect usage of clerkMiddleware(). Please ensure the following:
- clerkMiddleware() is used in your Next.js Middleware.
- ${prefixSteps ? [...prefixSteps, ''].join('\n- ') : ' '}clerkMiddleware() is used in your Next.js Middleware.
- Your Middleware matcher is configured to match this route or page.
- If you are using the src directory, make sure the Middleware file is inside of it.

Expand Down
45 changes: 44 additions & 1 deletion packages/nextjs/src/server/keyless-node.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -209,4 +209,47 @@ function removeKeyless() {
unlockFileWriting();
}

export { createOrReadKeyless, removeKeyless };
function hasSrcAppDir() {
const { existsSync } = safeNodeRuntimeFs();
const path = safeNodeRuntimePath();

const projectWithAppSrc = path.join(process.cwd(), 'src', 'app');

return !!existsSync(projectWithAppSrc);
}

function suggestMiddlewareLocation() {
const suggestionMessage = (to?: 'src/', from?: 'src/app/' | 'app/') =>
`Clerk: Move your middleware file to ./${to || ''}middleware.ts. Currently located at ./${from || ''}middleware.ts`;

const { existsSync } = safeNodeRuntimeFs();
const path = safeNodeRuntimePath();

const projectWithAppSrcPath = path.join(process.cwd(), 'src', 'app');
const projectWithAppPath = path.join(process.cwd(), 'app');

if (existsSync(projectWithAppSrcPath)) {
if (existsSync(path.join(projectWithAppSrcPath, 'middleware.ts'))) {
return suggestionMessage('src/', 'src/app/');
}

if (existsSync(path.join(process.cwd(), 'middleware.ts'))) {
return suggestionMessage('src/');
}

// default error
return undefined;
}

if (existsSync(projectWithAppPath)) {
if (existsSync(path.join(projectWithAppPath, 'middleware.ts'))) {
return suggestionMessage(undefined, 'app/');
}
// default error
return undefined;
}

return undefined;
}

export { createOrReadKeyless, removeKeyless, suggestMiddlewareLocation, hasSrcAppDir };
12 changes: 12 additions & 0 deletions packages/nextjs/src/utils/only-try.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
/**
* Discards errors thrown by attempted code
*/
const onlyTry = (cb: () => unknown) => {
try {
cb();
} catch {
// ignore
}
};

export { onlyTry };
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
5 changes: 5 additions & 0 deletions .changeset/fuzzy-rockets-smash.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/nextjs': patch
---

Improve error messages when `clerkMiddleware` is missing by suggesting the correct path to place the `middleware.ts` file.
10 changes: 1 addition & 9 deletions packages/nextjs/src/app-router/server/ClerkProvider.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import { getDynamicAuthData } from '../../server/buildClerkProps';
import type { NextClerkProviderProps } from '../../types';
import { canUseKeyless } from '../../utils/feature-flags';
import { mergeNextClerkPropsWithEnv } from '../../utils/mergeNextClerkPropsWithEnv';
import { onlyTry } from '../../utils/only-try';
import { isNext13 } from '../../utils/sdk-versions';
import { ClientClerkProvider } from '../client/ClerkProvider';
import { deleteKeylessAction } from '../keyless-actions';
Expand All@@ -23,15 +24,6 @@ const getNonceFromCSPHeader = React.cache(async function getNonceFromCSPHeader()
return getScriptNonceFromHeader((await headers()).get('Content-Security-Policy') || '') || '';
});

/** Discards errors thrown by attempted code */
const onlyTry = (cb: () => unknown) => {
try {
cb();
} catch {
// ignore
}
};

export async function ClerkProvider(
props: Without<NextClerkProviderProps, '__unstable_invokeMiddlewareOnAuthStateChange'>,
) {
Expand Down
22 changes: 19 additions & 3 deletions packages/nextjs/src/app-router/server/auth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,12 +3,13 @@ import { constants, createClerkRequest, createRedirect, type RedirectFun } from
import { notFound, redirect } from 'next/navigation';

import { PUBLISHABLE_KEY, SIGN_IN_URL, SIGN_UP_URL } from '../../server/constants';
import { createGetAuth } from '../../server/createGetAuth';
import { createAsyncGetAuth } from '../../server/createGetAuth';
import { authAuthHeaderMissing } from '../../server/errors';
import { getAuthKeyFromRequest, getHeader } from '../../server/headers-utils';
import type { AuthProtect } from '../../server/protect';
import { createProtect } from '../../server/protect';
import { decryptClerkRequestData } from '../../server/utils';
import { isNextWithUnstableServerActions } from '../../utils/sdk-versions';
import { buildRequestLike } from './utils';

/**
Expand All@@ -25,8 +26,10 @@ type Auth = AuthObject & {
*/
redirectToSignIn: RedirectFun<ReturnType<typeof redirect>>;
};

export interface AuthFn {
(): Promise<Auth>;

/**
* `auth` includes a single property, the `protect()` method, which you can use in two ways:
* - to check if a user is authenticated (signed in)
Expand DownExpand Up@@ -60,9 +63,22 @@ export const auth: AuthFn = async () => {
require('server-only');

const request = await buildRequestLike();
const authObject = createGetAuth({

const stepsBasedOnSrcDirectory = async () => {
if (isNextWithUnstableServerActions) {
return [];
}

try {
const isSrcAppDir = await import('../../server/keyless-node.js').then(m => m.hasSrcAppDir());
return [`Your Middleware exists at ./${isSrcAppDir ? 'src/' : ''}middleware.ts`];
} catch {
return [];
}
};
const authObject = await createAsyncGetAuth({
debugLoggerName: 'auth()',
noAuthStatusMessage: authAuthHeaderMissing(),
noAuthStatusMessage: authAuthHeaderMissing('auth', await stepsBasedOnSrcDirectory()),
})(request);

const clerkUrl = getAuthKeyFromRequest(request, 'ClerkUrl');
Expand Down
2 changes: 1 addition & 1 deletion packages/nextjs/src/app-router/server/utils.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@ export async function buildRequestLike(): Promise<NextRequest> {
}

throw new Error(
`Clerk: auth()and currentUser() are only supported in App Router (/app directory).\nIf you're using /pages, try getAuth() instead.\nOriginal error: ${e}`,
`Clerk: auth(), currentUser() and clerkClient(), are only supported in App Router (/app directory).\nIf you're using /pages, try getAuth() instead.\nOriginal error: ${e}`,

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Our relatively new clerkClient() also depends on headers()

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch

);
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/nextjs/src/server/__tests__/createGetAuth.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import hmacSHA1 from 'crypto-js/hmac-sha1';
import { NextRequest } from 'next/server';
import { describe, expect, it } from 'vitest';

import { createGetAuth, getAuth } from '../createGetAuth';
import { createSyncGetAuth, getAuth } from '../createGetAuth';

const mockSecretKey = 'sk_test_mock';

Expand All@@ -16,7 +16,7 @@ const mockTokenSignature = hmacSHA1(mockToken, 'sk_test_mock').toString();

describe('createGetAuth(opts)', () => {
it('returns a getAuth function', () => {
expect(createGetAuth({ debugLoggerName: 'test', noAuthStatusMessage: 'test' })).toBeInstanceOf(Function);
expect(createSyncGetAuth({ debugLoggerName: 'test', noAuthStatusMessage: 'test' })).toBeInstanceOf(Function);
});
});

Expand Down
46 changes: 40 additions & 6 deletions packages/nextjs/src/server/createGetAuth.ts
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,63 @@
import type { AuthObject } from '@clerk/backend';
import { constants } from '@clerk/backend/internal';
import { isTruthy } from '@clerk/shared/underscore';

import { withLogger } from '../utils/debugLogger';
import { isNextWithUnstableServerActions } from '../utils/sdk-versions';
import { getAuthDataFromRequest } from './data/getAuthDataFromRequest';
import { getAuthAuthHeaderMissing } from './errors';
import { getHeader } from './headers-utils';
import { detectClerkMiddleware, getHeader } from './headers-utils';
import type { RequestLike } from './types';
import { assertAuthStatus } from './utils';

export const createGetAuth = ({
export const createAsyncGetAuth = ({
debugLoggerName,
noAuthStatusMessage,
}: {
debugLoggerName: string;
noAuthStatusMessage: string;
}) =>
withLogger(debugLoggerName, logger => {
return async (req: RequestLike, opts?: { secretKey?: string }) => {
if (isTruthy(getHeader(req, constants.Headers.EnableDebug))) {
logger.enable();
}

if (!detectClerkMiddleware(req)) {
// Keep the same behaviour for versions that may have issues with bundling `node:fs`
if (isNextWithUnstableServerActions) {
assertAuthStatus(req, noAuthStatusMessage);
}

const missConfiguredMiddlewareLocation = await import('./keyless-node.js')
.then(m => m.suggestMiddlewareLocation())
.catch(() => undefined);

if (missConfiguredMiddlewareLocation) {
throw new Error(missConfiguredMiddlewareLocation);
}

// still throw there is no suggested move location
assertAuthStatus(req, noAuthStatusMessage);
}

return getAuthDataFromRequest(req, { ...opts, logger });
};
});

export const createSyncGetAuth = ({
debugLoggerName,
noAuthStatusMessage,
}: {
debugLoggerName: string;
noAuthStatusMessage: string;
}) =>
withLogger(debugLoggerName, logger => {
return (req: RequestLike, opts?: { secretKey?: string }): AuthObject => {
return (req: RequestLike, opts?: { secretKey?: string }) => {
if (isTruthy(getHeader(req, constants.Headers.EnableDebug))) {
logger.enable();
}

assertAuthStatus(req, noAuthStatusMessage);

return getAuthDataFromRequest(req, { ...opts, logger });
};
});
Expand DownExpand Up@@ -107,7 +141,7 @@ export const createGetAuth = ({
* }
* ```
*/
export const getAuth = createGetAuth({
export const getAuth = createSyncGetAuth({
debugLoggerName: 'getAuth()',
noAuthStatusMessage: getAuthAuthHeaderMissing(),
});
4 changes: 2 additions & 2 deletions packages/nextjs/src/server/errors.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,9 +20,9 @@ Check if signInUrl is missing from your configuration or if it is not an absolut

export const getAuthAuthHeaderMissing = () => authAuthHeaderMissing('getAuth');

export const authAuthHeaderMissing = (helperName = 'auth') =>
export const authAuthHeaderMissing = (helperName = 'auth', prefixSteps?: string[]) =>
`Clerk: ${helperName}() was called but Clerk can't detect usage of clerkMiddleware(). Please ensure the following:
- clerkMiddleware() is used in your Next.js Middleware.
- ${prefixSteps ? [...prefixSteps, ''].join('\n- ') : ' '}clerkMiddleware() is used in your Next.js Middleware.
- Your Middleware matcher is configured to match this route or page.
- If you are using the src directory, make sure the Middleware file is inside of it.

Expand Down
45 changes: 44 additions & 1 deletion packages/nextjs/src/server/keyless-node.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -209,4 +209,47 @@ function removeKeyless() {
unlockFileWriting();
}

export { createOrReadKeyless, removeKeyless };
function hasSrcAppDir() {
const { existsSync } = safeNodeRuntimeFs();
const path = safeNodeRuntimePath();

const projectWithAppSrc = path.join(process.cwd(), 'src', 'app');

return !!existsSync(projectWithAppSrc);
}

function suggestMiddlewareLocation() {
const suggestionMessage = (to?: 'src/', from?: 'src/app/' | 'app/') =>
`Clerk: Move your middleware file to ./${to || ''}middleware.ts. Currently located at ./${from || ''}middleware.ts`;

const { existsSync } = safeNodeRuntimeFs();
const path = safeNodeRuntimePath();

const projectWithAppSrcPath = path.join(process.cwd(), 'src', 'app');
const projectWithAppPath = path.join(process.cwd(), 'app');

if (existsSync(projectWithAppSrcPath)) {
if (existsSync(path.join(projectWithAppSrcPath, 'middleware.ts'))) {
return suggestionMessage('src/', 'src/app/');
}

if (existsSync(path.join(process.cwd(), 'middleware.ts'))) {
return suggestionMessage('src/');
}

// default error
return undefined;
}

if (existsSync(projectWithAppPath)) {
if (existsSync(path.join(projectWithAppPath, 'middleware.ts'))) {
return suggestionMessage(undefined, 'app/');
}
// default error
return undefined;
}

return undefined;
}

export { createOrReadKeyless, removeKeyless, suggestMiddlewareLocation, hasSrcAppDir };
12 changes: 12 additions & 0 deletions packages/nextjs/src/utils/only-try.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
/**
* Discards errors thrown by attempted code
*/
const onlyTry = (cb: () => unknown) => {
try {
cb();
} catch {
// ignore
}
};

export { onlyTry };
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
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
5 changes: 5 additions & 0 deletions .changeset/fuzzy-rockets-smash.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/nextjs': patch
---

Improve error messages when `clerkMiddleware` is missing by suggesting the correct path to place the `middleware.ts` file.
10 changes: 1 addition & 9 deletions packages/nextjs/src/app-router/server/ClerkProvider.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import { getDynamicAuthData } from '../../server/buildClerkProps';
import type { NextClerkProviderProps } from '../../types';
import { canUseKeyless } from '../../utils/feature-flags';
import { mergeNextClerkPropsWithEnv } from '../../utils/mergeNextClerkPropsWithEnv';
import { onlyTry } from '../../utils/only-try';
import { isNext13 } from '../../utils/sdk-versions';
import { ClientClerkProvider } from '../client/ClerkProvider';
import { deleteKeylessAction } from '../keyless-actions';
Expand All@@ -23,15 +24,6 @@ const getNonceFromCSPHeader = React.cache(async function getNonceFromCSPHeader()
return getScriptNonceFromHeader((await headers()).get('Content-Security-Policy') || '') || '';
});

/** Discards errors thrown by attempted code */
const onlyTry = (cb: () => unknown) => {
try {
cb();
} catch {
// ignore
}
};

export async function ClerkProvider(
props: Without<NextClerkProviderProps, '__unstable_invokeMiddlewareOnAuthStateChange'>,
) {
Expand Down
22 changes: 19 additions & 3 deletions packages/nextjs/src/app-router/server/auth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,12 +3,13 @@ import { constants, createClerkRequest, createRedirect, type RedirectFun } from
import { notFound, redirect } from 'next/navigation';

import { PUBLISHABLE_KEY, SIGN_IN_URL, SIGN_UP_URL } from '../../server/constants';
import { createGetAuth } from '../../server/createGetAuth';
import { createAsyncGetAuth } from '../../server/createGetAuth';
import { authAuthHeaderMissing } from '../../server/errors';
import { getAuthKeyFromRequest, getHeader } from '../../server/headers-utils';
import type { AuthProtect } from '../../server/protect';
import { createProtect } from '../../server/protect';
import { decryptClerkRequestData } from '../../server/utils';
import { isNextWithUnstableServerActions } from '../../utils/sdk-versions';
import { buildRequestLike } from './utils';

/**
Expand All@@ -25,8 +26,10 @@ type Auth = AuthObject & {
*/
redirectToSignIn: RedirectFun<ReturnType<typeof redirect>>;
};

export interface AuthFn {
(): Promise<Auth>;

/**
* `auth` includes a single property, the `protect()` method, which you can use in two ways:
* - to check if a user is authenticated (signed in)
Expand DownExpand Up@@ -60,9 +63,22 @@ export const auth: AuthFn = async () => {
require('server-only');

const request = await buildRequestLike();
const authObject = createGetAuth({

const stepsBasedOnSrcDirectory = async () => {
if (isNextWithUnstableServerActions) {
return [];
}

try {
const isSrcAppDir = await import('../../server/keyless-node.js').then(m => m.hasSrcAppDir());
return [`Your Middleware exists at ./${isSrcAppDir ? 'src/' : ''}middleware.ts`];
} catch {
return [];
}
};
const authObject = await createAsyncGetAuth({
debugLoggerName: 'auth()',
noAuthStatusMessage: authAuthHeaderMissing(),
noAuthStatusMessage: authAuthHeaderMissing('auth', await stepsBasedOnSrcDirectory()),
})(request);

const clerkUrl = getAuthKeyFromRequest(request, 'ClerkUrl');
Expand Down
2 changes: 1 addition & 1 deletion packages/nextjs/src/app-router/server/utils.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@ export async function buildRequestLike(): Promise<NextRequest> {
}

throw new Error(
`Clerk: auth()and currentUser() are only supported in App Router (/app directory).\nIf you're using /pages, try getAuth() instead.\nOriginal error: ${e}`,
`Clerk: auth(), currentUser() and clerkClient(), are only supported in App Router (/app directory).\nIf you're using /pages, try getAuth() instead.\nOriginal error: ${e}`,

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Our relatively new clerkClient() also depends on headers()

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch

);
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/nextjs/src/server/__tests__/createGetAuth.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import hmacSHA1 from 'crypto-js/hmac-sha1';
import { NextRequest } from 'next/server';
import { describe, expect, it } from 'vitest';

import { createGetAuth, getAuth } from '../createGetAuth';
import { createSyncGetAuth, getAuth } from '../createGetAuth';

const mockSecretKey = 'sk_test_mock';

Expand All@@ -16,7 +16,7 @@ const mockTokenSignature = hmacSHA1(mockToken, 'sk_test_mock').toString();

describe('createGetAuth(opts)', () => {
it('returns a getAuth function', () => {
expect(createGetAuth({ debugLoggerName: 'test', noAuthStatusMessage: 'test' })).toBeInstanceOf(Function);
expect(createSyncGetAuth({ debugLoggerName: 'test', noAuthStatusMessage: 'test' })).toBeInstanceOf(Function);
});
});

Expand Down
46 changes: 40 additions & 6 deletions packages/nextjs/src/server/createGetAuth.ts
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,63 @@
import type { AuthObject } from '@clerk/backend';
import { constants } from '@clerk/backend/internal';
import { isTruthy } from '@clerk/shared/underscore';

import { withLogger } from '../utils/debugLogger';
import { isNextWithUnstableServerActions } from '../utils/sdk-versions';
import { getAuthDataFromRequest } from './data/getAuthDataFromRequest';
import { getAuthAuthHeaderMissing } from './errors';
import { getHeader } from './headers-utils';
import { detectClerkMiddleware, getHeader } from './headers-utils';
import type { RequestLike } from './types';
import { assertAuthStatus } from './utils';

export const createGetAuth = ({
export const createAsyncGetAuth = ({
debugLoggerName,
noAuthStatusMessage,
}: {
debugLoggerName: string;
noAuthStatusMessage: string;
}) =>
withLogger(debugLoggerName, logger => {
return async (req: RequestLike, opts?: { secretKey?: string }) => {
if (isTruthy(getHeader(req, constants.Headers.EnableDebug))) {
logger.enable();
}

if (!detectClerkMiddleware(req)) {
// Keep the same behaviour for versions that may have issues with bundling `node:fs`
if (isNextWithUnstableServerActions) {
assertAuthStatus(req, noAuthStatusMessage);
}

const missConfiguredMiddlewareLocation = await import('./keyless-node.js')
.then(m => m.suggestMiddlewareLocation())
.catch(() => undefined);

if (missConfiguredMiddlewareLocation) {
throw new Error(missConfiguredMiddlewareLocation);
}

// still throw there is no suggested move location
assertAuthStatus(req, noAuthStatusMessage);
}

return getAuthDataFromRequest(req, { ...opts, logger });
};
});

export const createSyncGetAuth = ({
debugLoggerName,
noAuthStatusMessage,
}: {
debugLoggerName: string;
noAuthStatusMessage: string;
}) =>
withLogger(debugLoggerName, logger => {
return (req: RequestLike, opts?: { secretKey?: string }): AuthObject => {
return (req: RequestLike, opts?: { secretKey?: string }) => {
if (isTruthy(getHeader(req, constants.Headers.EnableDebug))) {
logger.enable();
}

assertAuthStatus(req, noAuthStatusMessage);

return getAuthDataFromRequest(req, { ...opts, logger });
};
});
Expand DownExpand Up@@ -107,7 +141,7 @@ export const createGetAuth = ({
* }
* ```
*/
export const getAuth = createGetAuth({
export const getAuth = createSyncGetAuth({
debugLoggerName: 'getAuth()',
noAuthStatusMessage: getAuthAuthHeaderMissing(),
});
4 changes: 2 additions & 2 deletions packages/nextjs/src/server/errors.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,9 +20,9 @@ Check if signInUrl is missing from your configuration or if it is not an absolut

export const getAuthAuthHeaderMissing = () => authAuthHeaderMissing('getAuth');

export const authAuthHeaderMissing = (helperName = 'auth') =>
export const authAuthHeaderMissing = (helperName = 'auth', prefixSteps?: string[]) =>
`Clerk: ${helperName}() was called but Clerk can't detect usage of clerkMiddleware(). Please ensure the following:
- clerkMiddleware() is used in your Next.js Middleware.
- ${prefixSteps ? [...prefixSteps, ''].join('\n- ') : ' '}clerkMiddleware() is used in your Next.js Middleware.
- Your Middleware matcher is configured to match this route or page.
- If you are using the src directory, make sure the Middleware file is inside of it.

Expand Down
45 changes: 44 additions & 1 deletion packages/nextjs/src/server/keyless-node.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -209,4 +209,47 @@ function removeKeyless() {
unlockFileWriting();
}

export { createOrReadKeyless, removeKeyless };
function hasSrcAppDir() {
const { existsSync } = safeNodeRuntimeFs();
const path = safeNodeRuntimePath();

const projectWithAppSrc = path.join(process.cwd(), 'src', 'app');

return !!existsSync(projectWithAppSrc);
}

function suggestMiddlewareLocation() {
const suggestionMessage = (to?: 'src/', from?: 'src/app/' | 'app/') =>
`Clerk: Move your middleware file to ./${to || ''}middleware.ts. Currently located at ./${from || ''}middleware.ts`;

const { existsSync } = safeNodeRuntimeFs();
const path = safeNodeRuntimePath();

const projectWithAppSrcPath = path.join(process.cwd(), 'src', 'app');
const projectWithAppPath = path.join(process.cwd(), 'app');

if (existsSync(projectWithAppSrcPath)) {
if (existsSync(path.join(projectWithAppSrcPath, 'middleware.ts'))) {
return suggestionMessage('src/', 'src/app/');
}

if (existsSync(path.join(process.cwd(), 'middleware.ts'))) {
return suggestionMessage('src/');
}

// default error
return undefined;
}

if (existsSync(projectWithAppPath)) {
if (existsSync(path.join(projectWithAppPath, 'middleware.ts'))) {
return suggestionMessage(undefined, 'app/');
}
// default error
return undefined;
}

return undefined;
}

export { createOrReadKeyless, removeKeyless, suggestMiddlewareLocation, hasSrcAppDir };
12 changes: 12 additions & 0 deletions packages/nextjs/src/utils/only-try.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
/**
* Discards errors thrown by attempted code
*/
const onlyTry = (cb: () => unknown) => {
try {
cb();
} catch {
// ignore
}
};

export { onlyTry };