@stamhoofd/backend 2.78.3 → 2.79.0

package/.env.ci.json

@@ -1,17 +1,28 @@
 {
     "environment": "test",
     "domains": {
-        "dashboard": "dashboard.stamhoofd.dev",
-        "registration": {
-            "": "stamhoofd.dev",
-            "BE": "dev.stamhoofd.be",
-            "NL": "dev.stamhoofd.nl"
+        "dashboard": "dashboard.stamhoofd",
+        "marketing": {
+            "": "www.be.stamhoofd",
+            "BE": "www.be.stamhoofd",
+            "NL": "www.nl.stamhoofd"
         },
-        "webshop": "shop.stamhoofd.dev",
-        "api": "api.stamhoofd.dev",
+        "webshop": {
+            "": "shop.be.stamhoofd",
+            "BE": "shop.be.stamhoofd",
+            "NL": "shop.nl.stamhoofd"
+        },
+        "api": "api.stamhoofd",
+        "rendererApi": "renderer.stamhoofd",
+            
+        "defaultTransactionalEmail": {
+            "": "stamhoofd.be"
+        },
+
         "defaultBroadcastEmail": {
             "": "stamhoofd.email"
-        }
+        },
+        "webshopCname": "shop.stamhoofd"
     },
     
     "PORT": 9091,

package/index.ts

@@ -60,10 +60,13 @@ const start = async () => {
     await UniqueUserService.check();
 
     // Init platform shared struct: otherwise permissions won't work with missing responsibilities
-    await Platform.getSharedStruct();
+    console.log('Loading platform...');
+    await Platform.loadCaches();
 
     const router = new Router();
 
+    console.log('Loading endpoints...');
+
     // Note: we should load endpoints one by once to have a reliable order of url matching
     await router.loadAllEndpoints(__dirname + '/src/endpoints/global/*');
     await router.loadAllEndpoints(__dirname + '/src/endpoints/admin/*');
@@ -76,6 +79,7 @@ const start = async () => {
 
     router.endpoints.push(new CORSPreflightEndpoint());
 
+    console.log('Creating router...');
     const routerServer = new RouterServer(router);
     routerServer.verbose = false;
 
@@ -104,6 +108,8 @@ const start = async () => {
     // Add CORS headers
     routerServer.addResponseMiddleware(CORSMiddleware);
 
+    console.log('Loading loaders...');
+
     // Register Excel loaders
     await import('./src/excel-loaders/members');
     await import('./src/excel-loaders/payments');
@@ -115,6 +121,7 @@ const start = async () => {
     await import('./src/email-recipient-loaders/orders');
     await import('./src/email-recipient-loaders/receivable-balances');
 
+    console.log('Opening port...');
     routerServer.listen(STAMHOOFD.PORT ?? 9090);
 
     const hrend = process.hrtime(bootTime);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/backend",
-    "version": "2.78.3",
+    "version": "2.79.0",
     "main": "./dist/index.js",
     "exports": {
         ".": {
@@ -16,6 +16,7 @@
         "clear": "rm -rf ./dist",
         "start": "yarn build && node --enable-source-maps ./dist/index.js",
         "test": "jest --runInBand",
+        "test:build": "yarn -s build:full && yarn -s test",
         "test:reset": "yarn build:full && jest --runInBand",
         "migrations": "yarn build:full && node ./dist/migrations.js",
         "lint": "eslint"
@@ -33,18 +34,18 @@
     "dependencies": {
         "@bwip-js/node": "^4.5.1",
         "@mollie/api-client": "3.7.0",
-        "@simonbackx/simple-database": "1.29.0",
-        "@simonbackx/simple-encoding": "2.20.0",
+        "@simonbackx/simple-database": "1.29.1",
+        "@simonbackx/simple-encoding": "2.21.0",
         "@simonbackx/simple-endpoints": "1.19.1",
         "@simonbackx/simple-logging": "^1.0.1",
-        "@stamhoofd/backend-i18n": "2.78.3",
-        "@stamhoofd/backend-middleware": "2.78.3",
-        "@stamhoofd/email": "2.78.3",
-        "@stamhoofd/models": "2.78.3",
-        "@stamhoofd/queues": "2.78.3",
-        "@stamhoofd/sql": "2.78.3",
-        "@stamhoofd/structures": "2.78.3",
-        "@stamhoofd/utility": "2.78.3",
+        "@stamhoofd/backend-i18n": "2.79.0",
+        "@stamhoofd/backend-middleware": "2.79.0",
+        "@stamhoofd/email": "2.79.0",
+        "@stamhoofd/models": "2.79.0",
+        "@stamhoofd/queues": "2.79.0",
+        "@stamhoofd/sql": "2.79.0",
+        "@stamhoofd/structures": "2.79.0",
+        "@stamhoofd/utility": "2.79.0",
         "archiver": "^7.0.1",
         "aws-sdk": "^2.885.0",
         "axios": "1.6.8",
@@ -64,5 +65,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "272bfbb259109530326ec2fd8c83af5f69d6268b"
+    "gitHead": "1ba7d80ded3676ecdc63741f3e8972bd378b5ea6"
 }

package/src/endpoints/admin/organizations/PatchOrganizationsEndpoint.ts

@@ -51,7 +51,7 @@ export class PatchOrganizationsEndpoint extends Endpoint<Params, Query, Body, Re
                 throw new SimpleError({ code: 'not_found', message: 'Organization not found', statusCode: 404 });
             }
 
-            if (organization.id === (await Platform.getShared()).membershipOrganizationId) {
+            if (organization.id === (await Platform.getSharedPrivateStruct()).membershipOrganizationId) {
                 throw new SimpleError({
                     code: 'cannot_delete_membership_organization',
                     message: 'Cannot delete membership organization',

package/src/endpoints/auth/CreateAdminEndpoint.ts

@@ -101,7 +101,7 @@ export class CreateAdminEndpoint extends Endpoint<Params, Query, Body, ResponseB
         const platformName = ((await Platform.getSharedStruct()).config.name);
 
         const name = organization?.name ?? platformName;
-        const what = organization ? `de vereniging ${name} op ${platformName}` : platformName;
+        const what = organization ? $t('de vereniging {name} op {platform}', { name, platform: platformName }) : platformName;
 
         const emailTo = admin.getEmailTo();
         const email: string = typeof emailTo === 'string' ? emailTo : emailTo[0]?.email;

package/src/endpoints/auth/CreateTokenEndpoint.ts

@@ -85,7 +85,7 @@ export class CreateTokenEndpoint extends Endpoint<Params, Query, Body, ResponseB
                 request.request.request?.setTimeout(30 * 1000);
 
                 if (STAMHOOFD.userMode === 'platform') {
-                    const platform = await Platform.getShared();
+                    const platform = await Platform.getSharedPrivateStruct();
                     const config = platform.config.loginMethods.get(LoginMethod.Password);
                     if (!config) {
                         throw new SimpleError({

package/src/endpoints/auth/ForgotPasswordEndpoint.ts

@@ -31,7 +31,7 @@ export class ForgotPasswordEndpoint extends Endpoint<Params, Query, Body, Respon
         const organization = await Context.setOptionalOrganizationScope();
 
         if (STAMHOOFD.userMode === 'platform') {
-            const platform = await Platform.getShared();
+            const platform = await Platform.getSharedPrivateStruct();
             const config = platform.config.loginMethods.get(LoginMethod.Password);
             if (!config) {
                 throw new SimpleError({

package/src/endpoints/auth/PatchUserEndpoint.ts

@@ -136,7 +136,7 @@ export class PatchUserEndpoint extends Endpoint<Params, Query, Body, ResponseBod
 
         if (editUser.id === user.id && request.body.password) {
             if (STAMHOOFD.userMode === 'platform') {
-                const platform = await Platform.getShared();
+                const platform = await Platform.getSharedPrivateStruct();
                 const config = platform.config.loginMethods.get(LoginMethod.Password);
                 if (!config) {
                     throw new SimpleError({