From 89e0cfd8741b6763ca04e90558bccf4c3c380cfa Mon Sep 17 00:00:00 2001 From: tobi <31960611+tsmethurst@users.noreply.github.com> Date: Sat, 13 Apr 2024 13:25:10 +0200 Subject: [feature] Admin accounts endpoints; approve/reject sign-ups (#2826) * update settings panels, add pending overview + approve/deny functions * add admin accounts get, approve, reject * send approved/rejected emails * use signup URL * docs! * email * swagger * web linting * fix email tests * wee lil fixerinos * use new paging logic for GetAccounts() series of admin endpoints, small changes to query building * shuffle useAccountIDIn check *before* adding to query * fix parse from toot react error * use `netip.Addr` * put valid slices in globals * optimistic updates for account state --------- Co-authored-by: kim --- .../settings/admin/actions/keys/expireremote.jsx | 59 -------------------- .../settings/admin/actions/keys/expireremote.tsx | 63 ++++++++++++++++++++++ web/source/settings/admin/actions/keys/index.jsx | 30 ----------- web/source/settings/admin/actions/keys/index.tsx | 30 +++++++++++ .../settings/admin/actions/media/cleanup.jsx | 57 -------------------- .../settings/admin/actions/media/cleanup.tsx | 61 +++++++++++++++++++++ web/source/settings/admin/actions/media/index.jsx | 30 ----------- web/source/settings/admin/actions/media/index.tsx | 30 +++++++++++ 8 files changed, 184 insertions(+), 176 deletions(-) delete mode 100644 web/source/settings/admin/actions/keys/expireremote.jsx create mode 100644 web/source/settings/admin/actions/keys/expireremote.tsx delete mode 100644 web/source/settings/admin/actions/keys/index.jsx create mode 100644 web/source/settings/admin/actions/keys/index.tsx delete mode 100644 web/source/settings/admin/actions/media/cleanup.jsx create mode 100644 web/source/settings/admin/actions/media/cleanup.tsx delete mode 100644 web/source/settings/admin/actions/media/index.jsx create mode 100644 web/source/settings/admin/actions/media/index.tsx (limited to 'web/source/settings/admin/actions') diff --git a/web/source/settings/admin/actions/keys/expireremote.jsx b/web/source/settings/admin/actions/keys/expireremote.jsx deleted file mode 100644 index 172f65bc3..000000000 --- a/web/source/settings/admin/actions/keys/expireremote.jsx +++ /dev/null @@ -1,59 +0,0 @@ -/* - 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 . -*/ - -const React = require("react"); - -const query = require("../../../lib/query"); - -const { useTextInput } = require("../../../lib/form"); -const { TextInput } = require("../../../components/form/inputs"); - -const MutationButton = require("../../../components/form/mutation-button"); - -module.exports = function ExpireRemote({}) { - const domainField = useTextInput("domain"); - - const [expire, expireResult] = query.useInstanceKeysExpireMutation(); - - function submitExpire(e) { - e.preventDefault(); - expire(domainField.value); - } - - 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. -

- - - - ); -}; diff --git a/web/source/settings/admin/actions/keys/expireremote.tsx b/web/source/settings/admin/actions/keys/expireremote.tsx new file mode 100644 index 000000000..3b5da2836 --- /dev/null +++ b/web/source/settings/admin/actions/keys/expireremote.tsx @@ -0,0 +1,63 @@ +/* + 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 { useInstanceKeysExpireMutation } from "../../../lib/query"; + +import { useTextInput } from "../../../lib/form"; +import { TextInput } from "../../../components/form/inputs"; + +import MutationButton from "../../../components/form/mutation-button"; + +export default function ExpireRemote({}) { + const domainField = useTextInput("domain"); + + const [expire, expireResult] = useInstanceKeysExpireMutation(); + + function submitExpire(e) { + e.preventDefault(); + expire(domainField.value); + } + + 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. +

+ + + + ); +} diff --git a/web/source/settings/admin/actions/keys/index.jsx b/web/source/settings/admin/actions/keys/index.jsx deleted file mode 100644 index f6a851e70..000000000 --- a/web/source/settings/admin/actions/keys/index.jsx +++ /dev/null @@ -1,30 +0,0 @@ -/* - 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 . -*/ - -const React = require("react"); -const ExpireRemote = require("./expireremote"); - -module.exports = function Keys() { - return ( - <> -

Key Actions

- - - ); -}; diff --git a/web/source/settings/admin/actions/keys/index.tsx b/web/source/settings/admin/actions/keys/index.tsx new file mode 100644 index 000000000..74bfd36ee --- /dev/null +++ b/web/source/settings/admin/actions/keys/index.tsx @@ -0,0 +1,30 @@ +/* + 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 ExpireRemote from "./expireremote"; + +export default function Keys() { + return ( + <> +

Key Actions

+ + + ); +} diff --git a/web/source/settings/admin/actions/media/cleanup.jsx b/web/source/settings/admin/actions/media/cleanup.jsx deleted file mode 100644 index 8b0e628f6..000000000 --- a/web/source/settings/admin/actions/media/cleanup.jsx +++ /dev/null @@ -1,57 +0,0 @@ -/* - 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 . -*/ - -const React = require("react"); - -const query = require("../../../lib/query"); - -const { useTextInput } = require("../../../lib/form"); -const { TextInput } = require("../../../components/form/inputs"); - -const MutationButton = require("../../../components/form/mutation-button"); - -module.exports = function Cleanup({}) { - const daysField = useTextInput("days", { defaultValue: 30 }); - - const [mediaCleanup, mediaCleanupResult] = query.useMediaCleanupMutation(); - - function submitCleanup(e) { - e.preventDefault(); - mediaCleanup(daysField.value); - } - - return ( -
-

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. -

- - - - ); -}; diff --git a/web/source/settings/admin/actions/media/cleanup.tsx b/web/source/settings/admin/actions/media/cleanup.tsx new file mode 100644 index 000000000..fd3ca1f41 --- /dev/null +++ b/web/source/settings/admin/actions/media/cleanup.tsx @@ -0,0 +1,61 @@ +/* + 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 { useMediaCleanupMutation } from "../../../lib/query"; + +import { useTextInput } from "../../../lib/form"; +import { TextInput } from "../../../components/form/inputs"; + +import MutationButton from "../../../components/form/mutation-button"; + +export default function Cleanup({}) { + const daysField = useTextInput("days", { defaultValue: "30" }); + + const [mediaCleanup, mediaCleanupResult] = useMediaCleanupMutation(); + + function submitCleanup(e) { + e.preventDefault(); + mediaCleanup(daysField.value); + } + + return ( +
+

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. +

+ + + + ); +} diff --git a/web/source/settings/admin/actions/media/index.jsx b/web/source/settings/admin/actions/media/index.jsx deleted file mode 100644 index c904eb047..000000000 --- a/web/source/settings/admin/actions/media/index.jsx +++ /dev/null @@ -1,30 +0,0 @@ -/* - 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 . -*/ - -const React = require("react"); -const Cleanup = require("./cleanup"); - -module.exports = function Media() { - return ( - <> -

Media Actions

- - - ); -}; diff --git a/web/source/settings/admin/actions/media/index.tsx b/web/source/settings/admin/actions/media/index.tsx new file mode 100644 index 000000000..b3b805986 --- /dev/null +++ b/web/source/settings/admin/actions/media/index.tsx @@ -0,0 +1,30 @@ +/* + 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 Cleanup from "./cleanup"; + +export default function Media() { + return ( + <> +

Media Actions

+ + + ); +} -- cgit v1.2.3