From 32bd5ae0c9fdf7e9825d2458cf411961b07d4ce2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lawri=20van=20Bu=C3=ABl?= Date: Tue, 4 Apr 2017 15:34:09 +0200 Subject: [PATCH 1/9] Initial Drupal integration for rocket chat, still WIP --- .meteor/packages | 1 + .meteor/versions | 1 + package.json | 160 ++++++++++---------- packages/rocketchat-drupal/common.js | 35 +++++ packages/rocketchat-drupal/login-button.css | 19 +++ packages/rocketchat-drupal/package.js | 22 +++ packages/rocketchat-drupal/startup.js | 22 +++ packages/rocketchat-i18n/i18n/en.i18n.json | 6 + 8 files changed, 190 insertions(+), 76 deletions(-) create mode 100644 packages/rocketchat-drupal/common.js create mode 100644 packages/rocketchat-drupal/login-button.css create mode 100644 packages/rocketchat-drupal/package.js create mode 100644 packages/rocketchat-drupal/startup.js diff --git a/.meteor/packages b/.meteor/packages index 905b829d46f2..2927e013530b 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -169,3 +169,4 @@ underscorestring:underscore.string yasaricli:slugify yasinuslu:blaze-meta deepwell:bootstrap-datepicker2 +rocketchat:drupal diff --git a/.meteor/versions b/.meteor/versions index d6517147238f..a0d8ce4a7ec4 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -137,6 +137,7 @@ rocketchat:crowd@1.0.0 rocketchat:custom-oauth@1.0.0 rocketchat:custom-sounds@1.0.0 rocketchat:dolphin@0.0.2 +rocketchat:drupal@0.0.1 rocketchat:emoji@1.0.0 rocketchat:emoji-custom@1.0.0 rocketchat:emoji-emojione@0.0.1 diff --git a/package.json b/package.json index 8c3773a2ef54..1e24b2d8c0f3 100644 --- a/package.json +++ b/package.json @@ -1,78 +1,86 @@ { - "name": "Rocket.Chat", - "description": "The Ultimate Open Source WebChat Platform", - "version": "0.55.0-develop", - "author": { - "name": "Rocket.Chat", - "url": "https://rocket.chat/" - }, - "contributors": [{ - "name": "Aaron Ogle", - "email": "aaron.ogle@rocket.chat" - }, { - "name": "Bradley Hilton", - "email": "bradley.hilton@rocket.chat" - }, { - "name": "Diego Sampaio", - "email": "diego.sampaio@rocket.chat" - }, { - "name": "Gabriel Engel", - "email": "gabriel.engel@rocket.chat" - }, { - "name": "Marcelo Schmidt", - "email": "marcelo.schmidt@rocket.chat" - }, { - "name": "Rodrigo Nascimento", - "email": "rodrigo.nascimento@rocket.chat" - }, { - "name": "Sing Li", - "email": "sing.li@rocket.chat" - }], - "keywords": [ - "rocketchat", - "rocket", - "chat" - ], - "scripts": { - "start": "meteor npm i && meteor", - "lint": "eslint .", - "lint-fix": "eslint . --fix", - "stylelint": "stylelint **/*.less", - "test": "node .scripts/start.js", - "deploy": "npm run build && pm2 startOrRestart pm2.json", - "chimp-watch": "chimp --ddp=http://localhost:3000 --watch --mocha --path=tests/end-to-end", - "chimp-test": "chimp tests/chimp-config.js", - "postinstall": "cd packages/rocketchat-katex && npm i" - }, - "license": "MIT", - "repository": { - "type": "git", - "url": "https://github.com/RocketChat/Rocket.Chat.git" - }, - "bugs": { - "url": "https://github.com/RocketChat/Rocket.Chat/issues", - "email": "support@rocket.chat" - }, - "devDependencies": { - "chimp": "^0.47.2", - "eslint": "^3.17.0", - "stylelint": "^7.9.0", - "supertest": "^3.0.0" - }, - "dependencies": { - "babel-runtime": "^6.23.0", - "bcrypt": "^1.0.2", - "codemirror": "^5.24.2", - "file-type": "^4.1.0", - "highlight.js": "^9.9.0", - "jquery": "^3.1.1", - "mime-db": "^1.26.0", - "mime-type": "^3.0.4", - "moment": "^2.17.1", - "moment-timezone": "^0.5.11", - "photoswipe": "^4.1.1", - "prom-client": "^7.1.0", - "semver": "^5.3.0", - "toastr": "^2.1.2" - } + "name": "Rocket.Chat", + "description": "The Ultimate Open Source WebChat Platform", + "version": "0.55.0-develop", + "author": { + "name": "Rocket.Chat", + "url": "https://rocket.chat/" + }, + "contributors": [ + { + "name": "Aaron Ogle", + "email": "aaron.ogle@rocket.chat" + }, + { + "name": "Bradley Hilton", + "email": "bradley.hilton@rocket.chat" + }, + { + "name": "Diego Sampaio", + "email": "diego.sampaio@rocket.chat" + }, + { + "name": "Gabriel Engel", + "email": "gabriel.engel@rocket.chat" + }, + { + "name": "Marcelo Schmidt", + "email": "marcelo.schmidt@rocket.chat" + }, + { + "name": "Rodrigo Nascimento", + "email": "rodrigo.nascimento@rocket.chat" + }, + { + "name": "Sing Li", + "email": "sing.li@rocket.chat" + } + ], + "keywords": [ + "rocketchat", + "rocket", + "chat" + ], + "scripts": { + "start": "meteor npm i && meteor", + "lint": "eslint .", + "lint-fix": "eslint . --fix", + "stylelint": "stylelint **/*.less", + "test": "node .scripts/start.js", + "deploy": "npm run build && pm2 startOrRestart pm2.json", + "chimp-watch": "chimp --ddp=http://localhost:3000 --watch --mocha --path=tests/end-to-end", + "chimp-test": "chimp tests/chimp-config.js", + "postinstall": "cd packages/rocketchat-katex && npm i" + }, + "license": "MIT", + "repository": { + "type": "git", + "url": "https://github.com/RocketChat/Rocket.Chat.git" + }, + "bugs": { + "url": "https://github.com/RocketChat/Rocket.Chat/issues", + "email": "support@rocket.chat" + }, + "devDependencies": { + "chimp": "^0.47.2", + "eslint": "^3.17.0", + "stylelint": "^7.9.0", + "supertest": "^3.0.0" + }, + "dependencies": { + "babel-runtime": "^6.23.0", + "bcrypt": "^1.0.2", + "codemirror": "^5.24.2", + "file-type": "^4.1.0", + "highlight.js": "^9.9.0", + "jquery": "^3.1.1", + "mime-db": "^1.26.0", + "mime-type": "^3.0.4", + "moment": "^2.17.1", + "moment-timezone": "^0.5.11", + "photoswipe": "^4.1.1", + "prom-client": "^7.1.0", + "semver": "^5.3.0", + "toastr": "^2.1.2" + } } diff --git a/packages/rocketchat-drupal/common.js b/packages/rocketchat-drupal/common.js new file mode 100644 index 000000000000..ad63da9636f2 --- /dev/null +++ b/packages/rocketchat-drupal/common.js @@ -0,0 +1,35 @@ +/* global CustomOAuth */ + +// Drupal Server CallBack URL needs to be http(s)://{rocketchat.server}[:port]/_oauth/drupal +// In RocketChat -> Administration the URL needs to be http(s)://{drupal.server}/ + +const config = { + serverURL: '', + identityPath: '/oauth2/UserInfo', + authorizePath: '/oauth2/authorize', + tokenPath: '/oauth2/token', + // addAutopublishFields: { + // forLoggedInUser: ['services.github-enterprise'], + // forOtherUsers: ['services.github-enterprise.username'] + // } +}; + +const Drupal = new CustomOAuth('drupal', config); + +if (Meteor.isServer) { + Meteor.startup(function() { + RocketChat.settings.get('API_Drupal_URL', function(key, value) { + config.serverURL = value; + Drupal.configure(config); + }); + }); +} else { + Meteor.startup(function() { + Tracker.autorun(function() { + if (RocketChat.settings.get('API_Drupal_URL')) { + config.serverURL = RocketChat.settings.get('API_Drupal_URL'); + Drupal.configure(config); + } + }); + }); +} diff --git a/packages/rocketchat-drupal/login-button.css b/packages/rocketchat-drupal/login-button.css new file mode 100644 index 000000000000..62bc646887a8 --- /dev/null +++ b/packages/rocketchat-drupal/login-button.css @@ -0,0 +1,19 @@ +#login-buttons-image-drupal { + border: #ff000b double thick; +} + +.icon-drupal.service-icon { + display: inline-block; + width: 50px; + height: 50px; + background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+Cjxzdmcgd2lkdGg9IjU3cHgiIGhlaWdodD0iNzZweCIgdmlld0JveD0iMCAwIDU3IDc2IiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPgogICAgPGcgaWQ9IlBhZ2UtMSIgc3Ryb2tlPSJub25lIiBzdHJva2Utd2lkdGg9IjEiIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCIgc2tldGNoOnR5cGU9Ik1TUGFnZSI+CiAgICAgICAgPGcgaWQ9ImRyb3AiIHNrZXRjaDp0eXBlPSJNU0xheWVyR3JvdXAiIGZpbGw9IiNGRkZGRkYiPgogICAgICAgICAgICA8cGF0aCBkPSJNMjguMzQzNjU0LDkuMjY2NzM0NCBDMzEuNTE3MTI0MiwxNC41NzM1MTA1IDM1LjI5MjIzMTgsMTguNTE5NTgzNCAzOS4yMTkyNTI4LDIyLjYyNDc1NiBDNDEuODI5MDIyMiwyNS4zNTMwMTQ1IDQ0LjUyNzg2NzMsMjguMTc0MDI1NCA0Ny4xODg0NDE2LDMxLjU1ODU3IEw0Ny4yMDQ5ODY2LDMxLjU3OTQ2MDIgTDQ3LjIyMTY5ODgsMzEuNjAwMTgzMyBDNTAuOTU3MDMxNSwzNi4yMjM5MzM5IDUyLjg1MDAxNjcsNDIuMDU2OTc1NiA1Mi41NTIyMDYyLDQ4LjAyNDU1MDIgQzUyLjI1MjM5MDIsNTQuMDMzMjM2NiA0OS43NDIwNTgxLDU5LjY4NzQ1ODMgNDUuNDgzNjM1Miw2My45NDU3MTQyIEM0MC45MDU2NzU5LDY4LjUyNDAwNzcgMzQuODE4NjA5NSw3MS4wNDUwMzU1IDI4LjM0Mzk4ODMsNzEuMDQ1MDM1NSBDMjEuODY5MzY3MSw3MS4wNDUwMzU1IDE1Ljc4MjMwMDcsNjguNTIzODQwNiAxMS4yMDQwMDcyLDYzLjk0NTcxNDIgQzYuOTQ1NDE3MDcsNTkuNjg3NDU4MyA0LjQzNDc1MDc2LDU0LjAzMjkwMjQgNC4xMzQ2MDA1NSw0OC4wMjQzODMgQzMuODM2Mjg4NjcsNDIuMDU2ODA4NSA1LjcyOTEwNjc5LDM2LjIyMzkzMzkgOS40NjQyNzIzMywzMS42MDAxODMzIEw5LjQ4MDk4NDQ4LDMxLjU3OTQ2MDIgTDkuNDk3NTI5NTEsMzEuNTU4NTcgQzEyLjE1ODI3MDksMjguMTczNjkxMiAxNC44NTc0NTAzLDI1LjM1MjM0NiAxNy40Njc3MjEsMjIuNjIzOTIwNCBDMjEuMzk0OTA5MiwxOC41MTg3NDc4IDI1LjE2OTg0OTYsMTQuNTczMTc2MyAyOC4zNDM2NTQsOS4yNjY3MzQ0IEwyOC4zNDM2NTQsOS4yNjY3MzQ0IFogTTI4LjM0MzY1NCwwLjA1NiBDMjMuMjkzNDA5NCwxMy4zNzE1NzI3IDE0LjgxMjk5NiwxOC4zMDU4MzUgNi4zNDM5NDY3OSwyOS4wNzk2NTY4IEMtMi42MTc5NDM3LDQwLjE3MzY4MzQgLTEuOTQzMjc0Miw1Ni40NzA4NzA4IDguMzY3NjIxMDQsNjYuNzgxNzY2MSBDMTMuODgzOTY3NSw3Mi4yOTgxMTI2IDIxLjExMzY0MzcsNzUuMDU1OTUxNiAyOC4zNDM2NTQsNzUuMDU1OTUxNiBDMzUuNTczNDk3Myw3NS4wNTU5NTE2IDQyLjgwMzE3MzQsNzIuMjk4MTEyNiA0OC4zMTkzNTI4LDY2Ljc4MTc2NjEgQzU4LjYzMDI0OCw1Ni40NzA4NzA4IDU5LjMwMzQxMzUsNDAuMTczNjgzNCA1MC4zNDE1MjMsMjkuMDc5NjU2OCBDNDEuODcyNjQwOSwxOC4zMDYwMDIxIDMzLjM5Mzg5ODcsMTMuMzcxNTcyNyAyOC4zNDM2NTQsMC4wNTYgTDI4LjM0MzY1NCwwLjA1NiBMMjguMzQzNjU0LDAuMDU2IFoiIGlkPSJTaGFwZSIgc2tldGNoOnR5cGU9Ik1TU2hhcGVHcm91cCI+PC9wYXRoPgogICAgICAgIDwvZz4KICAgIDwvZz4KPC9zdmc+); + background-repeat: no-repeat; + vertical-align: middle; + /*color: #ffffff;*/ + +} +.button.external-login.drupal { + /*min-height:100px;*/ + background-color: #2BA9E0; +} + diff --git a/packages/rocketchat-drupal/package.js b/packages/rocketchat-drupal/package.js new file mode 100644 index 000000000000..76a586de6cdb --- /dev/null +++ b/packages/rocketchat-drupal/package.js @@ -0,0 +1,22 @@ +Package.describe({ + name: 'rocketchat:drupal', + version: '0.0.1', + summary: 'RocketChat settings for Drupal oAuth2' +}); + +Package.onUse(function(api) { + api.versionsFrom('1.0'); + api.use('ecmascript'); + api.use('service-configuration'); + api.use('rocketchat:lib@0.0.1'); + api.use('rocketchat:custom-oauth'); + + // api.use('templating', 'client'); + + api.addFiles('common.js'); + api.addFiles('login-button.css', 'client'); + api.addFiles('startup.js', 'server'); + + api.use('templating', 'client'); +}); + diff --git a/packages/rocketchat-drupal/startup.js b/packages/rocketchat-drupal/startup.js new file mode 100644 index 000000000000..366cdd263444 --- /dev/null +++ b/packages/rocketchat-drupal/startup.js @@ -0,0 +1,22 @@ +// RocketChat.settings.add('Accounts_OAuth_Dolphin_URL', '', { type: 'string', group: 'OAuth', public: true, section: 'Dolphin', i18nLabel: 'URL' }); +// RocketChat.settings.add('Accounts_OAuth_Dolphin', false, { type: 'boolean', group: 'OAuth', section: 'Dolphin', i18nLabel: 'Accounts_OAuth_Custom_Enable' }); +// RocketChat.settings.add('Accounts_OAuth_Dolphin_id', '', { type: 'string', group: 'OAuth', section: 'Dolphin', i18nLabel: 'Accounts_OAuth_Custom_id' }); +// RocketChat.settings.add('Accounts_OAuth_Dolphin_secret', '', { type: 'string', group: 'OAuth', section: 'Dolphin', i18nLabel: 'Accounts_OAuth_Custom_Secret' }); +// RocketChat.settings.add('Accounts_OAuth_Dolphin_login_style', 'redirect', { type: 'select', group: 'OAuth', section: 'Dolphin', i18nLabel: 'Accounts_OAuth_Custom_Login_Style', persistent: true, values: [ { key: 'redirect', i18nLabel: 'Redirect' }, { key: 'popup', i18nLabel: 'Popup' }, { key: '', i18nLabel: 'Default' } ] }); +// RocketChat.settings.add('Accounts_OAuth_Dolphin_button_label_text', '', { type: 'string', group: 'OAuth', section: 'Dolphin', i18nLabel: 'Accounts_OAuth_Custom_Button_Label_Text', persistent: true }); +// RocketChat.settings.add('Accounts_OAuth_Dolphin_button_label_color', '#FFFFFF', { type: 'string', group: 'OAuth', section: 'Dolphin', i18nLabel: 'Accounts_OAuth_Custom_Button_Label_Color', persistent: true }); +// RocketChat.settings.add('Accounts_OAuth_Dolphin_button_color', '#13679A', { type: 'string', group: 'OAuth', section: 'Dolphin', i18nLabel: 'Accounts_OAuth_Custom_Button_Color', persistent: true }); +RocketChat.settings.addGroup('OAuth', function() { + this.section('Drupal', function() { + const enableQuery = { + _id: 'Accounts_OAuth_Drupal', + value: true + }; + + this.add('Accounts_OAuth_Drupal', false, { type: 'boolean' }); + this.add('API_Drupal_URL', '', { type: 'string', public: true, enableQuery, i18nDescription: 'API_Drupal_URL_Description' }); + this.add('Accounts_OAuth_Drupal_id', '', { type: 'string', enableQuery }); + this.add('Accounts_OAuth_Drupal_secret', '', { type: 'string', enableQuery }); + this.add('Accounts_OAuth_Drupal_callback_url', '_oauth/drupal', { type: 'relativeUrl', readonly: true, force: true, enableQuery }); + }); +}); diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json index 5cd0de1ba7be..355fa6e04eae 100644 --- a/packages/rocketchat-i18n/i18n/en.i18n.json +++ b/packages/rocketchat-i18n/i18n/en.i18n.json @@ -48,6 +48,12 @@ "Accounts_iframe_url": "Iframe Url", "Accounts_LoginExpiration": "Login Expiration in Days", "Accounts_ManuallyApproveNewUsers": "Manually Approve New Users", + "API_Drupal_URL": "Drupal Server URL", + "API_Drupal_URL_Description": "Example: https://domain.com (excluding trailing slash)", + "Accounts_OAuth_Drupal": "Drupal Login Enabled", + "Accounts_OAuth_Drupal_callback_url": "Drupal oAuth2 Redirect URI", + "Accounts_OAuth_Drupal_id": "Drupal oAuth2 Client ID", + "Accounts_OAuth_Drupal_secret": "Drupal oAuth2 Client Secret", "Accounts_OAuth_Custom_Authorize_Path": "Authorize Path", "Accounts_OAuth_Custom_Button_Color": "Button Color", "Accounts_OAuth_Custom_Button_Label_Color": "Button Text Color", From 13c3eeeb0291fd88dfe9080d42ad2113298c1bbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lawri=20van=20Bu=C3=ABl?= Date: Fri, 7 Apr 2017 17:13:34 +0200 Subject: [PATCH 2/9] Pre-Update of fork --- .meteor/packages | 26 +++++----- .meteor/release | 2 +- .meteor/versions | 54 ++++++++++----------- packages/rocketchat-drupal/common.js | 12 +++-- packages/rocketchat-drupal/login-button.css | 16 ++---- 5 files changed, 53 insertions(+), 57 deletions(-) diff --git a/.meteor/packages b/.meteor/packages index 2927e013530b..4866979d4922 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -4,38 +4,38 @@ # but you can also edit it by hand. rocketchat:cors -accounts-facebook@1.1.0 -accounts-github@1.2.0 -accounts-google@1.1.0 -accounts-meteor-developer@1.2.0 +accounts-facebook@1.1.1 +accounts-github@1.2.1 +accounts-google@1.1.1 +accounts-meteor-developer@1.2.1 accounts-password@1.3.4 -accounts-twitter@1.2.0 +accounts-twitter@1.2.1 blaze-html-templates -check@1.2.4 +check@1.2.5 coffeescript@1.11.1_4 -ddp-rate-limiter@1.0.6 +ddp-rate-limiter@1.0.7 ecmascript@0.6.3 ejson@1.0.13 email@1.1.18 fastclick@1.0.13 -http@1.2.11 +http@1.2.12 jquery@1.11.10 less@2.7.9 logging@1.1.17 meteor-base@1.0.4 mobile-experience@1.0.4 -mongo@1.1.15 +mongo@1.1.16 random@1.0.10 -rate-limit@1.0.6 +rate-limit@1.0.7 reactive-dict@1.1.8 reactive-var@1.0.11 reload@1.1.11 service-configuration@1.0.11 session@1.1.7 -shell-server@0.2.2 +shell-server@0.2.3 spacebars -standard-minifier-css@1.3.3 -standard-minifier-js@1.2.2 +standard-minifier-css@1.3.4 +standard-minifier-js@1.2.3 tracker@1.1.2 rocketchat:2fa diff --git a/.meteor/release b/.meteor/release index e6940fd82f24..31ce024f1836 100644 --- a/.meteor/release +++ b/.meteor/release @@ -1 +1 @@ -METEOR@1.4.3.1 +METEOR@1.4.3.2 diff --git a/.meteor/versions b/.meteor/versions index a0d8ce4a7ec4..834502a592fb 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -1,11 +1,11 @@ -accounts-base@1.2.14 -accounts-facebook@1.1.0 -accounts-github@1.2.0 -accounts-google@1.1.0 -accounts-meteor-developer@1.2.0 +accounts-base@1.2.15 +accounts-facebook@1.1.1 +accounts-github@1.2.1 +accounts-google@1.1.1 +accounts-meteor-developer@1.2.1 accounts-oauth@1.1.15 accounts-password@1.3.4 -accounts-twitter@1.2.0 +accounts-twitter@1.2.1 aldeed:simple-schema@1.5.3 allow-deny@1.0.5 autoupdate@1.3.12 @@ -13,12 +13,12 @@ babel-compiler@6.14.1 babel-runtime@1.0.1 base64@1.0.10 binary-heap@1.0.10 -blaze@2.3.0 -blaze-html-templates@1.1.0 +blaze@2.3.2 +blaze-html-templates@1.1.2 blaze-tools@1.0.10 boilerplate-generator@1.0.11 caching-compiler@1.1.9 -caching-html-compiler@1.1.0 +caching-html-compiler@1.1.2 callback-hook@1.0.10 cfs:http-methods@0.0.32 check@1.2.5 @@ -27,7 +27,7 @@ dandv:caret-position@2.1.1 ddp@1.2.5 ddp-client@1.3.3 ddp-common@1.2.8 -ddp-rate-limiter@1.0.6 +ddp-rate-limiter@1.0.7 ddp-server@1.3.13 deepwell:bootstrap-datepicker2@1.3.0 deps@1.0.12 @@ -48,11 +48,11 @@ google-oauth@1.2.0 hot-code-push@1.0.4 html-tools@1.0.11 htmljs@1.0.11 -http@1.2.11 +http@1.2.12 id-map@1.0.9 jalik:ufs@0.7.4_1 -jalik:ufs-gridfs@0.1.4 -jalik:ufs-local@0.2.8 +jalik:ufs-gridfs@0.2.1 +jalik:ufs-local@0.2.9 jparker:crypto-core@0.1.0 jparker:crypto-md5@0.1.1 jparker:gravatar@0.5.1 @@ -80,14 +80,14 @@ meteorhacks:inject-initial@1.0.4 meteorspark:util@0.2.0 minifier-css@1.2.16 minifier-js@1.2.18 -minimongo@1.0.20 +minimongo@1.0.21 mizzao:autocomplete@0.5.1 mizzao:timesync@0.3.4 mobile-experience@1.0.4 mobile-status-bar@1.0.14 modules@0.7.9 modules-runtime@0.7.9 -mongo@1.1.15 +mongo@1.1.16 mongo-id@1.0.6 mongo-livedata@1.0.12 mrt:reactive-store@0.0.1 @@ -95,11 +95,11 @@ mystor:device-detection@0.2.0 nimble:restivus@0.8.12 nooitaf:colors@1.1.2_1 npm-bcrypt@0.9.2 -npm-mongo@2.2.16_1 +npm-mongo@2.2.24 oauth@1.1.13 oauth1@1.1.11 oauth2@1.1.11 -observe-sequence@1.0.15 +observe-sequence@1.0.16 ordered-dict@1.0.9 ostrio:cookies@2.2.0 pauli:accounts-linkedin@1.3.1 @@ -114,7 +114,7 @@ raix:handlebar-helpers@0.2.5 raix:push@3.0.3-rc.7 raix:ui-dropped-event@0.0.7 random@1.0.10 -rate-limit@1.0.6 +rate-limit@1.0.7 reactive-dict@1.1.8 reactive-var@1.0.11 reload@1.1.11 @@ -223,30 +223,30 @@ routepolicy@1.0.12 service-configuration@1.0.11 session@1.1.7 sha@1.0.9 -shell-server@0.2.2 +shell-server@0.2.3 simple:json-routes@2.1.0 smoral:sweetalert@1.1.1 -spacebars@1.0.13 -spacebars-compiler@1.1.0 +spacebars@1.0.15 +spacebars-compiler@1.1.2 srp@1.0.10 standard-minifier-css@1.3.4 standard-minifier-js@1.2.3 steffo:meteor-accounts-saml@0.0.1 tap:i18n@1.8.2 -templating@1.3.0 -templating-compiler@1.3.0 -templating-runtime@1.3.0 -templating-tools@1.1.0 +templating@1.3.2 +templating-compiler@1.3.2 +templating-runtime@1.3.2 +templating-tools@1.1.2 tmeasday:crypto-base@3.1.2 tmeasday:crypto-md5@3.1.2 todda00:friendly-slugs@0.6.0 tracker@1.1.2 twitter-oauth@1.2.0 -ui@1.0.12 +ui@1.0.13 underscore@1.0.10 underscorestring:underscore.string@3.3.4 url@1.1.0 -webapp@1.3.13 +webapp@1.3.14 webapp-hashing@1.0.9 yasaricli:slugify@0.0.7 yasinuslu:blaze-meta@0.3.3 diff --git a/packages/rocketchat-drupal/common.js b/packages/rocketchat-drupal/common.js index ad63da9636f2..eeef0e8d846b 100644 --- a/packages/rocketchat-drupal/common.js +++ b/packages/rocketchat-drupal/common.js @@ -8,10 +8,14 @@ const config = { identityPath: '/oauth2/UserInfo', authorizePath: '/oauth2/authorize', tokenPath: '/oauth2/token', - // addAutopublishFields: { - // forLoggedInUser: ['services.github-enterprise'], - // forOtherUsers: ['services.github-enterprise.username'] - // } + scope: 'openid email profile offline_access', + tokenSentVia: "payload", + usernameField: "preferred_username", + mergeUsers: true, + addAutopublishFields: { + forLoggedInUser: ['services.drupal'], + forOtherUsers: ['services.drupal.name'] + } }; const Drupal = new CustomOAuth('drupal', config); diff --git a/packages/rocketchat-drupal/login-button.css b/packages/rocketchat-drupal/login-button.css index 62bc646887a8..86b8636fec09 100644 --- a/packages/rocketchat-drupal/login-button.css +++ b/packages/rocketchat-drupal/login-button.css @@ -1,19 +1,11 @@ -#login-buttons-image-drupal { - border: #ff000b double thick; -} - .icon-drupal.service-icon { display: inline-block; - width: 50px; - height: 50px; - background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+Cjxzdmcgd2lkdGg9IjU3cHgiIGhlaWdodD0iNzZweCIgdmlld0JveD0iMCAwIDU3IDc2IiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPgogICAgPGcgaWQ9IlBhZ2UtMSIgc3Ryb2tlPSJub25lIiBzdHJva2Utd2lkdGg9IjEiIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCIgc2tldGNoOnR5cGU9Ik1TUGFnZSI+CiAgICAgICAgPGcgaWQ9ImRyb3AiIHNrZXRjaDp0eXBlPSJNU0xheWVyR3JvdXAiIGZpbGw9IiNGRkZGRkYiPgogICAgICAgICAgICA8cGF0aCBkPSJNMjguMzQzNjU0LDkuMjY2NzM0NCBDMzEuNTE3MTI0MiwxNC41NzM1MTA1IDM1LjI5MjIzMTgsMTguNTE5NTgzNCAzOS4yMTkyNTI4LDIyLjYyNDc1NiBDNDEuODI5MDIyMiwyNS4zNTMwMTQ1IDQ0LjUyNzg2NzMsMjguMTc0MDI1NCA0Ny4xODg0NDE2LDMxLjU1ODU3IEw0Ny4yMDQ5ODY2LDMxLjU3OTQ2MDIgTDQ3LjIyMTY5ODgsMzEuNjAwMTgzMyBDNTAuOTU3MDMxNSwzNi4yMjM5MzM5IDUyLjg1MDAxNjcsNDIuMDU2OTc1NiA1Mi41NTIyMDYyLDQ4LjAyNDU1MDIgQzUyLjI1MjM5MDIsNTQuMDMzMjM2NiA0OS43NDIwNTgxLDU5LjY4NzQ1ODMgNDUuNDgzNjM1Miw2My45NDU3MTQyIEM0MC45MDU2NzU5LDY4LjUyNDAwNzcgMzQuODE4NjA5NSw3MS4wNDUwMzU1IDI4LjM0Mzk4ODMsNzEuMDQ1MDM1NSBDMjEuODY5MzY3MSw3MS4wNDUwMzU1IDE1Ljc4MjMwMDcsNjguNTIzODQwNiAxMS4yMDQwMDcyLDYzLjk0NTcxNDIgQzYuOTQ1NDE3MDcsNTkuNjg3NDU4MyA0LjQzNDc1MDc2LDU0LjAzMjkwMjQgNC4xMzQ2MDA1NSw0OC4wMjQzODMgQzMuODM2Mjg4NjcsNDIuMDU2ODA4NSA1LjcyOTEwNjc5LDM2LjIyMzkzMzkgOS40NjQyNzIzMywzMS42MDAxODMzIEw5LjQ4MDk4NDQ4LDMxLjU3OTQ2MDIgTDkuNDk3NTI5NTEsMzEuNTU4NTcgQzEyLjE1ODI3MDksMjguMTczNjkxMiAxNC44NTc0NTAzLDI1LjM1MjM0NiAxNy40Njc3MjEsMjIuNjIzOTIwNCBDMjEuMzk0OTA5MiwxOC41MTg3NDc4IDI1LjE2OTg0OTYsMTQuNTczMTc2MyAyOC4zNDM2NTQsOS4yNjY3MzQ0IEwyOC4zNDM2NTQsOS4yNjY3MzQ0IFogTTI4LjM0MzY1NCwwLjA1NiBDMjMuMjkzNDA5NCwxMy4zNzE1NzI3IDE0LjgxMjk5NiwxOC4zMDU4MzUgNi4zNDM5NDY3OSwyOS4wNzk2NTY4IEMtMi42MTc5NDM3LDQwLjE3MzY4MzQgLTEuOTQzMjc0Miw1Ni40NzA4NzA4IDguMzY3NjIxMDQsNjYuNzgxNzY2MSBDMTMuODgzOTY3NSw3Mi4yOTgxMTI2IDIxLjExMzY0MzcsNzUuMDU1OTUxNiAyOC4zNDM2NTQsNzUuMDU1OTUxNiBDMzUuNTczNDk3Myw3NS4wNTU5NTE2IDQyLjgwMzE3MzQsNzIuMjk4MTEyNiA0OC4zMTkzNTI4LDY2Ljc4MTc2NjEgQzU4LjYzMDI0OCw1Ni40NzA4NzA4IDU5LjMwMzQxMzUsNDAuMTczNjgzNCA1MC4zNDE1MjMsMjkuMDc5NjU2OCBDNDEuODcyNjQwOSwxOC4zMDYwMDIxIDMzLjM5Mzg5ODcsMTMuMzcxNTcyNyAyOC4zNDM2NTQsMC4wNTYgTDI4LjM0MzY1NCwwLjA1NiBMMjguMzQzNjU0LDAuMDU2IFoiIGlkPSJTaGFwZSIgc2tldGNoOnR5cGU9Ik1TU2hhcGVHcm91cCI+PC9wYXRoPgogICAgICAgIDwvZz4KICAgIDwvZz4KPC9zdmc+); + width: 21px; + height: 28px; + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABUAAAAcCAYAAACOGPReAAAABGdBTUEAALGPC/xhBQAAAAZiS0dEAP8A/wD/oL2nkwAAAcNJREFUSMetlbFrFFEQh7/dJnhpDHcx6SyiRLhLkUKDsRZB8S9IWi2Syj8iVooQ0FLBNlqJRpNO8Br7FLkoRDBooQHhNCr6WTjB48zd7d7uNI+d+c333pt9bx5kNPVGVm1WYF39rTbKhD7zr62XBVwI4MsYF4sCZ9S2uq6mMbbVmWGBx9WW+kGdCN+J+G6pY3mBo2pT/ape6IrNx2qb6mhW4Ii6qf5Ur/TQXI74pjoyCJioa3F8FgdoF0K3pib9hLfiDy9l3NVS6G/3EiyH4GbO+q9E3nJ3oKF+Vx/33Urvkj2K/EZn4JW6l/uY/MsfU9+rzUPHXCz/+jDADvC14Myhrqpf1EpB6LHgrCbqa+BzkiSXikAD/ByopcAUsFUUGLYFTKVABWiXBG0DlRTYB8ZLgo4D+ynQAuolQevAdgq8AM6rk0Vo0R7ngQ3UU+qvvNfzCOhKcE4fOu6r39TpIYHT0XsfdDon45puq7WcwFrk7f1XQvVsdPS3Wd+geMPeRN65XqJZdVf9od5Tz/TZ7t3Q7aqzg2avqnfUg2gQO+pT9WGMO+E/CF21m5H0gU8AV4GLwEmgCnwC3gEbwJMkST4elfsHJbIReGbv9uUAAAAASUVORK5CYII=); background-repeat: no-repeat; - vertical-align: middle; - /*color: #ffffff;*/ - } .button.external-login.drupal { - /*min-height:100px;*/ - background-color: #2BA9E0; + background-color: #0F85B6; } From 2125f10548a824489113f88e50d97858ebef9a3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lawri=20van=20Bu=C3=ABl?= Date: Fri, 7 Apr 2017 17:58:52 +0200 Subject: [PATCH 3/9] Moved Drupal Additions to the Drupal package until Integration acception. --- packages/rocketchat-i18n/i18n/en.i18n.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json index 7c2c9ff263e3..3dfe8c4b2d5e 100644 --- a/packages/rocketchat-i18n/i18n/en.i18n.json +++ b/packages/rocketchat-i18n/i18n/en.i18n.json @@ -48,12 +48,6 @@ "Accounts_iframe_url": "Iframe Url", "Accounts_LoginExpiration": "Login Expiration in Days", "Accounts_ManuallyApproveNewUsers": "Manually Approve New Users", - "API_Drupal_URL": "Drupal Server URL", - "API_Drupal_URL_Description": "Example: https://domain.com (excluding trailing slash)", - "Accounts_OAuth_Drupal": "Drupal Login Enabled", - "Accounts_OAuth_Drupal_callback_url": "Drupal oAuth2 Redirect URI", - "Accounts_OAuth_Drupal_id": "Drupal oAuth2 Client ID", - "Accounts_OAuth_Drupal_secret": "Drupal oAuth2 Client Secret", "Accounts_OAuth_Custom_Authorize_Path": "Authorize Path", "Accounts_OAuth_Custom_Button_Color": "Button Color", "Accounts_OAuth_Custom_Button_Label_Color": "Button Text Color", From 2ac4f8e2758c3721d75ada324963ad66892cfdd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lawri=20van=20Bu=C3=ABl?= Date: Fri, 7 Apr 2017 17:59:57 +0200 Subject: [PATCH 4/9] Added a simpleREADME on how to use this, and added the i18n text for english in this packege until acceptation to keep it as a single package. --- packages/rocketchat-drupal/README.md | 23 ++++++++++++++++++++ packages/rocketchat-drupal/i18n/en.i18n.json | 8 +++++++ 2 files changed, 31 insertions(+) create mode 100644 packages/rocketchat-drupal/README.md create mode 100644 packages/rocketchat-drupal/i18n/en.i18n.json diff --git a/packages/rocketchat-drupal/README.md b/packages/rocketchat-drupal/README.md new file mode 100644 index 000000000000..be85fc7ae2fb --- /dev/null +++ b/packages/rocketchat-drupal/README.md @@ -0,0 +1,23 @@ +#Drupal oAuth Integration module. +This module works in conjunction with the [Rocket.Chat+ Module for Drupal](https://www.drupal.org/project/rocket_chat) +Version 7.x-1.1 or later. + +A full set of instructions for how to connect the 2 are present in the drupal module's documentation. + +Basically to connect the 2 you first setup the oAuth server connection in your drupal, with the proper permissions +("Use OAuth2 Server" => "Anonymous User" = Checked). + +In the Rocket chat you have to do the following: +- fill in the 'Client ID'. + Bear in mind that the Client ID should not be guessable,but is seen in the URL when doing the login. +- fill in the 'Client Secret'. + This should be treated as a Secret Key (like the Secret Key of a TLS certificate). it __must not__ be guesable or + derivable, and is best a Alphanumerical sequence between 16 and 48 cahracters long (longer would be better but longer + than 48 characters can be problem with long URI's) +- fill in the Drupal's BaseURL. +- on the Drupal use the "Restrict redirect URIs" Setting to limit possible exploits. and set the Redirect URI's to + whatever is in the Callback URL (like `https://Rocketchat.example.com/_oauth/drupal` and possibly also the + `https://Rocketchat.example.com/_oauth/drupal?close` URI.). +- Lastly do not forget to Enable the Drupal OAuth and `SAVE CHANGES`. + +When all is a Blue Button with a drupal like logo will apear on the login page of Rocket.Chat+ diff --git a/packages/rocketchat-drupal/i18n/en.i18n.json b/packages/rocketchat-drupal/i18n/en.i18n.json new file mode 100644 index 000000000000..dd77578b3008 --- /dev/null +++ b/packages/rocketchat-drupal/i18n/en.i18n.json @@ -0,0 +1,8 @@ +{ +"API_Drupal_URL": "Drupal Server URL", +"API_Drupal_URL_Description": "Example: https://domain.com (excluding trailing slash)", +"Accounts_OAuth_Drupal": "Drupal Login Enabled", +"Accounts_OAuth_Drupal_callback_url": "Drupal oAuth2 Redirect URI", +"Accounts_OAuth_Drupal_id": "Drupal oAuth2 Client ID", +"Accounts_OAuth_Drupal_secret": "Drupal oAuth2 Client Secret" +} From 7667867f58834d3c7407b36d66cabe40d09813c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lawri=20van=20Bu=C3=ABl?= Date: Fri, 7 Apr 2017 18:08:24 +0200 Subject: [PATCH 5/9] aperantly also a i18n update. unsure if this is what we want. But Ready for integration into Rocketchat. --- .meteor/packages | 1 + 1 file changed, 1 insertion(+) diff --git a/.meteor/packages b/.meteor/packages index c6073aacff8f..1b0e499238ea 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -171,3 +171,4 @@ yasinuslu:blaze-meta deepwell:bootstrap-datepicker2 rocketchat:google-natural-language rocketchat:drupal +rocketchat:i18n From 20d00ad2c82c96a8bc30b809c3a739e1cbb0196b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lawri=20van=20Bu=C3=ABl?= Date: Fri, 7 Apr 2017 18:22:44 +0200 Subject: [PATCH 6/9] - Changed double quotes to single quotes. - Changed colorhex to lower case. --- packages/rocketchat-drupal/common.js | 4 ++-- packages/rocketchat-drupal/login-button.css | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/rocketchat-drupal/common.js b/packages/rocketchat-drupal/common.js index eeef0e8d846b..a7a7d9e67a5e 100644 --- a/packages/rocketchat-drupal/common.js +++ b/packages/rocketchat-drupal/common.js @@ -9,8 +9,8 @@ const config = { authorizePath: '/oauth2/authorize', tokenPath: '/oauth2/token', scope: 'openid email profile offline_access', - tokenSentVia: "payload", - usernameField: "preferred_username", + tokenSentVia: 'payload', + usernameField: 'preferred_username', mergeUsers: true, addAutopublishFields: { forLoggedInUser: ['services.drupal'], diff --git a/packages/rocketchat-drupal/login-button.css b/packages/rocketchat-drupal/login-button.css index 86b8636fec09..e10c9d9c58a0 100644 --- a/packages/rocketchat-drupal/login-button.css +++ b/packages/rocketchat-drupal/login-button.css @@ -5,7 +5,7 @@ background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABUAAAAcCAYAAACOGPReAAAABGdBTUEAALGPC/xhBQAAAAZiS0dEAP8A/wD/oL2nkwAAAcNJREFUSMetlbFrFFEQh7/dJnhpDHcx6SyiRLhLkUKDsRZB8S9IWi2Syj8iVooQ0FLBNlqJRpNO8Br7FLkoRDBooQHhNCr6WTjB48zd7d7uNI+d+c333pt9bx5kNPVGVm1WYF39rTbKhD7zr62XBVwI4MsYF4sCZ9S2uq6mMbbVmWGBx9WW+kGdCN+J+G6pY3mBo2pT/ape6IrNx2qb6mhW4Ii6qf5Ur/TQXI74pjoyCJioa3F8FgdoF0K3pib9hLfiDy9l3NVS6G/3EiyH4GbO+q9E3nJ3oKF+Vx/33Urvkj2K/EZn4JW6l/uY/MsfU9+rzUPHXCz/+jDADvC14Myhrqpf1EpB6LHgrCbqa+BzkiSXikAD/ByopcAUsFUUGLYFTKVABWiXBG0DlRTYB8ZLgo4D+ynQAuolQevAdgq8AM6rk0Vo0R7ngQ3UU+qvvNfzCOhKcE4fOu6r39TpIYHT0XsfdDon45puq7WcwFrk7f1XQvVsdPS3Wd+geMPeRN65XqJZdVf9od5Tz/TZ7t3Q7aqzg2avqnfUg2gQO+pT9WGMO+E/CF21m5H0gU8AV4GLwEmgCnwC3gEbwJMkST4elfsHJbIReGbv9uUAAAAASUVORK5CYII=); background-repeat: no-repeat; } + .button.external-login.drupal { - background-color: #0F85B6; + background-color: #0f85b6; } - From 0293b03db39995965adf2a9ea64338b604c84693 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lawri=20van=20Bu=C3=ABl?= Date: Fri, 7 Apr 2017 18:24:09 +0200 Subject: [PATCH 7/9] Removed Doplhin example comments --- packages/rocketchat-drupal/startup.js | 8 -------- 1 file changed, 8 deletions(-) diff --git a/packages/rocketchat-drupal/startup.js b/packages/rocketchat-drupal/startup.js index 366cdd263444..c0923d8f826a 100644 --- a/packages/rocketchat-drupal/startup.js +++ b/packages/rocketchat-drupal/startup.js @@ -1,11 +1,3 @@ -// RocketChat.settings.add('Accounts_OAuth_Dolphin_URL', '', { type: 'string', group: 'OAuth', public: true, section: 'Dolphin', i18nLabel: 'URL' }); -// RocketChat.settings.add('Accounts_OAuth_Dolphin', false, { type: 'boolean', group: 'OAuth', section: 'Dolphin', i18nLabel: 'Accounts_OAuth_Custom_Enable' }); -// RocketChat.settings.add('Accounts_OAuth_Dolphin_id', '', { type: 'string', group: 'OAuth', section: 'Dolphin', i18nLabel: 'Accounts_OAuth_Custom_id' }); -// RocketChat.settings.add('Accounts_OAuth_Dolphin_secret', '', { type: 'string', group: 'OAuth', section: 'Dolphin', i18nLabel: 'Accounts_OAuth_Custom_Secret' }); -// RocketChat.settings.add('Accounts_OAuth_Dolphin_login_style', 'redirect', { type: 'select', group: 'OAuth', section: 'Dolphin', i18nLabel: 'Accounts_OAuth_Custom_Login_Style', persistent: true, values: [ { key: 'redirect', i18nLabel: 'Redirect' }, { key: 'popup', i18nLabel: 'Popup' }, { key: '', i18nLabel: 'Default' } ] }); -// RocketChat.settings.add('Accounts_OAuth_Dolphin_button_label_text', '', { type: 'string', group: 'OAuth', section: 'Dolphin', i18nLabel: 'Accounts_OAuth_Custom_Button_Label_Text', persistent: true }); -// RocketChat.settings.add('Accounts_OAuth_Dolphin_button_label_color', '#FFFFFF', { type: 'string', group: 'OAuth', section: 'Dolphin', i18nLabel: 'Accounts_OAuth_Custom_Button_Label_Color', persistent: true }); -// RocketChat.settings.add('Accounts_OAuth_Dolphin_button_color', '#13679A', { type: 'string', group: 'OAuth', section: 'Dolphin', i18nLabel: 'Accounts_OAuth_Custom_Button_Color', persistent: true }); RocketChat.settings.addGroup('OAuth', function() { this.section('Drupal', function() { const enableQuery = { From a1589a9cdd0dc2eff89fd7f5d357de8f211b70b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lawri=20van=20Bu=C3=ABl?= Date: Fri, 7 Apr 2017 22:55:50 +0200 Subject: [PATCH 8/9] Revert accidental upgrades in the .meteor dir that should be done through the official channels and not this PR --- .meteor/versions | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/.meteor/versions b/.meteor/versions index 5a7373fd1830..b0c3f562be3d 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -1,12 +1,3 @@ -<<<<<<< HEAD -accounts-base@1.2.15 -accounts-facebook@1.1.1 -accounts-github@1.2.1 -accounts-google@1.1.1 -accounts-meteor-developer@1.2.1 -accounts-oauth@1.1.15 -accounts-password@1.3.4 -======= accounts-base@1.2.16 accounts-facebook@1.1.1 accounts-github@1.2.1 @@ -14,7 +5,6 @@ accounts-google@1.1.2 accounts-meteor-developer@1.2.1 accounts-oauth@1.1.15 accounts-password@1.3.5 ->>>>>>> upstream/develop accounts-twitter@1.2.1 aldeed:simple-schema@1.5.3 allow-deny@1.0.5 @@ -38,11 +28,7 @@ ddp@1.2.5 ddp-client@1.3.4 ddp-common@1.2.8 ddp-rate-limiter@1.0.7 -<<<<<<< HEAD -ddp-server@1.3.13 -======= ddp-server@1.3.14 ->>>>>>> upstream/develop deepwell:bootstrap-datepicker2@1.3.0 deps@1.0.12 diff-sequence@1.0.7 @@ -99,13 +85,8 @@ mizzao:autocomplete@0.5.1 mizzao:timesync@0.3.4 mobile-experience@1.0.4 mobile-status-bar@1.0.14 -<<<<<<< HEAD -modules@0.7.9 -modules-runtime@0.7.9 -======= modules@0.8.1 modules-runtime@0.7.10 ->>>>>>> upstream/develop mongo@1.1.16 mongo-id@1.0.6 mongo-livedata@1.0.12 @@ -133,11 +114,7 @@ raix:handlebar-helpers@0.2.5 raix:push@3.0.3-rc.7 raix:ui-dropped-event@0.0.7 random@1.0.10 -<<<<<<< HEAD -rate-limit@1.0.7 -======= rate-limit@1.0.8 ->>>>>>> upstream/develop reactive-dict@1.1.8 reactive-var@1.0.11 reload@1.1.11 @@ -270,11 +247,8 @@ ui@1.0.13 underscore@1.0.10 underscorestring:underscore.string@3.3.4 url@1.1.0 -<<<<<<< HEAD -webapp@1.3.14 -======= webapp@1.3.15 ->>>>>>> upstream/develop webapp-hashing@1.0.9 yasaricli:slugify@0.0.7 yasinuslu:blaze-meta@0.3.3 + From fad17698281825dfd1c95a9861677de8582a477a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lawri=20van=20Bu=C3=ABl?= Date: Mon, 10 Apr 2017 18:12:27 +0200 Subject: [PATCH 9/9] Moved translatable strings to i18n module, removed erouneos added rocketchat:i18n --- .meteor/packages | 2 +- packages/rocketchat-drupal/i18n/en.i18n.json | 8 -------- packages/rocketchat-i18n/i18n/en.i18n.json | 6 ++++++ 3 files changed, 7 insertions(+), 9 deletions(-) delete mode 100644 packages/rocketchat-drupal/i18n/en.i18n.json diff --git a/.meteor/packages b/.meteor/packages index 1b0e499238ea..4d6551b9363a 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -171,4 +171,4 @@ yasinuslu:blaze-meta deepwell:bootstrap-datepicker2 rocketchat:google-natural-language rocketchat:drupal -rocketchat:i18n + diff --git a/packages/rocketchat-drupal/i18n/en.i18n.json b/packages/rocketchat-drupal/i18n/en.i18n.json deleted file mode 100644 index dd77578b3008..000000000000 --- a/packages/rocketchat-drupal/i18n/en.i18n.json +++ /dev/null @@ -1,8 +0,0 @@ -{ -"API_Drupal_URL": "Drupal Server URL", -"API_Drupal_URL_Description": "Example: https://domain.com (excluding trailing slash)", -"Accounts_OAuth_Drupal": "Drupal Login Enabled", -"Accounts_OAuth_Drupal_callback_url": "Drupal oAuth2 Redirect URI", -"Accounts_OAuth_Drupal_id": "Drupal oAuth2 Client ID", -"Accounts_OAuth_Drupal_secret": "Drupal oAuth2 Client Secret" -} diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json index 3dfe8c4b2d5e..576c283660f8 100644 --- a/packages/rocketchat-i18n/i18n/en.i18n.json +++ b/packages/rocketchat-i18n/i18n/en.i18n.json @@ -62,6 +62,10 @@ "Accounts_OAuth_Custom_Token_Path": "Token Path", "Accounts_OAuth_Custom_Token_Sent_Via": "Token Sent Via", "Accounts_OAuth_Custom_Username_Field": "Username field", + "Accounts_OAuth_Drupal": "Drupal Login Enabled", + "Accounts_OAuth_Drupal_callback_url": "Drupal oAuth2 Redirect URI", + "Accounts_OAuth_Drupal_id": "Drupal oAuth2 Client ID", + "Accounts_OAuth_Drupal_secret": "Drupal oAuth2 Client Secret", "Accounts_OAuth_Facebook": "Facebook Login", "Accounts_OAuth_Facebook_callback_url": "Facebook Callback URL", "Accounts_OAuth_Facebook_id": "Facebook App Id", @@ -170,6 +174,8 @@ "API_CORS_Origin": "CORS Origin", "API_Default_Count": "Default Count", "API_Default_Count_Description": "The default count for REST API results if the consumer did not provided any.", + "API_Drupal_URL": "Drupal Server URL", + "API_Drupal_URL_Description": "Example: https://domain.com (excluding trailing slash)", "API_Embed": "Embed Link Previews", "API_Embed_Description": "Whether embedded link previews are enabled or not when a user posts a link to a website.", "API_EmbedCacheExpirationDays": "Embed cache expiration days",