@stamhoofd/backend 2.2.0 → 2.4.0

package/src/endpoints/organization/dashboard/email-templates/GetEmailTemplatesEndpoint.ts

@@ -1,7 +1,6 @@
-import { AutoEncoder, Decoder, field, StringDecoder } from '@simonbackx/simple-encoding';
+import { AutoEncoder, Data, Decoder, field, StringDecoder } from '@simonbackx/simple-encoding';
 import { DecodedRequest, Endpoint, Request, Response } from "@simonbackx/simple-endpoints";
-import { SimpleError } from '@simonbackx/simple-errors';
-import { EmailTemplate, Token } from '@stamhoofd/models';
+import { EmailTemplate } from '@stamhoofd/models';
 import { EmailTemplate as EmailTemplateStruct, EmailTemplateType } from '@stamhoofd/structures';
 
 import { Context } from '../../../../helpers/Context';
@@ -9,12 +8,29 @@ import { Context } from '../../../../helpers/Context';
 type Params = Record<string, never>;
 type Body = undefined;
 
+export class StringNullableDecoder<T> implements Decoder<T | null> {
+    decoder: Decoder<T>;
+
+    constructor(decoder: Decoder<T>) {
+        this.decoder = decoder;
+    }
+
+    decode(data: Data): T | null {
+        if (data.value === 'null') {
+            return null;
+        }
+
+        return data.decode(this.decoder);
+    }
+}
+
+
 class Query extends AutoEncoder {
-    @field({ decoder: StringDecoder, optional: true })
-    webshopId?: string
+    @field({ decoder: new StringNullableDecoder(StringDecoder), optional: true, nullable: true })
+    webshopId: string|null = null
 
-    @field({ decoder: StringDecoder, optional: true })
-    groupId?: string
+    @field({ decoder: new StringNullableDecoder(StringDecoder), optional: true, nullable: true})
+    groupId: string|null = null
 }
 
 type ResponseBody = EmailTemplateStruct[];
@@ -36,27 +52,29 @@ export class GetEmailTemplatesEndpoint extends Endpoint<Params, Query, Body, Res
     }
 
     async handle(request: DecodedRequest<Params, Query, Body>) {
-        const organization = await Context.setOrganizationScope();
+        const organization = await Context.setOptionalOrganizationScope();
         await Context.authenticate()
 
-        if (!await Context.auth.canReadEmailTemplates(organization.id)) {
-            throw Context.auth.error()
-        }  
-
-        const types = [
-            EmailTemplateType.OrderConfirmationOnline, 
-            EmailTemplateType.OrderConfirmationTransfer,
-            EmailTemplateType.OrderConfirmationPOS,
-            EmailTemplateType.OrderReceivedTransfer,
-            EmailTemplateType.TicketsConfirmation,
-            EmailTemplateType.TicketsConfirmationTransfer,
-            EmailTemplateType.TicketsConfirmationPOS,
-            EmailTemplateType.TicketsReceivedTransfer,
-            EmailTemplateType.RegistrationConfirmation
-        ]
+        if (organization) {
+            if (!await Context.auth.canReadEmailTemplates(organization.id)) {
+                throw Context.auth.error()
+            }  
+        } else {
+            if (!Context.auth.hasPlatformFullAccess()) {
+                throw Context.auth.error()
+            } 
+        }
+
+        const types = [...Object.values(EmailTemplateType)].filter(type => {
+            if (!organization) {
+                return true;
+            }
+            return EmailTemplateStruct.allowOrganizationLevel(type)
+        })
+
         
-        const templates = await EmailTemplate.where({ organizationId: organization.id, webshopId: request.query.webshopId ?? null, groupId: request.query.groupId ?? null, type: {sign: 'IN', value: types}});
+        const templates = organization ? (await EmailTemplate.where({ organizationId: organization.id, webshopId: request.query.webshopId ?? null, groupId: request.query.groupId ?? null, type: {sign: 'IN', value: types}})) : [];        
         const defaultTemplates = await EmailTemplate.where({ organizationId: null, type: {sign: 'IN', value: types} });
         return new Response([...templates, ...defaultTemplates].map(template => EmailTemplateStruct.create(template)))
     }
-}
+}

package/src/endpoints/organization/dashboard/email-templates/PatchEmailTemplatesEndpoint.ts

@@ -28,13 +28,18 @@ export class PatchEmailTemplatesEndpoint extends Endpoint<Params, Query, Body, R
     }
 
     async handle(request: DecodedRequest<Params, Query, Body>) {
-        const organization = await Context.setOrganizationScope();
+        const organization = await Context.setOptionalOrganizationScope();
         await Context.authenticate()
 
-        // Fast throw first (more in depth checking for patches later)
-        if (!await Context.auth.canReadEmailTemplates(organization.id)) {
-            throw Context.auth.error()
-        }  
+        if (organization) {
+            if (!await Context.auth.canReadEmailTemplates(organization.id)) {
+                throw Context.auth.error()
+            }  
+        } else {
+            if (!Context.auth.hasPlatformFullAccess()) {
+                throw Context.auth.error()
+            } 
+        }
 
         const templates: EmailTemplate[] = []
 
@@ -57,9 +62,14 @@ export class PatchEmailTemplatesEndpoint extends Endpoint<Params, Query, Body, R
 
         for (const put of request.body.getPuts()) {
             const struct = put.put
+
+            if (!EmailTemplateStruct.allowOrganizationLevel(struct.type) && organization) {
+                throw Context.auth.error();
+            }
+
             const template = new EmailTemplate()
             template.id = struct.id
-            template.organizationId = organization.id
+            template.organizationId = organization?.id ?? null
             template.webshopId = struct.webshopId
             template.groupId = struct.groupId
 
@@ -79,7 +89,16 @@ export class PatchEmailTemplatesEndpoint extends Endpoint<Params, Query, Body, R
 
             templates.push(template)
         }
+
+        for (const id of request.body.getDeletes()) {
+            const template = await EmailTemplate.getByID(id)
+            if (!template || !(await Context.auth.canAccessEmailTemplate(template, PermissionLevel.Write))) {
+                throw Context.auth.notFoundOrNoAccess("Je hebt geen toegang om deze emailtemplate te verwijderen")
+            } 
+            
+            await template.delete()
+        }
         
         return new Response(templates.map(template => EmailTemplateStruct.create(template)))
     }
-}
+}

package/src/endpoints/organization/dashboard/organization/PatchOrganizationEndpoint.ts

@@ -99,6 +99,8 @@ export class PatchOrganizationEndpoint extends Endpoint<Params, Query, Body, Res
             if (request.body.privateMeta && request.body.privateMeta.isPatch()) {
                 organization.privateMeta.emails = request.body.privateMeta.emails.applyTo(organization.privateMeta.emails)
                 organization.privateMeta.roles = request.body.privateMeta.roles.applyTo(organization.privateMeta.roles)
+                organization.privateMeta.responsibilities = request.body.privateMeta.responsibilities.applyTo(organization.privateMeta.responsibilities)
+                organization.privateMeta.inheritedResponsibilityRoles = request.body.privateMeta.inheritedResponsibilityRoles.applyTo(organization.privateMeta.inheritedResponsibilityRoles)
                 organization.privateMeta.privateKey = request.body.privateMeta.privateKey ?? organization.privateMeta.privateKey
                 organization.privateMeta.featureFlags = patchObject(organization.privateMeta.featureFlags, request.body.privateMeta.featureFlags);
 
@@ -181,28 +183,27 @@ export class PatchOrganizationEndpoint extends Endpoint<Params, Query, Body, Res
 
             // Allow admin patches (permissions only atm). No put atm
             if (request.body.admins) {
-                for (const patch of request.body.admins.getPatches()) {
-                    if (patch.permissions) {
-                        const admin = await User.getByID(patch.id)
-                        if (!admin || !await Context.auth.canAccessUser(admin, PermissionLevel.Full)) {
-                            throw new SimpleError({
-                                code: "invalid_field",
-                                message: "De beheerder die je wilt wijzigen bestaat niet (meer)",
-                                field: "admins"
-                            })
-                        }
-
-                        admin.permissions = UserPermissions.limitedPatch(admin.permissions, patch.permissions, organization.id)
-
-                        if (admin.id === user.id && (!admin.permissions || !admin.permissions.forOrganization(organization)?.hasFullAccess())) {
-                            throw new SimpleError({
-                                code: "permission_denied",
-                                message: "Je kan jezelf niet verwijderen als hoofdbeheerder"
-                            })
-                        }
-                        await admin.save()
-                    }
-                }
+                throw new Error("Temporary removed to keep code cleaner. Please use different endpoints.")
+                // for (const patch of request.body.admins.getPatches()) {
+                //     if (patch.permissions) {
+                //         const admin = await User.getByID(patch.id)
+                //         if (!admin || !await Context.auth.canAccessUser(admin, PermissionLevel.Full)) {
+                //             throw new SimpleError({
+                //                 code: "invalid_field",
+                //                 message: "De beheerder die je wilt wijzigen bestaat niet (meer)",
+                //                 field: "admins"
+                //             })
+                //         }
+                //         admin.permissions = UserPermissions.limitedPatch(admin.permissions, patch.permissions, organization.id)
+                //         if (admin.id === user.id && (!admin.permissions || !admin.permissions.forOrganization(organization)?.hasFullAccess())) {
+                //             throw new SimpleError({
+                //                 code: "permission_denied",
+                //                 message: "Je kan jezelf niet verwijderen als hoofdbeheerder"
+                //             })
+                //         }
+                //         await admin.save()
+                //     }
+                // }
             }
 
             if (request.body.meta) {

package/src/endpoints/organization/dashboard/registration-periods/PatchOrganizationRegistrationPeriodsEndpoint.ts

@@ -1,9 +1,9 @@
 import { DecodedRequest, Endpoint, Request, Response } from "@simonbackx/simple-endpoints";
-import { GroupPrivateSettings, OrganizationRegistrationPeriod as OrganizationRegistrationPeriodStruct, PermissionLevel, PermissionsResourceType, ResourcePermissions, Version } from "@stamhoofd/structures";
+import { Group as GroupStruct, GroupPrivateSettings, OrganizationRegistrationPeriod as OrganizationRegistrationPeriodStruct, PermissionLevel, PermissionsResourceType, ResourcePermissions, Version } from "@stamhoofd/structures";
 
 import { AutoEncoderPatchType, Decoder, PatchableArrayAutoEncoder, PatchableArrayDecoder, StringDecoder } from "@simonbackx/simple-encoding";
 import { Context } from "../../../../helpers/Context";
-import { Group, OrganizationRegistrationPeriod, Platform, RegistrationPeriod } from "@stamhoofd/models";
+import { Group, Member, OrganizationRegistrationPeriod, Platform, RegistrationPeriod } from "@stamhoofd/models";
 import { SimpleError } from "@simonbackx/simple-errors";
 
 type Params = Record<string, never>;
@@ -15,7 +15,7 @@ type ResponseBody = OrganizationRegistrationPeriodStruct[]
  * One endpoint to create, patch and delete members and their registrations and payments
  */
 
-export class PatchRegistrationPeriodsEndpoint extends Endpoint<Params, Query, Body, ResponseBody> {
+export class PatchOrganizationRegistrationPeriodsEndpoint extends Endpoint<Params, Query, Body, ResponseBody> {
     bodyDecoder = new PatchableArrayDecoder(OrganizationRegistrationPeriodStruct as Decoder<OrganizationRegistrationPeriodStruct>, OrganizationRegistrationPeriodStruct.patchType() as Decoder<AutoEncoderPatchType<OrganizationRegistrationPeriodStruct>>, StringDecoder)
 
     protected doesMatch(request: Request): [true, Params] | [false] {
@@ -39,25 +39,6 @@ export class PatchRegistrationPeriodsEndpoint extends Endpoint<Params, Query, Bo
             throw Context.auth.error()
         }
 
-        const platform = await Platform.getShared()
-
-        function validateDefaultGroupId(id: string|null): string|null {
-            if (id === null) {
-                return id;
-            }
-
-            if (platform.config.defaultAgeGroups.find(g => g.id === id)) {
-                return id;
-            }
-
-            throw new SimpleError({
-                code: "invalid_default_age_group",
-                message: "Invalid default age group",
-                human: "De standaard leeftijdsgroep is ongeldig",
-                statusCode: 400
-            })
-        }
-
         const structs: OrganizationRegistrationPeriodStruct[] = [];
 
         for (const {put} of request.body.getPuts()) {
@@ -82,23 +63,14 @@ export class PatchRegistrationPeriodsEndpoint extends Endpoint<Params, Query, Bo
             await organizationPeriod.save();
 
             for (const struct of put.groups) {
-                const model = new Group()
-                model.id = struct.id
-                model.organizationId = organization.id
-                model.defaultAgeGroupId = validateDefaultGroupId(struct.defaultAgeGroupId)
-                model.periodId = organizationPeriod.periodId
-                model.settings = struct.settings
-                model.privateSettings = struct.privateSettings ?? GroupPrivateSettings.create({})
-                model.status = struct.status
-                await model.updateOccupancy()
-                await model.save();
+                await PatchOrganizationRegistrationPeriodsEndpoint.createGroup(struct, organization.id, organizationPeriod.periodId)
             }
             const groups = await Group.getAll(organization.id, organizationPeriod.periodId)
 
             // Delete unreachable categories first
             await organizationPeriod.cleanCategories(groups);
             await Group.deleteUnreachable(organization.id, organizationPeriod, groups)
-            structs.push(organizationPeriod.getStructure(period, groups));
+            structs.push(organizationPeriod.getPrivateStructure(period, groups));
         }
 
         for (const patch of request.body.getPatches()) {
@@ -152,103 +124,17 @@ export class PatchRegistrationPeriodsEndpoint extends Endpoint<Params, Query, Bo
             const deleteGroups = patch.groups.getDeletes()
             if (deleteGroups.length > 0) {
                 for (const id of deleteGroups) {
-                    const model = await Group.getByID(id)
-                    if (!model || !await Context.auth.canAccessGroup(model, PermissionLevel.Full)) {
-                        throw Context.auth.error('Je hebt geen toegangsrechten om deze groep te verwijderen')
-                    }
-
-                    model.deletedAt = new Date()
-                    await model.save()
+                    await PatchOrganizationRegistrationPeriodsEndpoint.deleteGroup(id)
                     deleteUnreachable = true
                 }
             }
 
             for (const groupPut of patch.groups.getPuts()) {
-                if (!await Context.auth.hasFullAccess(organization.id) && !allowedIds.includes(groupPut.put.id)) {
-                    throw Context.auth.error('Je hebt geen toegangsrechten om groepen toe te voegen')
-                }
-
-                const struct = groupPut.put
-                const model = new Group()
-                model.id = struct.id
-                model.organizationId = organization.id
-                model.defaultAgeGroupId = validateDefaultGroupId(struct.defaultAgeGroupId)
-                model.periodId = organizationPeriod.periodId
-                model.settings = struct.settings
-                model.privateSettings = struct.privateSettings ?? GroupPrivateSettings.create({})
-                model.status = struct.status
-
-                if (!await Context.auth.canAccessGroup(model, PermissionLevel.Full)) {
-                    // Create a temporary permission role for this user
-                    const organizationPermissions = user.permissions?.organizationPermissions?.get(organization.id)
-                    if (!organizationPermissions) {
-                        throw new Error('Unexpected missing permissions')
-                    }
-                    const resourcePermissions = ResourcePermissions.create({
-                        resourceName: model.settings.name,
-                        level: PermissionLevel.Full
-                    })
-                    const patch = resourcePermissions.createInsertPatch(PermissionsResourceType.Groups, model.id, organizationPermissions)
-                    user.permissions!.organizationPermissions.set(organization.id, organizationPermissions.patch(patch))
-                    console.log('Automatically granted author full permissions to resource', 'group', model.id, 'user', user.id, 'patch', patch.encode({version: Version}))
-                    await user.save()
-                }
-
-                // Check if current user has permissions to this new group -> else fail with error
-                if (!await Context.auth.canAccessGroup(model, PermissionLevel.Full)) {
-                    throw new SimpleError({
-                        code: "missing_permissions",
-                        message: "You cannot restrict your own permissions",
-                        human: "Je kan geen inschrijvingsgroep maken zonder dat je zelf volledige toegang hebt tot de nieuwe groep"
-                    })
-                    continue;
-                }
-
-                await model.updateOccupancy()
-                await model.save();
+                await PatchOrganizationRegistrationPeriodsEndpoint.createGroup(groupPut.put, organization.id, organizationPeriod.periodId, {allowedIds})
             }
 
             for (const struct of patch.groups.getPatches()) {
-                const model = await Group.getByID(struct.id)
-
-                if (!model || !await Context.auth.canAccessGroup(model, PermissionLevel.Full)) {
-                    throw Context.auth.error('Je hebt geen toegangsrechten om deze groep te wijzigen')
-                }
-
-                if (struct.settings) {
-                    model.settings.patchOrPut(struct.settings)
-                }
-
-                if (struct.status) {
-                    model.status = struct.status
-                }
-                
-                if (struct.privateSettings) {
-                    model.privateSettings.patchOrPut(struct.privateSettings)
-
-                    if (!await Context.auth.canAccessGroup(model, PermissionLevel.Full)) {
-                        throw new SimpleError({
-                            code: "missing_permissions",
-                            message: "You cannot restrict your own permissions",
-                            human: "Je kan je eigen volledige toegang tot deze inschrijvingsgroep niet verwijderen. Vraag aan een hoofdbeheerder om jouw toegang te verwijderen."
-                        })
-                    }
-                }
-
-                if (struct.cycle !== undefined) {
-                    model.cycle = struct.cycle
-                }
-
-                if (struct.deletedAt !== undefined) {
-                    model.deletedAt = struct.deletedAt
-                }
-
-                if (struct.defaultAgeGroupId !== undefined) {
-                    model.defaultAgeGroupId = validateDefaultGroupId(struct.defaultAgeGroupId)
-                }
-                
-                await model.updateOccupancy()
-                await model.save();
+                await PatchOrganizationRegistrationPeriodsEndpoint.patchGroup(struct)
             }
 
             const period = await RegistrationPeriod.getByID(organizationPeriod.periodId);
@@ -261,7 +147,7 @@ export class PatchRegistrationPeriodsEndpoint extends Endpoint<Params, Query, Bo
             }
 
             if (period) {
-                structs.push(organizationPeriod.getStructure(period, groups));
+                structs.push(organizationPeriod.getPrivateStructure(period, groups));
             }
         }
 
@@ -270,4 +156,131 @@ export class PatchRegistrationPeriodsEndpoint extends Endpoint<Params, Query, Bo
         );
     }
 
+    static async validateDefaultGroupId(id: string|null): Promise<string|null> {
+        if (id === null) {
+            return id;
+        }
+        const platform = await Platform.getSharedStruct()
+
+        if (platform.config.defaultAgeGroups.find(g => g.id === id)) {
+            return id;
+        }
+
+        throw new SimpleError({
+            code: "invalid_default_age_group",
+            message: "Invalid default age group",
+            human: "De standaard leeftijdsgroep is ongeldig",
+            statusCode: 400
+        })
+    }
+
+    static async deleteGroup(id: string) {
+        const model = await Group.getByID(id)
+        if (!model || !await Context.auth.canAccessGroup(model, PermissionLevel.Full)) {
+            throw Context.auth.error('Je hebt geen toegangsrechten om deze groep te verwijderen')
+        }
+
+        model.deletedAt = new Date()
+        await model.save()
+        Member.updateMembershipsForGroupId(id)
+    }
+
+    static async patchGroup(struct: AutoEncoderPatchType<GroupStruct>) {
+        const model = await Group.getByID(struct.id)
+
+        if (!model || !await Context.auth.canAccessGroup(model, PermissionLevel.Full)) {
+            throw Context.auth.error('Je hebt geen toegangsrechten om deze groep te wijzigen')
+        }
+
+        if (struct.settings) {
+            model.settings.patchOrPut(struct.settings)
+        }
+
+        if (struct.status) {
+            model.status = struct.status
+        }
+        
+        if (struct.privateSettings) {
+            model.privateSettings.patchOrPut(struct.privateSettings)
+
+            if (!await Context.auth.canAccessGroup(model, PermissionLevel.Full)) {
+                throw new SimpleError({
+                    code: "missing_permissions",
+                    message: "You cannot restrict your own permissions",
+                    human: "Je kan je eigen volledige toegang tot deze inschrijvingsgroep niet verwijderen. Vraag aan een hoofdbeheerder om jouw toegang te verwijderen."
+                })
+            }
+        }
+
+        if (struct.cycle !== undefined) {
+            model.cycle = struct.cycle
+        }
+
+        if (struct.deletedAt !== undefined) {
+            model.deletedAt = struct.deletedAt
+        }
+
+        if (struct.defaultAgeGroupId !== undefined) {
+            model.defaultAgeGroupId = await this.validateDefaultGroupId(struct.defaultAgeGroupId)
+        }
+        
+        await model.updateOccupancy()
+        await model.save();
+        Member.updateMembershipsForGroupId(model.id)
+    }
+
+
+    static async createGroup(struct: GroupStruct, organizationId: string, periodId: string, options?: {allowedIds?: string[]}): Promise<Group> {
+        const allowedIds = options?.allowedIds ?? []
+
+        if (!await Context.auth.hasFullAccess(organizationId)) {
+            if (allowedIds.includes(struct.id)) {
+                // Ok
+            } else {
+                throw Context.auth.error('Je hebt geen toegangsrechten om groepen toe te voegen')
+            }
+        }
+
+        const user = Context.auth.user
+
+        const model = new Group()
+        model.id = struct.id
+        model.organizationId = organizationId
+        model.defaultAgeGroupId = await this.validateDefaultGroupId(struct.defaultAgeGroupId)
+        model.periodId = periodId
+        model.settings = struct.settings
+        model.privateSettings = struct.privateSettings ?? GroupPrivateSettings.create({})
+        model.status = struct.status
+        model.type = struct.type
+
+        if (!await Context.auth.canAccessGroup(model, PermissionLevel.Full)) {
+            // Create a temporary permission role for this user
+            const organizationPermissions = user.permissions?.organizationPermissions?.get(organizationId)
+            if (!organizationPermissions) {
+                throw new Error('Unexpected missing permissions')
+            }
+            const resourcePermissions = ResourcePermissions.create({
+                resourceName: model.settings.name,
+                level: PermissionLevel.Full
+            })
+            const patch = resourcePermissions.createInsertPatch(PermissionsResourceType.Groups, model.id, organizationPermissions)
+            user.permissions!.organizationPermissions.set(organizationId, organizationPermissions.patch(patch))
+            console.log('Automatically granted author full permissions to resource', 'group', model.id, 'user', user.id, 'patch', patch.encode({version: Version}))
+            await user.save()
+        }
+
+        // Check if current user has permissions to this new group -> else fail with error
+        if (!await Context.auth.canAccessGroup(model, PermissionLevel.Full)) {
+            throw new SimpleError({
+                code: "missing_permissions",
+                message: "You cannot restrict your own permissions",
+                human: "Je kan geen inschrijvingsgroep maken zonder dat je zelf volledige toegang hebt tot de nieuwe groep"
+            })
+        }
+
+        await model.updateOccupancy()
+        await model.save();
+        return model;
+    }
+
 }

package/src/endpoints/organization/dashboard/stripe/DeleteStripeAccountEndpoint.ts

@@ -1,10 +1,10 @@
 
 import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
-import { SimpleError } from '@simonbackx/simple-errors';
 import { StripeAccount } from '@stamhoofd/models';
 import { PermissionLevel } from '@stamhoofd/structures';
 
 import { Context } from '../../../../helpers/Context';
+import { StripeHelper } from '../../../../helpers/StripeHelper';
 
 type Params = { id: string };
 type Body = undefined;
@@ -42,13 +42,13 @@ export class DeleteStripeAccountEndpoint extends Endpoint<Params, Query, Body, R
         }
 
         // For now we don't delete them in Stripe because this causes issues with data access
-        // const stripe = StripeHelper.getInstance()
-        // 
-        // try {
-        //     await stripe.accounts.del(model.accountId);
-        // } catch (e) {
-        //     console.error('Tried deleting account but failed', e)
-        // }
+        const stripe = StripeHelper.getInstance()
+        
+        try {
+            await stripe.accounts.del(model.accountId);
+        } catch (e) {
+            console.error('Tried deleting account but failed', e)
+        }
 
         // If that succeeded
         model.status = "deleted"

package/src/endpoints/organization/dashboard/users/GetOrganizationAdminsEndpoint.ts

@@ -3,6 +3,7 @@ import { User } from '@stamhoofd/models';
 import { OrganizationAdmins, User as UserStruct } from "@stamhoofd/structures";
 
 import { Context } from "../../../../helpers/Context";
+import { AuthenticatedStructures } from "../../../../helpers/AuthenticatedStructures";
 type Params = Record<string, never>;
 type Query = undefined;
 type Body = undefined
@@ -35,7 +36,7 @@ export class GetOrganizationAdminsEndpoint extends Endpoint<Params, Query, Body,
         const admins = await User.getAdmins([organization.id])
 
         return new Response(OrganizationAdmins.create({
-            users: admins.map(a => UserStruct.create({...a, hasAccount: a.hasAccount()})),
+            users: await AuthenticatedStructures.usersWithMembers(admins)
         }));
     }
 }