A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.
fix(admin): only decide registrations still waiting for review
Hampusc59bdec5c941
diff --git a/fluxer_api/src/api/admin/controllers/InstanceConfigAdminController.ts b/fluxer_api/src/api/admin/controllers/InstanceConfigAdminController.tsindex f9f69a911..791364ad0 100644--- a/fluxer_api/src/api/admin/controllers/InstanceConfigAdminController.ts+++ b/fluxer_api/src/api/admin/controllers/InstanceConfigAdminController.ts@@ -56,6 +56,7 @@ import {ValidationErrorCodes} from '@fluxer/constants/src/ValidationErrorCodes';import {InputValidationError} from '@fluxer/errors/src/domains/core/InputValidationError';import {InstancePolicyTransitionNotAllowedError} from '@fluxer/errors/src/domains/core/InstancePolicyTransitionNotAllowedError';import {NotFoundError} from '@fluxer/errors/src/domains/core/NotFoundError';+import {UnknownUserError} from '@fluxer/errors/src/domains/user/UnknownUserError';import {BrandingAssetUploadRequest,CreateRegistrationUrlRequest,@@ -1154,7 +1155,7 @@ export function InstanceConfigAdminController(app: HonoApp) {const pendingRegistration = (await instanceConfigRepository.getPendingRegistrations()).find((entry) => entry.user_id === userId,);- await updatePendingRegistrationUser(ctx, userId, decision, pendingRegistration?.invite_code ?? null);+ await updatePendingRegistrationUser(ctx, userId, decision, pendingRegistration);await instanceConfigRepository.removePendingRegistration(userId);return ctx.json({pending_registrations: await instanceConfigRepository.getPendingRegistrations()});},@@ -1288,7 +1289,7 @@ async function updatePendingRegistrationUser(ctx: Context<HonoEnv>,userId: string,decision: 'approve' | 'reject',- inviteCode: string | null,+ pendingRegistration: {invite_code?: string | null} | undefined,): Promise<void> {const userRepository = ctx.get('userRepository');const user = await userRepository.findUnique(createUserID(BigInt(userId)));@@ -1302,6 +1303,9 @@ async function updatePendingRegistrationUser(return;}const traits = new Set(user.traits);+ if (!traits.has(REGISTRATION_PENDING_APPROVAL_TRAIT) && !traits.has(REGISTRATION_REJECTED_TRAIT)) {+ throw new UnknownUserError();+ }const wasPendingApproval = traits.delete(REGISTRATION_PENDING_APPROVAL_TRAIT);if (decision === 'reject') {traits.add(REGISTRATION_REJECTED_TRAIT);@@ -1312,7 +1316,7 @@ async function updatePendingRegistrationUser(if (decision === 'approve' && wasPendingApproval) {await maybeAutoJoinInvite(ctx.get('inviteService'), {userId: user.id,- inviteCode,+ inviteCode: pendingRegistration?.invite_code ?? null,requestCache: ctx.get('requestCache'),});await ctx.get('singleCommunityService').joinStockCommunity(user.id, ctx.get('requestCache'));diff --git a/fluxer_api/src/api/admin/tests/InstanceConfigPendingRegistrationApproval.test.ts b/fluxer_api/src/api/admin/tests/InstanceConfigPendingRegistrationApproval.test.tsindex 6aa819a85..453c14595 100644--- a/fluxer_api/src/api/admin/tests/InstanceConfigPendingRegistrationApproval.test.ts+++ b/fluxer_api/src/api/admin/tests/InstanceConfigPendingRegistrationApproval.test.ts@@ -109,7 +109,7 @@ describe('pending registration approval and the stock community', () => {await createBuilder(harness, admin.token).patch(`/admin/instance/pending-registrations/${outsider.userId}`).body({status: 'approved'})- .expect(HTTP_STATUS.OK)+ .expect(HTTP_STATUS.NOT_FOUND).execute();await createBuilder(harness, owner.token)@@ -399,7 +399,7 @@ describe('pending registration approval and the stock community', () => {expect(await listTestEmails(harness, {recipient: rejectedBody.email as string})).toEqual([]);});- it('sends no approval email for an account that was not waiting', async () => {+ it('leaves an account that was not waiting untouched', async () => {const admin = await setUserACLs(harness, await createTestAccount(harness), [AdminACLs.AUTHENTICATE,AdminACLs.REGISTRATION_REVIEW,@@ -407,13 +407,16 @@ describe('pending registration approval and the stock community', () => {const outsider = await createTestAccount(harness);await clearTestEmails(harness);- await createBuilder(harness, admin.token)- .patch(`/admin/instance/pending-registrations/${outsider.userId}`)- .body({status: 'approved'})- .expect(HTTP_STATUS.OK)- .execute();+ for (const status of ['approved', 'rejected'] as const) {+ await createBuilder(harness, admin.token)+ .patch(`/admin/instance/pending-registrations/${outsider.userId}`)+ .body({status})+ .expect(HTTP_STATUS.NOT_FOUND)+ .execute();+ }expect(await listTestEmails(harness, {recipient: outsider.email})).toEqual([]);+ await createBuilder(harness, outsider.token).get('/users/@me').expect(HTTP_STATUS.OK).execute();});it('drops the pending registration when the account is deleted', async () => {