From a276b1ca06ce3ebfc201b9aaf3aa8c37c98fe584 Mon Sep 17 00:00:00 2001 From: tobi <31960611+tsmethurst@users.noreply.github.com> Date: Mon, 27 May 2024 19:03:54 +0200 Subject: [feature/frontend] Let admins send test email to validate SMTP config (#2934) * [feature/frontend] Let admins send test email to validate SMTP config * wee --- .../settings/lib/query/admin/actions/index.ts | 73 ++++++++++++++++++++ web/source/settings/lib/query/admin/index.ts | 22 ------- .../settings/views/admin/actions/email/index.tsx | 29 ++++++++ .../settings/views/admin/actions/email/test.tsx | 77 ++++++++++++++++++++++ .../views/admin/actions/keys/expireremote.tsx | 25 ++++--- .../settings/views/admin/actions/keys/index.tsx | 5 +- .../settings/views/admin/actions/media/cleanup.tsx | 22 +++++-- .../settings/views/admin/actions/media/index.tsx | 5 +- web/source/settings/views/admin/menu.tsx | 8 ++- web/source/settings/views/admin/router.tsx | 6 +- 10 files changed, 227 insertions(+), 45 deletions(-) create mode 100644 web/source/settings/lib/query/admin/actions/index.ts create mode 100644 web/source/settings/views/admin/actions/email/index.tsx create mode 100644 web/source/settings/views/admin/actions/email/test.tsx (limited to 'web/source') diff --git a/web/source/settings/lib/query/admin/actions/index.ts b/web/source/settings/lib/query/admin/actions/index.ts new file mode 100644 index 000000000..7bf34c9ba --- /dev/null +++ b/web/source/settings/lib/query/admin/actions/index.ts @@ -0,0 +1,73 @@ +/* + GoToSocial + Copyright (C) GoToSocial Authors admin@gotosocial.org + SPDX-License-Identifier: AGPL-3.0-or-later + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . +*/ + +import { gtsApi } from "../../gts-api"; + +const extended = gtsApi.injectEndpoints({ + endpoints: (build) => ({ + mediaCleanup: build.mutation({ + query: (days) => ({ + method: "POST", + url: `/api/v1/admin/media_cleanup`, + params: { + remote_cache_days: days + } + }) + }), + + instanceKeysExpire: build.mutation({ + query: (domain) => ({ + method: "POST", + url: `/api/v1/admin/domain_keys_expire`, + params: { + domain: domain + } + }) + }), + + sendTestEmail: build.mutation({ + query: (params) => ({ + method: "POST", + url: `/api/v1/admin/email/test`, + params: params, + }) + }), + }), +}); + +/** + * POST to /api/v1/admin/media_cleanup to trigger manual cleanup. + */ +const useMediaCleanupMutation = extended.useMediaCleanupMutation; + +/** + * POST to /api/v1/admin/domain_keys_expire to expire domain keys for the given domain. + */ +const useInstanceKeysExpireMutation = extended.useInstanceKeysExpireMutation; + +/** + * POST to /api/v1/admin/email/test to send a test email to the given address. + */ +const useSendTestEmailMutation = extended.useSendTestEmailMutation; + +export { + useMediaCleanupMutation, + useInstanceKeysExpireMutation, + useSendTestEmailMutation, +}; diff --git a/web/source/settings/lib/query/admin/index.ts b/web/source/settings/lib/query/admin/index.ts index 3a095a8a1..fba028853 100644 --- a/web/source/settings/lib/query/admin/index.ts +++ b/web/source/settings/lib/query/admin/index.ts @@ -37,26 +37,6 @@ const extended = gtsApi.injectEndpoints({ ...replaceCacheOnMutation("instanceV1"), }), - mediaCleanup: build.mutation({ - query: (days) => ({ - method: "POST", - url: `/api/v1/admin/media_cleanup`, - params: { - remote_cache_days: days - } - }) - }), - - instanceKeysExpire: build.mutation({ - query: (domain) => ({ - method: "POST", - url: `/api/v1/admin/domain_keys_expire`, - params: { - domain: domain - } - }) - }), - getAccount: build.query({ query: (id) => ({ url: `/api/v1/admin/accounts/${id}` @@ -214,8 +194,6 @@ const extended = gtsApi.injectEndpoints({ export const { useUpdateInstanceMutation, - useMediaCleanupMutation, - useInstanceKeysExpireMutation, useGetAccountQuery, useLazyGetAccountQuery, useActionAccountMutation, diff --git a/web/source/settings/views/admin/actions/email/index.tsx b/web/source/settings/views/admin/actions/email/index.tsx new file mode 100644 index 000000000..e1b2fc759 --- /dev/null +++ b/web/source/settings/views/admin/actions/email/index.tsx @@ -0,0 +1,29 @@ +/* + GoToSocial + Copyright (C) GoToSocial Authors admin@gotosocial.org + SPDX-License-Identifier: AGPL-3.0-or-later + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . +*/ + +import React from "react"; +import Test from "./test"; + +export default function Email() { + return ( +
+ +
+ ); +} diff --git a/web/source/settings/views/admin/actions/email/test.tsx b/web/source/settings/views/admin/actions/email/test.tsx new file mode 100644 index 000000000..09b7ed909 --- /dev/null +++ b/web/source/settings/views/admin/actions/email/test.tsx @@ -0,0 +1,77 @@ +/* + GoToSocial + Copyright (C) GoToSocial Authors admin@gotosocial.org + SPDX-License-Identifier: AGPL-3.0-or-later + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . +*/ + +import React from "react"; +import { TextInput } from "../../../../components/form/inputs"; +import MutationButton from "../../../../components/form/mutation-button"; +import { useTextInput } from "../../../../lib/form"; +import { useSendTestEmailMutation } from "../../../../lib/query/admin/actions"; +import { useInstanceV1Query } from "../../../../lib/query/gts-api"; +import useFormSubmit from "../../../../lib/form/submit"; + +export default function Test({}) { + const { data: instance } = useInstanceV1Query(); + + const form = { + email: useTextInput("email", { defaultValue: instance?.email }), + message: useTextInput("message") + }; + + const [submit, result] = useFormSubmit(form, useSendTestEmailMutation(), { changedOnly: false }); + + return ( +
+
+

Send test email

+

+ To check whether your instance email configuration is correct, you can + try sending a test email to the given address, with an optional message. +
+ If you do not have SMTP configured for your instance, this will do nothing. +

+ + Learn more about SMTP configuration (opens in a new tab) + +
+ + + + + ); +} diff --git a/web/source/settings/views/admin/actions/keys/expireremote.tsx b/web/source/settings/views/admin/actions/keys/expireremote.tsx index 82045942c..d695ec0c8 100644 --- a/web/source/settings/views/admin/actions/keys/expireremote.tsx +++ b/web/source/settings/views/admin/actions/keys/expireremote.tsx @@ -21,7 +21,7 @@ import React from "react"; import { TextInput } from "../../../../components/form/inputs"; import MutationButton from "../../../../components/form/mutation-button"; import { useTextInput } from "../../../../lib/form"; -import { useInstanceKeysExpireMutation } from "../../../../lib/query/admin"; +import { useInstanceKeysExpireMutation } from "../../../../lib/query/admin/actions"; export default function ExpireRemote({}) { const domainField = useTextInput("domain"); @@ -35,15 +35,20 @@ export default function ExpireRemote({}) { return (
-

Expire remote instance keys

-

- Mark all public keys from the given remote instance as expired.

- This is useful in cases where the remote domain has had to rotate their keys for whatever - reason (security issue, data leak, routine safety procedure, etc), and your instance can no - longer communicate with theirs properly using cached keys. A key marked as expired in this way - will be lazily refetched next time a request is made to your instance signed by the owner of that - key. -

+
+

Expire remote instance keys

+

+ Mark all public keys from the given remote instance as expired. +
+ This is useful in cases where the remote domain has had to rotate + their keys for whatever reason (security issue, data leak, routine + safety procedure, etc), and your instance can no longer communicate + with theirs properly using cached keys. +
+ A key marked as expired in this way will be lazily refetched next time + a request is made to your instance signed by the owner of that key. +

+
-

Key Actions

+
- +
); } diff --git a/web/source/settings/views/admin/actions/media/cleanup.tsx b/web/source/settings/views/admin/actions/media/cleanup.tsx index c1df511e1..46f00b548 100644 --- a/web/source/settings/views/admin/actions/media/cleanup.tsx +++ b/web/source/settings/views/admin/actions/media/cleanup.tsx @@ -22,10 +22,10 @@ import React from "react"; import { useTextInput } from "../../../../lib/form"; import { TextInput } from "../../../../components/form/inputs"; import MutationButton from "../../../../components/form/mutation-button"; -import { useMediaCleanupMutation } from "../../../../lib/query/admin"; +import { useMediaCleanupMutation } from "../../../../lib/query/admin/actions"; export default function Cleanup({}) { - const daysField = useTextInput("days", { defaultValue: "30" }); + const daysField = useTextInput("days", { defaultValue: "7" }); const [mediaCleanup, mediaCleanupResult] = useMediaCleanupMutation(); @@ -36,12 +36,24 @@ export default function Cleanup({}) { return ( -

Cleanup

-

+

+

Cleanup

+

Clean up remote media older than the specified number of days. +
If the remote instance is still online they will be refetched when needed. +
Also cleans up unused headers and avatars from the media cache. -

+

+ + Learn more about media caching + cleanup (opens in a new tab) + +
-

Media Actions

+
- +
); } diff --git a/web/source/settings/views/admin/menu.tsx b/web/source/settings/views/admin/menu.tsx index 481f51a4d..3b88f6be3 100644 --- a/web/source/settings/views/admin/menu.tsx +++ b/web/source/settings/views/admin/menu.tsx @@ -34,6 +34,7 @@ import { useHasPermission } from "../../lib/navigation/util"; * - /settings/admin/emojis/local/:emojiId * - /settings/admin/emojis/remote * - /settings/admin/actions + * - /settings/admin/actions/email * - /settings/admin/actions/media * - /settings/admin/actions/keys * - /settings/admin/http-header-permissions/blocks @@ -94,9 +95,14 @@ function AdminActionsMenu() { + + - + -- cgit v1.2.3