Merge branch 'master' into fix-canvas

.github/workflows/backend.yml

@@ -58,6 +58,7 @@ jobs:
       - uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.3
         with:
           node-version-file: './.tool-versions'
+      - run: touch backend/.env # docker-compose requires `env_file:` to be present https://github.com/docker/compose/issues/3560
       - name: Backend | docker-compose database
         run: docker compose -f docker-compose.yml up --detach --no-deps database
       - name: Backend | Unit

.github/workflows/docker-e2e-deploy.yml

@@ -69,6 +69,7 @@ jobs:
         with:
           node-version-file: './.tool-versions'
       - run: echo "IMAGE_TAG=sha-$(echo $GITHUB_SHA | cut -c 1-7)" > .env
+      - run: touch backend/.env # docker-compose requires `env_file:` to be present https://github.com/docker/compose/issues/3560
       - run: docker compose -f docker-compose.yml up -d --wait --quiet-pull
       - name: Install cucumber-json-formatter
         run: |
@@ -92,7 +93,7 @@ jobs:
         id: pr-number
       - name: E2E | if tests failed, upload report
         if: ${{ failure() && steps.e2e-run.conclusion == 'failure' }}
-        uses: actions/upload-artifact@84480863f228bb9747b473957fcc9e309aa96097 # v4.4.2
+        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
         with:
           name: dreammall-e2e-test-report-pr-${{ steps.pr-number.outputs.pr }}
           path: /home/runner/work/dreammall.earth/dreammall.earth/tests/cypress/reports/dreammall-e2e_html_report

backend/.env.dist

@@ -13,7 +13,7 @@ BBB_SHARED_SECRET=""
 BBB_URL=""
 # BBB_WEBHOOK_URL="http://localhost:4000/bbb-webhook"
 
-JWKS_URI="http://localhost:9000/application/o/dreammallearth/jwks/"
+# JWKS_URI=
 
 # WELCOME_TABLE_MEETING_ID=
 # WELCOME_TABLE_NAME=

backend/.eslintrc.cjs

@@ -19,14 +19,15 @@ module.exports = {
     parser: '@typescript-eslint/parser',
     sourceType: 'module',
   },
-  plugins: ['@typescript-eslint', 'import', 'promise', 'security', 'n'],
+  plugins: ['@typescript-eslint', 'import', 'promise', 'security', 'n', 'no-catch-all'],
   settings: {
     'import/resolver': {
       typescript: true,
       node: true,
     },
   },
   rules: {
+    'no-catch-all/no-catch-all': 'error',
     'no-console': 'error',
     'no-debugger': 'error',
     camelcase: 'error',

backend/package.json

@@ -33,19 +33,19 @@
     "@graphql-tools/schema": "^10.0.6",
     "@graphql-yoga/subscription": "^5.0.1",
     "@prisma/client": "^5.20.0",
-    "@sentry/node": "^8.33.1",
+    "@sentry/node": "^8.34.0",
     "@types/express": "^4.17.21",
     "axios": "^1.7.7",
     "class-validator": "^0.14.1",
     "cors": "^2.8.5",
     "dotenv": "^16.4.5",
-    "express": "^4.21.0",
+    "express": "^4.21.1",
     "fast-xml-parser": "^4.5.0",
     "graphql": "^16.9.0",
     "graphql-scalars": "^1.23.0",
     "graphql-ws": "^5.16.0",
     "graphql-yoga": "^5.7.0",
-    "jose": "^5.9.3",
+    "jose": "^5.9.4",
     "nanoid": "^3.3.7",
     "prisma": "^5.20.0",
     "prisma-extension-soft-delete": "^1.0.1",
@@ -59,13 +59,13 @@
   "devDependencies": {
     "@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
     "@faker-js/faker": "^9.0.3",
-    "@sentry/core": "^8.33.1",
-    "@sentry/types": "^8.33.1",
+    "@sentry/core": "^8.34.0",
+    "@sentry/types": "^8.34.0",
     "@types/cors": "^2.8.17",
     "@types/express": "^4.17.21",
     "@types/jest": "^29.5.13",
     "@types/nanoid": "^3.0.0",
-    "@types/node": "^22.7.4",
+    "@types/node": "^22.7.5",
     "@types/supertest": "^6.0.2",
     "@types/uuid": "^10.0.0",
     "@types/ws": "^8.5.12",
@@ -79,6 +79,7 @@
     "eslint-plugin-jest": "^28.6.0",
     "eslint-plugin-json": "^3.1.0",
     "eslint-plugin-n": "^16.6.2",
+    "eslint-plugin-no-catch-all": "^1.1.0",
     "eslint-plugin-prettier": "^5.2.1",
     "eslint-plugin-promise": "^6.6.0",
     "eslint-plugin-security": "^3.0.1",
@@ -93,7 +94,7 @@
     "ts-jest": "^29.2.5",
     "ts-node": "^10.9.2",
     "tsc-watch": "^6.2.0",
-    "typescript": "^5.6.2",
+    "typescript": "^5.6.3",
     "wait-for-expect": "^3.0.2"
   },
   "imports": {

backend/prisma/seed.ts

@@ -27,9 +27,9 @@ const seedUsers = async () => {
         name: 'Räuber Hotzenplotz',
         referenceId: faker.string.alphanumeric({ length: 8, casing: 'upper', exclude: 'O' }),
       },
-      ...Array.from(new Array(100), () => ({
+      ...Array.from(new Array(100), (_, i) => ({
         name: faker.person.fullName(),
-        username: faker.internet.userName(),
+        username: faker.internet.userName() + i,
         referenceId: faker.string.alphanumeric({ length: 8, casing: 'upper', exclude: 'O' }),
       })),
     ],

backend/src/api/BBB/index.ts

@@ -43,7 +43,7 @@ export const getMeetings = async (): Promise<MeetingInfo[]> => {
     } else {
       logger.error('parse getMeetings with error', parsed)
     }
-  } catch (err) {
+  } catch (err) /* eslint-disable-line no-catch-all/no-catch-all */ {
     logger.error('getMeetings with error', err)
   }
   return []
@@ -74,7 +74,7 @@ export const createMeeting = async (
       response: CreateMeetingResponse
     } = parser.parse(data as string)
     return parsed.response
-  } catch (err) {
+  } catch (err) /* eslint-disable-line no-catch-all/no-catch-all */ {
     logger.error('createMeeting with error', err)
     return null
   }