Skip to content

Preview branch fixes #2126

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
merged 2 commits into from
May 29, 2025
+17 −2
Merged

Preview branch fixes #2126

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
71bc1a8
SDK: auto-detect the branch using the VERCEL_GIT_COMMIT_REF env var
matt-aitken May 29, 2025
f7fcbee
Waitpoint token completion with HTTP is now working
matt-aitken May 29, 2025
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
13 changes: 12 additions & 1 deletion apps/webapp/app/routes/api.v1.waitpoints.tokens.$waitpointFriendlyId.callback.$hash.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@ export async function action({ request, params }: ActionFunctionArgs) {
environment: {
select: {
apiKey: true,
parentEnvironment: {
select: {
apiKey: true,
},
},
},
},
},
Expand All @@ -52,7 +57,13 @@ export async function action({ request, params }: ActionFunctionArgs) {
return json({ error: "Waitpoint not found" }, { status: 404 });
}

if (!verifyHttpCallbackHash(waitpoint.id, hash, waitpoint.environment.apiKey)) {
if (
!verifyHttpCallbackHash(
waitpoint.id,
hash,
waitpoint.environment.parentEnvironment?.apiKey ?? waitpoint.environment.apiKey
)
) {
return json({ error: "Invalid URL, hash doesn't match" }, { status: 401 });
}

Expand Down
6 changes: 5 additions & 1 deletion packages/core/src/v3/apiClientManager/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,11 @@ export class APIClientManagerAPI {

get branchName(): string | undefined {
const config = this.#getConfig();
const value = config?.previewBranch ?? getEnvVar("TRIGGER_PREVIEW_BRANCH") ?? undefined;
const value =
config?.previewBranch ??
getEnvVar("TRIGGER_PREVIEW_BRANCH") ??
getEnvVar("VERCEL_GIT_COMMIT_REF") ??
undefined;
return value ? value : undefined;
}

Expand Down