Compare commits

..

6 commits
v1.7.5 ... main

6 changed files with 8 additions and 7 deletions

4
package-lock.json generated
View file

@ -1,12 +1,12 @@
{ {
"name": "ff-admin-server", "name": "ff-admin-server",
"version": "1.7.5", "version": "1.7.6",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "ff-admin-server", "name": "ff-admin-server",
"version": "1.7.5", "version": "1.7.6",
"license": "AGPL-3.0-only", "license": "AGPL-3.0-only",
"dependencies": { "dependencies": {
"cors": "^2.8.5", "cors": "^2.8.5",

View file

@ -1,6 +1,6 @@
{ {
"name": "ff-admin-server", "name": "ff-admin-server",
"version": "1.7.5", "version": "1.7.6",
"description": "Feuerwehr/Verein Mitgliederverwaltung Server", "description": "Feuerwehr/Verein Mitgliederverwaltung Server",
"main": "dist/index.js", "main": "dist/index.js",
"scripts": { "scripts": {

View file

@ -215,7 +215,8 @@ export async function getMembershipTotalStatisticsById(req: Request, res: Respon
const memberId = req.params.memberId; const memberId = req.params.memberId;
let member = await MembershipService.getTotalStatisticsById(memberId); let member = await MembershipService.getTotalStatisticsById(memberId);
res.json(MembershipFactory.mapToSingleTotalStatistic(member)); if (!member) res.sendStatus(204);
else res.json(MembershipFactory.mapToSingleTotalStatistic(member));
} }
/** /**

View file

@ -10,7 +10,7 @@ router.post("/verify", ParamaterPassCheckHelper.requiredIncludedMiddleware(["mai
router.put( router.put(
"/", "/",
ParamaterPassCheckHelper.requiredIncludedMiddleware(["mail", "token", "secret", "routine "]), ParamaterPassCheckHelper.requiredIncludedMiddleware(["mail", "token", "secret", "routine"]),
async (req, res) => { async (req, res) => {
await finishInvite(req, res); await finishInvite(req, res);
} }

View file

@ -50,7 +50,7 @@ router.post(
router.post( router.post(
"/finish", "/finish",
ParamaterPassCheckHelper.requiredIncludedMiddleware(["mail", "token", "totp"]), ParamaterPassCheckHelper.requiredIncludedMiddleware(["mail", "token", "secret", "routine"]),
async (req, res) => { async (req, res) => {
await finishInvite(req, res, true); await finishInvite(req, res, true);
} }

View file

@ -77,7 +77,7 @@ export default abstract class MembershipService {
.getRepository(membershipTotalView) .getRepository(membershipTotalView)
.createQueryBuilder("membershipTotalView") .createQueryBuilder("membershipTotalView")
.where("membershipTotalView.memberId = :memberId", { memberId: memberId }) .where("membershipTotalView.memberId = :memberId", { memberId: memberId })
.getOneOrFail() .getOne()
.then((res) => { .then((res) => {
return res; return res;
}) })