Custom oauth

.meteor/packages

@@ -78,6 +78,5 @@ raix:push@2.6.13-rc.1
 jalik:ufs
 jalik:ufs-gridfs
 monbro:mongodb-mapreduce-aggregation
-accounts-gitlab
-gitlab
+rocketchat:custom-oauth
 rocketchat:gitlab

.meteor/versions

@@ -1,7 +1,6 @@
 accounts-base@1.2.0
 accounts-facebook@1.0.4
 accounts-github@1.0.4
-accounts-gitlab@1.0.5-plugins.0
 accounts-google@1.0.4
 accounts-meteor-developer@1.0.4
 accounts-oauth@1.1.5
@@ -32,7 +31,6 @@ fastclick@1.0.3
 francocatena:status@1.3.2
 geojson-utils@1.0.3
 github@1.1.3
-gitlab@1.1.4-plugins.0
 google@1.1.5
 html-tools@1.0.4
 htmljs@1.0.4
@@ -104,6 +102,7 @@ reload@1.1.3
 retry@1.0.3
 rocketchat:autolinker@0.0.1
 rocketchat:colors@0.0.1
+rocketchat:custom-oauth@1.0.0
 rocketchat:emojione@0.0.1
 rocketchat:favico@0.0.1
 rocketchat:file@0.0.1

client/stylesheets/base.less

@@ -3546,9 +3546,6 @@ a.github-fork {
 		padding: 0;
 		-webkit-flex-grow: 1;
 		flex-grow: 1;
-		span {
-			display: none;
-		}
 	}
 }
 

client/views/login/services.coffee

@@ -1,12 +1,17 @@
+Meteor.startup ->
+	ServiceConfiguration.configurations.find({custom: true}).observe
+		added: (record) ->
+			new CustomOAuth record.service,
+				serverURL: record.serverURL
+
 Template.loginServices.helpers
 	loginService: ->
 		services = []
 
-		authServices = _.pluck ServiceConfiguration.configurations.find({}, { service: 1 }).fetch(), 'service'
+		authServices = ServiceConfiguration.configurations.find({}, { sort: {service: 1} }).fetch()
 
-		authServices.sort()
 		authServices.forEach (service) ->
-			switch service
+			switch service.service
 				when 'meteor-developer'
 					serviceName = 'Meteor'
 					icon = 'meteor'
@@ -15,10 +20,10 @@ Template.loginServices.helpers
 					icon = 'github-circled'
 				when 'gitlab'
 					serviceName = 'Gitlab'
-					icon = service
+					icon = service.service
 				else
-					serviceName = _.capitalize service
-					icon = service
+					serviceName = _.capitalize service.service
+					icon = service.service
 
 			services.push
 				service: service
@@ -29,7 +34,7 @@ Template.loginServices.helpers
 
 Template.loginServices.events
 	'click .external-login': (e, t)->
-		return unless this.service?
+		return unless this.service?.service?
 
 		loadingIcon = $(e.currentTarget).find('.loading-icon')
 		serviceIcon = $(e.currentTarget).find('.service-icon')
@@ -38,7 +43,7 @@ Template.loginServices.events
 		serviceIcon.addClass 'hidden'
 
 		# login with native facebook app
-		if Meteor.isCordova and this.service is 'facebook'
+		if Meteor.isCordova and this.service.service is 'facebook'
 			Meteor.loginWithFacebookCordova {}, (error) ->
 				loadingIcon.addClass 'hidden'
 				serviceIcon.removeClass 'hidden'
@@ -50,7 +55,7 @@ Template.loginServices.events
 
 				FlowRouter.go 'index'
 		else
-			loginWithService = "loginWith" + (if this.service is 'meteor-developer' then 'MeteorDeveloperAccount' else _.capitalize(this.service))
+			loginWithService = "loginWith" + (if this.service.service is 'meteor-developer' then 'MeteorDeveloperAccount' else _.capitalize(this.service.service))
 			serviceConfig = {}
 			Meteor[loginWithService] serviceConfig, (error) ->
 				loadingIcon.addClass 'hidden'

client/views/login/services.html

@@ -2,7 +2,7 @@
 	{{#if loginService.length}}
 		<div class="social-login">
 			{{#each loginService}}
-				<button type="button" class="button external-login {{service}}"><i class="icon-{{icon}} service-icon"></i><i class="icon-spin4 animate-spin loading-icon hidden"></i><span>{{displayName}}</span></button>
+				<button type="button" class="button external-login {{service.service}}" title="{{displayName}}" style="{{#if service.buttonColor}}background-color:{{service.buttonColor}};{{/if}}{{#if service.buttonLabelColor}}color:{{service.buttonLabelColor}};{{/if}}"><i class="icon-{{icon}} service-icon"></i><i class="icon-spin4 animate-spin loading-icon hidden"></i><span>{{service.buttonLabelText}}</span></button>
 			{{/each}}
 		</div>
 	{{/if}}

i18n/en.i18n.json

@@ -3,26 +3,35 @@
   "Access_Online_Demo" : "Access the Online Demo",
   "Accounts_denyUnverifiedEmail" : "Deny unverified e-mail",
   "Accounts_EmailVerification" : "E-mail Verification",
-  "Accounts_Facebook": "Facebook Login",
-  "Accounts_Facebook_id": "Facebook App Id",
-  "Accounts_Facebook_secret": "Facebook Secret",
-  "Accounts_Github": "GitHub Login",
-  "Accounts_Github_id": "GitHub Id",
-  "Accounts_Github_secret": "GitHub Secret",
-  "Accounts_Google": "Google Login",
-  "Accounts_Google_id": "Google Id",
-  "Accounts_Google_secret": "Google Secret",
-  "Accounts_Linkedin": "LinkedIn Login",
-  "Accounts_Linkedin_id": "LinkedIn Id",
-  "Accounts_Linkedin_secret": "LinkedIn Secret",
-  "Accounts_ManuallyApproveNewUsers" : "Manually aprove new users",
-  "Accounts_Meteor": "Meteor Login",
-  "Accounts_Meteor_id": "Meteor Id",
-  "Accounts_Meteor_secret": "Meteor Secret",
-  "Accounts_RegistrationRequired" : "Registration Required",
-  "Accounts_Twitter": "Twitter Login",
-  "Accounts_Twitter_id": "Twitter Id",
-  "Accounts_Twitter_secret": "Twitter Secret",
+  "Accounts_OAuth_Facebook": "Facebook Login",
+  "Accounts_OAuth_Facebook_id": "Facebook App Id",
+  "Accounts_OAuth_Facebook_secret": "Facebook Secret",
+  "Accounts_OAuth_Github": "GitHub Login",
+  "Accounts_OAuth_Github_id": "GitHub Id",
+  "Accounts_OAuth_Github_secret": "GitHub Secret",
+  "Accounts_OAuth_Google": "Google Login",
+  "Accounts_OAuth_Google_id": "Google Id",
+  "Accounts_OAuth_Google_secret": "Google Secret",
+  "Accounts_OAuth_Linkedin": "LinkedIn Login",
+  "Accounts_OAuth_Linkedin_id": "LinkedIn Id",
+  "Accounts_OAuth_Linkedin_secret": "LinkedIn Secret",
+  "Accounts_OAuth_ManuallyApproveNewUsers" : "Manually aprove new users",
+  "Accounts_OAuth_Meteor": "Meteor Login",
+  "Accounts_OAuth_Meteor_id": "Meteor Id",
+  "Accounts_OAuth_Meteor_secret": "Meteor Secret",
+  "Accounts_OAuth_RegistrationRequired" : "Registration Required",
+  "Accounts_OAuth_Twitter": "Twitter Login",
+  "Accounts_OAuth_Twitter_id": "Twitter Id",
+  "Accounts_OAuth_Twitter_secret": "Twitter Secret",
+  "Accounts_OAuth_Custom_ID": "ID",
+  "Accounts_OAuth_Custom_URL": "URL",
+  "Accounts_OAuth_Custom_Token_Path": "Token Path",
+  "Accounts_OAuth_Custom_Identity_Path": "Identity Path",
+  "Accounts_OAuth_Custom_Secret": "Secret",
+  "Accounts_OAuth_Custom_Enable": "Enable",
+  "Accounts_OAuth_Custom_Button_Label_Text": "Button Text",
+  "Accounts_OAuth_Custom_Button_Label_Color": "Button Text Color",
+  "Accounts_OAuth_Custom_Button_Color": "Button Color",
   "Add_Members" : "Add Members",
   "Add_users" : "Add users",
   "Administration" : "Administration",