apitech
/
Rocket.Chat
mirror of https://github.com/RocketChat/Rocket.Chat
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[FIX] Fix create channel, when created a readonly channel (#10665)

Browse Source 
[FIX] Channel owner was being set as muted when creating a read-only channel
pull/10406/merge
Marcos Spessatto Defendi 7 years ago committed by Rodrigo Nascimento
parent b2ef99b922
commit aaed87d93f
2 changed files with 59 additions and 24 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 5
      packages/rocketchat-lib/server/functions/createRoom.js
  2. 78
      tests/end-to-end/api/05-chat.js

5
packages/rocketchat-lib/server/functions/createRoom.js
Unescape View File

@ -65,12 +65,13 @@ RocketChat.createRoom = function(type, name, owner, members, readOnly, extraData
for (const username of members) {
const member = RocketChat.models.Users.findOneByUsername(username, { fields: { username: 1 }});
const isTheOwner = username === owner.username;
if (!member) {
continue;
}
// make all room members muted by default, unless they have the post-readonly permission
if (readOnly === true && !RocketChat.authz.hasPermission(member._id, 'post-readonly')) {
// make all room members (Except the owner) muted by default, unless they have the post-readonly permission
if (readOnly === true && !RocketChat.authz.hasPermission(member._id, 'post-readonly') && !isTheOwner) {
RocketChat.models.Rooms.muteUsernameByRoomId(room._id, username);
}

78
tests/end-to-end/api/05-chat.js
Unescape View File

@ -5,15 +5,10 @@
import {
getCredentials,
api,
login,
request,
credentials,
message,
log,
apiPrivateChannelName
message
} from '../../data/api-data.js';
import { adminEmail, password } from '../../data/user.js';
import supertest from 'supertest';
describe('[Chat]', function() {
this.retries(0);
@ -49,7 +44,7 @@ describe('[Chat]', function() {
alias: 'Gruggy',
emoji: ':smirk:',
avatar: 'http://res.guggy.com/logo_128.png',
attachments: [{
attachments: [ {
color: '#ff0000',
text: 'Yay for gruggy!',
ts: '2016-12-09T16:53:06.761Z',
@ -66,7 +61,7 @@ describe('[Chat]', function() {
audio_url: 'http://www.w3schools.com/tags/horse.mp3',
video_url: 'http://www.w3schools.com/tags/movie.mp4',
fields: ''
}]
} ]
})
.expect('Content-Type', 'application/json')
.expect(400)
@ -86,7 +81,7 @@ describe('[Chat]', function() {
alias: 'Gruggy',
emoji: ':smirk:',
avatar: 'http://res.guggy.com/logo_128.png',
attachments: [{
attachments: [ {
color: '#ff0000',
text: 'Yay for gruggy!',
ts: '2016-12-09T16:53:06.761Z',
@ -102,12 +97,12 @@ describe('[Chat]', function() {
image_url: 'http://res.guggy.com/logo_128.png',
audio_url: 'http://www.w3schools.com/tags/horse.mp3',
video_url: 'http://www.w3schools.com/tags/movie.mp4',
fields: [{
fields: [ {
short: true,
title: 12,
value: false
}]
}]
} ]
} ]
})
.expect('Content-Type', 'application/json')
.expect(400)
@ -127,7 +122,7 @@ describe('[Chat]', function() {
alias: 'Gruggy',
emoji: ':smirk:',
avatar: 'http://res.guggy.com/logo_128.png',
attachments: [{
attachments: [ {
color: '#ff0000',
text: 'Yay for gruggy!',
ts: '2016-12-09T16:53:06.761Z',
@ -143,7 +138,7 @@ describe('[Chat]', function() {
image_url: 'http://res.guggy.com/logo_128.png',
audio_url: 'http://www.w3schools.com/tags/horse.mp3',
video_url: 'http://www.w3schools.com/tags/movie.mp4',
fields: [{
fields: [ {
short: true,
title: 'Test',
value: 'Testing out something or other'
@ -151,8 +146,8 @@ describe('[Chat]', function() {
short: true,
title: 'Another Test',
value: '[Link](https://google.com/) something and this and that.'
}]
}]
} ]
} ]
})
.expect('Content-Type', 'application/json')
.expect(200)
@ -163,6 +158,7 @@ describe('[Chat]', function() {
})
.end(done);
});
});
describe('/chat.getMessage', () => {
@ -214,7 +210,7 @@ describe('[Chat]', function() {
alias: 'Gruggy',
emoji: ':smirk:',
avatar: 'http://res.guggy.com/logo_128.png',
attachments: [{
attachments: [ {
color: '#ff0000',
text: 'Yay for gruggy!',
ts: '2016-12-09T16:53:06.761Z',
@ -231,7 +227,7 @@ describe('[Chat]', function() {
audio_url: 'http://www.w3schools.com/tags/horse.mp3',
video_url: 'http://www.w3schools.com/tags/movie.mp4',
fields: ''
}]
} ]
}
})
.expect('Content-Type', 'application/json')
@ -255,7 +251,7 @@ describe('[Chat]', function() {
alias: 'Gruggy',
emoji: ':smirk:',
avatar: 'http://res.guggy.com/logo_128.png',
attachments: [{
attachments: [ {
color: '#ff0000',
text: 'Yay for gruggy!',
ts: '2016-12-09T16:53:06.761Z',
@ -271,7 +267,7 @@ describe('[Chat]', function() {
image_url: 'http://res.guggy.com/logo_128.png',
audio_url: 'http://www.w3schools.com/tags/horse.mp3',
video_url: 'http://www.w3schools.com/tags/movie.mp4',
fields: [{
fields: [ {
short: true,
title: 'Test',
value: 'Testing out something or other'
@ -279,8 +275,8 @@ describe('[Chat]', function() {
short: true,
title: 'Another Test',
value: '[Link](https://google.com/) something and this and that.'
}]
}]
} ]
} ]
}
})
.expect('Content-Type', 'application/json')
@ -291,6 +287,44 @@ describe('[Chat]', function() {
})
.end(done);
});
describe('Read only channel', () => {
let readOnlyChannel;
it('Creating a read-only channel', (done) => {
request.post(api('channels.create'))
.set(credentials)
.send({
name: `readonlychannel${ +new Date() }`,
readOnly: true
})
.expect('Content-Type', 'application/json')
.expect(200)
.expect((res) => {
expect(res.body).to.have.property('success', true);
readOnlyChannel = res.body.channel;
})
.end(done);
});
it('should send a message when the user is the owner of a readonly channel', (done) => {
request.post(api('chat.sendMessage'))
.set(credentials)
.send({
message: {
rid: readOnlyChannel._id,
msg: 'Sample message'
}
})
.expect('Content-Type', 'application/json')
.expect(200)
.expect((res) => {
expect(res.body).to.have.property('success', true);
expect(res.body).to.have.property('message').and.to.be.an('object');
})
.end(done);
});
});
});
describe('/chat.update', () => {

Write Preview
Loading…
Cancel
Save