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 --- web/source/settings/lib/navigation/util.js | 49 --------------------------- web/source/settings/lib/navigation/util.ts | 54 ++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 49 deletions(-) delete mode 100644 web/source/settings/lib/navigation/util.js create mode 100644 web/source/settings/lib/navigation/util.ts (limited to 'web/source/settings/lib/navigation') diff --git a/web/source/settings/lib/navigation/util.js b/web/source/settings/lib/navigation/util.js deleted file mode 100644 index 2c6c4968f..000000000 --- a/web/source/settings/lib/navigation/util.js +++ /dev/null @@ -1,49 +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 RoleContext = React.createContext([]); -const BaseUrlContext = React.createContext(null); - -function urlSafe(str) { - return str.toLowerCase().replace(/[\s/]+/g, "-"); -} - -function useHasPermission(permissions) { - const roles = React.useContext(RoleContext); - return checkPermission(permissions, roles); -} - -function checkPermission(requiredPermissisons, user) { - // requiredPermissions can be 'false', in which case there are no restrictions - if (requiredPermissisons === false) { - return true; - } - - // or an array of roles, check if one of the user's roles is sufficient - return user.some((role) => requiredPermissisons.includes(role)); -} - -function useBaseUrl() { - return React.useContext(BaseUrlContext); -} - -module.exports = { - urlSafe, RoleContext, useHasPermission, checkPermission, BaseUrlContext, useBaseUrl -}; \ No newline at end of file diff --git a/web/source/settings/lib/navigation/util.ts b/web/source/settings/lib/navigation/util.ts new file mode 100644 index 000000000..e6f8ee697 --- /dev/null +++ b/web/source/settings/lib/navigation/util.ts @@ -0,0 +1,54 @@ +/* + 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 { createContext, useContext } from "react"; +const RoleContext = createContext([]); +const BaseUrlContext = createContext(""); + +function urlSafe(str) { + return str.toLowerCase().replace(/[\s/]+/g, "-"); +} + +function useHasPermission(permissions) { + const roles = useContext(RoleContext); + return checkPermission(permissions, roles); +} + +function checkPermission(requiredPermissisons, user) { + // requiredPermissions can be 'false', in which case there are no restrictions + if (requiredPermissisons === false) { + return true; + } + + // or an array of roles, check if one of the user's roles is sufficient + return user.some((role) => requiredPermissisons.includes(role)); +} + +function useBaseUrl() { + return useContext(BaseUrlContext); +} + +export { + urlSafe, + RoleContext, + useHasPermission, + checkPermission, + BaseUrlContext, + useBaseUrl +}; -- cgit v1.2.3