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
17 changes: 17 additions & 0 deletions .changeset/spicy-lizards-take.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
---
'@clerk/nextjs': minor
---

- Introduce `auth().redirectToSignUp()` that can be used in API routes and pages. Originally effort by [@sambarnes](https://github.com/clerk/javascript/pull/5407)

```ts
import { clerkMiddleware } from '@clerk/nextjs/server';

export default clerkMiddleware(async (auth) => {
const { userId, redirectToSignUp } = await auth();

if (!userId) {
return redirectToSignUp();
}
});
```
13 changes: 12 additions & 1 deletion packages/backend/src/createRedirect.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -97,7 +97,18 @@ export const createRedirect: CreateRedirect = params => {
}

const accountsSignUpUrl = `${accountsBaseUrl}/sign-up`;
const targetUrl = signUpUrl || accountsSignUpUrl;

// Allows redirection to SignInOrUp path
function buildSignUpUrl(signIn: string | URL | undefined) {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Just want to make sure that I understand this part here. If there's a sign in URL option (env var or middleware key), we assume that combined flow is enabled - but doesn't it also need be able via the withSignUp prop?

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.

yes, but in that case signUpUrl will be defined. withSignUp is per component, nothing in can do about it on the server.

if (!signIn) {
return;
}
const url = new URL(signIn, baseUrl);
url.pathname = `${url.pathname}/create`;
return url.toString();
}

const targetUrl = signUpUrl || buildSignUpUrl(signInUrl) || accountsSignUpUrl;

if (hasPendingStatus) {
return redirectToTasks(targetUrl, { returnBackUrl });
Expand Down
49 changes: 37 additions & 12 deletions packages/nextjs/src/app-router/server/auth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,16 @@ type Auth = AuthObject & {
* `auth()` on the server-side can only access redirect URLs defined via [environment variables](https://clerk.com/docs/deployments/clerk-environment-variables#sign-in-and-sign-up-redirects) or [`clerkMiddleware` dynamic keys](https://clerk.com/docs/references/nextjs/clerk-middleware#dynamic-keys).
*/
redirectToSignIn: RedirectFun<ReturnType<typeof redirect>>;

/**
* The `auth()` helper returns the `redirectToSignUp()` method, which you can use to redirect the user to the sign-up page.
*
* @param [returnBackUrl] {string | URL} - The URL to redirect the user back to after they sign up.
*
* @note
* `auth()` on the server-side can only access redirect URLs defined via [environment variables](https://clerk.com/docs/deployments/clerk-environment-variables#sign-in-and-sign-up-redirects) or [`clerkMiddleware` dynamic keys](https://clerk.com/docs/references/nextjs/clerk-middleware#dynamic-keys).
*/
redirectToSignUp: RedirectFun<ReturnType<typeof redirect>>;
};

export interface AuthFn {
Expand DownExpand Up@@ -83,29 +93,44 @@ export const auth: AuthFn = async () => {

const clerkUrl = getAuthKeyFromRequest(request, 'ClerkUrl');

const redirectToSignIn: RedirectFun<never> = (opts = {}) => {
const createRedirectForRequest = (...args: Parameters<RedirectFun<never>>) => {
const { returnBackUrl } = args[0] || {};
const clerkRequest = createClerkRequest(request);
const devBrowserToken =
clerkRequest.clerkUrl.searchParams.get(constants.QueryParameters.DevBrowser) ||
clerkRequest.cookies.get(constants.Cookies.DevBrowser);

const encryptedRequestData = getHeader(request, constants.Headers.ClerkRequestData);
const decryptedRequestData = decryptClerkRequestData(encryptedRequestData);
return [
createRedirect({
redirectAdapter: redirect,
devBrowserToken: devBrowserToken,
baseUrl: clerkRequest.clerkUrl.toString(),
publishableKey: decryptedRequestData.publishableKey || PUBLISHABLE_KEY,
signInUrl: decryptedRequestData.signInUrl || SIGN_IN_URL,
signUpUrl: decryptedRequestData.signUpUrl || SIGN_UP_URL,
sessionStatus: authObject.sessionStatus,
}),
returnBackUrl === null ? '' : returnBackUrl || clerkUrl?.toString(),
] as const;
};

const redirectToSignIn: RedirectFun<never> = (opts = {}) => {
const [r, returnBackUrl] = createRedirectForRequest(opts);
return r.redirectToSignIn({
returnBackUrl,
});
};

return createRedirect({
redirectAdapter: redirect,
devBrowserToken: devBrowserToken,
baseUrl: clerkRequest.clerkUrl.toString(),
publishableKey: decryptedRequestData.publishableKey || PUBLISHABLE_KEY,
signInUrl: decryptedRequestData.signInUrl || SIGN_IN_URL,
signUpUrl: decryptedRequestData.signUpUrl || SIGN_UP_URL,
sessionStatus: authObject.sessionStatus,
}).redirectToSignIn({
returnBackUrl: opts.returnBackUrl === null ? '' : opts.returnBackUrl || clerkUrl?.toString(),
const redirectToSignUp: RedirectFun<never> = (opts = {}) => {
const [r, returnBackUrl] = createRedirectForRequest(opts);
return r.redirectToSignUp({
returnBackUrl,
});
};

return Object.assign(authObject, { redirectToSignIn });
return Object.assign(authObject, { redirectToSignIn, redirectToSignUp });
};

auth.protect = async (...args: any[]) => {
Expand Down
90 changes: 64 additions & 26 deletions packages/nextjs/src/server/__tests__/clerkMiddleware.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,8 @@ import { clerkMiddleware } from '../clerkMiddleware';
import { createRouteMatcher } from '../routeMatcher';
import { decryptClerkRequestData } from '../utils';

vi.mock('../clerkClient');

const publishableKey = 'pk_test_Y2xlcmsuaW5jbHVkZWQua2F0eWRpZC05Mi5sY2wuZGV2JA';
const authenticateRequestMock = vi.fn().mockResolvedValue({
toAuth: () => ({
Expand All@@ -21,15 +23,6 @@ const authenticateRequestMock = vi.fn().mockResolvedValue({
publishableKey,
});

vi.mock('../clerkClient', () => {
return {
clerkClient: () => ({
authenticateRequest: authenticateRequestMock,
telemetry: { record: vi.fn() },
}),
};
});

/**
* Disable console warnings about config matchers
*/
Expand All@@ -45,6 +38,14 @@ afterAll(() => {
global.console.log = consoleLog;
});

beforeEach(() => {
vi.mocked(clerkClient).mockResolvedValue({
authenticateRequest: authenticateRequestMock,
// @ts-expect-error - mock
telemetry: { record: vi.fn() },
});
});

// Removing this mock will cause the clerkMiddleware tests to fail due to missing publishable key
// This mock SHOULD exist before the imports
vi.mock(import('../constants.js'), async importOriginal => {
Expand DownExpand Up@@ -301,84 +302,121 @@ describe('clerkMiddleware(params)', () => {
});
});

describe('auth().redirectToSignIn()', () => {
it('redirects to sign-in url when redirectToSignIn is called and the request is a page request', async () => {
describe.each([
{
name: 'auth().redirectToSignIn()',
util: 'redirectToSignIn',
locationHeader: 'sign-in',
} as const,
{
name: 'auth().redirectToSignUp()',
util: 'redirectToSignUp',
locationHeader: 'sign-up',
} as const,
])('$name', ({ util, locationHeader }) => {
it(`redirects to ${locationHeader} url when ${util} is called and the request is a page request`, async () => {
const req = mockRequest({
url: '/protected',
headers: new Headers({ [constants.Headers.SecFetchDest]: 'document' }),
appendDevBrowserCookie: true,
});

const resp = await clerkMiddleware(async auth => {
const { redirectToSignIn } = await auth();
redirectToSignIn();
(await auth())[util]();
})(req, {} as NextFetchEvent);

expect(resp?.status).toEqual(307);
expect(resp?.headers.get('location')).toContain('sign-in');
expect(resp?.headers.get('location')).toContain(locationHeader);
expect((await clerkClient()).authenticateRequest).toBeCalled();
});

it('redirects to sign-in url when redirectToSignIn is called with the correct returnBackUrl', async () => {
it(`redirects to ${locationHeader} url when redirectToSignIn is called with the correct returnBackUrl`, async () => {
const req = mockRequest({
url: '/protected',
headers: new Headers({ [constants.Headers.SecFetchDest]: 'document' }),
appendDevBrowserCookie: true,
});

const resp = await clerkMiddleware(async auth => {
const { redirectToSignIn } = await auth();
redirectToSignIn();
(await auth())[util]();
})(req, {} as NextFetchEvent);

expect(resp?.status).toEqual(307);
expect(resp?.status).toEqual(307);
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
expect(new URL(resp!.headers.get('location')!).searchParams.get('redirect_url')).toContain('/protected');
expect((await clerkClient()).authenticateRequest).toBeCalled();
});

it('redirects to sign-in url with redirect_url set to the provided returnBackUrl param', async () => {
it(`redirects to ${locationHeader} url with redirect_url set to the provided returnBackUrl param`, async () => {
const req = mockRequest({
url: '/protected',
headers: new Headers({ [constants.Headers.SecFetchDest]: 'document' }),
appendDevBrowserCookie: true,
});

const resp = await clerkMiddleware(async auth => {
const { redirectToSignIn } = await auth();
redirectToSignIn({ returnBackUrl: 'https://www.clerk.com/hello' });
(await auth())[util]({ returnBackUrl: 'https://www.clerk.com/hello' });
})(req, {} as NextFetchEvent);

expect(resp?.status).toEqual(307);
expect(resp?.headers.get('location')).toContain('sign-in');
expect(resp?.headers.get('location')).toContain(locationHeader);
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
expect(new URL(resp!.headers.get('location')!).searchParams.get('redirect_url')).toEqual(
'https://www.clerk.com/hello',
);
expect((await clerkClient()).authenticateRequest).toBeCalled();
});

it('redirects to sign-in url without a redirect_url when returnBackUrl is null', async () => {
it(`redirects to ${locationHeader} url without a redirect_url when returnBackUrl is null`, async () => {
const req = mockRequest({
url: '/protected',
headers: new Headers({ [constants.Headers.SecFetchDest]: 'document' }),
appendDevBrowserCookie: true,
});

const resp = await clerkMiddleware(async auth => {
const { redirectToSignIn } = await auth();
redirectToSignIn({ returnBackUrl: null });
(await auth())[util]({ returnBackUrl: null });
})(req, {} as NextFetchEvent);

expect(resp?.status).toEqual(307);
expect(resp?.headers.get('location')).toContain('sign-in');
expect(resp?.headers.get('location')).toContain(locationHeader);
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
expect(new URL(resp!.headers.get('location')!).searchParams.get('redirect_url')).toBeNull();
expect((await clerkClient()).authenticateRequest).toBeCalled();
});
});

describe('auth().redirectToSignUp()', () => {
it('to support signInOrUp', async () => {
vi.mocked(clerkClient).mockResolvedValue({
authenticateRequest: vi.fn().mockResolvedValue({
toAuth: () => ({
debug: (d: any) => d,
}),
headers: new Headers(),
publishableKey,
signInUrl: '/hello',
}),
// @ts-expect-error - mock
telemetry: { record: vi.fn() },
});

const req = mockRequest({
url: '/protected',
headers: new Headers({ [constants.Headers.SecFetchDest]: 'document' }),
appendDevBrowserCookie: true,
});

const resp = await clerkMiddleware(async auth => {
(await auth()).redirectToSignUp();
})(req, {} as NextFetchEvent);

expect(resp?.status).toEqual(307);
expect(resp?.headers.get('location')).toContain(`/hello/create`);
expect((await clerkClient()).authenticateRequest).toBeCalled();
});
});

describe('auth.protect()', () => {
it('redirects to sign-in url when protect is called, the user is signed out and the request is a page request', async () => {
const req = mockRequest({
Expand Down
30 changes: 26 additions & 4 deletions packages/nextjs/src/server/clerkMiddleware.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,8 +17,10 @@ import {
isNextjsNotFoundError,
isNextjsRedirectError,
isRedirectToSignInError,
isRedirectToSignUpError,
nextjsRedirectError,
redirectToSignInError,
redirectToSignUpError,
} from './nextErrors';
import type { AuthProtect } from './protect';
import { createProtect } from './protect';
Expand All@@ -33,6 +35,7 @@ import {

export type ClerkMiddlewareAuthObject = AuthObject & {
redirectToSignIn: RedirectFun<Response>;
redirectToSignUp: RedirectFun<Response>;
};

export interface ClerkMiddlewareAuth {
Expand DownExpand Up@@ -162,9 +165,13 @@ export const clerkMiddleware = ((...args: unknown[]): NextMiddleware | NextMiddl
logger.debug('auth', () => ({ auth: authObject, debug: authObject.debug() }));

const redirectToSignIn = createMiddlewareRedirectToSignIn(clerkRequest);
const redirectToSignUp = createMiddlewareRedirectToSignUp(clerkRequest);
const protect = await createMiddlewareProtect(clerkRequest, authObject, redirectToSignIn);

const authObjWithMethods: ClerkMiddlewareAuthObject = Object.assign(authObject, { redirectToSignIn });
const authObjWithMethods: ClerkMiddlewareAuthObject = Object.assign(authObject, {
redirectToSignIn,
redirectToSignUp,
});
const authHandler = () => Promise.resolve(authObjWithMethods);
authHandler.protect = protect;

Expand DownExpand Up@@ -303,6 +310,15 @@ const createMiddlewareRedirectToSignIn = (
};
};

const createMiddlewareRedirectToSignUp = (
clerkRequest: ClerkRequest,
): ClerkMiddlewareAuthObject['redirectToSignUp'] => {
return (opts = {}) => {
const url = clerkRequest.clerkUrl.toString();
redirectToSignUpError(url, opts.returnBackUrl);
};
};

const createMiddlewareProtect = (
clerkRequest: ClerkRequest,
authObject: AuthObject,
Expand DownExpand Up@@ -345,15 +361,21 @@ const handleControlFlowErrors = (
);
}

if (isRedirectToSignInError(e)) {
return createRedirect({
const isRedirectToSignIn = isRedirectToSignInError(e);
const isRedirectToSignUp = isRedirectToSignUpError(e);

if (isRedirectToSignIn || isRedirectToSignUp) {
const redirect = createRedirect({
redirectAdapter,
baseUrl: clerkRequest.clerkUrl,
signInUrl: requestState.signInUrl,
signUpUrl: requestState.signUpUrl,
publishableKey: requestState.publishableKey,
sessionStatus: requestState.toAuth()?.sessionStatus,
}).redirectToSignIn({ returnBackUrl: e.returnBackUrl });
});

const { returnBackUrl } = e;
return redirect[isRedirectToSignIn ? 'redirectToSignIn' : 'redirectToSignUp']({ returnBackUrl });
}

if (isNextjsRedirectError(e)) {
Expand Down
Loading
, '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
17 changes: 17 additions & 0 deletions .changeset/spicy-lizards-take.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
---
'@clerk/nextjs': minor
---

- Introduce `auth().redirectToSignUp()` that can be used in API routes and pages. Originally effort by [@sambarnes](https://github.com/clerk/javascript/pull/5407)

```ts
import { clerkMiddleware } from '@clerk/nextjs/server';

export default clerkMiddleware(async (auth) => {
const { userId, redirectToSignUp } = await auth();

if (!userId) {
return redirectToSignUp();
}
});
```
13 changes: 12 additions & 1 deletion packages/backend/src/createRedirect.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -97,7 +97,18 @@ export const createRedirect: CreateRedirect = params => {
}

const accountsSignUpUrl = `${accountsBaseUrl}/sign-up`;
const targetUrl = signUpUrl || accountsSignUpUrl;

// Allows redirection to SignInOrUp path
function buildSignUpUrl(signIn: string | URL | undefined) {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Just want to make sure that I understand this part here. If there's a sign in URL option (env var or middleware key), we assume that combined flow is enabled - but doesn't it also need be able via the withSignUp prop?

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.

yes, but in that case signUpUrl will be defined. withSignUp is per component, nothing in can do about it on the server.

if (!signIn) {
return;
}
const url = new URL(signIn, baseUrl);
url.pathname = `${url.pathname}/create`;
return url.toString();
}

const targetUrl = signUpUrl || buildSignUpUrl(signInUrl) || accountsSignUpUrl;

if (hasPendingStatus) {
return redirectToTasks(targetUrl, { returnBackUrl });
Expand Down
49 changes: 37 additions & 12 deletions packages/nextjs/src/app-router/server/auth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,16 @@ type Auth = AuthObject & {
* `auth()` on the server-side can only access redirect URLs defined via [environment variables](https://clerk.com/docs/deployments/clerk-environment-variables#sign-in-and-sign-up-redirects) or [`clerkMiddleware` dynamic keys](https://clerk.com/docs/references/nextjs/clerk-middleware#dynamic-keys).
*/
redirectToSignIn: RedirectFun<ReturnType<typeof redirect>>;

/**
* The `auth()` helper returns the `redirectToSignUp()` method, which you can use to redirect the user to the sign-up page.
*
* @param [returnBackUrl] {string | URL} - The URL to redirect the user back to after they sign up.
*
* @note
* `auth()` on the server-side can only access redirect URLs defined via [environment variables](https://clerk.com/docs/deployments/clerk-environment-variables#sign-in-and-sign-up-redirects) or [`clerkMiddleware` dynamic keys](https://clerk.com/docs/references/nextjs/clerk-middleware#dynamic-keys).
*/
redirectToSignUp: RedirectFun<ReturnType<typeof redirect>>;
};

export interface AuthFn {
Expand DownExpand Up@@ -83,29 +93,44 @@ export const auth: AuthFn = async () => {

const clerkUrl = getAuthKeyFromRequest(request, 'ClerkUrl');

const redirectToSignIn: RedirectFun<never> = (opts = {}) => {
const createRedirectForRequest = (...args: Parameters<RedirectFun<never>>) => {
const { returnBackUrl } = args[0] || {};
const clerkRequest = createClerkRequest(request);
const devBrowserToken =
clerkRequest.clerkUrl.searchParams.get(constants.QueryParameters.DevBrowser) ||
clerkRequest.cookies.get(constants.Cookies.DevBrowser);

const encryptedRequestData = getHeader(request, constants.Headers.ClerkRequestData);
const decryptedRequestData = decryptClerkRequestData(encryptedRequestData);
return [
createRedirect({
redirectAdapter: redirect,
devBrowserToken: devBrowserToken,
baseUrl: clerkRequest.clerkUrl.toString(),
publishableKey: decryptedRequestData.publishableKey || PUBLISHABLE_KEY,
signInUrl: decryptedRequestData.signInUrl || SIGN_IN_URL,
signUpUrl: decryptedRequestData.signUpUrl || SIGN_UP_URL,
sessionStatus: authObject.sessionStatus,
}),
returnBackUrl === null ? '' : returnBackUrl || clerkUrl?.toString(),
] as const;
};

const redirectToSignIn: RedirectFun<never> = (opts = {}) => {
const [r, returnBackUrl] = createRedirectForRequest(opts);
return r.redirectToSignIn({
returnBackUrl,
});
};

return createRedirect({
redirectAdapter: redirect,
devBrowserToken: devBrowserToken,
baseUrl: clerkRequest.clerkUrl.toString(),
publishableKey: decryptedRequestData.publishableKey || PUBLISHABLE_KEY,
signInUrl: decryptedRequestData.signInUrl || SIGN_IN_URL,
signUpUrl: decryptedRequestData.signUpUrl || SIGN_UP_URL,
sessionStatus: authObject.sessionStatus,
}).redirectToSignIn({
returnBackUrl: opts.returnBackUrl === null ? '' : opts.returnBackUrl || clerkUrl?.toString(),
const redirectToSignUp: RedirectFun<never> = (opts = {}) => {
const [r, returnBackUrl] = createRedirectForRequest(opts);
return r.redirectToSignUp({
returnBackUrl,
});
};

return Object.assign(authObject, { redirectToSignIn });
return Object.assign(authObject, { redirectToSignIn, redirectToSignUp });
};

auth.protect = async (...args: any[]) => {
Expand Down
90 changes: 64 additions & 26 deletions packages/nextjs/src/server/__tests__/clerkMiddleware.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,8 @@ import { clerkMiddleware } from '../clerkMiddleware';
import { createRouteMatcher } from '../routeMatcher';
import { decryptClerkRequestData } from '../utils';

vi.mock('../clerkClient');

const publishableKey = 'pk_test_Y2xlcmsuaW5jbHVkZWQua2F0eWRpZC05Mi5sY2wuZGV2JA';
const authenticateRequestMock = vi.fn().mockResolvedValue({
toAuth: () => ({
Expand All@@ -21,15 +23,6 @@ const authenticateRequestMock = vi.fn().mockResolvedValue({
publishableKey,
});

vi.mock('../clerkClient', () => {
return {
clerkClient: () => ({
authenticateRequest: authenticateRequestMock,
telemetry: { record: vi.fn() },
}),
};
});

/**
* Disable console warnings about config matchers
*/
Expand All@@ -45,6 +38,14 @@ afterAll(() => {
global.console.log = consoleLog;
});

beforeEach(() => {
vi.mocked(clerkClient).mockResolvedValue({
authenticateRequest: authenticateRequestMock,
// @ts-expect-error - mock
telemetry: { record: vi.fn() },
});
});

// Removing this mock will cause the clerkMiddleware tests to fail due to missing publishable key
// This mock SHOULD exist before the imports
vi.mock(import('../constants.js'), async importOriginal => {
Expand DownExpand Up@@ -301,84 +302,121 @@ describe('clerkMiddleware(params)', () => {
});
});

describe('auth().redirectToSignIn()', () => {
it('redirects to sign-in url when redirectToSignIn is called and the request is a page request', async () => {
describe.each([
{
name: 'auth().redirectToSignIn()',
util: 'redirectToSignIn',
locationHeader: 'sign-in',
} as const,
{
name: 'auth().redirectToSignUp()',
util: 'redirectToSignUp',
locationHeader: 'sign-up',
} as const,
])('$name', ({ util, locationHeader }) => {
it(`redirects to ${locationHeader} url when ${util} is called and the request is a page request`, async () => {
const req = mockRequest({
url: '/protected',
headers: new Headers({ [constants.Headers.SecFetchDest]: 'document' }),
appendDevBrowserCookie: true,
});

const resp = await clerkMiddleware(async auth => {
const { redirectToSignIn } = await auth();
redirectToSignIn();
(await auth())[util]();
})(req, {} as NextFetchEvent);

expect(resp?.status).toEqual(307);
expect(resp?.headers.get('location')).toContain('sign-in');
expect(resp?.headers.get('location')).toContain(locationHeader);
expect((await clerkClient()).authenticateRequest).toBeCalled();
});

it('redirects to sign-in url when redirectToSignIn is called with the correct returnBackUrl', async () => {
it(`redirects to ${locationHeader} url when redirectToSignIn is called with the correct returnBackUrl`, async () => {
const req = mockRequest({
url: '/protected',
headers: new Headers({ [constants.Headers.SecFetchDest]: 'document' }),
appendDevBrowserCookie: true,
});

const resp = await clerkMiddleware(async auth => {
const { redirectToSignIn } = await auth();
redirectToSignIn();
(await auth())[util]();
})(req, {} as NextFetchEvent);

expect(resp?.status).toEqual(307);
expect(resp?.status).toEqual(307);
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
expect(new URL(resp!.headers.get('location')!).searchParams.get('redirect_url')).toContain('/protected');
expect((await clerkClient()).authenticateRequest).toBeCalled();
});

it('redirects to sign-in url with redirect_url set to the provided returnBackUrl param', async () => {
it(`redirects to ${locationHeader} url with redirect_url set to the provided returnBackUrl param`, async () => {
const req = mockRequest({
url: '/protected',
headers: new Headers({ [constants.Headers.SecFetchDest]: 'document' }),
appendDevBrowserCookie: true,
});

const resp = await clerkMiddleware(async auth => {
const { redirectToSignIn } = await auth();
redirectToSignIn({ returnBackUrl: 'https://www.clerk.com/hello' });
(await auth())[util]({ returnBackUrl: 'https://www.clerk.com/hello' });
})(req, {} as NextFetchEvent);

expect(resp?.status).toEqual(307);
expect(resp?.headers.get('location')).toContain('sign-in');
expect(resp?.headers.get('location')).toContain(locationHeader);
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
expect(new URL(resp!.headers.get('location')!).searchParams.get('redirect_url')).toEqual(
'https://www.clerk.com/hello',
);
expect((await clerkClient()).authenticateRequest).toBeCalled();
});

it('redirects to sign-in url without a redirect_url when returnBackUrl is null', async () => {
it(`redirects to ${locationHeader} url without a redirect_url when returnBackUrl is null`, async () => {
const req = mockRequest({
url: '/protected',
headers: new Headers({ [constants.Headers.SecFetchDest]: 'document' }),
appendDevBrowserCookie: true,
});

const resp = await clerkMiddleware(async auth => {
const { redirectToSignIn } = await auth();
redirectToSignIn({ returnBackUrl: null });
(await auth())[util]({ returnBackUrl: null });
})(req, {} as NextFetchEvent);

expect(resp?.status).toEqual(307);
expect(resp?.headers.get('location')).toContain('sign-in');
expect(resp?.headers.get('location')).toContain(locationHeader);
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
expect(new URL(resp!.headers.get('location')!).searchParams.get('redirect_url')).toBeNull();
expect((await clerkClient()).authenticateRequest).toBeCalled();
});
});

describe('auth().redirectToSignUp()', () => {
it('to support signInOrUp', async () => {
vi.mocked(clerkClient).mockResolvedValue({
authenticateRequest: vi.fn().mockResolvedValue({
toAuth: () => ({
debug: (d: any) => d,
}),
headers: new Headers(),
publishableKey,
signInUrl: '/hello',
}),
// @ts-expect-error - mock
telemetry: { record: vi.fn() },
});

const req = mockRequest({
url: '/protected',
headers: new Headers({ [constants.Headers.SecFetchDest]: 'document' }),
appendDevBrowserCookie: true,
});

const resp = await clerkMiddleware(async auth => {
(await auth()).redirectToSignUp();
})(req, {} as NextFetchEvent);

expect(resp?.status).toEqual(307);
expect(resp?.headers.get('location')).toContain(`/hello/create`);
expect((await clerkClient()).authenticateRequest).toBeCalled();
});
});

describe('auth.protect()', () => {
it('redirects to sign-in url when protect is called, the user is signed out and the request is a page request', async () => {
const req = mockRequest({
Expand Down
30 changes: 26 additions & 4 deletions packages/nextjs/src/server/clerkMiddleware.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,8 +17,10 @@ import {
isNextjsNotFoundError,
isNextjsRedirectError,
isRedirectToSignInError,
isRedirectToSignUpError,
nextjsRedirectError,
redirectToSignInError,
redirectToSignUpError,
} from './nextErrors';
import type { AuthProtect } from './protect';
import { createProtect } from './protect';
Expand All@@ -33,6 +35,7 @@ import {

export type ClerkMiddlewareAuthObject = AuthObject & {
redirectToSignIn: RedirectFun<Response>;
redirectToSignUp: RedirectFun<Response>;
};

export interface ClerkMiddlewareAuth {
Expand DownExpand Up@@ -162,9 +165,13 @@ export const clerkMiddleware = ((...args: unknown[]): NextMiddleware | NextMiddl
logger.debug('auth', () => ({ auth: authObject, debug: authObject.debug() }));

const redirectToSignIn = createMiddlewareRedirectToSignIn(clerkRequest);
const redirectToSignUp = createMiddlewareRedirectToSignUp(clerkRequest);
const protect = await createMiddlewareProtect(clerkRequest, authObject, redirectToSignIn);

const authObjWithMethods: ClerkMiddlewareAuthObject = Object.assign(authObject, { redirectToSignIn });
const authObjWithMethods: ClerkMiddlewareAuthObject = Object.assign(authObject, {
redirectToSignIn,
redirectToSignUp,
});
const authHandler = () => Promise.resolve(authObjWithMethods);
authHandler.protect = protect;

Expand DownExpand Up@@ -303,6 +310,15 @@ const createMiddlewareRedirectToSignIn = (
};
};

const createMiddlewareRedirectToSignUp = (
clerkRequest: ClerkRequest,
): ClerkMiddlewareAuthObject['redirectToSignUp'] => {
return (opts = {}) => {
const url = clerkRequest.clerkUrl.toString();
redirectToSignUpError(url, opts.returnBackUrl);
};
};

const createMiddlewareProtect = (
clerkRequest: ClerkRequest,
authObject: AuthObject,
Expand DownExpand Up@@ -345,15 +361,21 @@ const handleControlFlowErrors = (
);
}

if (isRedirectToSignInError(e)) {
return createRedirect({
const isRedirectToSignIn = isRedirectToSignInError(e);
const isRedirectToSignUp = isRedirectToSignUpError(e);

if (isRedirectToSignIn || isRedirectToSignUp) {
const redirect = createRedirect({
redirectAdapter,
baseUrl: clerkRequest.clerkUrl,
signInUrl: requestState.signInUrl,
signUpUrl: requestState.signUpUrl,
publishableKey: requestState.publishableKey,
sessionStatus: requestState.toAuth()?.sessionStatus,
}).redirectToSignIn({ returnBackUrl: e.returnBackUrl });
});

const { returnBackUrl } = e;
return redirect[isRedirectToSignIn ? 'redirectToSignIn' : 'redirectToSignUp']({ returnBackUrl });
}

if (isNextjsRedirectError(e)) {
Expand Down
Loading
, '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
17 changes: 17 additions & 0 deletions .changeset/spicy-lizards-take.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
---
'@clerk/nextjs': minor
---

- Introduce `auth().redirectToSignUp()` that can be used in API routes and pages. Originally effort by [@sambarnes](https://github.com/clerk/javascript/pull/5407)

```ts
import { clerkMiddleware } from '@clerk/nextjs/server';

export default clerkMiddleware(async (auth) => {
const { userId, redirectToSignUp } = await auth();

if (!userId) {
return redirectToSignUp();
}
});
```
13 changes: 12 additions & 1 deletion packages/backend/src/createRedirect.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -97,7 +97,18 @@ export const createRedirect: CreateRedirect = params => {
}

const accountsSignUpUrl = `${accountsBaseUrl}/sign-up`;
const targetUrl = signUpUrl || accountsSignUpUrl;

// Allows redirection to SignInOrUp path
function buildSignUpUrl(signIn: string | URL | undefined) {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Just want to make sure that I understand this part here. If there's a sign in URL option (env var or middleware key), we assume that combined flow is enabled - but doesn't it also need be able via the withSignUp prop?

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.

yes, but in that case signUpUrl will be defined. withSignUp is per component, nothing in can do about it on the server.

if (!signIn) {
return;
}
const url = new URL(signIn, baseUrl);
url.pathname = `${url.pathname}/create`;
return url.toString();
}

const targetUrl = signUpUrl || buildSignUpUrl(signInUrl) || accountsSignUpUrl;

if (hasPendingStatus) {
return redirectToTasks(targetUrl, { returnBackUrl });
Expand Down
49 changes: 37 additions & 12 deletions packages/nextjs/src/app-router/server/auth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,16 @@ type Auth = AuthObject & {
* `auth()` on the server-side can only access redirect URLs defined via [environment variables](https://clerk.com/docs/deployments/clerk-environment-variables#sign-in-and-sign-up-redirects) or [`clerkMiddleware` dynamic keys](https://clerk.com/docs/references/nextjs/clerk-middleware#dynamic-keys).
*/
redirectToSignIn: RedirectFun<ReturnType<typeof redirect>>;

/**
* The `auth()` helper returns the `redirectToSignUp()` method, which you can use to redirect the user to the sign-up page.
*
* @param [returnBackUrl] {string | URL} - The URL to redirect the user back to after they sign up.
*
* @note
* `auth()` on the server-side can only access redirect URLs defined via [environment variables](https://clerk.com/docs/deployments/clerk-environment-variables#sign-in-and-sign-up-redirects) or [`clerkMiddleware` dynamic keys](https://clerk.com/docs/references/nextjs/clerk-middleware#dynamic-keys).
*/
redirectToSignUp: RedirectFun<ReturnType<typeof redirect>>;
};

export interface AuthFn {
Expand DownExpand Up@@ -83,29 +93,44 @@ export const auth: AuthFn = async () => {

const clerkUrl = getAuthKeyFromRequest(request, 'ClerkUrl');

const redirectToSignIn: RedirectFun<never> = (opts = {}) => {
const createRedirectForRequest = (...args: Parameters<RedirectFun<never>>) => {
const { returnBackUrl } = args[0] || {};
const clerkRequest = createClerkRequest(request);
const devBrowserToken =
clerkRequest.clerkUrl.searchParams.get(constants.QueryParameters.DevBrowser) ||
clerkRequest.cookies.get(constants.Cookies.DevBrowser);

const encryptedRequestData = getHeader(request, constants.Headers.ClerkRequestData);
const decryptedRequestData = decryptClerkRequestData(encryptedRequestData);
return [
createRedirect({
redirectAdapter: redirect,
devBrowserToken: devBrowserToken,
baseUrl: clerkRequest.clerkUrl.toString(),
publishableKey: decryptedRequestData.publishableKey || PUBLISHABLE_KEY,
signInUrl: decryptedRequestData.signInUrl || SIGN_IN_URL,
signUpUrl: decryptedRequestData.signUpUrl || SIGN_UP_URL,
sessionStatus: authObject.sessionStatus,
}),
returnBackUrl === null ? '' : returnBackUrl || clerkUrl?.toString(),
] as const;
};

const redirectToSignIn: RedirectFun<never> = (opts = {}) => {
const [r, returnBackUrl] = createRedirectForRequest(opts);
return r.redirectToSignIn({
returnBackUrl,
});
};

return createRedirect({
redirectAdapter: redirect,
devBrowserToken: devBrowserToken,
baseUrl: clerkRequest.clerkUrl.toString(),
publishableKey: decryptedRequestData.publishableKey || PUBLISHABLE_KEY,
signInUrl: decryptedRequestData.signInUrl || SIGN_IN_URL,
signUpUrl: decryptedRequestData.signUpUrl || SIGN_UP_URL,
sessionStatus: authObject.sessionStatus,
}).redirectToSignIn({
returnBackUrl: opts.returnBackUrl === null ? '' : opts.returnBackUrl || clerkUrl?.toString(),
const redirectToSignUp: RedirectFun<never> = (opts = {}) => {
const [r, returnBackUrl] = createRedirectForRequest(opts);
return r.redirectToSignUp({
returnBackUrl,
});
};

return Object.assign(authObject, { redirectToSignIn });
return Object.assign(authObject, { redirectToSignIn, redirectToSignUp });
};

auth.protect = async (...args: any[]) => {
Expand Down
90 changes: 64 additions & 26 deletions packages/nextjs/src/server/__tests__/clerkMiddleware.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,8 @@ import { clerkMiddleware } from '../clerkMiddleware';
import { createRouteMatcher } from '../routeMatcher';
import { decryptClerkRequestData } from '../utils';

vi.mock('../clerkClient');

const publishableKey = 'pk_test_Y2xlcmsuaW5jbHVkZWQua2F0eWRpZC05Mi5sY2wuZGV2JA';
const authenticateRequestMock = vi.fn().mockResolvedValue({
toAuth: () => ({
Expand All@@ -21,15 +23,6 @@ const authenticateRequestMock = vi.fn().mockResolvedValue({
publishableKey,
});

vi.mock('../clerkClient', () => {
return {
clerkClient: () => ({
authenticateRequest: authenticateRequestMock,
telemetry: { record: vi.fn() },
}),
};
});

/**
* Disable console warnings about config matchers
*/
Expand All@@ -45,6 +38,14 @@ afterAll(() => {
global.console.log = consoleLog;
});

beforeEach(() => {
vi.mocked(clerkClient).mockResolvedValue({
authenticateRequest: authenticateRequestMock,
// @ts-expect-error - mock
telemetry: { record: vi.fn() },
});
});

// Removing this mock will cause the clerkMiddleware tests to fail due to missing publishable key
// This mock SHOULD exist before the imports
vi.mock(import('../constants.js'), async importOriginal => {
Expand DownExpand Up@@ -301,84 +302,121 @@ describe('clerkMiddleware(params)', () => {
});
});

describe('auth().redirectToSignIn()', () => {
it('redirects to sign-in url when redirectToSignIn is called and the request is a page request', async () => {
describe.each([
{
name: 'auth().redirectToSignIn()',
util: 'redirectToSignIn',
locationHeader: 'sign-in',
} as const,
{
name: 'auth().redirectToSignUp()',
util: 'redirectToSignUp',
locationHeader: 'sign-up',
} as const,
])('$name', ({ util, locationHeader }) => {
it(`redirects to ${locationHeader} url when ${util} is called and the request is a page request`, async () => {
const req = mockRequest({
url: '/protected',
headers: new Headers({ [constants.Headers.SecFetchDest]: 'document' }),
appendDevBrowserCookie: true,
});

const resp = await clerkMiddleware(async auth => {
const { redirectToSignIn } = await auth();
redirectToSignIn();
(await auth())[util]();
})(req, {} as NextFetchEvent);

expect(resp?.status).toEqual(307);
expect(resp?.headers.get('location')).toContain('sign-in');
expect(resp?.headers.get('location')).toContain(locationHeader);
expect((await clerkClient()).authenticateRequest).toBeCalled();
});

it('redirects to sign-in url when redirectToSignIn is called with the correct returnBackUrl', async () => {
it(`redirects to ${locationHeader} url when redirectToSignIn is called with the correct returnBackUrl`, async () => {
const req = mockRequest({
url: '/protected',
headers: new Headers({ [constants.Headers.SecFetchDest]: 'document' }),
appendDevBrowserCookie: true,
});

const resp = await clerkMiddleware(async auth => {
const { redirectToSignIn } = await auth();
redirectToSignIn();
(await auth())[util]();
})(req, {} as NextFetchEvent);

expect(resp?.status).toEqual(307);
expect(resp?.status).toEqual(307);
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
expect(new URL(resp!.headers.get('location')!).searchParams.get('redirect_url')).toContain('/protected');
expect((await clerkClient()).authenticateRequest).toBeCalled();
});

it('redirects to sign-in url with redirect_url set to the provided returnBackUrl param', async () => {
it(`redirects to ${locationHeader} url with redirect_url set to the provided returnBackUrl param`, async () => {
const req = mockRequest({
url: '/protected',
headers: new Headers({ [constants.Headers.SecFetchDest]: 'document' }),
appendDevBrowserCookie: true,
});

const resp = await clerkMiddleware(async auth => {
const { redirectToSignIn } = await auth();
redirectToSignIn({ returnBackUrl: 'https://www.clerk.com/hello' });
(await auth())[util]({ returnBackUrl: 'https://www.clerk.com/hello' });
})(req, {} as NextFetchEvent);

expect(resp?.status).toEqual(307);
expect(resp?.headers.get('location')).toContain('sign-in');
expect(resp?.headers.get('location')).toContain(locationHeader);
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
expect(new URL(resp!.headers.get('location')!).searchParams.get('redirect_url')).toEqual(
'https://www.clerk.com/hello',
);
expect((await clerkClient()).authenticateRequest).toBeCalled();
});

it('redirects to sign-in url without a redirect_url when returnBackUrl is null', async () => {
it(`redirects to ${locationHeader} url without a redirect_url when returnBackUrl is null`, async () => {
const req = mockRequest({
url: '/protected',
headers: new Headers({ [constants.Headers.SecFetchDest]: 'document' }),
appendDevBrowserCookie: true,
});

const resp = await clerkMiddleware(async auth => {
const { redirectToSignIn } = await auth();
redirectToSignIn({ returnBackUrl: null });
(await auth())[util]({ returnBackUrl: null });
})(req, {} as NextFetchEvent);

expect(resp?.status).toEqual(307);
expect(resp?.headers.get('location')).toContain('sign-in');
expect(resp?.headers.get('location')).toContain(locationHeader);
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
expect(new URL(resp!.headers.get('location')!).searchParams.get('redirect_url')).toBeNull();
expect((await clerkClient()).authenticateRequest).toBeCalled();
});
});

describe('auth().redirectToSignUp()', () => {
it('to support signInOrUp', async () => {
vi.mocked(clerkClient).mockResolvedValue({
authenticateRequest: vi.fn().mockResolvedValue({
toAuth: () => ({
debug: (d: any) => d,
}),
headers: new Headers(),
publishableKey,
signInUrl: '/hello',
}),
// @ts-expect-error - mock
telemetry: { record: vi.fn() },
});

const req = mockRequest({
url: '/protected',
headers: new Headers({ [constants.Headers.SecFetchDest]: 'document' }),
appendDevBrowserCookie: true,
});

const resp = await clerkMiddleware(async auth => {
(await auth()).redirectToSignUp();
})(req, {} as NextFetchEvent);

expect(resp?.status).toEqual(307);
expect(resp?.headers.get('location')).toContain(`/hello/create`);
expect((await clerkClient()).authenticateRequest).toBeCalled();
});
});

describe('auth.protect()', () => {
it('redirects to sign-in url when protect is called, the user is signed out and the request is a page request', async () => {
const req = mockRequest({
Expand Down
30 changes: 26 additions & 4 deletions packages/nextjs/src/server/clerkMiddleware.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,8 +17,10 @@ import {
isNextjsNotFoundError,
isNextjsRedirectError,
isRedirectToSignInError,
isRedirectToSignUpError,
nextjsRedirectError,
redirectToSignInError,
redirectToSignUpError,
} from './nextErrors';
import type { AuthProtect } from './protect';
import { createProtect } from './protect';
Expand All@@ -33,6 +35,7 @@ import {

export type ClerkMiddlewareAuthObject = AuthObject & {
redirectToSignIn: RedirectFun<Response>;
redirectToSignUp: RedirectFun<Response>;
};

export interface ClerkMiddlewareAuth {
Expand DownExpand Up@@ -162,9 +165,13 @@ export const clerkMiddleware = ((...args: unknown[]): NextMiddleware | NextMiddl
logger.debug('auth', () => ({ auth: authObject, debug: authObject.debug() }));

const redirectToSignIn = createMiddlewareRedirectToSignIn(clerkRequest);
const redirectToSignUp = createMiddlewareRedirectToSignUp(clerkRequest);
const protect = await createMiddlewareProtect(clerkRequest, authObject, redirectToSignIn);

const authObjWithMethods: ClerkMiddlewareAuthObject = Object.assign(authObject, { redirectToSignIn });
const authObjWithMethods: ClerkMiddlewareAuthObject = Object.assign(authObject, {
redirectToSignIn,
redirectToSignUp,
});
const authHandler = () => Promise.resolve(authObjWithMethods);
authHandler.protect = protect;

Expand DownExpand Up@@ -303,6 +310,15 @@ const createMiddlewareRedirectToSignIn = (
};
};

const createMiddlewareRedirectToSignUp = (
clerkRequest: ClerkRequest,
): ClerkMiddlewareAuthObject['redirectToSignUp'] => {
return (opts = {}) => {
const url = clerkRequest.clerkUrl.toString();
redirectToSignUpError(url, opts.returnBackUrl);
};
};

const createMiddlewareProtect = (
clerkRequest: ClerkRequest,
authObject: AuthObject,
Expand DownExpand Up@@ -345,15 +361,21 @@ const handleControlFlowErrors = (
);
}

if (isRedirectToSignInError(e)) {
return createRedirect({
const isRedirectToSignIn = isRedirectToSignInError(e);
const isRedirectToSignUp = isRedirectToSignUpError(e);

if (isRedirectToSignIn || isRedirectToSignUp) {
const redirect = createRedirect({
redirectAdapter,
baseUrl: clerkRequest.clerkUrl,
signInUrl: requestState.signInUrl,
signUpUrl: requestState.signUpUrl,
publishableKey: requestState.publishableKey,
sessionStatus: requestState.toAuth()?.sessionStatus,
}).redirectToSignIn({ returnBackUrl: e.returnBackUrl });
});

const { returnBackUrl } = e;
return redirect[isRedirectToSignIn ? 'redirectToSignIn' : 'redirectToSignUp']({ returnBackUrl });
}

if (isNextjsRedirectError(e)) {
Expand Down
Loading
, '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
17 changes: 17 additions & 0 deletions .changeset/spicy-lizards-take.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
---
'@clerk/nextjs': minor
---

- Introduce `auth().redirectToSignUp()` that can be used in API routes and pages. Originally effort by [@sambarnes](https://github.com/clerk/javascript/pull/5407)

```ts
import { clerkMiddleware } from '@clerk/nextjs/server';

export default clerkMiddleware(async (auth) => {
const { userId, redirectToSignUp } = await auth();

if (!userId) {
return redirectToSignUp();
}
});
```
13 changes: 12 additions & 1 deletion packages/backend/src/createRedirect.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -97,7 +97,18 @@ export const createRedirect: CreateRedirect = params => {
}

const accountsSignUpUrl = `${accountsBaseUrl}/sign-up`;
const targetUrl = signUpUrl || accountsSignUpUrl;

// Allows redirection to SignInOrUp path
function buildSignUpUrl(signIn: string | URL | undefined) {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Just want to make sure that I understand this part here. If there's a sign in URL option (env var or middleware key), we assume that combined flow is enabled - but doesn't it also need be able via the withSignUp prop?

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.

yes, but in that case signUpUrl will be defined. withSignUp is per component, nothing in can do about it on the server.

if (!signIn) {
return;
}
const url = new URL(signIn, baseUrl);
url.pathname = `${url.pathname}/create`;
return url.toString();
}

const targetUrl = signUpUrl || buildSignUpUrl(signInUrl) || accountsSignUpUrl;

if (hasPendingStatus) {
return redirectToTasks(targetUrl, { returnBackUrl });
Expand Down
49 changes: 37 additions & 12 deletions packages/nextjs/src/app-router/server/auth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,16 @@ type Auth = AuthObject & {
* `auth()` on the server-side can only access redirect URLs defined via [environment variables](https://clerk.com/docs/deployments/clerk-environment-variables#sign-in-and-sign-up-redirects) or [`clerkMiddleware` dynamic keys](https://clerk.com/docs/references/nextjs/clerk-middleware#dynamic-keys).
*/
redirectToSignIn: RedirectFun<ReturnType<typeof redirect>>;

/**
* The `auth()` helper returns the `redirectToSignUp()` method, which you can use to redirect the user to the sign-up page.
*
* @param [returnBackUrl] {string | URL} - The URL to redirect the user back to after they sign up.
*
* @note
* `auth()` on the server-side can only access redirect URLs defined via [environment variables](https://clerk.com/docs/deployments/clerk-environment-variables#sign-in-and-sign-up-redirects) or [`clerkMiddleware` dynamic keys](https://clerk.com/docs/references/nextjs/clerk-middleware#dynamic-keys).
*/
redirectToSignUp: RedirectFun<ReturnType<typeof redirect>>;
};

export interface AuthFn {
Expand DownExpand Up@@ -83,29 +93,44 @@ export const auth: AuthFn = async () => {

const clerkUrl = getAuthKeyFromRequest(request, 'ClerkUrl');

const redirectToSignIn: RedirectFun<never> = (opts = {}) => {
const createRedirectForRequest = (...args: Parameters<RedirectFun<never>>) => {
const { returnBackUrl } = args[0] || {};
const clerkRequest = createClerkRequest(request);
const devBrowserToken =
clerkRequest.clerkUrl.searchParams.get(constants.QueryParameters.DevBrowser) ||
clerkRequest.cookies.get(constants.Cookies.DevBrowser);

const encryptedRequestData = getHeader(request, constants.Headers.ClerkRequestData);
const decryptedRequestData = decryptClerkRequestData(encryptedRequestData);
return [
createRedirect({
redirectAdapter: redirect,
devBrowserToken: devBrowserToken,
baseUrl: clerkRequest.clerkUrl.toString(),
publishableKey: decryptedRequestData.publishableKey || PUBLISHABLE_KEY,
signInUrl: decryptedRequestData.signInUrl || SIGN_IN_URL,
signUpUrl: decryptedRequestData.signUpUrl || SIGN_UP_URL,
sessionStatus: authObject.sessionStatus,
}),
returnBackUrl === null ? '' : returnBackUrl || clerkUrl?.toString(),
] as const;
};

const redirectToSignIn: RedirectFun<never> = (opts = {}) => {
const [r, returnBackUrl] = createRedirectForRequest(opts);
return r.redirectToSignIn({
returnBackUrl,
});
};

return createRedirect({
redirectAdapter: redirect,
devBrowserToken: devBrowserToken,
baseUrl: clerkRequest.clerkUrl.toString(),
publishableKey: decryptedRequestData.publishableKey || PUBLISHABLE_KEY,
signInUrl: decryptedRequestData.signInUrl || SIGN_IN_URL,
signUpUrl: decryptedRequestData.signUpUrl || SIGN_UP_URL,
sessionStatus: authObject.sessionStatus,
}).redirectToSignIn({
returnBackUrl: opts.returnBackUrl === null ? '' : opts.returnBackUrl || clerkUrl?.toString(),
const redirectToSignUp: RedirectFun<never> = (opts = {}) => {
const [r, returnBackUrl] = createRedirectForRequest(opts);
return r.redirectToSignUp({
returnBackUrl,
});
};

return Object.assign(authObject, { redirectToSignIn });
return Object.assign(authObject, { redirectToSignIn, redirectToSignUp });
};

auth.protect = async (...args: any[]) => {
Expand Down
90 changes: 64 additions & 26 deletions packages/nextjs/src/server/__tests__/clerkMiddleware.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,8 @@ import { clerkMiddleware } from '../clerkMiddleware';
import { createRouteMatcher } from '../routeMatcher';
import { decryptClerkRequestData } from '../utils';

vi.mock('../clerkClient');

const publishableKey = 'pk_test_Y2xlcmsuaW5jbHVkZWQua2F0eWRpZC05Mi5sY2wuZGV2JA';
const authenticateRequestMock = vi.fn().mockResolvedValue({
toAuth: () => ({
Expand All@@ -21,15 +23,6 @@ const authenticateRequestMock = vi.fn().mockResolvedValue({
publishableKey,
});

vi.mock('../clerkClient', () => {
return {
clerkClient: () => ({
authenticateRequest: authenticateRequestMock,
telemetry: { record: vi.fn() },
}),
};
});

/**
* Disable console warnings about config matchers
*/
Expand All@@ -45,6 +38,14 @@ afterAll(() => {
global.console.log = consoleLog;
});

beforeEach(() => {
vi.mocked(clerkClient).mockResolvedValue({
authenticateRequest: authenticateRequestMock,
// @ts-expect-error - mock
telemetry: { record: vi.fn() },
});
});

// Removing this mock will cause the clerkMiddleware tests to fail due to missing publishable key
// This mock SHOULD exist before the imports
vi.mock(import('../constants.js'), async importOriginal => {
Expand DownExpand Up@@ -301,84 +302,121 @@ describe('clerkMiddleware(params)', () => {
});
});

describe('auth().redirectToSignIn()', () => {
it('redirects to sign-in url when redirectToSignIn is called and the request is a page request', async () => {
describe.each([
{
name: 'auth().redirectToSignIn()',
util: 'redirectToSignIn',
locationHeader: 'sign-in',
} as const,
{
name: 'auth().redirectToSignUp()',
util: 'redirectToSignUp',
locationHeader: 'sign-up',
} as const,
])('$name', ({ util, locationHeader }) => {
it(`redirects to ${locationHeader} url when ${util} is called and the request is a page request`, async () => {
const req = mockRequest({
url: '/protected',
headers: new Headers({ [constants.Headers.SecFetchDest]: 'document' }),
appendDevBrowserCookie: true,
});

const resp = await clerkMiddleware(async auth => {
const { redirectToSignIn } = await auth();
redirectToSignIn();
(await auth())[util]();
})(req, {} as NextFetchEvent);

expect(resp?.status).toEqual(307);
expect(resp?.headers.get('location')).toContain('sign-in');
expect(resp?.headers.get('location')).toContain(locationHeader);
expect((await clerkClient()).authenticateRequest).toBeCalled();
});

it('redirects to sign-in url when redirectToSignIn is called with the correct returnBackUrl', async () => {
it(`redirects to ${locationHeader} url when redirectToSignIn is called with the correct returnBackUrl`, async () => {
const req = mockRequest({
url: '/protected',
headers: new Headers({ [constants.Headers.SecFetchDest]: 'document' }),
appendDevBrowserCookie: true,
});

const resp = await clerkMiddleware(async auth => {
const { redirectToSignIn } = await auth();
redirectToSignIn();
(await auth())[util]();
})(req, {} as NextFetchEvent);

expect(resp?.status).toEqual(307);
expect(resp?.status).toEqual(307);
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
expect(new URL(resp!.headers.get('location')!).searchParams.get('redirect_url')).toContain('/protected');
expect((await clerkClient()).authenticateRequest).toBeCalled();
});

it('redirects to sign-in url with redirect_url set to the provided returnBackUrl param', async () => {
it(`redirects to ${locationHeader} url with redirect_url set to the provided returnBackUrl param`, async () => {
const req = mockRequest({
url: '/protected',
headers: new Headers({ [constants.Headers.SecFetchDest]: 'document' }),
appendDevBrowserCookie: true,
});

const resp = await clerkMiddleware(async auth => {
const { redirectToSignIn } = await auth();
redirectToSignIn({ returnBackUrl: 'https://www.clerk.com/hello' });
(await auth())[util]({ returnBackUrl: 'https://www.clerk.com/hello' });
})(req, {} as NextFetchEvent);

expect(resp?.status).toEqual(307);
expect(resp?.headers.get('location')).toContain('sign-in');
expect(resp?.headers.get('location')).toContain(locationHeader);
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
expect(new URL(resp!.headers.get('location')!).searchParams.get('redirect_url')).toEqual(
'https://www.clerk.com/hello',
);
expect((await clerkClient()).authenticateRequest).toBeCalled();
});

it('redirects to sign-in url without a redirect_url when returnBackUrl is null', async () => {
it(`redirects to ${locationHeader} url without a redirect_url when returnBackUrl is null`, async () => {
const req = mockRequest({
url: '/protected',
headers: new Headers({ [constants.Headers.SecFetchDest]: 'document' }),
appendDevBrowserCookie: true,
});

const resp = await clerkMiddleware(async auth => {
const { redirectToSignIn } = await auth();
redirectToSignIn({ returnBackUrl: null });
(await auth())[util]({ returnBackUrl: null });
})(req, {} as NextFetchEvent);

expect(resp?.status).toEqual(307);
expect(resp?.headers.get('location')).toContain('sign-in');
expect(resp?.headers.get('location')).toContain(locationHeader);
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
expect(new URL(resp!.headers.get('location')!).searchParams.get('redirect_url')).toBeNull();
expect((await clerkClient()).authenticateRequest).toBeCalled();
});
});

describe('auth().redirectToSignUp()', () => {
it('to support signInOrUp', async () => {
vi.mocked(clerkClient).mockResolvedValue({
authenticateRequest: vi.fn().mockResolvedValue({
toAuth: () => ({
debug: (d: any) => d,
}),
headers: new Headers(),
publishableKey,
signInUrl: '/hello',
}),
// @ts-expect-error - mock
telemetry: { record: vi.fn() },
});

const req = mockRequest({
url: '/protected',
headers: new Headers({ [constants.Headers.SecFetchDest]: 'document' }),
appendDevBrowserCookie: true,
});

const resp = await clerkMiddleware(async auth => {
(await auth()).redirectToSignUp();
})(req, {} as NextFetchEvent);

expect(resp?.status).toEqual(307);
expect(resp?.headers.get('location')).toContain(`/hello/create`);
expect((await clerkClient()).authenticateRequest).toBeCalled();
});
});

describe('auth.protect()', () => {
it('redirects to sign-in url when protect is called, the user is signed out and the request is a page request', async () => {
const req = mockRequest({
Expand Down
30 changes: 26 additions & 4 deletions packages/nextjs/src/server/clerkMiddleware.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,8 +17,10 @@ import {
isNextjsNotFoundError,
isNextjsRedirectError,
isRedirectToSignInError,
isRedirectToSignUpError,
nextjsRedirectError,
redirectToSignInError,
redirectToSignUpError,
} from './nextErrors';
import type { AuthProtect } from './protect';
import { createProtect } from './protect';
Expand All@@ -33,6 +35,7 @@ import {

export type ClerkMiddlewareAuthObject = AuthObject & {
redirectToSignIn: RedirectFun<Response>;
redirectToSignUp: RedirectFun<Response>;
};

export interface ClerkMiddlewareAuth {
Expand DownExpand Up@@ -162,9 +165,13 @@ export const clerkMiddleware = ((...args: unknown[]): NextMiddleware | NextMiddl
logger.debug('auth', () => ({ auth: authObject, debug: authObject.debug() }));

const redirectToSignIn = createMiddlewareRedirectToSignIn(clerkRequest);
const redirectToSignUp = createMiddlewareRedirectToSignUp(clerkRequest);
const protect = await createMiddlewareProtect(clerkRequest, authObject, redirectToSignIn);

const authObjWithMethods: ClerkMiddlewareAuthObject = Object.assign(authObject, { redirectToSignIn });
const authObjWithMethods: ClerkMiddlewareAuthObject = Object.assign(authObject, {
redirectToSignIn,
redirectToSignUp,
});
const authHandler = () => Promise.resolve(authObjWithMethods);
authHandler.protect = protect;

Expand DownExpand Up@@ -303,6 +310,15 @@ const createMiddlewareRedirectToSignIn = (
};
};

const createMiddlewareRedirectToSignUp = (
clerkRequest: ClerkRequest,
): ClerkMiddlewareAuthObject['redirectToSignUp'] => {
return (opts = {}) => {
const url = clerkRequest.clerkUrl.toString();
redirectToSignUpError(url, opts.returnBackUrl);
};
};

const createMiddlewareProtect = (
clerkRequest: ClerkRequest,
authObject: AuthObject,
Expand DownExpand Up@@ -345,15 +361,21 @@ const handleControlFlowErrors = (
);
}

if (isRedirectToSignInError(e)) {
return createRedirect({
const isRedirectToSignIn = isRedirectToSignInError(e);
const isRedirectToSignUp = isRedirectToSignUpError(e);

if (isRedirectToSignIn || isRedirectToSignUp) {
const redirect = createRedirect({
redirectAdapter,
baseUrl: clerkRequest.clerkUrl,
signInUrl: requestState.signInUrl,
signUpUrl: requestState.signUpUrl,
publishableKey: requestState.publishableKey,
sessionStatus: requestState.toAuth()?.sessionStatus,
}).redirectToSignIn({ returnBackUrl: e.returnBackUrl });
});

const { returnBackUrl } = e;
return redirect[isRedirectToSignIn ? 'redirectToSignIn' : 'redirectToSignUp']({ returnBackUrl });
}

if (isNextjsRedirectError(e)) {
Expand Down
Loading
, '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
17 changes: 17 additions & 0 deletions .changeset/spicy-lizards-take.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
---
'@clerk/nextjs': minor
---

- Introduce `auth().redirectToSignUp()` that can be used in API routes and pages. Originally effort by [@sambarnes](https://github.com/clerk/javascript/pull/5407)

```ts
import { clerkMiddleware } from '@clerk/nextjs/server';

export default clerkMiddleware(async (auth) => {
const { userId, redirectToSignUp } = await auth();

if (!userId) {
return redirectToSignUp();
}
});
```
13 changes: 12 additions & 1 deletion packages/backend/src/createRedirect.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -97,7 +97,18 @@ export const createRedirect: CreateRedirect = params => {
}

const accountsSignUpUrl = `${accountsBaseUrl}/sign-up`;
const targetUrl = signUpUrl || accountsSignUpUrl;

// Allows redirection to SignInOrUp path
function buildSignUpUrl(signIn: string | URL | undefined) {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Just want to make sure that I understand this part here. If there's a sign in URL option (env var or middleware key), we assume that combined flow is enabled - but doesn't it also need be able via the withSignUp prop?

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.

yes, but in that case signUpUrl will be defined. withSignUp is per component, nothing in can do about it on the server.

if (!signIn) {
return;
}
const url = new URL(signIn, baseUrl);
url.pathname = `${url.pathname}/create`;
return url.toString();
}

const targetUrl = signUpUrl || buildSignUpUrl(signInUrl) || accountsSignUpUrl;

if (hasPendingStatus) {
return redirectToTasks(targetUrl, { returnBackUrl });
Expand Down
49 changes: 37 additions & 12 deletions packages/nextjs/src/app-router/server/auth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,16 @@ type Auth = AuthObject & {
* `auth()` on the server-side can only access redirect URLs defined via [environment variables](https://clerk.com/docs/deployments/clerk-environment-variables#sign-in-and-sign-up-redirects) or [`clerkMiddleware` dynamic keys](https://clerk.com/docs/references/nextjs/clerk-middleware#dynamic-keys).
*/
redirectToSignIn: RedirectFun<ReturnType<typeof redirect>>;

/**
* The `auth()` helper returns the `redirectToSignUp()` method, which you can use to redirect the user to the sign-up page.
*
* @param [returnBackUrl] {string | URL} - The URL to redirect the user back to after they sign up.
*
* @note
* `auth()` on the server-side can only access redirect URLs defined via [environment variables](https://clerk.com/docs/deployments/clerk-environment-variables#sign-in-and-sign-up-redirects) or [`clerkMiddleware` dynamic keys](https://clerk.com/docs/references/nextjs/clerk-middleware#dynamic-keys).
*/
redirectToSignUp: RedirectFun<ReturnType<typeof redirect>>;
};

export interface AuthFn {
Expand DownExpand Up@@ -83,29 +93,44 @@ export const auth: AuthFn = async () => {

const clerkUrl = getAuthKeyFromRequest(request, 'ClerkUrl');

const redirectToSignIn: RedirectFun<never> = (opts = {}) => {
const createRedirectForRequest = (...args: Parameters<RedirectFun<never>>) => {
const { returnBackUrl } = args[0] || {};
const clerkRequest = createClerkRequest(request);
const devBrowserToken =
clerkRequest.clerkUrl.searchParams.get(constants.QueryParameters.DevBrowser) ||
clerkRequest.cookies.get(constants.Cookies.DevBrowser);

const encryptedRequestData = getHeader(request, constants.Headers.ClerkRequestData);
const decryptedRequestData = decryptClerkRequestData(encryptedRequestData);
return [
createRedirect({
redirectAdapter: redirect,
devBrowserToken: devBrowserToken,
baseUrl: clerkRequest.clerkUrl.toString(),
publishableKey: decryptedRequestData.publishableKey || PUBLISHABLE_KEY,
signInUrl: decryptedRequestData.signInUrl || SIGN_IN_URL,
signUpUrl: decryptedRequestData.signUpUrl || SIGN_UP_URL,
sessionStatus: authObject.sessionStatus,
}),
returnBackUrl === null ? '' : returnBackUrl || clerkUrl?.toString(),
] as const;
};

const redirectToSignIn: RedirectFun<never> = (opts = {}) => {
const [r, returnBackUrl] = createRedirectForRequest(opts);
return r.redirectToSignIn({
returnBackUrl,
});
};

return createRedirect({
redirectAdapter: redirect,
devBrowserToken: devBrowserToken,
baseUrl: clerkRequest.clerkUrl.toString(),
publishableKey: decryptedRequestData.publishableKey || PUBLISHABLE_KEY,
signInUrl: decryptedRequestData.signInUrl || SIGN_IN_URL,
signUpUrl: decryptedRequestData.signUpUrl || SIGN_UP_URL,
sessionStatus: authObject.sessionStatus,
}).redirectToSignIn({
returnBackUrl: opts.returnBackUrl === null ? '' : opts.returnBackUrl || clerkUrl?.toString(),
const redirectToSignUp: RedirectFun<never> = (opts = {}) => {
const [r, returnBackUrl] = createRedirectForRequest(opts);
return r.redirectToSignUp({
returnBackUrl,
});
};

return Object.assign(authObject, { redirectToSignIn });
return Object.assign(authObject, { redirectToSignIn, redirectToSignUp });
};

auth.protect = async (...args: any[]) => {
Expand Down
90 changes: 64 additions & 26 deletions packages/nextjs/src/server/__tests__/clerkMiddleware.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,8 @@ import { clerkMiddleware } from '../clerkMiddleware';
import { createRouteMatcher } from '../routeMatcher';
import { decryptClerkRequestData } from '../utils';

vi.mock('../clerkClient');

const publishableKey = 'pk_test_Y2xlcmsuaW5jbHVkZWQua2F0eWRpZC05Mi5sY2wuZGV2JA';
const authenticateRequestMock = vi.fn().mockResolvedValue({
toAuth: () => ({
Expand All@@ -21,15 +23,6 @@ const authenticateRequestMock = vi.fn().mockResolvedValue({
publishableKey,
});

vi.mock('../clerkClient', () => {
return {
clerkClient: () => ({
authenticateRequest: authenticateRequestMock,
telemetry: { record: vi.fn() },
}),
};
});

/**
* Disable console warnings about config matchers
*/
Expand All@@ -45,6 +38,14 @@ afterAll(() => {
global.console.log = consoleLog;
});

beforeEach(() => {
vi.mocked(clerkClient).mockResolvedValue({
authenticateRequest: authenticateRequestMock,
// @ts-expect-error - mock
telemetry: { record: vi.fn() },
});
});

// Removing this mock will cause the clerkMiddleware tests to fail due to missing publishable key
// This mock SHOULD exist before the imports
vi.mock(import('../constants.js'), async importOriginal => {
Expand DownExpand Up@@ -301,84 +302,121 @@ describe('clerkMiddleware(params)', () => {
});
});

describe('auth().redirectToSignIn()', () => {
it('redirects to sign-in url when redirectToSignIn is called and the request is a page request', async () => {
describe.each([
{
name: 'auth().redirectToSignIn()',
util: 'redirectToSignIn',
locationHeader: 'sign-in',
} as const,
{
name: 'auth().redirectToSignUp()',
util: 'redirectToSignUp',
locationHeader: 'sign-up',
} as const,
])('$name', ({ util, locationHeader }) => {
it(`redirects to ${locationHeader} url when ${util} is called and the request is a page request`, async () => {
const req = mockRequest({
url: '/protected',
headers: new Headers({ [constants.Headers.SecFetchDest]: 'document' }),
appendDevBrowserCookie: true,
});

const resp = await clerkMiddleware(async auth => {
const { redirectToSignIn } = await auth();
redirectToSignIn();
(await auth())[util]();
})(req, {} as NextFetchEvent);

expect(resp?.status).toEqual(307);
expect(resp?.headers.get('location')).toContain('sign-in');
expect(resp?.headers.get('location')).toContain(locationHeader);
expect((await clerkClient()).authenticateRequest).toBeCalled();
});

it('redirects to sign-in url when redirectToSignIn is called with the correct returnBackUrl', async () => {
it(`redirects to ${locationHeader} url when redirectToSignIn is called with the correct returnBackUrl`, async () => {
const req = mockRequest({
url: '/protected',
headers: new Headers({ [constants.Headers.SecFetchDest]: 'document' }),
appendDevBrowserCookie: true,
});

const resp = await clerkMiddleware(async auth => {
const { redirectToSignIn } = await auth();
redirectToSignIn();
(await auth())[util]();
})(req, {} as NextFetchEvent);

expect(resp?.status).toEqual(307);
expect(resp?.status).toEqual(307);
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
expect(new URL(resp!.headers.get('location')!).searchParams.get('redirect_url')).toContain('/protected');
expect((await clerkClient()).authenticateRequest).toBeCalled();
});

it('redirects to sign-in url with redirect_url set to the provided returnBackUrl param', async () => {
it(`redirects to ${locationHeader} url with redirect_url set to the provided returnBackUrl param`, async () => {
const req = mockRequest({
url: '/protected',
headers: new Headers({ [constants.Headers.SecFetchDest]: 'document' }),
appendDevBrowserCookie: true,
});

const resp = await clerkMiddleware(async auth => {
const { redirectToSignIn } = await auth();
redirectToSignIn({ returnBackUrl: 'https://www.clerk.com/hello' });
(await auth())[util]({ returnBackUrl: 'https://www.clerk.com/hello' });
})(req, {} as NextFetchEvent);

expect(resp?.status).toEqual(307);
expect(resp?.headers.get('location')).toContain('sign-in');
expect(resp?.headers.get('location')).toContain(locationHeader);
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
expect(new URL(resp!.headers.get('location')!).searchParams.get('redirect_url')).toEqual(
'https://www.clerk.com/hello',
);
expect((await clerkClient()).authenticateRequest).toBeCalled();
});

it('redirects to sign-in url without a redirect_url when returnBackUrl is null', async () => {
it(`redirects to ${locationHeader} url without a redirect_url when returnBackUrl is null`, async () => {
const req = mockRequest({
url: '/protected',
headers: new Headers({ [constants.Headers.SecFetchDest]: 'document' }),
appendDevBrowserCookie: true,
});

const resp = await clerkMiddleware(async auth => {
const { redirectToSignIn } = await auth();
redirectToSignIn({ returnBackUrl: null });
(await auth())[util]({ returnBackUrl: null });
})(req, {} as NextFetchEvent);

expect(resp?.status).toEqual(307);
expect(resp?.headers.get('location')).toContain('sign-in');
expect(resp?.headers.get('location')).toContain(locationHeader);
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
expect(new URL(resp!.headers.get('location')!).searchParams.get('redirect_url')).toBeNull();
expect((await clerkClient()).authenticateRequest).toBeCalled();
});
});

describe('auth().redirectToSignUp()', () => {
it('to support signInOrUp', async () => {
vi.mocked(clerkClient).mockResolvedValue({
authenticateRequest: vi.fn().mockResolvedValue({
toAuth: () => ({
debug: (d: any) => d,
}),
headers: new Headers(),
publishableKey,
signInUrl: '/hello',
}),
// @ts-expect-error - mock
telemetry: { record: vi.fn() },
});

const req = mockRequest({
url: '/protected',
headers: new Headers({ [constants.Headers.SecFetchDest]: 'document' }),
appendDevBrowserCookie: true,
});

const resp = await clerkMiddleware(async auth => {
(await auth()).redirectToSignUp();
})(req, {} as NextFetchEvent);

expect(resp?.status).toEqual(307);
expect(resp?.headers.get('location')).toContain(`/hello/create`);
expect((await clerkClient()).authenticateRequest).toBeCalled();
});
});

describe('auth.protect()', () => {
it('redirects to sign-in url when protect is called, the user is signed out and the request is a page request', async () => {
const req = mockRequest({
Expand Down
30 changes: 26 additions & 4 deletions packages/nextjs/src/server/clerkMiddleware.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,8 +17,10 @@ import {
isNextjsNotFoundError,
isNextjsRedirectError,
isRedirectToSignInError,
isRedirectToSignUpError,
nextjsRedirectError,
redirectToSignInError,
redirectToSignUpError,
} from './nextErrors';
import type { AuthProtect } from './protect';
import { createProtect } from './protect';
Expand All@@ -33,6 +35,7 @@ import {

export type ClerkMiddlewareAuthObject = AuthObject & {
redirectToSignIn: RedirectFun<Response>;
redirectToSignUp: RedirectFun<Response>;
};

export interface ClerkMiddlewareAuth {
Expand DownExpand Up@@ -162,9 +165,13 @@ export const clerkMiddleware = ((...args: unknown[]): NextMiddleware | NextMiddl
logger.debug('auth', () => ({ auth: authObject, debug: authObject.debug() }));

const redirectToSignIn = createMiddlewareRedirectToSignIn(clerkRequest);
const redirectToSignUp = createMiddlewareRedirectToSignUp(clerkRequest);
const protect = await createMiddlewareProtect(clerkRequest, authObject, redirectToSignIn);

const authObjWithMethods: ClerkMiddlewareAuthObject = Object.assign(authObject, { redirectToSignIn });
const authObjWithMethods: ClerkMiddlewareAuthObject = Object.assign(authObject, {
redirectToSignIn,
redirectToSignUp,
});
const authHandler = () => Promise.resolve(authObjWithMethods);
authHandler.protect = protect;

Expand DownExpand Up@@ -303,6 +310,15 @@ const createMiddlewareRedirectToSignIn = (
};
};

const createMiddlewareRedirectToSignUp = (
clerkRequest: ClerkRequest,
): ClerkMiddlewareAuthObject['redirectToSignUp'] => {
return (opts = {}) => {
const url = clerkRequest.clerkUrl.toString();
redirectToSignUpError(url, opts.returnBackUrl);
};
};

const createMiddlewareProtect = (
clerkRequest: ClerkRequest,
authObject: AuthObject,
Expand DownExpand Up@@ -345,15 +361,21 @@ const handleControlFlowErrors = (
);
}

if (isRedirectToSignInError(e)) {
return createRedirect({
const isRedirectToSignIn = isRedirectToSignInError(e);
const isRedirectToSignUp = isRedirectToSignUpError(e);

if (isRedirectToSignIn || isRedirectToSignUp) {
const redirect = createRedirect({
redirectAdapter,
baseUrl: clerkRequest.clerkUrl,
signInUrl: requestState.signInUrl,
signUpUrl: requestState.signUpUrl,
publishableKey: requestState.publishableKey,
sessionStatus: requestState.toAuth()?.sessionStatus,
}).redirectToSignIn({ returnBackUrl: e.returnBackUrl });
});

const { returnBackUrl } = e;
return redirect[isRedirectToSignIn ? 'redirectToSignIn' : 'redirectToSignUp']({ returnBackUrl });
}

if (isNextjsRedirectError(e)) {
Expand Down
Loading
, '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
17 changes: 17 additions & 0 deletions .changeset/spicy-lizards-take.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
---
'@clerk/nextjs': minor
---

- Introduce `auth().redirectToSignUp()` that can be used in API routes and pages. Originally effort by [@sambarnes](https://github.com/clerk/javascript/pull/5407)

```ts
import { clerkMiddleware } from '@clerk/nextjs/server';

export default clerkMiddleware(async (auth) => {
const { userId, redirectToSignUp } = await auth();

if (!userId) {
return redirectToSignUp();
}
});
```
13 changes: 12 additions & 1 deletion packages/backend/src/createRedirect.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -97,7 +97,18 @@ export const createRedirect: CreateRedirect = params => {
}

const accountsSignUpUrl = `${accountsBaseUrl}/sign-up`;
const targetUrl = signUpUrl || accountsSignUpUrl;

// Allows redirection to SignInOrUp path
function buildSignUpUrl(signIn: string | URL | undefined) {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Just want to make sure that I understand this part here. If there's a sign in URL option (env var or middleware key), we assume that combined flow is enabled - but doesn't it also need be able via the withSignUp prop?

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.

yes, but in that case signUpUrl will be defined. withSignUp is per component, nothing in can do about it on the server.

if (!signIn) {
return;
}
const url = new URL(signIn, baseUrl);
url.pathname = `${url.pathname}/create`;
return url.toString();
}

const targetUrl = signUpUrl || buildSignUpUrl(signInUrl) || accountsSignUpUrl;

if (hasPendingStatus) {
return redirectToTasks(targetUrl, { returnBackUrl });
Expand Down
49 changes: 37 additions & 12 deletions packages/nextjs/src/app-router/server/auth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,16 @@ type Auth = AuthObject & {
* `auth()` on the server-side can only access redirect URLs defined via [environment variables](https://clerk.com/docs/deployments/clerk-environment-variables#sign-in-and-sign-up-redirects) or [`clerkMiddleware` dynamic keys](https://clerk.com/docs/references/nextjs/clerk-middleware#dynamic-keys).
*/
redirectToSignIn: RedirectFun<ReturnType<typeof redirect>>;

/**
* The `auth()` helper returns the `redirectToSignUp()` method, which you can use to redirect the user to the sign-up page.
*
* @param [returnBackUrl] {string | URL} - The URL to redirect the user back to after they sign up.
*
* @note
* `auth()` on the server-side can only access redirect URLs defined via [environment variables](https://clerk.com/docs/deployments/clerk-environment-variables#sign-in-and-sign-up-redirects) or [`clerkMiddleware` dynamic keys](https://clerk.com/docs/references/nextjs/clerk-middleware#dynamic-keys).
*/
redirectToSignUp: RedirectFun<ReturnType<typeof redirect>>;
};

export interface AuthFn {
Expand DownExpand Up@@ -83,29 +93,44 @@ export const auth: AuthFn = async () => {

const clerkUrl = getAuthKeyFromRequest(request, 'ClerkUrl');

const redirectToSignIn: RedirectFun<never> = (opts = {}) => {
const createRedirectForRequest = (...args: Parameters<RedirectFun<never>>) => {
const { returnBackUrl } = args[0] || {};
const clerkRequest = createClerkRequest(request);
const devBrowserToken =
clerkRequest.clerkUrl.searchParams.get(constants.QueryParameters.DevBrowser) ||
clerkRequest.cookies.get(constants.Cookies.DevBrowser);

const encryptedRequestData = getHeader(request, constants.Headers.ClerkRequestData);
const decryptedRequestData = decryptClerkRequestData(encryptedRequestData);
return [
createRedirect({
redirectAdapter: redirect,
devBrowserToken: devBrowserToken,
baseUrl: clerkRequest.clerkUrl.toString(),
publishableKey: decryptedRequestData.publishableKey || PUBLISHABLE_KEY,
signInUrl: decryptedRequestData.signInUrl || SIGN_IN_URL,
signUpUrl: decryptedRequestData.signUpUrl || SIGN_UP_URL,
sessionStatus: authObject.sessionStatus,
}),
returnBackUrl === null ? '' : returnBackUrl || clerkUrl?.toString(),
] as const;
};

const redirectToSignIn: RedirectFun<never> = (opts = {}) => {
const [r, returnBackUrl] = createRedirectForRequest(opts);
return r.redirectToSignIn({
returnBackUrl,
});
};

return createRedirect({
redirectAdapter: redirect,
devBrowserToken: devBrowserToken,
baseUrl: clerkRequest.clerkUrl.toString(),
publishableKey: decryptedRequestData.publishableKey || PUBLISHABLE_KEY,
signInUrl: decryptedRequestData.signInUrl || SIGN_IN_URL,
signUpUrl: decryptedRequestData.signUpUrl || SIGN_UP_URL,
sessionStatus: authObject.sessionStatus,
}).redirectToSignIn({
returnBackUrl: opts.returnBackUrl === null ? '' : opts.returnBackUrl || clerkUrl?.toString(),
const redirectToSignUp: RedirectFun<never> = (opts = {}) => {
const [r, returnBackUrl] = createRedirectForRequest(opts);
return r.redirectToSignUp({
returnBackUrl,
});
};

return Object.assign(authObject, { redirectToSignIn });
return Object.assign(authObject, { redirectToSignIn, redirectToSignUp });
};

auth.protect = async (...args: any[]) => {
Expand Down
90 changes: 64 additions & 26 deletions packages/nextjs/src/server/__tests__/clerkMiddleware.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,8 @@ import { clerkMiddleware } from '../clerkMiddleware';
import { createRouteMatcher } from '../routeMatcher';
import { decryptClerkRequestData } from '../utils';

vi.mock('../clerkClient');

const publishableKey = 'pk_test_Y2xlcmsuaW5jbHVkZWQua2F0eWRpZC05Mi5sY2wuZGV2JA';
const authenticateRequestMock = vi.fn().mockResolvedValue({
toAuth: () => ({
Expand All@@ -21,15 +23,6 @@ const authenticateRequestMock = vi.fn().mockResolvedValue({
publishableKey,
});

vi.mock('../clerkClient', () => {
return {
clerkClient: () => ({
authenticateRequest: authenticateRequestMock,
telemetry: { record: vi.fn() },
}),
};
});

/**
* Disable console warnings about config matchers
*/
Expand All@@ -45,6 +38,14 @@ afterAll(() => {
global.console.log = consoleLog;
});

beforeEach(() => {
vi.mocked(clerkClient).mockResolvedValue({
authenticateRequest: authenticateRequestMock,
// @ts-expect-error - mock
telemetry: { record: vi.fn() },
});
});

// Removing this mock will cause the clerkMiddleware tests to fail due to missing publishable key
// This mock SHOULD exist before the imports
vi.mock(import('../constants.js'), async importOriginal => {
Expand DownExpand Up@@ -301,84 +302,121 @@ describe('clerkMiddleware(params)', () => {
});
});

describe('auth().redirectToSignIn()', () => {
it('redirects to sign-in url when redirectToSignIn is called and the request is a page request', async () => {
describe.each([
{
name: 'auth().redirectToSignIn()',
util: 'redirectToSignIn',
locationHeader: 'sign-in',
} as const,
{
name: 'auth().redirectToSignUp()',
util: 'redirectToSignUp',
locationHeader: 'sign-up',
} as const,
])('$name', ({ util, locationHeader }) => {
it(`redirects to ${locationHeader} url when ${util} is called and the request is a page request`, async () => {
const req = mockRequest({
url: '/protected',
headers: new Headers({ [constants.Headers.SecFetchDest]: 'document' }),
appendDevBrowserCookie: true,
});

const resp = await clerkMiddleware(async auth => {
const { redirectToSignIn } = await auth();
redirectToSignIn();
(await auth())[util]();
})(req, {} as NextFetchEvent);

expect(resp?.status).toEqual(307);
expect(resp?.headers.get('location')).toContain('sign-in');
expect(resp?.headers.get('location')).toContain(locationHeader);
expect((await clerkClient()).authenticateRequest).toBeCalled();
});

it('redirects to sign-in url when redirectToSignIn is called with the correct returnBackUrl', async () => {
it(`redirects to ${locationHeader} url when redirectToSignIn is called with the correct returnBackUrl`, async () => {
const req = mockRequest({
url: '/protected',
headers: new Headers({ [constants.Headers.SecFetchDest]: 'document' }),
appendDevBrowserCookie: true,
});

const resp = await clerkMiddleware(async auth => {
const { redirectToSignIn } = await auth();
redirectToSignIn();
(await auth())[util]();
})(req, {} as NextFetchEvent);

expect(resp?.status).toEqual(307);
expect(resp?.status).toEqual(307);
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
expect(new URL(resp!.headers.get('location')!).searchParams.get('redirect_url')).toContain('/protected');
expect((await clerkClient()).authenticateRequest).toBeCalled();
});

it('redirects to sign-in url with redirect_url set to the provided returnBackUrl param', async () => {
it(`redirects to ${locationHeader} url with redirect_url set to the provided returnBackUrl param`, async () => {
const req = mockRequest({
url: '/protected',
headers: new Headers({ [constants.Headers.SecFetchDest]: 'document' }),
appendDevBrowserCookie: true,
});

const resp = await clerkMiddleware(async auth => {
const { redirectToSignIn } = await auth();
redirectToSignIn({ returnBackUrl: 'https://www.clerk.com/hello' });
(await auth())[util]({ returnBackUrl: 'https://www.clerk.com/hello' });
})(req, {} as NextFetchEvent);

expect(resp?.status).toEqual(307);
expect(resp?.headers.get('location')).toContain('sign-in');
expect(resp?.headers.get('location')).toContain(locationHeader);
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
expect(new URL(resp!.headers.get('location')!).searchParams.get('redirect_url')).toEqual(
'https://www.clerk.com/hello',
);
expect((await clerkClient()).authenticateRequest).toBeCalled();
});

it('redirects to sign-in url without a redirect_url when returnBackUrl is null', async () => {
it(`redirects to ${locationHeader} url without a redirect_url when returnBackUrl is null`, async () => {
const req = mockRequest({
url: '/protected',
headers: new Headers({ [constants.Headers.SecFetchDest]: 'document' }),
appendDevBrowserCookie: true,
});

const resp = await clerkMiddleware(async auth => {
const { redirectToSignIn } = await auth();
redirectToSignIn({ returnBackUrl: null });
(await auth())[util]({ returnBackUrl: null });
})(req, {} as NextFetchEvent);

expect(resp?.status).toEqual(307);
expect(resp?.headers.get('location')).toContain('sign-in');
expect(resp?.headers.get('location')).toContain(locationHeader);
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
expect(new URL(resp!.headers.get('location')!).searchParams.get('redirect_url')).toBeNull();
expect((await clerkClient()).authenticateRequest).toBeCalled();
});
});

describe('auth().redirectToSignUp()', () => {
it('to support signInOrUp', async () => {
vi.mocked(clerkClient).mockResolvedValue({
authenticateRequest: vi.fn().mockResolvedValue({
toAuth: () => ({
debug: (d: any) => d,
}),
headers: new Headers(),
publishableKey,
signInUrl: '/hello',
}),
// @ts-expect-error - mock
telemetry: { record: vi.fn() },
});

const req = mockRequest({
url: '/protected',
headers: new Headers({ [constants.Headers.SecFetchDest]: 'document' }),
appendDevBrowserCookie: true,
});

const resp = await clerkMiddleware(async auth => {
(await auth()).redirectToSignUp();
})(req, {} as NextFetchEvent);

expect(resp?.status).toEqual(307);
expect(resp?.headers.get('location')).toContain(`/hello/create`);
expect((await clerkClient()).authenticateRequest).toBeCalled();
});
});

describe('auth.protect()', () => {
it('redirects to sign-in url when protect is called, the user is signed out and the request is a page request', async () => {
const req = mockRequest({
Expand Down
30 changes: 26 additions & 4 deletions packages/nextjs/src/server/clerkMiddleware.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,8 +17,10 @@ import {
isNextjsNotFoundError,
isNextjsRedirectError,
isRedirectToSignInError,
isRedirectToSignUpError,
nextjsRedirectError,
redirectToSignInError,
redirectToSignUpError,
} from './nextErrors';
import type { AuthProtect } from './protect';
import { createProtect } from './protect';
Expand All@@ -33,6 +35,7 @@ import {

export type ClerkMiddlewareAuthObject = AuthObject & {
redirectToSignIn: RedirectFun<Response>;
redirectToSignUp: RedirectFun<Response>;
};

export interface ClerkMiddlewareAuth {
Expand DownExpand Up@@ -162,9 +165,13 @@ export const clerkMiddleware = ((...args: unknown[]): NextMiddleware | NextMiddl
logger.debug('auth', () => ({ auth: authObject, debug: authObject.debug() }));

const redirectToSignIn = createMiddlewareRedirectToSignIn(clerkRequest);
const redirectToSignUp = createMiddlewareRedirectToSignUp(clerkRequest);
const protect = await createMiddlewareProtect(clerkRequest, authObject, redirectToSignIn);

const authObjWithMethods: ClerkMiddlewareAuthObject = Object.assign(authObject, { redirectToSignIn });
const authObjWithMethods: ClerkMiddlewareAuthObject = Object.assign(authObject, {
redirectToSignIn,
redirectToSignUp,
});
const authHandler = () => Promise.resolve(authObjWithMethods);
authHandler.protect = protect;

Expand DownExpand Up@@ -303,6 +310,15 @@ const createMiddlewareRedirectToSignIn = (
};
};

const createMiddlewareRedirectToSignUp = (
clerkRequest: ClerkRequest,
): ClerkMiddlewareAuthObject['redirectToSignUp'] => {
return (opts = {}) => {
const url = clerkRequest.clerkUrl.toString();
redirectToSignUpError(url, opts.returnBackUrl);
};
};

const createMiddlewareProtect = (
clerkRequest: ClerkRequest,
authObject: AuthObject,
Expand DownExpand Up@@ -345,15 +361,21 @@ const handleControlFlowErrors = (
);
}

if (isRedirectToSignInError(e)) {
return createRedirect({
const isRedirectToSignIn = isRedirectToSignInError(e);
const isRedirectToSignUp = isRedirectToSignUpError(e);

if (isRedirectToSignIn || isRedirectToSignUp) {
const redirect = createRedirect({
redirectAdapter,
baseUrl: clerkRequest.clerkUrl,
signInUrl: requestState.signInUrl,
signUpUrl: requestState.signUpUrl,
publishableKey: requestState.publishableKey,
sessionStatus: requestState.toAuth()?.sessionStatus,
}).redirectToSignIn({ returnBackUrl: e.returnBackUrl });
});

const { returnBackUrl } = e;
return redirect[isRedirectToSignIn ? 'redirectToSignIn' : 'redirectToSignUp']({ returnBackUrl });
}

if (isNextjsRedirectError(e)) {
Expand Down
Loading
, '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
17 changes: 17 additions & 0 deletions .changeset/spicy-lizards-take.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
---
'@clerk/nextjs': minor
---

- Introduce `auth().redirectToSignUp()` that can be used in API routes and pages. Originally effort by [@sambarnes](https://github.com/clerk/javascript/pull/5407)

```ts
import { clerkMiddleware } from '@clerk/nextjs/server';

export default clerkMiddleware(async (auth) => {
const { userId, redirectToSignUp } = await auth();

if (!userId) {
return redirectToSignUp();
}
});
```
13 changes: 12 additions & 1 deletion packages/backend/src/createRedirect.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -97,7 +97,18 @@ export const createRedirect: CreateRedirect = params => {
}

const accountsSignUpUrl = `${accountsBaseUrl}/sign-up`;
const targetUrl = signUpUrl || accountsSignUpUrl;

// Allows redirection to SignInOrUp path
function buildSignUpUrl(signIn: string | URL | undefined) {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Just want to make sure that I understand this part here. If there's a sign in URL option (env var or middleware key), we assume that combined flow is enabled - but doesn't it also need be able via the withSignUp prop?

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.

yes, but in that case signUpUrl will be defined. withSignUp is per component, nothing in can do about it on the server.

if (!signIn) {
return;
}
const url = new URL(signIn, baseUrl);
url.pathname = `${url.pathname}/create`;
return url.toString();
}

const targetUrl = signUpUrl || buildSignUpUrl(signInUrl) || accountsSignUpUrl;

if (hasPendingStatus) {
return redirectToTasks(targetUrl, { returnBackUrl });
Expand Down
49 changes: 37 additions & 12 deletions packages/nextjs/src/app-router/server/auth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,16 @@ type Auth = AuthObject & {
* `auth()` on the server-side can only access redirect URLs defined via [environment variables](https://clerk.com/docs/deployments/clerk-environment-variables#sign-in-and-sign-up-redirects) or [`clerkMiddleware` dynamic keys](https://clerk.com/docs/references/nextjs/clerk-middleware#dynamic-keys).
*/
redirectToSignIn: RedirectFun<ReturnType<typeof redirect>>;

/**
* The `auth()` helper returns the `redirectToSignUp()` method, which you can use to redirect the user to the sign-up page.
*
* @param [returnBackUrl] {string | URL} - The URL to redirect the user back to after they sign up.
*
* @note
* `auth()` on the server-side can only access redirect URLs defined via [environment variables](https://clerk.com/docs/deployments/clerk-environment-variables#sign-in-and-sign-up-redirects) or [`clerkMiddleware` dynamic keys](https://clerk.com/docs/references/nextjs/clerk-middleware#dynamic-keys).
*/
redirectToSignUp: RedirectFun<ReturnType<typeof redirect>>;
};

export interface AuthFn {
Expand DownExpand Up@@ -83,29 +93,44 @@ export const auth: AuthFn = async () => {

const clerkUrl = getAuthKeyFromRequest(request, 'ClerkUrl');

const redirectToSignIn: RedirectFun<never> = (opts = {}) => {
const createRedirectForRequest = (...args: Parameters<RedirectFun<never>>) => {
const { returnBackUrl } = args[0] || {};
const clerkRequest = createClerkRequest(request);
const devBrowserToken =
clerkRequest.clerkUrl.searchParams.get(constants.QueryParameters.DevBrowser) ||
clerkRequest.cookies.get(constants.Cookies.DevBrowser);

const encryptedRequestData = getHeader(request, constants.Headers.ClerkRequestData);
const decryptedRequestData = decryptClerkRequestData(encryptedRequestData);
return [
createRedirect({
redirectAdapter: redirect,
devBrowserToken: devBrowserToken,
baseUrl: clerkRequest.clerkUrl.toString(),
publishableKey: decryptedRequestData.publishableKey || PUBLISHABLE_KEY,
signInUrl: decryptedRequestData.signInUrl || SIGN_IN_URL,
signUpUrl: decryptedRequestData.signUpUrl || SIGN_UP_URL,
sessionStatus: authObject.sessionStatus,
}),
returnBackUrl === null ? '' : returnBackUrl || clerkUrl?.toString(),
] as const;
};

const redirectToSignIn: RedirectFun<never> = (opts = {}) => {
const [r, returnBackUrl] = createRedirectForRequest(opts);
return r.redirectToSignIn({
returnBackUrl,
});
};

return createRedirect({
redirectAdapter: redirect,
devBrowserToken: devBrowserToken,
baseUrl: clerkRequest.clerkUrl.toString(),
publishableKey: decryptedRequestData.publishableKey || PUBLISHABLE_KEY,
signInUrl: decryptedRequestData.signInUrl || SIGN_IN_URL,
signUpUrl: decryptedRequestData.signUpUrl || SIGN_UP_URL,
sessionStatus: authObject.sessionStatus,
}).redirectToSignIn({
returnBackUrl: opts.returnBackUrl === null ? '' : opts.returnBackUrl || clerkUrl?.toString(),
const redirectToSignUp: RedirectFun<never> = (opts = {}) => {
const [r, returnBackUrl] = createRedirectForRequest(opts);
return r.redirectToSignUp({
returnBackUrl,
});
};

return Object.assign(authObject, { redirectToSignIn });
return Object.assign(authObject, { redirectToSignIn, redirectToSignUp });
};

auth.protect = async (...args: any[]) => {
Expand Down
90 changes: 64 additions & 26 deletions packages/nextjs/src/server/__tests__/clerkMiddleware.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,8 @@ import { clerkMiddleware } from '../clerkMiddleware';
import { createRouteMatcher } from '../routeMatcher';
import { decryptClerkRequestData } from '../utils';

vi.mock('../clerkClient');

const publishableKey = 'pk_test_Y2xlcmsuaW5jbHVkZWQua2F0eWRpZC05Mi5sY2wuZGV2JA';
const authenticateRequestMock = vi.fn().mockResolvedValue({
toAuth: () => ({
Expand All@@ -21,15 +23,6 @@ const authenticateRequestMock = vi.fn().mockResolvedValue({
publishableKey,
});

vi.mock('../clerkClient', () => {
return {
clerkClient: () => ({
authenticateRequest: authenticateRequestMock,
telemetry: { record: vi.fn() },
}),
};
});

/**
* Disable console warnings about config matchers
*/
Expand All@@ -45,6 +38,14 @@ afterAll(() => {
global.console.log = consoleLog;
});

beforeEach(() => {
vi.mocked(clerkClient).mockResolvedValue({
authenticateRequest: authenticateRequestMock,
// @ts-expect-error - mock
telemetry: { record: vi.fn() },
});
});

// Removing this mock will cause the clerkMiddleware tests to fail due to missing publishable key
// This mock SHOULD exist before the imports
vi.mock(import('../constants.js'), async importOriginal => {
Expand DownExpand Up@@ -301,84 +302,121 @@ describe('clerkMiddleware(params)', () => {
});
});

describe('auth().redirectToSignIn()', () => {
it('redirects to sign-in url when redirectToSignIn is called and the request is a page request', async () => {
describe.each([
{
name: 'auth().redirectToSignIn()',
util: 'redirectToSignIn',
locationHeader: 'sign-in',
} as const,
{
name: 'auth().redirectToSignUp()',
util: 'redirectToSignUp',
locationHeader: 'sign-up',
} as const,
])('$name', ({ util, locationHeader }) => {
it(`redirects to ${locationHeader} url when ${util} is called and the request is a page request`, async () => {
const req = mockRequest({
url: '/protected',
headers: new Headers({ [constants.Headers.SecFetchDest]: 'document' }),
appendDevBrowserCookie: true,
});

const resp = await clerkMiddleware(async auth => {
const { redirectToSignIn } = await auth();
redirectToSignIn();
(await auth())[util]();
})(req, {} as NextFetchEvent);

expect(resp?.status).toEqual(307);
expect(resp?.headers.get('location')).toContain('sign-in');
expect(resp?.headers.get('location')).toContain(locationHeader);
expect((await clerkClient()).authenticateRequest).toBeCalled();
});

it('redirects to sign-in url when redirectToSignIn is called with the correct returnBackUrl', async () => {
it(`redirects to ${locationHeader} url when redirectToSignIn is called with the correct returnBackUrl`, async () => {
const req = mockRequest({
url: '/protected',
headers: new Headers({ [constants.Headers.SecFetchDest]: 'document' }),
appendDevBrowserCookie: true,
});

const resp = await clerkMiddleware(async auth => {
const { redirectToSignIn } = await auth();
redirectToSignIn();
(await auth())[util]();
})(req, {} as NextFetchEvent);

expect(resp?.status).toEqual(307);
expect(resp?.status).toEqual(307);
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
expect(new URL(resp!.headers.get('location')!).searchParams.get('redirect_url')).toContain('/protected');
expect((await clerkClient()).authenticateRequest).toBeCalled();
});

it('redirects to sign-in url with redirect_url set to the provided returnBackUrl param', async () => {
it(`redirects to ${locationHeader} url with redirect_url set to the provided returnBackUrl param`, async () => {
const req = mockRequest({
url: '/protected',
headers: new Headers({ [constants.Headers.SecFetchDest]: 'document' }),
appendDevBrowserCookie: true,
});

const resp = await clerkMiddleware(async auth => {
const { redirectToSignIn } = await auth();
redirectToSignIn({ returnBackUrl: 'https://www.clerk.com/hello' });
(await auth())[util]({ returnBackUrl: 'https://www.clerk.com/hello' });
})(req, {} as NextFetchEvent);

expect(resp?.status).toEqual(307);
expect(resp?.headers.get('location')).toContain('sign-in');
expect(resp?.headers.get('location')).toContain(locationHeader);
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
expect(new URL(resp!.headers.get('location')!).searchParams.get('redirect_url')).toEqual(
'https://www.clerk.com/hello',
);
expect((await clerkClient()).authenticateRequest).toBeCalled();
});

it('redirects to sign-in url without a redirect_url when returnBackUrl is null', async () => {
it(`redirects to ${locationHeader} url without a redirect_url when returnBackUrl is null`, async () => {
const req = mockRequest({
url: '/protected',
headers: new Headers({ [constants.Headers.SecFetchDest]: 'document' }),
appendDevBrowserCookie: true,
});

const resp = await clerkMiddleware(async auth => {
const { redirectToSignIn } = await auth();
redirectToSignIn({ returnBackUrl: null });
(await auth())[util]({ returnBackUrl: null });
})(req, {} as NextFetchEvent);

expect(resp?.status).toEqual(307);
expect(resp?.headers.get('location')).toContain('sign-in');
expect(resp?.headers.get('location')).toContain(locationHeader);
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
expect(new URL(resp!.headers.get('location')!).searchParams.get('redirect_url')).toBeNull();
expect((await clerkClient()).authenticateRequest).toBeCalled();
});
});

describe('auth().redirectToSignUp()', () => {
it('to support signInOrUp', async () => {
vi.mocked(clerkClient).mockResolvedValue({
authenticateRequest: vi.fn().mockResolvedValue({
toAuth: () => ({
debug: (d: any) => d,
}),
headers: new Headers(),
publishableKey,
signInUrl: '/hello',
}),
// @ts-expect-error - mock
telemetry: { record: vi.fn() },
});

const req = mockRequest({
url: '/protected',
headers: new Headers({ [constants.Headers.SecFetchDest]: 'document' }),
appendDevBrowserCookie: true,
});

const resp = await clerkMiddleware(async auth => {
(await auth()).redirectToSignUp();
})(req, {} as NextFetchEvent);

expect(resp?.status).toEqual(307);
expect(resp?.headers.get('location')).toContain(`/hello/create`);
expect((await clerkClient()).authenticateRequest).toBeCalled();
});
});

describe('auth.protect()', () => {
it('redirects to sign-in url when protect is called, the user is signed out and the request is a page request', async () => {
const req = mockRequest({
Expand Down
30 changes: 26 additions & 4 deletions packages/nextjs/src/server/clerkMiddleware.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,8 +17,10 @@ import {
isNextjsNotFoundError,
isNextjsRedirectError,
isRedirectToSignInError,
isRedirectToSignUpError,
nextjsRedirectError,
redirectToSignInError,
redirectToSignUpError,
} from './nextErrors';
import type { AuthProtect } from './protect';
import { createProtect } from './protect';
Expand All@@ -33,6 +35,7 @@ import {

export type ClerkMiddlewareAuthObject = AuthObject & {
redirectToSignIn: RedirectFun<Response>;
redirectToSignUp: RedirectFun<Response>;
};

export interface ClerkMiddlewareAuth {
Expand DownExpand Up@@ -162,9 +165,13 @@ export const clerkMiddleware = ((...args: unknown[]): NextMiddleware | NextMiddl
logger.debug('auth', () => ({ auth: authObject, debug: authObject.debug() }));

const redirectToSignIn = createMiddlewareRedirectToSignIn(clerkRequest);
const redirectToSignUp = createMiddlewareRedirectToSignUp(clerkRequest);
const protect = await createMiddlewareProtect(clerkRequest, authObject, redirectToSignIn);

const authObjWithMethods: ClerkMiddlewareAuthObject = Object.assign(authObject, { redirectToSignIn });
const authObjWithMethods: ClerkMiddlewareAuthObject = Object.assign(authObject, {
redirectToSignIn,
redirectToSignUp,
});
const authHandler = () => Promise.resolve(authObjWithMethods);
authHandler.protect = protect;

Expand DownExpand Up@@ -303,6 +310,15 @@ const createMiddlewareRedirectToSignIn = (
};
};

const createMiddlewareRedirectToSignUp = (
clerkRequest: ClerkRequest,
): ClerkMiddlewareAuthObject['redirectToSignUp'] => {
return (opts = {}) => {
const url = clerkRequest.clerkUrl.toString();
redirectToSignUpError(url, opts.returnBackUrl);
};
};

const createMiddlewareProtect = (
clerkRequest: ClerkRequest,
authObject: AuthObject,
Expand DownExpand Up@@ -345,15 +361,21 @@ const handleControlFlowErrors = (
);
}

if (isRedirectToSignInError(e)) {
return createRedirect({
const isRedirectToSignIn = isRedirectToSignInError(e);
const isRedirectToSignUp = isRedirectToSignUpError(e);

if (isRedirectToSignIn || isRedirectToSignUp) {
const redirect = createRedirect({
redirectAdapter,
baseUrl: clerkRequest.clerkUrl,
signInUrl: requestState.signInUrl,
signUpUrl: requestState.signUpUrl,
publishableKey: requestState.publishableKey,
sessionStatus: requestState.toAuth()?.sessionStatus,
}).redirectToSignIn({ returnBackUrl: e.returnBackUrl });
});

const { returnBackUrl } = e;
return redirect[isRedirectToSignIn ? 'redirectToSignIn' : 'redirectToSignUp']({ returnBackUrl });
}

if (isNextjsRedirectError(e)) {
Expand Down
Loading
, '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
17 changes: 17 additions & 0 deletions .changeset/spicy-lizards-take.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
---
'@clerk/nextjs': minor
---

- Introduce `auth().redirectToSignUp()` that can be used in API routes and pages. Originally effort by [@sambarnes](https://github.com/clerk/javascript/pull/5407)

```ts
import { clerkMiddleware } from '@clerk/nextjs/server';

export default clerkMiddleware(async (auth) => {
const { userId, redirectToSignUp } = await auth();

if (!userId) {
return redirectToSignUp();
}
});
```
13 changes: 12 additions & 1 deletion packages/backend/src/createRedirect.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -97,7 +97,18 @@ export const createRedirect: CreateRedirect = params => {
}

const accountsSignUpUrl = `${accountsBaseUrl}/sign-up`;
const targetUrl = signUpUrl || accountsSignUpUrl;

// Allows redirection to SignInOrUp path
function buildSignUpUrl(signIn: string | URL | undefined) {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Just want to make sure that I understand this part here. If there's a sign in URL option (env var or middleware key), we assume that combined flow is enabled - but doesn't it also need be able via the withSignUp prop?

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.

yes, but in that case signUpUrl will be defined. withSignUp is per component, nothing in can do about it on the server.

if (!signIn) {
return;
}
const url = new URL(signIn, baseUrl);
url.pathname = `${url.pathname}/create`;
return url.toString();
}

const targetUrl = signUpUrl || buildSignUpUrl(signInUrl) || accountsSignUpUrl;

if (hasPendingStatus) {
return redirectToTasks(targetUrl, { returnBackUrl });
Expand Down
49 changes: 37 additions & 12 deletions packages/nextjs/src/app-router/server/auth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,16 @@ type Auth = AuthObject & {
* `auth()` on the server-side can only access redirect URLs defined via [environment variables](https://clerk.com/docs/deployments/clerk-environment-variables#sign-in-and-sign-up-redirects) or [`clerkMiddleware` dynamic keys](https://clerk.com/docs/references/nextjs/clerk-middleware#dynamic-keys).
*/
redirectToSignIn: RedirectFun<ReturnType<typeof redirect>>;

/**
* The `auth()` helper returns the `redirectToSignUp()` method, which you can use to redirect the user to the sign-up page.
*
* @param [returnBackUrl] {string | URL} - The URL to redirect the user back to after they sign up.
*
* @note
* `auth()` on the server-side can only access redirect URLs defined via [environment variables](https://clerk.com/docs/deployments/clerk-environment-variables#sign-in-and-sign-up-redirects) or [`clerkMiddleware` dynamic keys](https://clerk.com/docs/references/nextjs/clerk-middleware#dynamic-keys).
*/
redirectToSignUp: RedirectFun<ReturnType<typeof redirect>>;
};

export interface AuthFn {
Expand DownExpand Up@@ -83,29 +93,44 @@ export const auth: AuthFn = async () => {

const clerkUrl = getAuthKeyFromRequest(request, 'ClerkUrl');

const redirectToSignIn: RedirectFun<never> = (opts = {}) => {
const createRedirectForRequest = (...args: Parameters<RedirectFun<never>>) => {
const { returnBackUrl } = args[0] || {};
const clerkRequest = createClerkRequest(request);
const devBrowserToken =
clerkRequest.clerkUrl.searchParams.get(constants.QueryParameters.DevBrowser) ||
clerkRequest.cookies.get(constants.Cookies.DevBrowser);

const encryptedRequestData = getHeader(request, constants.Headers.ClerkRequestData);
const decryptedRequestData = decryptClerkRequestData(encryptedRequestData);
return [
createRedirect({
redirectAdapter: redirect,
devBrowserToken: devBrowserToken,
baseUrl: clerkRequest.clerkUrl.toString(),
publishableKey: decryptedRequestData.publishableKey || PUBLISHABLE_KEY,
signInUrl: decryptedRequestData.signInUrl || SIGN_IN_URL,
signUpUrl: decryptedRequestData.signUpUrl || SIGN_UP_URL,
sessionStatus: authObject.sessionStatus,
}),
returnBackUrl === null ? '' : returnBackUrl || clerkUrl?.toString(),
] as const;
};

const redirectToSignIn: RedirectFun<never> = (opts = {}) => {
const [r, returnBackUrl] = createRedirectForRequest(opts);
return r.redirectToSignIn({
returnBackUrl,
});
};

return createRedirect({
redirectAdapter: redirect,
devBrowserToken: devBrowserToken,
baseUrl: clerkRequest.clerkUrl.toString(),
publishableKey: decryptedRequestData.publishableKey || PUBLISHABLE_KEY,
signInUrl: decryptedRequestData.signInUrl || SIGN_IN_URL,
signUpUrl: decryptedRequestData.signUpUrl || SIGN_UP_URL,
sessionStatus: authObject.sessionStatus,
}).redirectToSignIn({
returnBackUrl: opts.returnBackUrl === null ? '' : opts.returnBackUrl || clerkUrl?.toString(),
const redirectToSignUp: RedirectFun<never> = (opts = {}) => {
const [r, returnBackUrl] = createRedirectForRequest(opts);
return r.redirectToSignUp({
returnBackUrl,
});
};

return Object.assign(authObject, { redirectToSignIn });
return Object.assign(authObject, { redirectToSignIn, redirectToSignUp });
};

auth.protect = async (...args: any[]) => {
Expand Down
90 changes: 64 additions & 26 deletions packages/nextjs/src/server/__tests__/clerkMiddleware.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,8 @@ import { clerkMiddleware } from '../clerkMiddleware';
import { createRouteMatcher } from '../routeMatcher';
import { decryptClerkRequestData } from '../utils';

vi.mock('../clerkClient');

const publishableKey = 'pk_test_Y2xlcmsuaW5jbHVkZWQua2F0eWRpZC05Mi5sY2wuZGV2JA';
const authenticateRequestMock = vi.fn().mockResolvedValue({
toAuth: () => ({
Expand All@@ -21,15 +23,6 @@ const authenticateRequestMock = vi.fn().mockResolvedValue({
publishableKey,
});

vi.mock('../clerkClient', () => {
return {
clerkClient: () => ({
authenticateRequest: authenticateRequestMock,
telemetry: { record: vi.fn() },
}),
};
});

/**
* Disable console warnings about config matchers
*/
Expand All@@ -45,6 +38,14 @@ afterAll(() => {
global.console.log = consoleLog;
});

beforeEach(() => {
vi.mocked(clerkClient).mockResolvedValue({
authenticateRequest: authenticateRequestMock,
// @ts-expect-error - mock
telemetry: { record: vi.fn() },
});
});

// Removing this mock will cause the clerkMiddleware tests to fail due to missing publishable key
// This mock SHOULD exist before the imports
vi.mock(import('../constants.js'), async importOriginal => {
Expand DownExpand Up@@ -301,84 +302,121 @@ describe('clerkMiddleware(params)', () => {
});
});

describe('auth().redirectToSignIn()', () => {
it('redirects to sign-in url when redirectToSignIn is called and the request is a page request', async () => {
describe.each([
{
name: 'auth().redirectToSignIn()',
util: 'redirectToSignIn',
locationHeader: 'sign-in',
} as const,
{
name: 'auth().redirectToSignUp()',
util: 'redirectToSignUp',
locationHeader: 'sign-up',
} as const,
])('$name', ({ util, locationHeader }) => {
it(`redirects to ${locationHeader} url when ${util} is called and the request is a page request`, async () => {
const req = mockRequest({
url: '/protected',
headers: new Headers({ [constants.Headers.SecFetchDest]: 'document' }),
appendDevBrowserCookie: true,
});

const resp = await clerkMiddleware(async auth => {
const { redirectToSignIn } = await auth();
redirectToSignIn();
(await auth())[util]();
})(req, {} as NextFetchEvent);

expect(resp?.status).toEqual(307);
expect(resp?.headers.get('location')).toContain('sign-in');
expect(resp?.headers.get('location')).toContain(locationHeader);
expect((await clerkClient()).authenticateRequest).toBeCalled();
});

it('redirects to sign-in url when redirectToSignIn is called with the correct returnBackUrl', async () => {
it(`redirects to ${locationHeader} url when redirectToSignIn is called with the correct returnBackUrl`, async () => {
const req = mockRequest({
url: '/protected',
headers: new Headers({ [constants.Headers.SecFetchDest]: 'document' }),
appendDevBrowserCookie: true,
});

const resp = await clerkMiddleware(async auth => {
const { redirectToSignIn } = await auth();
redirectToSignIn();
(await auth())[util]();
})(req, {} as NextFetchEvent);

expect(resp?.status).toEqual(307);
expect(resp?.status).toEqual(307);
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
expect(new URL(resp!.headers.get('location')!).searchParams.get('redirect_url')).toContain('/protected');
expect((await clerkClient()).authenticateRequest).toBeCalled();
});

it('redirects to sign-in url with redirect_url set to the provided returnBackUrl param', async () => {
it(`redirects to ${locationHeader} url with redirect_url set to the provided returnBackUrl param`, async () => {
const req = mockRequest({
url: '/protected',
headers: new Headers({ [constants.Headers.SecFetchDest]: 'document' }),
appendDevBrowserCookie: true,
});

const resp = await clerkMiddleware(async auth => {
const { redirectToSignIn } = await auth();
redirectToSignIn({ returnBackUrl: 'https://www.clerk.com/hello' });
(await auth())[util]({ returnBackUrl: 'https://www.clerk.com/hello' });
})(req, {} as NextFetchEvent);

expect(resp?.status).toEqual(307);
expect(resp?.headers.get('location')).toContain('sign-in');
expect(resp?.headers.get('location')).toContain(locationHeader);
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
expect(new URL(resp!.headers.get('location')!).searchParams.get('redirect_url')).toEqual(
'https://www.clerk.com/hello',
);
expect((await clerkClient()).authenticateRequest).toBeCalled();
});

it('redirects to sign-in url without a redirect_url when returnBackUrl is null', async () => {
it(`redirects to ${locationHeader} url without a redirect_url when returnBackUrl is null`, async () => {
const req = mockRequest({
url: '/protected',
headers: new Headers({ [constants.Headers.SecFetchDest]: 'document' }),
appendDevBrowserCookie: true,
});

const resp = await clerkMiddleware(async auth => {
const { redirectToSignIn } = await auth();
redirectToSignIn({ returnBackUrl: null });
(await auth())[util]({ returnBackUrl: null });
})(req, {} as NextFetchEvent);

expect(resp?.status).toEqual(307);
expect(resp?.headers.get('location')).toContain('sign-in');
expect(resp?.headers.get('location')).toContain(locationHeader);
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
expect(new URL(resp!.headers.get('location')!).searchParams.get('redirect_url')).toBeNull();
expect((await clerkClient()).authenticateRequest).toBeCalled();
});
});

describe('auth().redirectToSignUp()', () => {
it('to support signInOrUp', async () => {
vi.mocked(clerkClient).mockResolvedValue({
authenticateRequest: vi.fn().mockResolvedValue({
toAuth: () => ({
debug: (d: any) => d,
}),
headers: new Headers(),
publishableKey,
signInUrl: '/hello',
}),
// @ts-expect-error - mock
telemetry: { record: vi.fn() },
});

const req = mockRequest({
url: '/protected',
headers: new Headers({ [constants.Headers.SecFetchDest]: 'document' }),
appendDevBrowserCookie: true,
});

const resp = await clerkMiddleware(async auth => {
(await auth()).redirectToSignUp();
})(req, {} as NextFetchEvent);

expect(resp?.status).toEqual(307);
expect(resp?.headers.get('location')).toContain(`/hello/create`);
expect((await clerkClient()).authenticateRequest).toBeCalled();
});
});

describe('auth.protect()', () => {
it('redirects to sign-in url when protect is called, the user is signed out and the request is a page request', async () => {
const req = mockRequest({
Expand Down
30 changes: 26 additions & 4 deletions packages/nextjs/src/server/clerkMiddleware.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,8 +17,10 @@ import {
isNextjsNotFoundError,
isNextjsRedirectError,
isRedirectToSignInError,
isRedirectToSignUpError,
nextjsRedirectError,
redirectToSignInError,
redirectToSignUpError,
} from './nextErrors';
import type { AuthProtect } from './protect';
import { createProtect } from './protect';
Expand All@@ -33,6 +35,7 @@ import {

export type ClerkMiddlewareAuthObject = AuthObject & {
redirectToSignIn: RedirectFun<Response>;
redirectToSignUp: RedirectFun<Response>;
};

export interface ClerkMiddlewareAuth {
Expand DownExpand Up@@ -162,9 +165,13 @@ export const clerkMiddleware = ((...args: unknown[]): NextMiddleware | NextMiddl
logger.debug('auth', () => ({ auth: authObject, debug: authObject.debug() }));

const redirectToSignIn = createMiddlewareRedirectToSignIn(clerkRequest);
const redirectToSignUp = createMiddlewareRedirectToSignUp(clerkRequest);
const protect = await createMiddlewareProtect(clerkRequest, authObject, redirectToSignIn);

const authObjWithMethods: ClerkMiddlewareAuthObject = Object.assign(authObject, { redirectToSignIn });
const authObjWithMethods: ClerkMiddlewareAuthObject = Object.assign(authObject, {
redirectToSignIn,
redirectToSignUp,
});
const authHandler = () => Promise.resolve(authObjWithMethods);
authHandler.protect = protect;

Expand DownExpand Up@@ -303,6 +310,15 @@ const createMiddlewareRedirectToSignIn = (
};
};

const createMiddlewareRedirectToSignUp = (
clerkRequest: ClerkRequest,
): ClerkMiddlewareAuthObject['redirectToSignUp'] => {
return (opts = {}) => {
const url = clerkRequest.clerkUrl.toString();
redirectToSignUpError(url, opts.returnBackUrl);
};
};

const createMiddlewareProtect = (
clerkRequest: ClerkRequest,
authObject: AuthObject,
Expand DownExpand Up@@ -345,15 +361,21 @@ const handleControlFlowErrors = (
);
}

if (isRedirectToSignInError(e)) {
return createRedirect({
const isRedirectToSignIn = isRedirectToSignInError(e);
const isRedirectToSignUp = isRedirectToSignUpError(e);

if (isRedirectToSignIn || isRedirectToSignUp) {
const redirect = createRedirect({
redirectAdapter,
baseUrl: clerkRequest.clerkUrl,
signInUrl: requestState.signInUrl,
signUpUrl: requestState.signUpUrl,
publishableKey: requestState.publishableKey,
sessionStatus: requestState.toAuth()?.sessionStatus,
}).redirectToSignIn({ returnBackUrl: e.returnBackUrl });
});

const { returnBackUrl } = e;
return redirect[isRedirectToSignIn ? 'redirectToSignIn' : 'redirectToSignUp']({ returnBackUrl });
}

if (isNextjsRedirectError(e)) {
Expand Down
Loading