From 72eedef8d0d5b5f2e53858e6fee9c15f2e17b15e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Tue, 23 Aug 2022 13:12:38 +0200 Subject: [PATCH] Cleanup --- .../src/middleware/permissionsMiddleware.js | 62 ------------------- backend/src/schema/resolvers/groups.js | 8 --- backend/src/schema/resolvers/groups.spec.js | 20 ------ 3 files changed, 90 deletions(-) diff --git a/backend/src/middleware/permissionsMiddleware.js b/backend/src/middleware/permissionsMiddleware.js index 926f824e4..bfd10537a 100644 --- a/backend/src/middleware/permissionsMiddleware.js +++ b/backend/src/middleware/permissionsMiddleware.js @@ -57,8 +57,6 @@ const isAllowedSeeingMembersOfGroup = rule({ })(async (_parent, args, { user, driver }) => { if (!(user && user.id)) return false const { id: groupId } = args - // Wolle: console.log('groupId: ', groupId) - // console.log('user.id: ', user.id) const session = driver.session() const readTxPromise = session.readTransaction(async (transaction) => { const transactionResponse = await transaction.run( @@ -76,8 +74,6 @@ const isAllowedSeeingMembersOfGroup = rule({ }) try { const { member, group } = await readTxPromise - // Wolle: console.log('member: ', member) - // console.log('group: ', group) return ( !!group && (group.groupType === 'public' || @@ -86,7 +82,6 @@ const isAllowedSeeingMembersOfGroup = rule({ ['usual', 'admin', 'owner'].includes(member.myRoleInGroup))) ) } catch (error) { - // Wolle: console.log('error: ', error) throw new Error(error) } finally { session.close() @@ -100,12 +95,6 @@ const isAllowedToChangeGroupMemberRole = rule({ const adminId = user.id const { groupId, userId, roleInGroup } = args if (adminId === userId) return false - // Wolle: - // console.log('isAllowedToChangeGroupMemberRole !!!') - // console.log('adminId: ', adminId) - // console.log('groupId: ', groupId) - // console.log('userId: ', userId) - // console.log('roleInGroup: ', roleInGroup) const session = driver.session() const readTxPromise = session.readTransaction(async (transaction) => { const transactionResponse = await transaction.run( @@ -116,23 +105,6 @@ const isAllowedToChangeGroupMemberRole = rule({ `, { groupId, adminId, userId }, ) - // Wolle: - // console.log( - // 'transactionResponse: ', - // transactionResponse, - // ) - // console.log( - // 'transaction admins: ', - // transactionResponse.records.map((record) => record.get('admin')), - // ) - // console.log( - // 'transaction groups: ', - // transactionResponse.records.map((record) => record.get('group')), - // ) - // console.log( - // 'transaction members: ', - // transactionResponse.records.map((record) => record.get('member')), - // ) return { admin: transactionResponse.records.map((record) => record.get('admin'))[0], group: transactionResponse.records.map((record) => record.get('group'))[0], @@ -140,14 +112,7 @@ const isAllowedToChangeGroupMemberRole = rule({ } }) try { - // Wolle: - // console.log('enter try !!!') const { admin, group, member } = await readTxPromise - // Wolle: - // console.log('after !!!') - // console.log('admin: ', admin) - // console.log('group: ', group) - // console.log('member: ', member) return ( !!group && !!admin && @@ -160,8 +125,6 @@ const isAllowedToChangeGroupMemberRole = rule({ ['pending', 'usual', 'admin', 'owner'].includes(roleInGroup))) ) } catch (error) { - // Wolle: - // console.log('error: ', error) throw new Error(error) } finally { session.close() @@ -173,11 +136,6 @@ const isAllowedToJoinGroup = rule({ })(async (_parent, args, { user, driver }) => { if (!(user && user.id)) return false const { groupId, userId } = args - // Wolle: - // console.log('adminId: ', adminId) - // console.log('groupId: ', groupId) - // console.log('userId: ', userId) - // console.log('roleInGroup: ', roleInGroup) const session = driver.session() const readTxPromise = session.readTransaction(async (transaction) => { const transactionResponse = await transaction.run( @@ -188,35 +146,15 @@ const isAllowedToJoinGroup = rule({ `, { groupId, userId }, ) - // Wolle: - // console.log( - // 'transactionResponse: ', - // transactionResponse, - // ) - // console.log( - // 'transaction groups: ', - // transactionResponse.records.map((record) => record.get('group')), - // ) - // console.log( - // 'transaction members: ', - // transactionResponse.records.map((record) => record.get('member')), - // ) return { group: transactionResponse.records.map((record) => record.get('group'))[0], member: transactionResponse.records.map((record) => record.get('member'))[0], } }) try { - // Wolle: - // console.log('enter try !!!') const { group, member } = await readTxPromise - // Wolle: - // console.log('after !!!') - // console.log('group: ', group) - // console.log('member: ', member) return !!group && (group.groupType !== 'hidden' || (!!member && !!member.myRoleInGroup)) } catch (error) { - // Wolle: console.log('error: ', error) throw new Error(error) } finally { session.close() diff --git a/backend/src/schema/resolvers/groups.js b/backend/src/schema/resolvers/groups.js index 6ca09d72a..c47cf6085 100644 --- a/backend/src/schema/resolvers/groups.js +++ b/backend/src/schema/resolvers/groups.js @@ -48,7 +48,6 @@ export default { }, GroupMembers: async (_object, params, context, _resolveInfo) => { const { id: groupId } = params - // Wolle: console.log('groupId: ', groupId) const session = context.driver.session() const readTxResultPromise = session.readTransaction(async (txc) => { const groupMemberCypher = ` @@ -160,11 +159,6 @@ export default { }, ChangeGroupMemberRole: async (_parent, params, context, _resolveInfo) => { const { groupId, userId, roleInGroup } = params - // Wolle - // console.log('ChangeGroupMemberRole !!!') - // console.log('groupId: ', groupId) - // console.log('userId: ', userId) - // console.log('roleInGroup: ', roleInGroup) const session = context.driver.session() const writeTxResultPromise = session.writeTransaction(async (transaction) => { const joinGroupCypher = ` @@ -180,8 +174,6 @@ export default { ` const result = await transaction.run(joinGroupCypher, { groupId, userId, roleInGroup }) const [member] = await result.records.map((record) => record.get('member')) - // Wolle - // console.log('member: ', member) return member }) try { diff --git a/backend/src/schema/resolvers/groups.spec.js b/backend/src/schema/resolvers/groups.spec.js index 7a5f9504a..be9ba4f3d 100644 --- a/backend/src/schema/resolvers/groups.spec.js +++ b/backend/src/schema/resolvers/groups.spec.js @@ -728,16 +728,6 @@ describe('in mode', () => { roleInGroup: 'admin', }, }) - // Wolle: - // const groups = await query({ query: groupQuery, variables: {} }) - // console.log('groups.data.Group: ', groups.data.Group) - // const groupMemberOfClosedGroup = await mutate({ - // mutation: groupMembersQuery, - // variables: { - // id: 'hidden-group', - // }, - // }) - // console.log('groupMemberOfClosedGroup.data.GroupMembers: ', groupMemberOfClosedGroup.data.GroupMembers) authenticatedUser = null }) @@ -1340,16 +1330,6 @@ describe('in mode', () => { }) it('has role admin', async () => { - // Wolle: - // const groups = await query({ query: groupQuery, variables: {} }) - // console.log('groups.data.Group: ', groups.data.Group) - // const groupMemberOfClosedGroup = await mutate({ - // mutation: groupMembersQuery, - // variables: { - // id: 'closed-group', - // }, - // }) - // console.log('groupMemberOfClosedGroup.data.GroupMembers: ', groupMemberOfClosedGroup.data.GroupMembers) await expect( mutate({ mutation: changeGroupMemberRoleMutation,