From 82c46455b60222923e4677eb9313ddefb598962a Mon Sep 17 00:00:00 2001 From: Lee Faus Date: Thu, 1 Oct 2015 06:37:13 -0700 Subject: [PATCH] update to share --- .meteor/packages | 1 + .meteor/versions | 1 + packages/rocketchat-github-enterprise/common.coffee | 2 +- packages/rocketchat-github-enterprise/i18n/en.i18n.json | 4 +++- packages/rocketchat-github-enterprise/startup.coffee | 6 +++++- packages/rocketchat-lib/settings/server/startup.coffee | 3 --- server/startup/migrations/v18.coffee | 3 --- 7 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.meteor/packages b/.meteor/packages index 2faeaa391ea..bf41c219900 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -100,3 +100,4 @@ random ejson spacebars check +rocketchat:github-enterprise diff --git a/.meteor/versions b/.meteor/versions index e1541559ed8..e34a68e2b1d 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -125,6 +125,7 @@ rocketchat:custom-oauth@1.0.0 rocketchat:emojione@0.0.1 rocketchat:favico@0.0.1 rocketchat:file@0.0.1 +rocketchat:github-enterprise@0.0.1 rocketchat:gitlab@0.0.1 rocketchat:highlight@0.0.1 rocketchat:ldap@0.0.1 diff --git a/packages/rocketchat-github-enterprise/common.coffee b/packages/rocketchat-github-enterprise/common.coffee index 9a8c47e6abb..5e5edf02f09 100644 --- a/packages/rocketchat-github-enterprise/common.coffee +++ b/packages/rocketchat-github-enterprise/common.coffee @@ -1,5 +1,5 @@ config = - serverURL: 'http://faushouse.vm' + serverURL: '' identityPath: '/api/v3/user' addAutopublishFields: forLoggedInUser: ['services.github-enterprise'] diff --git a/packages/rocketchat-github-enterprise/i18n/en.i18n.json b/packages/rocketchat-github-enterprise/i18n/en.i18n.json index 7eb5f77e2d3..b2a4ef36f45 100644 --- a/packages/rocketchat-github-enterprise/i18n/en.i18n.json +++ b/packages/rocketchat-github-enterprise/i18n/en.i18n.json @@ -1,3 +1,5 @@ { - "API_GitHub_Enterprise_URL" : "GitHub Enterprise" + "API_GitHub_Enterprise_URL" : "GitHub Enterprise Server URL", + "Accounts_OAuth_GitHub_Enterprise_id" : "GitHub OAuth Client Id", + "Accounts_OAuth_GitHub_Enterprise_secret" : "GitHub OAuth Client Secret" } diff --git a/packages/rocketchat-github-enterprise/startup.coffee b/packages/rocketchat-github-enterprise/startup.coffee index 50cd053cf03..0fe6afa3f6c 100644 --- a/packages/rocketchat-github-enterprise/startup.coffee +++ b/packages/rocketchat-github-enterprise/startup.coffee @@ -1 +1,5 @@ -RocketChat.settings.add 'API_GitHub_Enterprise_URL', '', { type: 'string', group: 'API', public: true, i18nLabel: 'rocketchat-github-enterprise:API_GitHub_Enterprise_URL' } + +RocketChat.settings.add 'Accounts_OAuth_GitHub_Enterprise', false, {type: 'boolean', group: 'Accounts', section: 'GitHub Enterprise'} +RocketChat.settings.add 'API_GitHub_Enterprise_URL', '', { type: 'string', group: 'Accounts', public: true, section: 'GitHub Enterprise', i18nLabel: 'rocketchat-github-enterprise:API_GitHub_Enterprise_URL' } +RocketChat.settings.add 'Accounts_OAuth_GitHub_Enterprise_id', '', { type: 'string', group: 'Accounts', section: 'GitHub Enterprise', i18nLabel: 'rocketchat-github-enterprise:API_GitHub_Enterprise_id' } +RocketChat.settings.add 'Accounts_OAuth_GitHub_Enterprise_secret', '', { type: 'string', group: 'Accounts', section: 'GitHub Enterprise', i18nLabel: 'rocketchat-github-enterprise:API_GitHub_Enterprise_secret' } diff --git a/packages/rocketchat-lib/settings/server/startup.coffee b/packages/rocketchat-lib/settings/server/startup.coffee index 40a9f567f4c..93d44b9c3bb 100644 --- a/packages/rocketchat-lib/settings/server/startup.coffee +++ b/packages/rocketchat-lib/settings/server/startup.coffee @@ -21,9 +21,6 @@ RocketChat.settings.add 'Accounts_OAuth_Google_secret', '', { type: 'string', gr RocketChat.settings.add 'Accounts_OAuth_Github', false, { type: 'boolean', group: 'Accounts', section: 'Github', public: true } RocketChat.settings.add 'Accounts_OAuth_Github_id', '', { type: 'string', group: 'Accounts', section: 'Github' } RocketChat.settings.add 'Accounts_OAuth_Github_secret', '', { type: 'string', group: 'Accounts', section: 'Github' } -RocketChat.settings.add 'Accounts_OAuth_GitHub_Enterprise', false, { type: 'boolean', group: 'Accounts', section: 'GitHub Enterprise', public: true } -RocketChat.settings.add 'Accounts_OAuth_GitHub_Enterprise_id', '', { type: 'string', group: 'Accounts', section: 'GitHub Enterprise' } -RocketChat.settings.add 'Accounts_OAuth_GitHub_Enterprise_secret', '', { type: 'string', group: 'Accounts', section: 'GitHub Enterprise' } RocketChat.settings.add 'Accounts_OAuth_Gitlab', false, { type: 'boolean', group: 'Accounts', section: 'Gitlab', public: true } RocketChat.settings.add 'Accounts_OAuth_Gitlab_id', '', { type: 'string', group: 'Accounts', section: 'Gitlab' } RocketChat.settings.add 'Accounts_OAuth_Gitlab_secret', '', { type: 'string', group: 'Accounts', section: 'Gitlab' } diff --git a/server/startup/migrations/v18.coffee b/server/startup/migrations/v18.coffee index 777ee26a2c0..f9293c59bfa 100644 --- a/server/startup/migrations/v18.coffee +++ b/server/startup/migrations/v18.coffee @@ -12,9 +12,6 @@ Meteor.startup -> Accounts_Github: 'Accounts_OAuth_Github' Accounts_Github_id: 'Accounts_OAuth_Github_id' Accounts_Github_secret: 'Accounts_OAuth_Github_secret' - Accounts_GitHub_Enterprise: 'Accounts_OAuth_GitHub_Enterprise' - Accounts_GitHub_Enterprise_id: 'Accounts_OAuth_GitHub_Enterprise_id' - Accounts_GitHub_Enterprise_secret: 'Accounts_OAuth_GitHub_Enterprise_secret' Accounts_Gitlab: 'Accounts_OAuth_Gitlab' Accounts_Gitlab_id: 'Accounts_OAuth_Gitlab_id' Accounts_Gitlab_secret: 'Accounts_OAuth_Gitlab_secret'