ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Wolfgang Huß 2022-08-23 13:12:38 +02:00
parent 47027ad86b
commit 72eedef8d0
3 changed files with 0 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
backend/src/middleware/permissionsMiddleware.js
View File

@ -57,8 +57,6 @@ const isAllowedSeeingMembersOfGroup = rule({
})(async (_parent, args, { user, driver }) => { })(async (_parent, args, { user, driver }) => {
if (!(user && user.id)) return false if (!(user && user.id)) return false
const { id: groupId } = args const { id: groupId } = args
// Wolle: console.log('groupId: ', groupId)
// console.log('user.id: ', user.id)
const session = driver.session() const session = driver.session()
const readTxPromise = session.readTransaction(async (transaction) => { const readTxPromise = session.readTransaction(async (transaction) => {
const transactionResponse = await transaction.run( const transactionResponse = await transaction.run(
@ -76,8 +74,6 @@ const isAllowedSeeingMembersOfGroup = rule({
}) })
try { try {
const { member, group } = await readTxPromise const { member, group } = await readTxPromise
// Wolle: console.log('member: ', member)
// console.log('group: ', group)
return ( return (
!!group && !!group &&
(group.groupType === 'public' || (group.groupType === 'public' ||
@ -86,7 +82,6 @@ const isAllowedSeeingMembersOfGroup = rule({
['usual', 'admin', 'owner'].includes(member.myRoleInGroup))) ['usual', 'admin', 'owner'].includes(member.myRoleInGroup)))
) )
} catch (error) { } catch (error) {
// Wolle: console.log('error: ', error)
throw new Error(error) throw new Error(error)
} finally { } finally {
session.close() session.close()
@ -100,12 +95,6 @@ const isAllowedToChangeGroupMemberRole = rule({
const adminId = user.id const adminId = user.id
const { groupId, userId, roleInGroup } = args const { groupId, userId, roleInGroup } = args
if (adminId === userId) return false 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 session = driver.session()
const readTxPromise = session.readTransaction(async (transaction) => { const readTxPromise = session.readTransaction(async (transaction) => {
const transactionResponse = await transaction.run( const transactionResponse = await transaction.run(
@ -116,23 +105,6 @@ const isAllowedToChangeGroupMemberRole = rule({
`, `,
{ groupId, adminId, userId }, { 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 { return {
admin: transactionResponse.records.map((record) => record.get('admin'))[0], admin: transactionResponse.records.map((record) => record.get('admin'))[0],
group: transactionResponse.records.map((record) => record.get('group'))[0], group: transactionResponse.records.map((record) => record.get('group'))[0],
@ -140,14 +112,7 @@ const isAllowedToChangeGroupMemberRole = rule({
} }
}) })
try { try {
// Wolle:
// console.log('enter try !!!')
const { admin, group, member } = await readTxPromise const { admin, group, member } = await readTxPromise
// Wolle:
// console.log('after !!!')
// console.log('admin: ', admin)
// console.log('group: ', group)
// console.log('member: ', member)
return ( return (
!!group && !!group &&
!!admin && !!admin &&
@ -160,8 +125,6 @@ const isAllowedToChangeGroupMemberRole = rule({
['pending', 'usual', 'admin', 'owner'].includes(roleInGroup))) ['pending', 'usual', 'admin', 'owner'].includes(roleInGroup)))
) )
} catch (error) { } catch (error) {
// Wolle:
// console.log('error: ', error)
throw new Error(error) throw new Error(error)
} finally { } finally {
session.close() session.close()
@ -173,11 +136,6 @@ const isAllowedToJoinGroup = rule({
})(async (_parent, args, { user, driver }) => { })(async (_parent, args, { user, driver }) => {
if (!(user && user.id)) return false if (!(user && user.id)) return false
const { groupId, userId } = args 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 session = driver.session()
const readTxPromise = session.readTransaction(async (transaction) => { const readTxPromise = session.readTransaction(async (transaction) => {
const transactionResponse = await transaction.run( const transactionResponse = await transaction.run(
@ -188,35 +146,15 @@ const isAllowedToJoinGroup = rule({
`, `,
{ groupId, userId }, { 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 { return {
group: transactionResponse.records.map((record) => record.get('group'))[0], group: transactionResponse.records.map((record) => record.get('group'))[0],
member: transactionResponse.records.map((record) => record.get('member'))[0], member: transactionResponse.records.map((record) => record.get('member'))[0],
} }
}) })
try { try {
// Wolle:
// console.log('enter try !!!')
const { group, member } = await readTxPromise 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)) return !!group && (group.groupType !== 'hidden' || (!!member && !!member.myRoleInGroup))
} catch (error) { } catch (error) {
// Wolle: console.log('error: ', error)
throw new Error(error) throw new Error(error)
} finally { } finally {
session.close() session.close()

8
backend/src/schema/resolvers/groups.js
View File

@ -48,7 +48,6 @@ export default {
}, },
GroupMembers: async (_object, params, context, _resolveInfo) => { GroupMembers: async (_object, params, context, _resolveInfo) => {
const { id: groupId } = params const { id: groupId } = params
// Wolle: console.log('groupId: ', groupId)
const session = context.driver.session() const session = context.driver.session()
const readTxResultPromise = session.readTransaction(async (txc) => { const readTxResultPromise = session.readTransaction(async (txc) => {
const groupMemberCypher = ` const groupMemberCypher = `
@ -160,11 +159,6 @@ export default {
}, },
ChangeGroupMemberRole: async (_parent, params, context, _resolveInfo) => { ChangeGroupMemberRole: async (_parent, params, context, _resolveInfo) => {
const { groupId, userId, roleInGroup } = params 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 session = context.driver.session()
const writeTxResultPromise = session.writeTransaction(async (transaction) => { const writeTxResultPromise = session.writeTransaction(async (transaction) => {
const joinGroupCypher = ` const joinGroupCypher = `
@ -180,8 +174,6 @@ export default {
` `
const result = await transaction.run(joinGroupCypher, { groupId, userId, roleInGroup }) const result = await transaction.run(joinGroupCypher, { groupId, userId, roleInGroup })
const [member] = await result.records.map((record) => record.get('member')) const [member] = await result.records.map((record) => record.get('member'))
// Wolle
// console.log('member: ', member)
return member return member
}) })
try { try {

20
backend/src/schema/resolvers/groups.spec.js
View File

@ -728,16 +728,6 @@ describe('in mode', () => {
roleInGroup: 'admin', 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 authenticatedUser = null
}) })
@ -1340,16 +1330,6 @@ describe('in mode', () => {
}) })
it('has role admin', async () => { 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( await expect(
mutate({ mutate({
mutation: changeGroupMemberRoleMutation, mutation: changeGroupMemberRoleMutation,