Skip to content

Allow entering empty secret in webhook config #2186

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
jakub-tldr merged 2 commits into from
Mar 4, 2026
Merged

Allow entering empty secret in webhook config #2186

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f087beb
allow for empty secret
jakub-tldr Mar 4, 2026
ccd467e
lint
jakub-tldr Mar 4, 2026
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
22 changes: 11 additions & 11 deletions web/src/pages/WebhooksPage/modals/CEWebhookModal/CEWebhookModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,13 @@ const formSchema = z.object({
),
token: z
.string()
.min(1, m.form_error_required())
.max(
250,
m.form_error_max_len({
length: 250,
}),
),
)
.nullable(),
enabled: z.boolean(),
on_user_created: z.boolean(),
on_user_deleted: z.boolean(),
Expand All @@ -98,7 +98,10 @@ const ModalContent = ({ webhook }: ModalData) => {

const defaultValues = useMemo((): FormFields => {
if (isPresent(webhook)) {
return webhook;
return {
...webhook,
token: webhook.token || null,
};
}
return {
description: '',
Expand All @@ -107,7 +110,7 @@ const ModalContent = ({ webhook }: ModalData) => {
on_user_created: false,
on_user_deleted: false,
on_user_modified: false,
token: '',
token: null,
url: '',
};
}, [webhook]);
Expand Down Expand Up @@ -139,13 +142,14 @@ const ModalContent = ({ webhook }: ModalData) => {
onChange: formSchema,
},
onSubmit: async ({ value }) => {
const payload = { ...value, token: value.token ?? '' };
if (isEdit) {
await editWebhook({
id: webhook.id,
...value,
...payload,
});
} else {
await addWebhook(value);
await addWebhook(payload);
}
},
});
Expand All @@ -171,11 +175,7 @@ const ModalContent = ({ webhook }: ModalData) => {
<SizedBox height={ThemeSpacing.Xl} />
<form.AppField name="token">
{(field) => (
<field.FormInput
required
label={m.form_label_secret_token()}
type="password"
/>
<field.FormInput label={m.form_label_secret_token()} type="password" />
)}
</form.AppField>
<Divider spacing={ThemeSpacing.Xl} />
Expand Down
Loading