Ehrenamt/ff-admin-server
2
0
Fork 0
Code Issues 18 Pull requests Projects Releases 14 Packages Wiki Activity Actions

patches v1.3.5 #74

Merged
jkeffects merged 10 commits from develop into main 2025-03-12 08:52:49 +00:00
Conversation 0 Commits 10 Files changed 176 +81 -76
19 changed files with 81 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 357c27861b - Show all commits

4
src/controller/admin/configuration/templateUsageController.ts
View file

@ -21,7 +21,7 @@ export async function getAllTemplateUsages(req: Request, res: Response): Promise
if (!req.isOwner) { if (!req.isOwner) {
templateUsages = templateUsages.filter((tu) => { templateUsages = templateUsages.filter((tu) => {
return ( return (
PermissionHelper.can(req.permissions, "update", "settings", tu.scope.split(".")[0] as PermissionModule) || PermissionHelper.can(req.permissions, "update", "configuration", tu.scope.split(".")[0] as PermissionModule) ||
PermissionHelper.can(req.permissions, "update", "club", tu.scope.split(".")[0] as PermissionModule) PermissionHelper.can(req.permissions, "update", "club", tu.scope.split(".")[0] as PermissionModule)
); );
}); });
@ -66,7 +66,7 @@ export async function updateTemplateUsage(req: Request, res: Response): Promise<
let allowedSettings = PermissionHelper.can( let allowedSettings = PermissionHelper.can(
req.permissions, req.permissions,
"update", "update",
"settings", "configuration",
req.params.scope as PermissionModule req.params.scope as PermissionModule
); );
let allowedClub = PermissionHelper.can(req.permissions, "update", "club", req.params.scope as PermissionModule); let allowedClub = PermissionHelper.can(req.permissions, "update", "club", req.params.scope as PermissionModule);

6
src/routes/admin/configuration/award.ts
View file

@ -20,7 +20,7 @@ router.get("/:id", async (req: Request, res: Response) => {
router.post( router.post(
"/", "/",
PermissionHelper.passCheckMiddleware("create", "settings", "award"), PermissionHelper.passCheckMiddleware("create", "configuration", "award"),
async (req: Request, res: Response) => { async (req: Request, res: Response) => {
await createAward(req, res); await createAward(req, res);
} }
@ -28,7 +28,7 @@ router.post(
router.patch( router.patch(
"/:id", "/:id",
PermissionHelper.passCheckMiddleware("update", "settings", "award"), PermissionHelper.passCheckMiddleware("update", "configuration", "award"),
async (req: Request, res: Response) => { async (req: Request, res: Response) => {
await updateAward(req, res); await updateAward(req, res);
} }
@ -36,7 +36,7 @@ router.patch(
router.delete( router.delete(
"/:id", "/:id",
PermissionHelper.passCheckMiddleware("delete", "settings", "award"), PermissionHelper.passCheckMiddleware("delete", "configuration", "award"),
async (req: Request, res: Response) => { async (req: Request, res: Response) => {
await deleteAward(req, res); await deleteAward(req, res);
} }

6
src/routes/admin/configuration/calendarType.ts
View file

@ -25,7 +25,7 @@ router.get("/:id", async (req: Request, res: Response) => {
router.post( router.post(
"/", "/",
PermissionHelper.passCheckMiddleware("create", "settings", "calendar_type"), PermissionHelper.passCheckMiddleware("create", "configuration", "calendar_type"),
async (req: Request, res: Response) => { async (req: Request, res: Response) => {
await createCalendarType(req, res); await createCalendarType(req, res);
} }
@ -33,7 +33,7 @@ router.post(
router.patch( router.patch(
"/:id", "/:id",
PermissionHelper.passCheckMiddleware("update", "settings", "calendar_type"), PermissionHelper.passCheckMiddleware("update", "configuration", "calendar_type"),
async (req: Request, res: Response) => { async (req: Request, res: Response) => {
await updateCalendarType(req, res); await updateCalendarType(req, res);
} }
@ -41,7 +41,7 @@ router.patch(
router.delete( router.delete(
"/:id", "/:id",
PermissionHelper.passCheckMiddleware("delete", "settings", "calendar_type"), PermissionHelper.passCheckMiddleware("delete", "configuration", "calendar_type"),
async (req: Request, res: Response) => { async (req: Request, res: Response) => {
await deleteCalendarType(req, res); await deleteCalendarType(req, res);
} }

6
src/routes/admin/configuration/communicationType.ts
View file

@ -25,7 +25,7 @@ router.get("/:id", async (req: Request, res: Response) => {
router.post( router.post(
"/", "/",
PermissionHelper.passCheckMiddleware("create", "settings", "communication_type"), PermissionHelper.passCheckMiddleware("create", "configuration", "communication_type"),
async (req: Request, res: Response) => { async (req: Request, res: Response) => {
await createCommunicationType(req, res); await createCommunicationType(req, res);
} }
@ -33,7 +33,7 @@ router.post(
router.patch( router.patch(
"/:id", "/:id",
PermissionHelper.passCheckMiddleware("update", "settings", "communication_type"), PermissionHelper.passCheckMiddleware("update", "configuration", "communication_type"),
async (req: Request, res: Response) => { async (req: Request, res: Response) => {
await updateCommunicationType(req, res); await updateCommunicationType(req, res);
} }
@ -41,7 +41,7 @@ router.patch(
router.delete( router.delete(
"/:id", "/:id",
PermissionHelper.passCheckMiddleware("delete", "settings", "communication_type"), PermissionHelper.passCheckMiddleware("delete", "configuration", "communication_type"),
async (req: Request, res: Response) => { async (req: Request, res: Response) => {
await deleteCommunicationType(req, res); await deleteCommunicationType(req, res);
} }

6
src/routes/admin/configuration/executivePosition.ts
View file

@ -20,7 +20,7 @@ router.get("/:id", async (req: Request, res: Response) => {
router.post( router.post(
"/", "/",
PermissionHelper.passCheckMiddleware("create", "settings", "executive_position"), PermissionHelper.passCheckMiddleware("create", "configuration", "executive_position"),
async (req: Request, res: Response) => { async (req: Request, res: Response) => {
await createExecutivePosition(req, res); await createExecutivePosition(req, res);
} }
@ -28,7 +28,7 @@ router.post(
router.patch( router.patch(
"/:id", "/:id",
PermissionHelper.passCheckMiddleware("update", "settings", "executive_position"), PermissionHelper.passCheckMiddleware("update", "configuration", "executive_position"),
async (req: Request, res: Response) => { async (req: Request, res: Response) => {
await updateExecutivePosition(req, res); await updateExecutivePosition(req, res);
} }
@ -36,7 +36,7 @@ router.patch(
router.delete( router.delete(
"/:id", "/:id",
PermissionHelper.passCheckMiddleware("delete", "settings", "executive_position"), PermissionHelper.passCheckMiddleware("delete", "configuration", "executive_position"),
async (req: Request, res: Response) => { async (req: Request, res: Response) => {
await deleteExecutivePosition(req, res); await deleteExecutivePosition(req, res);
} }

6
src/routes/admin/configuration/membershipStatus.ts
View file

@ -20,7 +20,7 @@ router.get("/:id", async (req: Request, res: Response) => {
router.post( router.post(
"/", "/",
PermissionHelper.passCheckMiddleware("create", "settings", "membership_status"), PermissionHelper.passCheckMiddleware("create", "configuration", "membership_status"),
async (req: Request, res: Response) => { async (req: Request, res: Response) => {
await createMembershipStatus(req, res); await createMembershipStatus(req, res);
} }
@ -28,7 +28,7 @@ router.post(
router.patch( router.patch(
"/:id", "/:id",
PermissionHelper.passCheckMiddleware("update", "settings", "membership_status"), PermissionHelper.passCheckMiddleware("update", "configuration", "membership_status"),
async (req: Request, res: Response) => { async (req: Request, res: Response) => {
await updateMembershipStatus(req, res); await updateMembershipStatus(req, res);
} }
@ -36,7 +36,7 @@ router.patch(
router.delete( router.delete(
"/:id", "/:id",
PermissionHelper.passCheckMiddleware("delete", "settings", "membership_status"), PermissionHelper.passCheckMiddleware("delete", "configuration", "membership_status"),
async (req: Request, res: Response) => { async (req: Request, res: Response) => {
await deleteMembershipStatus(req, res); await deleteMembershipStatus(req, res);
} }

4
src/routes/admin/configuration/newsletterConfig.ts
View file

@ -19,7 +19,7 @@ router.get("/:id", async (req: Request, res: Response) => {
router.put( router.put(
"/", "/",
PermissionHelper.passCheckMiddleware("create", "settings", "newsletter_config"), PermissionHelper.passCheckMiddleware("create", "configuration", "newsletter_config"),
async (req: Request, res: Response) => { async (req: Request, res: Response) => {
await setNewsletterConfig(req, res); await setNewsletterConfig(req, res);
} }
@ -27,7 +27,7 @@ router.put(
router.delete( router.delete(
"/:comTypeId", "/:comTypeId",
PermissionHelper.passCheckMiddleware("create", "settings", "newsletter_config"), PermissionHelper.passCheckMiddleware("create", "configuration", "newsletter_config"),
async (req: Request, res: Response) => { async (req: Request, res: Response) => {
await deleteNewsletterConfig(req, res); await deleteNewsletterConfig(req, res);
} }

6
src/routes/admin/configuration/qualification.ts
View file

@ -20,7 +20,7 @@ router.get("/:id", async (req: Request, res: Response) => {
router.post( router.post(
"/", "/",
PermissionHelper.passCheckMiddleware("create", "settings", "qualification"), PermissionHelper.passCheckMiddleware("create", "configuration", "qualification"),
async (req: Request, res: Response) => { async (req: Request, res: Response) => {
await createQualification(req, res); await createQualification(req, res);
} }
@ -28,7 +28,7 @@ router.post(
router.patch( router.patch(
"/:id", "/:id",
PermissionHelper.passCheckMiddleware("update", "settings", "qualification"), PermissionHelper.passCheckMiddleware("update", "configuration", "qualification"),
async (req: Request, res: Response) => { async (req: Request, res: Response) => {
await updateQualification(req, res); await updateQualification(req, res);
} }
@ -36,7 +36,7 @@ router.patch(
router.delete( router.delete(
"/:id", "/:id",
PermissionHelper.passCheckMiddleware("delete", "settings", "qualification"), PermissionHelper.passCheckMiddleware("delete", "configuration", "qualification"),
async (req: Request, res: Response) => { async (req: Request, res: Response) => {
await deleteQualification(req, res); await deleteQualification(req, res);
} }

6
src/routes/admin/configuration/queryStore.ts
View file

@ -20,7 +20,7 @@ router.get("/:id", async (req: Request, res: Response) => {
router.post( router.post(
"/", "/",
PermissionHelper.passCheckMiddleware("create", "settings", "query_store"), PermissionHelper.passCheckMiddleware("create", "configuration", "query_store"),
async (req: Request, res: Response) => { async (req: Request, res: Response) => {
await createQueryStore(req, res); await createQueryStore(req, res);
} }
@ -28,7 +28,7 @@ router.post(
router.patch( router.patch(
"/:id", "/:id",
PermissionHelper.passCheckMiddleware("update", "settings", "query_store"), PermissionHelper.passCheckMiddleware("update", "configuration", "query_store"),
async (req: Request, res: Response) => { async (req: Request, res: Response) => {
await updateQueryStore(req, res); await updateQueryStore(req, res);
} }
@ -36,7 +36,7 @@ router.patch(
router.delete( router.delete(
"/:id", "/:id",
PermissionHelper.passCheckMiddleware("delete", "settings", "query_store"), PermissionHelper.passCheckMiddleware("delete", "configuration", "query_store"),
async (req: Request, res: Response) => { async (req: Request, res: Response) => {
await deleteQueryStore(req, res); await deleteQueryStore(req, res);
} }

6
src/routes/admin/configuration/salutation.ts
View file

@ -20,7 +20,7 @@ router.get("/:id", async (req: Request, res: Response) => {
router.post( router.post(
"/", "/",
PermissionHelper.passCheckMiddleware("create", "settings", "salutation"), PermissionHelper.passCheckMiddleware("create", "configuration", "salutation"),
async (req: Request, res: Response) => { async (req: Request, res: Response) => {
await createSalutation(req, res); await createSalutation(req, res);
} }
@ -28,7 +28,7 @@ router.post(
router.patch( router.patch(
"/:id", "/:id",
PermissionHelper.passCheckMiddleware("update", "settings", "salutation"), PermissionHelper.passCheckMiddleware("update", "configuration", "salutation"),
async (req: Request, res: Response) => { async (req: Request, res: Response) => {
await updateSalutation(req, res); await updateSalutation(req, res);
} }
@ -36,7 +36,7 @@ router.patch(
router.delete( router.delete(
"/:id", "/:id",
PermissionHelper.passCheckMiddleware("delete", "settings", "salutation"), PermissionHelper.passCheckMiddleware("delete", "configuration", "salutation"),
async (req: Request, res: Response) => { async (req: Request, res: Response) => {
await deleteSalutation(req, res); await deleteSalutation(req, res);
} }

8
src/routes/admin/configuration/template.ts
View file

@ -21,7 +21,7 @@ router.get("/:id", async (req: Request, res: Response) => {
router.post( router.post(
"/", "/",
PermissionHelper.passCheckMiddleware("create", "settings", "template"), PermissionHelper.passCheckMiddleware("create", "configuration", "template"),
async (req: Request, res: Response) => { async (req: Request, res: Response) => {
await createTemplate(req, res); await createTemplate(req, res);
} }
@ -29,7 +29,7 @@ router.post(
router.post( router.post(
"/clone", "/clone",
PermissionHelper.passCheckMiddleware("create", "settings", "template"), PermissionHelper.passCheckMiddleware("create", "configuration", "template"),
async (req: Request, res: Response) => { async (req: Request, res: Response) => {
await cloneTemplate(req, res); await cloneTemplate(req, res);
} }
@ -37,7 +37,7 @@ router.post(
router.patch( router.patch(
"/:id", "/:id",
PermissionHelper.passCheckMiddleware("update", "settings", "template"), PermissionHelper.passCheckMiddleware("update", "configuration", "template"),
async (req: Request, res: Response) => { async (req: Request, res: Response) => {
await updateTemplate(req, res); await updateTemplate(req, res);
} }
@ -45,7 +45,7 @@ router.patch(
router.delete( router.delete(
"/:id", "/:id",
PermissionHelper.passCheckMiddleware("delete", "settings", "template"), PermissionHelper.passCheckMiddleware("delete", "configuration", "template"),
async (req: Request, res: Response) => { async (req: Request, res: Response) => {
await deleteTemplate(req, res); await deleteTemplate(req, res);
} }

2
src/routes/admin/configuration/templateUsage.ts
View file

@ -20,7 +20,7 @@ router.get("/:scope", async (req: Request, res: Response) => {
router.patch( router.patch(
"/:scope", "/:scope",
PermissionHelper.passCheckMiddleware("update", "settings", "template_usage"), PermissionHelper.passCheckMiddleware("update", "configuration", "template_usage"),
async (req: Request, res: Response) => { async (req: Request, res: Response) => {
await updateTemplateUsage(req, res); await updateTemplateUsage(req, res);
} }

47
src/routes/admin/index.ts
View file

@ -31,7 +31,7 @@ var router = express.Router({ mergeParams: true });
router.use( router.use(
"/award", "/award",
PermissionHelper.passCheckSomeMiddleware([ PermissionHelper.passCheckSomeMiddleware([
{ requiredPermissions: "read", section: "settings", module: "award" }, { requiredPermissions: "read", section: "configuration", module: "award" },
{ requiredPermissions: "read", section: "club", module: "member" }, { requiredPermissions: "read", section: "club", module: "member" },
]), ]),
award award
@ -39,7 +39,7 @@ router.use(
router.use( router.use(
"/communicationtype", "/communicationtype",
PermissionHelper.passCheckSomeMiddleware([ PermissionHelper.passCheckSomeMiddleware([
{ requiredPermissions: "read", section: "settings", module: "communication_type" }, { requiredPermissions: "read", section: "configuration", module: "communication_type" },
{ requiredPermissions: "read", section: "club", module: "member" }, { requiredPermissions: "read", section: "club", module: "member" },
]), ]),
communicationType communicationType
@ -47,7 +47,7 @@ router.use(
router.use( router.use(
"/executiveposition", "/executiveposition",
PermissionHelper.passCheckSomeMiddleware([ PermissionHelper.passCheckSomeMiddleware([
{ requiredPermissions: "read", section: "settings", module: "executive_position" }, { requiredPermissions: "read", section: "configuration", module: "executive_position" },
{ requiredPermissions: "read", section: "club", module: "member" }, { requiredPermissions: "read", section: "club", module: "member" },
]), ]),
executivePosition executivePosition
@ -55,7 +55,7 @@ router.use(
router.use( router.use(
"/membershipstatus", "/membershipstatus",
PermissionHelper.passCheckSomeMiddleware([ PermissionHelper.passCheckSomeMiddleware([
{ requiredPermissions: "read", section: "settings", module: "membership_status" }, { requiredPermissions: "read", section: "configuration", module: "membership_status" },
{ requiredPermissions: "read", section: "club", module: "member" }, { requiredPermissions: "read", section: "club", module: "member" },
]), ]),
membershipStatus membershipStatus
@ -63,7 +63,7 @@ router.use(
router.use( router.use(
"/qualification", "/qualification",
PermissionHelper.passCheckSomeMiddleware([ PermissionHelper.passCheckSomeMiddleware([
{ requiredPermissions: "read", section: "settings", module: "qualification" }, { requiredPermissions: "read", section: "configuration", module: "qualification" },
{ requiredPermissions: "read", section: "club", module: "member" }, { requiredPermissions: "read", section: "club", module: "member" },
]), ]),
qualification qualification
@ -71,7 +71,7 @@ router.use(
router.use( router.use(
"/salutation", "/salutation",
PermissionHelper.passCheckSomeMiddleware([ PermissionHelper.passCheckSomeMiddleware([
{ requiredPermissions: "read", section: "settings", module: "salutation" }, { requiredPermissions: "read", section: "configuration", module: "salutation" },
{ requiredPermissions: "read", section: "club", module: "member" }, { requiredPermissions: "read", section: "club", module: "member" },
]), ]),
salutation salutation
@ -79,26 +79,26 @@ router.use(
router.use( router.use(
"/calendartype", "/calendartype",
PermissionHelper.passCheckSomeMiddleware([ PermissionHelper.passCheckSomeMiddleware([
{ requiredPermissions: "read", section: "settings", module: "calendar_type" }, { requiredPermissions: "read", section: "configuration", module: "calendar_type" },
{ requiredPermissions: "read", section: "club", module: "calendar" }, { requiredPermissions: "read", section: "club", module: "calendar" },
]), ]),
calendarType calendarType
); );
router.use("/querystore", PermissionHelper.passCheckMiddleware("read", "settings", "query_store"), queryStore); router.use("/querystore", PermissionHelper.passCheckMiddleware("read", "configuration", "query_store"), queryStore);
router.use("/template", PermissionHelper.passCheckMiddleware("read", "settings", "template"), template); router.use("/template", PermissionHelper.passCheckMiddleware("read", "configuration", "template"), template);
router.use( router.use(
"/templateusage", "/templateusage",
PermissionHelper.passCheckSomeMiddleware([ PermissionHelper.passCheckSomeMiddleware([
{ requiredPermissions: "read", section: "settings", module: "template_usage" }, { requiredPermissions: "read", section: "configuration", module: "template_usage" },
{ requiredPermissions: "read", section: "settings", module: "template" }, { requiredPermissions: "read", section: "configuration", module: "template" },
]), ]),
templateUsage templateUsage
); );
router.use( router.use(
"/newsletterconfig", "/newsletterconfig",
PermissionHelper.passCheckSomeMiddleware([ PermissionHelper.passCheckSomeMiddleware([
{ requiredPermissions: "read", section: "settings", module: "newsletter_config" }, { requiredPermissions: "read", section: "configuration", module: "newsletter_config" },
{ requiredPermissions: "read", section: "settings", module: "communication_type" }, { requiredPermissions: "read", section: "configuration", module: "communication_type" },
]), ]),
newsletterConfig newsletterConfig
); );
@ -117,7 +117,7 @@ router.use(
"/querybuilder", "/querybuilder",
PermissionHelper.passCheckSomeMiddleware([ PermissionHelper.passCheckSomeMiddleware([
{ requiredPermissions: "read", section: "club", module: "query" }, { requiredPermissions: "read", section: "club", module: "query" },
{ requiredPermissions: "read", section: "settings", module: "query_store" }, { requiredPermissions: "read", section: "configuration", module: "query_store" },
]), ]),
queryBuilder queryBuilder
); );
@ -128,22 +128,27 @@ router.use(
{ requiredPermissions: "read", section: "club", module: "member" }, { requiredPermissions: "read", section: "club", module: "member" },
{ requiredPermissions: "read", section: "club", module: "calendar" }, { requiredPermissions: "read", section: "club", module: "calendar" },
{ requiredPermissions: "read", section: "club", module: "query" }, { requiredPermissions: "read", section: "club", module: "query" },
{ requiredPermissions: "read", section: "settings", module: "query_store" }, { requiredPermissions: "read", section: "configuration", module: "query_store" },
]), ]),
newsletter newsletter
); );
router.use("/role", PermissionHelper.passCheckMiddleware("read", "user", "role"), role); router.use("/role", PermissionHelper.passCheckMiddleware("read", "management", "role"), role);
router.use( router.use(
"/user", "/user",
PermissionHelper.passCheckSomeMiddleware([ PermissionHelper.passCheckSomeMiddleware([
{ requiredPermissions: "read", section: "user", module: "user" }, { requiredPermissions: "read", section: "management", module: "user" },
{ requiredPermissions: "read", section: "user", module: "role" }, { requiredPermissions: "read", section: "management", module: "role" },
]), ]),
user user
); );
router.use("/invite", PermissionHelper.passCheckMiddleware("read", "user", "user"), invite); router.use("/invite", PermissionHelper.passCheckMiddleware("read", "management", "user"), invite);
router.use("/webapi", preventWebapiAccess, PermissionHelper.passCheckMiddleware("read", "user", "webapi"), api); router.use("/webapi", preventWebapiAccess, PermissionHelper.passCheckMiddleware("read", "management", "webapi"), api);
router.use("/backup", preventWebapiAccess, PermissionHelper.passCheckMiddleware("read", "user", "backup"), backup); router.use(
"/backup",
preventWebapiAccess,
PermissionHelper.passCheckMiddleware("read", "management", "backup"),
backup
);
export default router; export default router;

8
src/routes/admin/management/backup.ts
View file

@ -54,7 +54,7 @@ router.get("/uploaded/:filename", async (req: Request, res: Response) => {
router.post( router.post(
"/", "/",
PermissionHelper.passCheckMiddleware("create", "user", "backup"), PermissionHelper.passCheckMiddleware("create", "management", "backup"),
async (req: Request, res: Response) => { async (req: Request, res: Response) => {
await createManualBackup(req, res); await createManualBackup(req, res);
} }
@ -62,7 +62,7 @@ router.post(
router.post( router.post(
"/generated/restore", "/generated/restore",
PermissionHelper.passCheckMiddleware("admin", "user", "backup"), PermissionHelper.passCheckMiddleware("admin", "management", "backup"),
async (req: Request, res: Response) => { async (req: Request, res: Response) => {
await restoreBackupByLocalFile(req, res); await restoreBackupByLocalFile(req, res);
} }
@ -70,7 +70,7 @@ router.post(
router.post( router.post(
"/uploaded/restore", "/uploaded/restore",
PermissionHelper.passCheckMiddleware("admin", "user", "backup"), PermissionHelper.passCheckMiddleware("admin", "management", "backup"),
async (req: Request, res: Response) => { async (req: Request, res: Response) => {
await restoreBackupByUploadedFile(req, res); await restoreBackupByUploadedFile(req, res);
} }
@ -78,7 +78,7 @@ router.post(
router.post( router.post(
"/upload", "/upload",
PermissionHelper.passCheckMiddleware("create", "user", "backup"), PermissionHelper.passCheckMiddleware("create", "management", "backup"),
upload.single("file"), upload.single("file"),
async (req: Request, res: Response) => { async (req: Request, res: Response) => {
await uploadBackupFile(req, res); await uploadBackupFile(req, res);

4
src/routes/admin/management/invite.ts
View file

@ -10,7 +10,7 @@ router.get("/", async (req: Request, res: Response) => {
router.post( router.post(
"/", "/",
PermissionHelper.passCheckMiddleware("create", "user", "user"), PermissionHelper.passCheckMiddleware("create", "management", "user"),
async (req: Request, res: Response) => { async (req: Request, res: Response) => {
await inviteUser(req, res); await inviteUser(req, res);
} }
@ -18,7 +18,7 @@ router.post(
router.delete( router.delete(
"/:mail", "/:mail",
PermissionHelper.passCheckMiddleware("delete", "user", "user"), PermissionHelper.passCheckMiddleware("delete", "management", "user"),
async (req: Request, res: Response) => { async (req: Request, res: Response) => {
await deleteInvite(req, res); await deleteInvite(req, res);
} }

8
src/routes/admin/management/role.ts
View file

@ -26,7 +26,7 @@ router.get("/:id/permissions", async (req: Request, res: Response) => {
router.post( router.post(
"/", "/",
PermissionHelper.passCheckMiddleware("create", "user", "role"), PermissionHelper.passCheckMiddleware("create", "management", "role"),
async (req: Request, res: Response) => { async (req: Request, res: Response) => {
await createRole(req, res); await createRole(req, res);
} }
@ -34,7 +34,7 @@ router.post(
router.patch( router.patch(
"/:id", "/:id",
PermissionHelper.passCheckMiddleware("update", "user", "role"), PermissionHelper.passCheckMiddleware("update", "management", "role"),
async (req: Request, res: Response) => { async (req: Request, res: Response) => {
await updateRole(req, res); await updateRole(req, res);
} }
@ -42,7 +42,7 @@ router.patch(
router.patch( router.patch(
"/:id/permissions", "/:id/permissions",
PermissionHelper.passCheckMiddleware("admin", "user", "role"), PermissionHelper.passCheckMiddleware("admin", "management", "role"),
async (req: Request, res: Response) => { async (req: Request, res: Response) => {
await updateRolePermissions(req, res); await updateRolePermissions(req, res);
} }
@ -50,7 +50,7 @@ router.patch(
router.delete( router.delete(
"/:id", "/:id",
PermissionHelper.passCheckMiddleware("delete", "user", "role"), PermissionHelper.passCheckMiddleware("delete", "management", "role"),
async (req: Request, res: Response) => { async (req: Request, res: Response) => {
await deleteRole(req, res); await deleteRole(req, res);
} }

8
src/routes/admin/management/user.ts
View file

@ -32,7 +32,7 @@ router.get("/:id/roles", async (req: Request, res: Response) => {
router.patch( router.patch(
"/:id", "/:id",
PermissionHelper.passCheckMiddleware("update", "user", "user"), PermissionHelper.passCheckMiddleware("update", "management", "user"),
async (req: Request, res: Response) => { async (req: Request, res: Response) => {
await updateUser(req, res); await updateUser(req, res);
} }
@ -40,7 +40,7 @@ router.patch(
router.patch( router.patch(
"/:id/permissions", "/:id/permissions",
PermissionHelper.passCheckMiddleware("admin", "user", "user"), PermissionHelper.passCheckMiddleware("admin", "management", "user"),
async (req: Request, res: Response) => { async (req: Request, res: Response) => {
await updateUserPermissions(req, res); await updateUserPermissions(req, res);
} }
@ -48,7 +48,7 @@ router.patch(
router.patch( router.patch(
"/:id/roles", "/:id/roles",
PermissionHelper.passCheckMiddleware("update", "user", "user"), PermissionHelper.passCheckMiddleware("update", "management", "user"),
async (req: Request, res: Response) => { async (req: Request, res: Response) => {
await updateUserRoles(req, res); await updateUserRoles(req, res);
} }
@ -56,7 +56,7 @@ router.patch(
router.delete( router.delete(
"/:id", "/:id",
PermissionHelper.passCheckMiddleware("delete", "user", "user"), PermissionHelper.passCheckMiddleware("delete", "management", "user"),
async (req: Request, res: Response) => { async (req: Request, res: Response) => {
await deleteUser(req, res); await deleteUser(req, res);
} }

8
src/routes/admin/management/webapi.ts
View file

@ -31,7 +31,7 @@ router.get("/:id/permissions", async (req: Request, res: Response) => {
router.post( router.post(
"/", "/",
PermissionHelper.passCheckMiddleware("create", "user", "webapi"), PermissionHelper.passCheckMiddleware("create", "management", "webapi"),
async (req: Request, res: Response) => { async (req: Request, res: Response) => {
await createWebapi(req, res); await createWebapi(req, res);
} }
@ -39,7 +39,7 @@ router.post(
router.patch( router.patch(
"/:id", "/:id",
PermissionHelper.passCheckMiddleware("update", "user", "webapi"), PermissionHelper.passCheckMiddleware("update", "management", "webapi"),
async (req: Request, res: Response) => { async (req: Request, res: Response) => {
await updateWebapi(req, res); await updateWebapi(req, res);
} }
@ -47,7 +47,7 @@ router.patch(
router.patch( router.patch(
"/:id/permissions", "/:id/permissions",
PermissionHelper.passCheckMiddleware("admin", "user", "webapi"), PermissionHelper.passCheckMiddleware("admin", "management", "webapi"),
async (req: Request, res: Response) => { async (req: Request, res: Response) => {
await updateWebapiPermissions(req, res); await updateWebapiPermissions(req, res);
} }
@ -55,7 +55,7 @@ router.patch(
router.delete( router.delete(
"/:id", "/:id",
PermissionHelper.passCheckMiddleware("delete", "user", "webapi"), PermissionHelper.passCheckMiddleware("delete", "management", "webapi"),
async (req: Request, res: Response) => { async (req: Request, res: Response) => {
await deleteWebapi(req, res); await deleteWebapi(req, res);
} }

8
src/type/permissionTypes.ts
View file

@ -1,4 +1,4 @@
export type PermissionSection = "club" | "settings" | "user"; export type PermissionSection = "club" | "configuration" | "management";
export type PermissionModule = export type PermissionModule =
| "member" | "member"
@ -43,7 +43,7 @@ export type SectionsAndModulesObject = {
[section in PermissionSection]: Array<PermissionModule>; [section in PermissionSection]: Array<PermissionModule>;
}; };
export const permissionSections: Array<PermissionSection> = ["club", "settings", "user"]; export const permissionSections: Array<PermissionSection> = ["club", "configuration", "management"];
export const permissionModules: Array<PermissionModule> = [ export const permissionModules: Array<PermissionModule> = [
"member", "member",
"calendar", "calendar",
@ -69,7 +69,7 @@ export const permissionModules: Array<PermissionModule> = [
export const permissionTypes: Array<PermissionType> = ["read", "create", "update", "delete"]; export const permissionTypes: Array<PermissionType> = ["read", "create", "update", "delete"];
export const sectionsAndModules: SectionsAndModulesObject = { export const sectionsAndModules: SectionsAndModulesObject = {
club: ["member", "calendar", "newsletter", "protocol", "query"], club: ["member", "calendar", "newsletter", "protocol", "query"],
settings: [ configuration: [
"qualification", "qualification",
"award", "award",
"executive_position", "executive_position",
@ -82,5 +82,5 @@ export const sectionsAndModules: SectionsAndModulesObject = {
"template_usage", "template_usage",
"newsletter_config", "newsletter_config",
], ],
user: ["user", "role", "webapi", "backup"], management: ["user", "role", "webapi", "backup"],
}; };