diff --git a/package-lock.json b/package-lock.json index 1a5914d..8bf624a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "ff-admin-server", - "version": "1.7.6", + "version": "1.7.5", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "ff-admin-server", - "version": "1.7.6", + "version": "1.7.5", "license": "AGPL-3.0-only", "dependencies": { "cors": "^2.8.5", diff --git a/package.json b/package.json index f1dd2ee..9269f75 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ff-admin-server", - "version": "1.7.6", + "version": "1.7.5", "description": "Feuerwehr/Verein Mitgliederverwaltung Server", "main": "dist/index.js", "scripts": { diff --git a/src/controller/admin/club/memberController.ts b/src/controller/admin/club/memberController.ts index 23615a1..6301cec 100644 --- a/src/controller/admin/club/memberController.ts +++ b/src/controller/admin/club/memberController.ts @@ -215,8 +215,7 @@ export async function getMembershipTotalStatisticsById(req: Request, res: Respon const memberId = req.params.memberId; let member = await MembershipService.getTotalStatisticsById(memberId); - if (!member) res.sendStatus(204); - else res.json(MembershipFactory.mapToSingleTotalStatistic(member)); + res.json(MembershipFactory.mapToSingleTotalStatistic(member)); } /** diff --git a/src/routes/invite.ts b/src/routes/invite.ts index 9c1159d..ebb4ddd 100644 --- a/src/routes/invite.ts +++ b/src/routes/invite.ts @@ -10,7 +10,7 @@ router.post("/verify", ParamaterPassCheckHelper.requiredIncludedMiddleware(["mai router.put( "/", - ParamaterPassCheckHelper.requiredIncludedMiddleware(["mail", "token", "secret", "routine"]), + ParamaterPassCheckHelper.requiredIncludedMiddleware(["mail", "token", "secret", "routine "]), async (req, res) => { await finishInvite(req, res); } diff --git a/src/routes/setup.ts b/src/routes/setup.ts index 68748c9..4830d4a 100644 --- a/src/routes/setup.ts +++ b/src/routes/setup.ts @@ -50,7 +50,7 @@ router.post( router.post( "/finish", - ParamaterPassCheckHelper.requiredIncludedMiddleware(["mail", "token", "secret", "routine"]), + ParamaterPassCheckHelper.requiredIncludedMiddleware(["mail", "token", "totp"]), async (req, res) => { await finishInvite(req, res, true); } diff --git a/src/service/club/member/membershipService.ts b/src/service/club/member/membershipService.ts index b36e2fb..d423b13 100644 --- a/src/service/club/member/membershipService.ts +++ b/src/service/club/member/membershipService.ts @@ -77,7 +77,7 @@ export default abstract class MembershipService { .getRepository(membershipTotalView) .createQueryBuilder("membershipTotalView") .where("membershipTotalView.memberId = :memberId", { memberId: memberId }) - .getOne() + .getOneOrFail() .then((res) => { return res; })