@stamhoofd/backend 2.3.1 → 2.5.0

package/src/endpoints/global/webshops/GetWebshopFromDomainEndpoint.ts

@@ -78,7 +78,7 @@ export class GetWebshopFromDomainEndpoint extends Endpoint<Params, Query, Body,
                     }
 
                     return new Response(GetWebshopFromDomainResult.create({
-                        organization: await organization.getStructure({emptyGroups: true}),
+                        organization: organization.getBaseStructure(),
                         webshop: WebshopStruct.create(webshop)
                     }));
                 }
@@ -113,14 +113,14 @@ export class GetWebshopFromDomainEndpoint extends Endpoint<Params, Query, Body,
             if (!webshop) {
                 // Return organization, so we know the locale + can do some custom logic
                 return new Response(GetWebshopFromDomainResult.create({
-                    organization: await organization.getStructure({emptyGroups: true}),
+                    organization: organization.getBaseStructure(),
                     webshop: null,
                     webshops: []
                 }));
             }
 
             return new Response(GetWebshopFromDomainResult.create({
-                organization: await organization.getStructure({emptyGroups: true}),
+                organization: organization.getBaseStructure(),
                 webshop: WebshopStruct.create(webshop)
             }));
         }
@@ -156,7 +156,7 @@ export class GetWebshopFromDomainEndpoint extends Endpoint<Params, Query, Body,
 
                 // Return organization, and the known webshops on this domain
                 return new Response(GetWebshopFromDomainResult.create({
-                    organization: await organization.getStructure({emptyGroups: true}),
+                    organization: organization.getBaseStructure(),
                     webshop: null,
                     webshops: webshops.map(w => WebshopPreview.create(w)).filter(w => w.isClosed(0) === false).sort((a, b) => Sorter.byStringValue(a.meta.name, b.meta.name))
                 }));
@@ -180,7 +180,7 @@ export class GetWebshopFromDomainEndpoint extends Endpoint<Params, Query, Body,
         }
 
         return new Response(GetWebshopFromDomainResult.create({
-            organization: await organization.getStructure({emptyGroups: true}),
+            organization: organization.getBaseStructure(),
             webshop: WebshopStruct.create(webshop)
         }));
     }

package/src/endpoints/organization/dashboard/email/EmailEndpoint.ts

@@ -55,7 +55,7 @@ export class EmailEndpoint extends Endpoint<Params, Query, Body, ResponseBody> {
             return [false];
         }
 
-        const params = Endpoint.parseParameters(request.url, "/email", {});
+        const params = Endpoint.parseParameters(request.url, "/email/legacy", {});
 
         if (params) {
             return [true, params as Params];

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) {