diff --git a/package.json b/package.json index 51abda961d0..2220ec4fe12 100644 --- a/package.json +++ b/package.json @@ -63,9 +63,9 @@ "eslint": "^3.11.1" }, "dependencies": { - "babel-runtime": "^6.18.0", - "bcrypt": "^1.0.0", "jquery": "^2.1.0", + "babel-runtime": "^6.20.0", + "bcrypt": "^1.0.1", "moment": "^2.17.1", "moment-timezone": "^0.5.10", "toastr": "^2.1.2" diff --git a/packages/rocketchat-integrations/server/api/api.coffee b/packages/rocketchat-integrations/server/api/api.coffee index 1786e0ce2fe..dadc14439e5 100644 --- a/packages/rocketchat-integrations/server/api/api.coffee +++ b/packages/rocketchat-integrations/server/api/api.coffee @@ -50,8 +50,11 @@ Api = new Restivus apiPath: 'hooks/' auth: user: -> - if @bodyParams?.payload? - @bodyParams = JSON.parse @bodyParams.payload + payloadKeys = Object.keys @bodyParams + payloadIsWrapped = @bodyParams?.payload? and payloadKeys.length == 1 + + if payloadIsWrapped and @request.headers['content-type'] is 'application/x-www-form-urlencoded' + @bodyParams = @bodyParams.payload @integration = RocketChat.models.Integrations.findOne _id: @request.params.integrationId diff --git a/packages/rocketchat-livechat/app/.meteor/versions b/packages/rocketchat-livechat/app/.meteor/versions index 43bf7548171..128e7dfc2af 100644 --- a/packages/rocketchat-livechat/app/.meteor/versions +++ b/packages/rocketchat-livechat/app/.meteor/versions @@ -49,7 +49,7 @@ minimongo@1.0.19 mizzao:timesync@0.4.0 modules@0.7.7 modules-runtime@0.7.7 -momentjs:moment@2.17.0 +momentjs:moment@2.17.1 mongo@1.1.14 mongo-id@1.0.6 npm-bcrypt@0.9.2 diff --git a/packages/rocketchat-livechat/app/package.json b/packages/rocketchat-livechat/app/package.json index 1c0bb6f91dc..ca4b67ed8e8 100644 --- a/packages/rocketchat-livechat/app/package.json +++ b/packages/rocketchat-livechat/app/package.json @@ -21,9 +21,9 @@ }, "dependencies": { "autolinker": "^1.4.0", - "babel-runtime": "^6.18.0", - "bcrypt": "^1.0.0", "jquery": "^2.1.0", + "babel-runtime": "^6.20.0", + "bcrypt": "^1.0.1", "moment": "^2.17.1", "toastr": "^2.1.2" } diff --git a/server/startup/migrations/v069.coffee b/server/startup/migrations/v069.coffee deleted file mode 100644 index 601ce26a40d..00000000000 --- a/server/startup/migrations/v069.coffee +++ /dev/null @@ -1,12 +0,0 @@ -RocketChat.Migrations.add - version: 69 - up: -> - RocketChat.models.Settings.update { "_id": "theme-color-custom-scrollbar-color", "value": "rgba(255, 255, 255, 0.05)" }, { $set: { "editor": "expression", "value": "@transparent-darker" } } - RocketChat.models.Settings.update { "_id": "theme-color-info-font-color", "value": "#aaaaaa" }, { $set: { "editor": "expression", "value": "@secondary-font-color" } } - RocketChat.models.Settings.update { "_id": "theme-color-link-font-color", "value": "#008ce3" }, { $set: { "editor": "expression", "value": "@primary-action-color" } } - RocketChat.models.Settings.update { "_id": "theme-color-status-away", "value": "#fcb316" }, { $set: { "editor": "expression", "value": "@pending-color" } } - RocketChat.models.Settings.update { "_id": "theme-color-status-busy", "value": "#d30230" }, { $set: { "editor": "expression", "value": "@error-color" } } - RocketChat.models.Settings.update { "_id": "theme-color-status-offline", "value": "rgba(150, 150, 150, 0.50)" }, { $set: { "editor": "expression", "value": "@transparent-darker" } } - RocketChat.models.Settings.update { "_id": "theme-color-status-online", "value": "#35ac19" }, { $set: { "editor": "expression", "value": "@success-color" } } - RocketChat.models.Settings.update { "_id": "theme-color-tertiary-background-color", "value": "#eaeaea" }, { $set: { "editor": "expression", "value": "@component-color" } } - RocketChat.models.Settings.update { "_id": "theme-color-tertiary-font-color", "value": "rgba(255, 255, 255, 0.6)" }, { $set: { "editor": "expression", "value": "@transparent-lightest" } } diff --git a/server/startup/migrations/v069.js b/server/startup/migrations/v069.js new file mode 100644 index 00000000000..8e56b7a932d --- /dev/null +++ b/server/startup/migrations/v069.js @@ -0,0 +1,87 @@ +RocketChat.Migrations.add({ + version: 69, + up: function() { + RocketChat.models.Settings.update({ + '_id': 'theme-color-custom-scrollbar-color', + 'value': 'rgba(255, 255, 255, 0.05)' + }, { + $set: { + 'editor': 'expression', + 'value': '@transparent-darker' + } + }); + RocketChat.models.Settings.update({ + '_id': 'theme-color-info-font-color', + 'value': '#aaaaaa' + }, { + $set: { + 'editor': 'expression', + 'value': '@secondary-font-color' + } + }); + RocketChat.models.Settings.update({ + '_id': 'theme-color-link-font-color', + 'value': '#008ce3' + }, { + $set: { + 'editor': 'expression', + 'value': '@primary-action-color' + } + }); + RocketChat.models.Settings.update({ + '_id': 'theme-color-status-away', + 'value': '#fcb316' + }, { + $set: { + 'editor': 'expression', + 'value': '@pending-color' + } + }); + RocketChat.models.Settings.update({ + '_id': 'theme-color-status-busy', + 'value': '#d30230' + }, { + $set: { + 'editor': 'expression', + 'value': '@error-color' + } + }); + RocketChat.models.Settings.update({ + '_id': 'theme-color-status-offline', + 'value': 'rgba(150, 150, 150, 0.50)' + }, { + $set: { + 'editor': 'expression', + 'value': '@transparent-darker' + } + }); + RocketChat.models.Settings.update({ + '_id': 'theme-color-status-online', + 'value': '#35ac19' + }, { + $set: { + 'editor': 'expression', + 'value': '@success-color' + } + }); + RocketChat.models.Settings.update({ + '_id': 'theme-color-tertiary-background-color', + 'value': '#eaeaea' + }, { + $set: { + 'editor': 'expression', + 'value': '@component-color' + } + }); + return RocketChat.models.Settings.update({ + '_id': 'theme-color-tertiary-font-color', + 'value': 'rgba(255, 255, 255, 0.6)' + }, { + $set: { + 'editor': 'expression', + 'value': '@transparent-lightest' + } + }); + } +}); + diff --git a/tests/steps/04-main-elements-render.js b/tests/steps/04-main-elements-render.js index 90d8cf86d38..3966a3522db 100644 --- a/tests/steps/04-main-elements-render.js +++ b/tests/steps/04-main-elements-render.js @@ -262,7 +262,7 @@ describe('Main Elements Render', function() { flexTab.userSearchBar.isVisible().should.be.true; }); - it('should show the show all link', () => { + it.skip('should show the show all link', () => { flexTab.showAll.isVisible().should.be.true; }); });