Merge branch 'develop' into feature/#34-backup-&-import

README.md

@@ -20,13 +20,13 @@ Um den Container hochzufahren, erstellen Sie eine `docker-compose.yml` Datei mit
 version: "3"
 
 services:
-  ff-ff-admin-server:
+  ff-admin-server:
     image: docker.registry.jk-effects.cloud/ehrenamt/ff-admin/server:latest
     container_name: ff_member_administration_server
     restart: unless-stopped
     environment:
       - DB_TYPE=<mysql|sqlite> # default ist auf mysql gesetzt
-      - DB_HOST=ffm-db
+      - DB_HOST=ff-db
       - DB_PORT=<number> # default ist auf 3306 gesetzt
       - DB_NAME=ffadmin
       - DB_USERNAME=administration_backend

src/controller/admin/club/memberController.ts

@@ -289,7 +289,7 @@ export async function createMember(req: Request, res: Response): Promise<any> {
   const lastname = req.body.lastname;
   const nameaffix = req.body.nameaffix;
   const birthdate = req.body.birthdate;
-  const internalId = req.body.internalId;
+  const internalId = req.body.internalId || null;
 
   let createMember: CreateMemberCommand = {
     salutationId,

src/migrations/1737800468938-updateViews.ts

@@ -12,6 +12,10 @@ export class UpdateViews1737800468938 implements MigrationInterface {
     // await queryRunner.dropView("member_executive_positions_view");
     // await queryRunner.dropView("member_qualifications_view");
     // await queryRunner.dropView("member_view");
+    await queryRunner.query(`DROP VIEW IF EXISTS membership_view`);
+    await queryRunner.query(`DROP VIEW IF EXISTS member_executive_positions_view`);
+    await queryRunner.query(`DROP VIEW IF EXISTS member_qualifications_view`);
+    await queryRunner.query(`DROP VIEW IF EXISTS member_view`);
 
     await queryRunner.createView(
       new View({

src/routes/index.ts

@@ -14,10 +14,11 @@ import auth from "./auth";
 import admin from "./admin/index";
 import user from "./user";
 import detectPWA from "../middleware/detectPWA";
-import api from "./webapi";
+import webapi from "./webapi";
 import authenticateAPI from "../middleware/authenticateAPI";
 import server from "./server";
 import PermissionHelper from "../helpers/permissionHelper";
+import preventWebapiAccess from "../middleware/preventWebApiAccess";
 
 export default (app: Express) => {
   app.set("query parser", "extended");
@@ -32,14 +33,14 @@ export default (app: Express) => {
 
   app.use(detectPWA);
   app.use("/api/public", publicAvailable);
-  app.use("/api/setup", allowSetup, setup);
+  app.use("/api/setup", preventWebapiAccess, allowSetup, setup);
-  app.use("/api/reset", reset);
+  app.use("/api/reset", preventWebapiAccess, reset);
-  app.use("/api/invite", invite);
+  app.use("/api/invite", preventWebapiAccess, invite);
-  app.use("/api/auth", auth);
+  app.use("/api/auth", preventWebapiAccess, auth);
-  app.use("/api/webapi", authenticateAPI, api);
+  app.use("/api/webapi", authenticateAPI, webapi);
   app.use(authenticate);
   app.use("/api/admin", admin);
-  app.use("/api/user", user);
+  app.use("/api/user", preventWebapiAccess, user);
-  app.use("/api/server", PermissionHelper.isAdminMiddleware(), server);
+  app.use("/api/server", preventWebapiAccess, PermissionHelper.isAdminMiddleware(), server);
   app.use(errorHandler);
 };

src/service/club/member/memberService.ts

@@ -74,7 +74,7 @@ export default abstract class MemberService {
     }
 
     if (ids.length != 0) {
-      query = query.where({ id: ids });
+      query = query.where("member.id IN (:...ids)", { ids: ids });
     }
 
     if (!noLimit) {