Skip to content

chore: avoid Object.assign #1166

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 3 commits into from
Jul 31, 2025
Merged

chore: avoid Object.assign #1166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a75e532
chore: avoid Object.assign
Uzlopak Jul 30, 2025
95c3cd6
Merge branch 'main' into simpler
wolfy1339 Jul 31, 2025
d33b411
add explicit undefined
wolfy1339 Jul 31, 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
5 changes: 4 additions & 1 deletion src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,10 @@ export interface State extends Options<any> {
/**
* Error object with optional properties coming from `octokit.request` errors
*/
export type WebhookError = Error & Partial<RequestError>;
export type WebhookError = Error &
Partial<RequestError> & {
event?: EmitterWebhookEventWithStringPayloadAndSignature | undefined;
};

export interface AggregateWebhookError extends AggregateError {
errors: WebhookError[];
Expand Down
9 changes: 5 additions & 4 deletions src/verify-and-receive.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,12 @@ export async function verifyAndReceive(
if (!matchesSignature) {
const error = new Error(
"[@octokit/webhooks] signature does not match event payload and secret",
);
) as WebhookError;

return state.eventHandler.receive(
Object.assign(error, { event, status: 400 }) as WebhookError,
);
error.event = event;
error.status = 400;

return state.eventHandler.receive(error);
}

let payload: EmitterWebhookEvent["payload"];
Expand Down