Merge pull request #1 from geekgonecrazy/fix-github-ee

Fix GitHub Enterprise oauth
RocketChat · Oct 1, 2015 · 0efbd9e · 0efbd9e
2 parents 82c4645 + 677f9f7
commit 0efbd9e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/packages/rocketchat-github-enterprise/common.coffee b/packages/rocketchat-github-enterprise/common.coffee
@@ -1,11 +1,13 @@
 config =
 	serverURL: ''
 	identityPath: '/api/v3/user'
+	authorizePath: '/login/oauth/authorize'
+	tokenPath: '/login/oauth/access_token'
 	addAutopublishFields:
 		forLoggedInUser: ['services.github-enterprise']
 		forOtherUsers: ['services.github-enterprise.username']
 
-GitHubEnterprise = new CustomOAuth 'github-enterprise', config
+GitHubEnterprise = new CustomOAuth 'github_enterprise', config
 
 if Meteor.isServer
 	Meteor.startup ->

diff --git a/packages/rocketchat-github-enterprise/github-enterprise-login-button.css b/packages/rocketchat-github-enterprise/github-enterprise-login-button.css
diff --git a/packages/rocketchat-lib/settings/server/updateServices.coffee b/packages/rocketchat-lib/settings/server/updateServices.coffee
@@ -3,8 +3,7 @@ updateServices = ->
 	Meteor.clearTimeout timer if timer?
 
 	timer = Meteor.setTimeout ->
-		services = RocketChat.models.Settings.find({_id: /^(Accounts_OAuth_|Accounts_OAuth_Custom_)[a-z]+$/i}).fetch()
-
+		services = RocketChat.models.Settings.find({_id: /^(Accounts_OAuth_|Accounts_OAuth_Custom_)[a-z_-]+$/i}).fetch()
 		for service in services
 			console.log "Updating login service #{service._id}".blue
 
@@ -21,6 +20,7 @@ updateServices = ->
 					clientId: RocketChat.models.Settings.findOneById("#{service._id}_id")?.value
 					secret: RocketChat.models.Settings.findOneById("#{service._id}_secret")?.value
 
+
 				if /Accounts_OAuth_Custom_/.test service._id
 					data.custom = true
 					data.serverURL = RocketChat.models.Settings.findOneById("#{service._id}_url")?.value
@@ -43,7 +43,6 @@ updateServices = ->
 				if serviceName is 'Twitter'
 					data.consumerKey = data.clientId
 					delete data.clientId
-
 				ServiceConfiguration.configurations.upsert {service: serviceName.toLowerCase()}, $set: data
 			else
 				ServiceConfiguration.configurations.remove {service: serviceName.toLowerCase()}