Compare commits

..

No commits in common. "main" and "v1.7.5" have entirely different histories.
main ... v1.7.5

6 changed files with 7 additions and 8 deletions

4
package-lock.json generated
View file

@ -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",

View file

@ -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": {

View file

@ -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));
}
/**

View file

@ -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);
}

View file

@ -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);
}

View file

@ -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;
})