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/query/admin/index.ts | 65 ++++++++++++++++++++++------ 1 file changed, 52 insertions(+), 13 deletions(-) (limited to 'web/source/settings/lib/query/admin/index.ts') diff --git a/web/source/settings/lib/query/admin/index.ts b/web/source/settings/lib/query/admin/index.ts index e61179216..74f410e05 100644 --- a/web/source/settings/lib/query/admin/index.ts +++ b/web/source/settings/lib/query/admin/index.ts @@ -20,6 +20,7 @@ import { replaceCacheOnMutation, removeFromCacheOnMutation } from "../query-modifiers"; import { gtsApi } from "../gts-api"; import { listToKeyedObject } from "../transforms"; +import { AdminAccount, HandleSignupParams, SearchAccountParams } from "../../types/account"; const extended = gtsApi.injectEndpoints({ endpoints: (build) => ({ @@ -54,14 +55,43 @@ const extended = gtsApi.injectEndpoints({ }) }), - getAccount: build.query({ + getAccount: build.query({ query: (id) => ({ - url: `/api/v1/accounts/${id}` + url: `/api/v1/admin/accounts/${id}` }), - providesTags: (_, __, id) => [{ type: "Account", id }] + providesTags: (_result, _error, id) => [ + { type: 'Account', id } + ], }), - actionAccount: build.mutation({ + searchAccounts: build.query({ + query: (form) => { + const params = new(URLSearchParams); + Object.entries(form).forEach(([k, v]) => { + if (v !== undefined) { + params.append(k, v); + } + }); + + let query = ""; + if (params.size !== 0) { + query = `?${params.toString()}`; + } + + return { + url: `/api/v2/admin/accounts${query}` + }; + }, + providesTags: (res) => + res + ? [ + ...res.map(({ id }) => ({ type: 'Account' as const, id })), + { type: 'Account', id: 'LIST' }, + ] + : [{ type: 'Account', id: 'LIST' }], + }), + + actionAccount: build.mutation({ query: ({ id, action, reason }) => ({ method: "POST", url: `/api/v1/admin/accounts/${id}/action`, @@ -71,16 +101,23 @@ const extended = gtsApi.injectEndpoints({ text: reason } }), - invalidatesTags: (_, __, { id }) => [{ type: "Account", id }] + invalidatesTags: (_result, _error, { id }) => [ + { type: 'Account', id }, + ], }), - searchAccount: build.mutation({ - query: (username) => ({ - url: `/api/v2/search?q=${encodeURIComponent(username)}&resolve=true` - }), - transformResponse: (res) => { - return res.accounts ?? []; - } + handleSignup: build.mutation({ + query: ({id, approve_or_reject, ...formData}) => { + return { + method: "POST", + url: `/api/v1/admin/accounts/${id}/${approve_or_reject}`, + asForm: true, + body: approve_or_reject === "reject" ?? formData, + }; + }, + invalidatesTags: (_result, _error, { id }) => [ + { type: 'Account', id }, + ], }), instanceRules: build.query({ @@ -140,7 +177,9 @@ export const { useInstanceKeysExpireMutation, useGetAccountQuery, useActionAccountMutation, - useSearchAccountMutation, + useSearchAccountsQuery, + useLazySearchAccountsQuery, + useHandleSignupMutation, useInstanceRulesQuery, useAddInstanceRuleMutation, useUpdateInstanceRuleMutation, -- cgit v1.2.3