diff --git a/backend/package.json b/backend/package.json index a94ca620d..058e636a1 100644 --- a/backend/package.json +++ b/backend/package.json @@ -25,7 +25,8 @@ "db:migrate:create": "migrate --compiler 'ts:./src/db/compiler.ts' --migrations-dir ./src/db/migrations --template-file ./src/db/migrate/template.ts --date-format 'yyyymmddHHmmss' create", "prod:migrate": "migrate --migrations-dir ./build/src/db/migrations --store ./build/src/db/migrate/store.js", "prod:db:data:branding": "node build/src/db/data-branding.js", - "prod:db:data:categories": "node build/src/db/categories.js" + "prod:db:data:categories": "node build/src/db/categories.js", + "prod:db:data:admin": "node build/src/db/admin.js" }, "dependencies": { "@aws-sdk/client-s3": "^3.971.0", diff --git a/backend/src/middleware/permissionsMiddleware.ts b/backend/src/middleware/permissionsMiddleware.ts index 5631b7747..1f90752f0 100644 --- a/backend/src/middleware/permissionsMiddleware.ts +++ b/backend/src/middleware/permissionsMiddleware.ts @@ -387,7 +387,7 @@ const isAllowedToGenerateGroupInviteCode = rule({ return !!( await context.database.query({ query: ` - MATCH (user:User{id: user.id})-[membership:MEMBER_OF]->(group:Group {id: $args.groupId}) + MATCH (user:User{id: $user.id})-[membership:MEMBER_OF]->(group:Group {id: $args.groupId}) WHERE (group.type IN ['closed','hidden'] AND membership.role IN ['admin', 'owner']) OR (NOT group.type IN ['closed','hidden'] AND NOT membership.role = 'pending') RETURN count(group) as count diff --git a/package.json b/package.json index 8975dd936..0c64ecbd9 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,10 @@ "url": "https://github.com/Ocelot-Social-Community/Ocelot-Social.git" }, "cypress-cucumber-preprocessor": { - "stepDefinitions": "cypress/support/step_definitions/**/*.js", + "stepDefinitions": [ + "cypress/support/step_definitions/[filepart]/**/*.js", + "cypress/support/step_definitions/common/**/*.js" + ], "json": { "enabled": true, "output": "cypress/reports/json_logs/cucumber_log.json",