Skip to content

fix(astro): Remove duplicate auth headers values #3948

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wobsoriano merged 2 commits into from
Aug 13, 2024
Merged

fix(astro): Remove duplicate auth headers values #3948

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90e0b9d
fix(astro): Remove duplicate auth headers
wobsoriano Aug 13, 2024
30b7506
chore(astro): Add changeset
wobsoriano Aug 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/shy-ghosts-flash.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@clerk/astro": patch
---

Remove duplicate headers set in Clerk middleware
19 changes: 4 additions & 15 deletions packages/astro/src/server/clerk-middleware.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,11 @@ export const clerkMiddleware: ClerkMiddleware = (...args: unknown[]): any => {
handlerResult = handleControlFlowErrors(e, clerkRequest, requestState, context);
}

if (isRedirect(handlerResult!)) {
return serverRedirectWithAuth(context, clerkRequest, handlerResult!, options);
if (isRedirect(handlerResult)) {
return serverRedirectWithAuth(context, clerkRequest, handlerResult, options);
}

const response = await decorateRequest(context.locals, handlerResult!, requestState);
const response = decorateRequest(context.locals, handlerResult);
Copy link
Member Author

@wobsoriano wobsoriano Aug 13, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

The x-clerk-auth-* headers are already set here

javascript/packages/astro/src/server/clerk-middleware.ts

Lines 113 to 115 in c443544

requestState.headers.forEach((value, key) => {
response.headers.append(key, value);
});

if (requestState.headers) {
requestState.headers.forEach((value, key) => {
response.headers.append(key, value);
Expand Down Expand Up @@ -262,18 +262,7 @@ function findClosingHeadTagIndex(chunk: Uint8Array, endHeadTag: Uint8Array) {
return chunk.findIndex((_, i) => endHeadTag.every((value, j) => value === chunk[i + j]));
}

async function decorateRequest(
locals: APIContext['locals'],
res: Response,
requestState: RequestState,
): Promise<Response> {
const { reason, message, status, token } = requestState;

res.headers.set(constants.Headers.AuthToken, token || '');
res.headers.set(constants.Headers.AuthStatus, status);
res.headers.set(constants.Headers.AuthMessage, message || '');
res.headers.set(constants.Headers.AuthReason, reason || '');

function decorateRequest(locals: APIContext['locals'], res: Response): Response {
/**
* Populate every page with the authObject. This allows for SSR to work properly
* without sucrificing DX and having developers wrap each page with a Layout that would handle this.
Expand Down