Merge remote-tracking branch 'origin/develop' into imports/wave-8-mai…

…n-module-autocomplete # Conflicts: # packages/meteor-accounts-saml/package.js # packages/meteor-accounts-saml/server/saml_utils.js
RocketChat · Nov 1, 2018 · 8e8fe19 · 8e8fe19
2 parents 1489ec6 + c5a14f2
commit 8e8fe19
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/packages/meteor-accounts-saml/package.js b/packages/meteor-accounts-saml/package.js
@@ -8,7 +8,15 @@ Package.describe({
 Package.on_use(function(api) {
 	api.use([
 		'ecmascript',
+		'http',
+		'accounts-base',
 	]);
+	api.use([
+		'routepolicy',
+		'webapp',
+		'rocketchat:lib',
+		'service-configuration',
+	], 'server');
 
 	api.mainModule('client/index.js', 'client');
 	api.mainModule('server/index.js', 'server');

diff --git a/packages/meteor-accounts-saml/server/saml_utils.js b/packages/meteor-accounts-saml/server/saml_utils.js
@@ -9,7 +9,7 @@ import array2string from 'arraybuffer-to-string';
 // var prefixMatch = new RegExp(/(?!xmlns)^.*:/);
 
 
-const SAML = function(options) {
+export const SAML = function(options) {
 	this.options = this.initialize(options);
 };
 
@@ -545,7 +545,3 @@ SAML.prototype.generateServiceProviderMetadata = function(callbackUrl) {
 		newline: '\n',
 	});
 };
-
-export {
-	SAML,
-};