From 4b6cf430d85a77230f377d27821feca46327b781 Mon Sep 17 00:00:00 2001 From: Kai Alexander Fischer Date: Mon, 8 Oct 2018 19:58:30 +0200 Subject: [PATCH 1/2] Remove deprecated api endpoint --- .../rocketchat-api/server/v1/permissions.js | 11 ---------- tests/end-to-end/api/11-permissions.js | 20 ------------------- 2 files changed, 31 deletions(-) diff --git a/packages/rocketchat-api/server/v1/permissions.js b/packages/rocketchat-api/server/v1/permissions.js index 1517a86b7b55..29319b541e31 100644 --- a/packages/rocketchat-api/server/v1/permissions.js +++ b/packages/rocketchat-api/server/v1/permissions.js @@ -5,17 +5,6 @@ Method: GET Route: api/v1/permissions */ -RocketChat.API.v1.addRoute('permissions', { authRequired: true }, { - get() { - const warningMessage = 'The endpoint "permissions" is deprecated and will be removed after version v0.69'; - console.warn(warningMessage); - - const result = Meteor.runAsUser(this.userId, () => Meteor.call('permissions/get')); - - return RocketChat.API.v1.success(result); - }, -}); - RocketChat.API.v1.addRoute('permissions.list', { authRequired: true }, { get() { const result = Meteor.runAsUser(this.userId, () => Meteor.call('permissions/get')); diff --git a/tests/end-to-end/api/11-permissions.js b/tests/end-to-end/api/11-permissions.js index 176f22b92dd9..d13d3f5e569f 100644 --- a/tests/end-to-end/api/11-permissions.js +++ b/tests/end-to-end/api/11-permissions.js @@ -8,26 +8,6 @@ describe('[Permissions]', function() { before((done) => getCredentials(done)); - // DEPRECATED - // TODO: Remove this after three versions have been released. That means at 0.69 this should be gone. - describe('[/permissions]', () => { - it('should return all permissions that exists on the server, with respective roles', (done) => { - request.get(api('permissions')) - .set(credentials) - .expect('Content-Type', 'application/json') - .expect(200) - .expect((res) => { - expect(res.body).to.be.a('array'); - - const firstElement = res.body[0]; - expect(firstElement).to.have.property('_id'); - expect(firstElement).to.have.property('roles').and.to.be.a('array'); - expect(firstElement).to.have.property('_updatedAt'); - }) - .end(done); - }); - }); - describe('[/permissions.list]', () => { it('should return all permissions that exists on the server, with respective roles', (done) => { request.get(api('permissions.list')) From 598fca3a50c2c4759666c20bbf8e916142f41ff1 Mon Sep 17 00:00:00 2001 From: Marcos Defendi Date: Wed, 17 Oct 2018 17:18:53 -0300 Subject: [PATCH 2/2] removing outdated comment --- packages/rocketchat-api/server/v1/permissions.js | 7 ------- 1 file changed, 7 deletions(-) diff --git a/packages/rocketchat-api/server/v1/permissions.js b/packages/rocketchat-api/server/v1/permissions.js index 29319b541e31..4ca4fae1ed8a 100644 --- a/packages/rocketchat-api/server/v1/permissions.js +++ b/packages/rocketchat-api/server/v1/permissions.js @@ -1,10 +1,3 @@ -/** - This API returns all permissions that exists - on the server, with respective roles. - - Method: GET - Route: api/v1/permissions - */ RocketChat.API.v1.addRoute('permissions.list', { authRequired: true }, { get() { const result = Meteor.runAsUser(this.userId, () => Meteor.call('permissions/get'));