IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #246 from Human-Connection/27_disable_posts

Browse Source 
Obfuscate user name and use a neutral replacement
This commit is contained in:
Robert Schäfer 2019-03-17 14:46:48 +01:00 committed by GitHub
commit fd8cc3f7e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/middleware/softDeleteMiddleware.js
View File

@ -15,12 +15,13 @@ const setDefaultFilters = (resolve, root, args, context, info) => {
const obfuscateDisabled = async (resolve, root, args, context, info) => { const obfuscateDisabled = async (resolve, root, args, context, info) => {
if (!isModerator(context) && root.disabled) { if (!isModerator(context) && root.disabled) {
root.content = 'DELETED' root.content = 'UNAVAILABLE'
root.contentExcerpt = 'DELETED' root.contentExcerpt = 'UNAVAILABLE'
root.title = 'DELETED' root.title = 'UNAVAILABLE'
root.image = 'DELETED' root.image = 'UNAVAILABLE'
root.avatar = 'DELETED' root.avatar = 'UNAVAILABLE'
root.about = 'DELETED' root.about = 'UNAVAILABLE'
root.name = 'UNAVAILABLE'
} }
return resolve(root, args, context, info) return resolve(root, args, context, info)
} }

24
src/middleware/softDeleteMiddleware.spec.js
View File

@ -12,7 +12,7 @@ beforeAll(async () => {
await Promise.all([ await Promise.all([
factory.create('User', { id: 'u1', role: 'user', email: 'user@example.org', password: '1234' }), factory.create('User', { id: 'u1', role: 'user', email: 'user@example.org', password: '1234' }),
factory.create('User', { id: 'm1', role: 'moderator', email: 'moderator@example.org', password: '1234' }), factory.create('User', { id: 'm1', role: 'moderator', email: 'moderator@example.org', password: '1234' }),
factory.create('User', { id: 'u2', role: 'user', avatar: '/some/offensive/avatar.jpg', about: 'This self description is very offensive', email: 'troll@example.org', password: '1234' }) factory.create('User', { id: 'u2', role: 'user', name: 'Offensive Name', avatar: '/some/offensive/avatar.jpg', about: 'This self description is very offensive', email: 'troll@example.org', password: '1234' })
]) ])
await factory.authenticateAs({ email: 'user@example.org', password: '1234' }) await factory.authenticateAs({ email: 'user@example.org', password: '1234' })
@ -62,7 +62,7 @@ describe('softDeleteMiddleware', () => {
comment = response.User[0].following[0].comments[0] comment = response.User[0].following[0].comments[0]
} }
const beforeUser = async () => { const beforeUser = async () => {
query = '{ User(id: "u1") { following { about avatar } } }' query = '{ User(id: "u1") { following { name about avatar } } }'
const response = await action() const response = await action()
user = response.User[0].following[0] user = response.User[0].following[0]
} }
@ -85,6 +85,7 @@ describe('softDeleteMiddleware', () => {
describe('User', () => { describe('User', () => {
beforeEach(beforeUser) beforeEach(beforeUser)
it('displays name', () => expect(user.name).toEqual('Offensive Name'))
it('displays about', () => expect(user.about).toEqual('This self description is very offensive')) it('displays about', () => expect(user.about).toEqual('This self description is very offensive'))
it('displays avatar', () => expect(user.avatar).toEqual('/some/offensive/avatar.jpg')) it('displays avatar', () => expect(user.avatar).toEqual('/some/offensive/avatar.jpg'))
}) })
@ -115,24 +116,25 @@ describe('softDeleteMiddleware', () => {
describe('User', () => { describe('User', () => {
beforeEach(beforeUser) beforeEach(beforeUser)
it('obfuscates about', () => expect(user.about).toEqual('DELETED')) it('displays name', () => expect(user.name).toEqual('UNAVAILABLE'))
it('obfuscates avatar', () => expect(user.avatar).toEqual('DELETED')) it('obfuscates about', () => expect(user.about).toEqual('UNAVAILABLE'))
it('obfuscates avatar', () => expect(user.avatar).toEqual('UNAVAILABLE'))
}) })
describe('Post', () => { describe('Post', () => {
beforeEach(beforePost) beforeEach(beforePost)
it('obfuscates title', () => expect(post.title).toEqual('DELETED')) it('obfuscates title', () => expect(post.title).toEqual('UNAVAILABLE'))
it('obfuscates content', () => expect(post.content).toEqual('DELETED')) it('obfuscates content', () => expect(post.content).toEqual('UNAVAILABLE'))
it('obfuscates contentExcerpt', () => expect(post.contentExcerpt).toEqual('DELETED')) it('obfuscates contentExcerpt', () => expect(post.contentExcerpt).toEqual('UNAVAILABLE'))
it('obfuscates image', () => expect(post.image).toEqual('DELETED')) it('obfuscates image', () => expect(post.image).toEqual('UNAVAILABLE'))
}) })
describe('Comment', () => { describe('Comment', () => {
beforeEach(beforeComment) beforeEach(beforeComment)
it('obfuscates content', () => expect(comment.content).toEqual('DELETED')) it('obfuscates content', () => expect(comment.content).toEqual('UNAVAILABLE'))
it('obfuscates contentExcerpt', () => expect(comment.contentExcerpt).toEqual('DELETED')) it('obfuscates contentExcerpt', () => expect(comment.contentExcerpt).toEqual('UNAVAILABLE'))
}) })
}) })
}) })
@ -185,7 +187,7 @@ describe('softDeleteMiddleware', () => {
it('conceals disabled comments', async () => { it('conceals disabled comments', async () => {
const expected = [ const expected = [
{ content: 'Enabled comment on public post' }, { content: 'Enabled comment on public post' },
{ content: 'DELETED' } { content: 'UNAVAILABLE' }
] ]
const { Post: [{ comments }] } = await action() const { Post: [{ comments }] } = await action()
await expect(comments).toEqual(expect.arrayContaining(expected)) await expect(comments).toEqual(expect.arrayContaining(expected))

19
src/seed/seed-db.js
View File

@ -191,7 +191,12 @@ import Factory from './factories'
f.create('Comment', { id: 'c4' }), f.create('Comment', { id: 'c4' }),
f.create('Comment', { id: 'c5' }), f.create('Comment', { id: 'c5' }),
f.create('Comment', { id: 'c6' }), f.create('Comment', { id: 'c6' }),
f.create('Comment', { id: 'c7' }) f.create('Comment', { id: 'c7' }),
f.create('Comment', { id: 'c8' }),
f.create('Comment', { id: 'c9' }),
f.create('Comment', { id: 'c10' }),
f.create('Comment', { id: 'c11' }),
f.create('Comment', { id: 'c12' })
]) ])
await Promise.all([ await Promise.all([
@ -208,7 +213,17 @@ import Factory from './factories'
f.relate('Comment', 'Author', { from: 'u3', to: 'c6' }), f.relate('Comment', 'Author', { from: 'u3', to: 'c6' }),
f.relate('Comment', 'Post', { from: 'c6', to: 'p4' }), f.relate('Comment', 'Post', { from: 'c6', to: 'p4' }),
f.relate('Comment', 'Author', { from: 'u2', to: 'c7' }), f.relate('Comment', 'Author', { from: 'u2', to: 'c7' }),
f.relate('Comment', 'Post', { from: 'c7', to: 'p2' }) f.relate('Comment', 'Post', { from: 'c7', to: 'p2' }),
f.relate('Comment', 'Author', { from: 'u5', to: 'c8' }),
f.relate('Comment', 'Post', { from: 'c8', to: 'p15' }),
f.relate('Comment', 'Author', { from: 'u6', to: 'c9' }),
f.relate('Comment', 'Post', { from: 'c9', to: 'p15' }),
f.relate('Comment', 'Author', { from: 'u7', to: 'c10' }),
f.relate('Comment', 'Post', { from: 'c10', to: 'p15' }),
f.relate('Comment', 'Author', { from: 'u5', to: 'c11' }),
f.relate('Comment', 'Post', { from: 'c11', to: 'p15' }),
f.relate('Comment', 'Author', { from: 'u6', to: 'c12' }),
f.relate('Comment', 'Post', { from: 'c12', to: 'p15' })
]) ])
const disableMutation = 'mutation($id: ID!) { disable(id: $id) }' const disableMutation = 'mutation($id: ID!) { disable(id: $id) }'