2.7.0

.devcontainer/Dockerfile

@@ -1,9 +1,13 @@
 FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:22-bullseye
 
+RUN apt-get update && \
+  apt-get install -y \
+  socat
+
 # pnpm
 ENV PNPM_HOME=/workspaces/pnpm
 ENV PATH="$PNPM_HOME:$PATH"
-RUN su node -c "npm install -g pnpm@9.15.2"
+RUN su node -c "npm install -g pnpm@10.24.0"
 RUN corepack enable
 
 ENV TZ=Europe/Berlin

.devcontainer/docker-compose.yml

@@ -10,9 +10,3 @@ services:
 
     # Overrides default command so things don't shut down after the process ends.
     command: sleep infinity
-
-    # Runs app on the same network as the database container, allows "forwardPorts" in devcontainer.json function.
-    network_mode: service:postgres
-
-    # Use "forwardPorts" in **devcontainer.json** to forward an app port locally.
-    # (Adding the "ports" property to this file will not forward from a Codespace.)

.vscode/tasks.json

@@ -32,6 +32,9 @@
       "options": {
         "statusbar": {
           "hide": true
+        },
+        "env": {
+          "NODE_ENV": "development"
         }
       }
     },
@@ -86,20 +89,34 @@
         }
       }
     },
+    {
+      "type": "shell",
+      "command": "socat TCP-LISTEN:6060,fork TCP:keycloak:6060",
+      "label": "proxy:keycloak",
+      "problemMatcher": [],
+      "presentation": {
+        "reveal": "silent"
+      },
+      "options": {
+        "statusbar": {
+          "hide": true
+        }
+      }
+    },
     {
       "label": "start:apps",
       "dependsOn": [
         "start:api",
-        "start:frontend"
+        "start:frontend",
+        "proxy:keycloak"
       ],
       "problemMatcher": []
     },
     {
       "label": "start:apps and services",
       "dependsOn": [
-        "start:api",
-        "start:frontend",
-        "start:services"
+        "start:apps",
+        "start:services",
       ],
       "problemMatcher": [],
       "options": {

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:18.14.2-alpine3.16  AS workspace-base
+FROM node:22.20.0-alpine3.22  AS workspace-base
 
 RUN apk add --no-cache bash curl jq
 

apps/api/config/.gitignore

@@ -0,0 +1 @@
+local.json

apps/api/config/custom-environment-variables.json

@@ -1,28 +1,38 @@
 {
+  "clientUrl": "CLIENT_URL",
+
   "server": {
     "host": "SERVER_HOST",
     "port": "SERVER_PORT"
   },
 
-  "loggingLevel": "LOGGING_LEVEL",
-
-  "clientUrl": "CLIENT_URL",
-
   "db": {
     "url": "DATABASE_URL"
   },
 
   "authentication": {
-    "secret": "AUTHENTICATION_SECRET"
+    "secret": "AUTHENTICATION_SECRET",
+    "expiresIn": "AUTHENTICATION_EXPIRES_IN",
+    "dlrg": {
+      "issuer": "AUTHENTICATION_DLRG_ISSUER",
+      "clientId": "AUTHENTICATION_DLRG_CLIENTID",
+      "clientSecret": "AUTHENTICATION_DLRG_CLIENTSECRET",
+      "allowInsecure": "AUTHENTICATION_DLRG_ALLOWINSECURE"
+    }
   },
+
   "mail": {
     "sendMails": "MAIL_SENDMAILS",
     "sendgridApiKey": "MAIL_SENDGRID_APIKEY"
   },
+
+  "loggingLevel": "LOGGING_LEVEL",
+
   "meilisearch": {
     "host": "MEILISEARCH_HOST",
     "apiKey": "MEILISEARCH_KEY"
   },
+
   "fileDefaultProvider": "FILE_DEFAULT_PROVIDER",
   "fileProviders": {
     "LOCAL": {
@@ -35,9 +45,11 @@
       "folder": "FILE_PROVIDER_AZURE_FOLDER"
     }
   },
+
   "tomtom": {
     "apiKey": "TOMTOM_APIKEY"
   },
+
   "public": {
     "legal": {
       "imprint": "PUBLIC_LEGAL_IMPRINT",

apps/api/config/default.json

@@ -10,7 +10,7 @@
     "secret": "secret",
     "expiresIn": "1d",
     "dlrg": {
-      "client_id": "1200000-0"
+      "allowInsecure": false
     }
   },
 
@@ -48,8 +48,8 @@
   },
   "public": {
     "legal": {
-      "imprint": "https://localhost:8080",
-      "privacy": "https://localhost:8080"
+      "imprint": "https://sh.dlrg.de/index.php?id=457933&L=0",
+      "privacy": "https://sh.dlrg.de/impressum-und-datenschutz/"
     }
   },
 

apps/api/config/development.json

@@ -0,0 +1,12 @@
+{
+  "loggingLevel": "debug",
+
+  "authentication": {
+    "dlrg": {
+      "issuer": "http://localhost:6060/realms/dlrg",
+      "clientId": "brahmsee.digital",
+      "clientSecret": "",
+      "allowInsecure": true
+    }
+  }
+}

apps/api/email/account-password-reset-oauth.mjml

@@ -0,0 +1,17 @@
+{{#> layout }}
+
+<mj-text
+  font-size="16px"
+  line-height="1.5"
+>
+  Wir haben eine Anfrage erhalten, das Passwort für deinen Account bei <b>{{ hostname }}</b> zurückzusetzen.
+</mj-text>
+
+<mj-text
+  font-size="16px"
+  line-height="1.5"
+>
+  Dein Account ist mit dem ISC verbunden. Nutze auf der Login-Seite den "DLRG|ISC" Link zum anmelden.
+</mj-text>
+
+{{/layout}}

apps/api/package.json

@@ -27,55 +27,46 @@
     "seed": "tsx prisma/seeders/index.ts"
   },
   "dependencies": {
-    "@azure/storage-blob": "^12.17.0",
+    "@azure/storage-blob": "catalog:",
     "@codeanker/authentication": "workspace:*",
-    "@codeanker/datagrid": "file:../../vendor/codeanker-datagrid-2.7.1-trimmed.tgz",
     "@codeanker/helpers": "workspace:*",
     "@codeanker/service-sms": "file:../../vendor/codeanker-service-sms-0.0.2.tar.gz",
     "@e965/xlsx": "^0.20.3",
-    "@faker-js/faker": "^9.4.0",
-    "@koa/cors": "^5.0.0",
-    "@koa/router": "^12.0.1",
+    "@faker-js/faker": "catalog:",
+    "@hono/node-server": "^1.19.6",
+    "@hono/trpc-server": "^0.4.0",
     "@prisma/client": "^5.19.1",
     "@prisma/extension-accelerate": "^1.1.0",
     "@sendgrid/mail": "^8.1.0",
     "@trpc/server": "catalog:",
     "archiver": "^7.0.1",
-    "axios": "^1.9.0",
     "config": "^3.3.9",
     "dayjs": "^1.11.10",
     "dot-prop": "^9.0.0",
     "fast-csv": "^5.0.1",
-    "grant": "^5.4.22",
     "handlebars": "^4.7.8",
+    "hono": "^4.10.7",
+    "http-errors": "^2.0.1",
     "jsonwebtoken": "^9.0.2",
-    "koa": "^2.16.1",
-    "koa-body": "^6.0.1",
-    "koa-helmet": "^7.0.2",
-    "koa-router": "^13.0.1",
-    "koa-session": "^6.4.0",
-    "koa-static": "^5.0.0",
     "meilisearch": "^0.37.0",
     "mime": "^4.0.6",
     "mjml": "^4.15.3",
+    "oauth4webapi": "^3.8.3",
     "prom-client": "^15.0.0",
     "superjson": "catalog:",
-    "trpc-koa-adapter": "^1.1.3",
     "uuid": "^11.0.5",
     "winston": "^3.11.0",
-    "zod": "^3.22.4"
+    "zod": "catalog:"
   },
   "devDependencies": {
     "@codeanker/eslint-config": "workspace:*",
     "@codeanker/typescript-config": "workspace:*",
     "@inquirer/prompts": "^7.1.0",
     "@types/archiver": "^6.0.3",
     "@types/config": "^3.3.3",
+    "@types/http-errors": "^2.0.5",
     "@types/http-status-codes": "^1.2.0",
     "@types/jsonwebtoken": "^9.0.8",
-    "@types/koa": "^2.14.0",
-    "@types/koa-bodyparser": "^4.3.12",
-    "@types/koa-router": "^7.4.8",
     "@types/mjml": "^4.7.4",
     "@types/node": "catalog:",
     "commander": "^13.0.0",