From 3a853248149b40dee3cd84d643ca993e616c9d8a Mon Sep 17 00:00:00 2001
From: Marcos Spessatto Defendi <marcos.defendi@ulbra.inf.br>
Date: Tue, 6 Nov 2018 14:26:23 -0200
Subject: [PATCH] Convert rocketchat-cas to main module structure (#12532)

---
 packages/rocketchat-cas/client/cas_client.js  |  1 +
 packages/rocketchat-cas/client/index.js       |  1 +
 packages/rocketchat-cas/package.js            | 28 ++++++++-----------
 .../rocketchat-cas/server/cas_rocketchat.js   |  8 +++---
 packages/rocketchat-cas/server/cas_server.js  |  5 ++--
 packages/rocketchat-cas/server/index.js       |  3 ++
 .../server/models/CredentialTokens.js         |  2 ++
 7 files changed, 25 insertions(+), 23 deletions(-)
 create mode 100644 packages/rocketchat-cas/client/index.js
 create mode 100644 packages/rocketchat-cas/server/index.js

diff --git a/packages/rocketchat-cas/client/cas_client.js b/packages/rocketchat-cas/client/cas_client.js
index 9bf775ec8e3..4811ef8bb5f 100644
--- a/packages/rocketchat-cas/client/cas_client.js
+++ b/packages/rocketchat-cas/client/cas_client.js
@@ -1,6 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Accounts } from 'meteor/accounts-base';
 import { Random } from 'meteor/random';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 const openCenteredPopup = function(url, width, height) {
 
diff --git a/packages/rocketchat-cas/client/index.js b/packages/rocketchat-cas/client/index.js
new file mode 100644
index 00000000000..75213558d6d
--- /dev/null
+++ b/packages/rocketchat-cas/client/index.js
@@ -0,0 +1 @@
+import './cas_client';
diff --git a/packages/rocketchat-cas/package.js b/packages/rocketchat-cas/package.js
index a599f42ed3e..25096d4fd1f 100644
--- a/packages/rocketchat-cas/package.js
+++ b/packages/rocketchat-cas/package.js
@@ -6,21 +6,15 @@ Package.describe({
 });
 
 Package.onUse(function(api) {
-	// Server libs
-	api.use('rocketchat:lib', 'server');
-	api.use('rocketchat:logger', 'server');
-	api.use('service-configuration', 'server');
-	api.use('routepolicy', 'server');
-	api.use('webapp', 'server');
-	api.use('accounts-base', 'server');
-
-	api.use('ecmascript');
-
-	// Server files
-	api.add_files('server/cas_rocketchat.js', 'server');
-	api.add_files('server/cas_server.js', 'server');
-	api.add_files('server/models/CredentialTokens.js', 'server');
-
-	// Client files
-	api.add_files('client/cas_client.js', 'client');
+	api.use([
+		'ecmascript',
+		'rocketchat:lib',
+		'rocketchat:logger',
+		'service-configuration',
+		'routepolicy',
+		'webapp',
+		'accounts-base',
+	]);
+	api.mainModule('client/index.js', 'client');
+	api.mainModule('server/index.js', 'server');
 });
diff --git a/packages/rocketchat-cas/server/cas_rocketchat.js b/packages/rocketchat-cas/server/cas_rocketchat.js
index a91d89b6bdc..3d96e1d4d39 100644
--- a/packages/rocketchat-cas/server/cas_rocketchat.js
+++ b/packages/rocketchat-cas/server/cas_rocketchat.js
@@ -1,8 +1,8 @@
-/* globals logger:true */
-
 import { Meteor } from 'meteor/meteor';
-
-logger = new Logger('CAS', {});
+import { Logger } from 'meteor/rocketchat:logger';
+import { RocketChat } from 'meteor/rocketchat:lib';
+import { ServiceConfiguration } from 'meteor/service-configuration';
+export const logger = new Logger('CAS', {});
 
 Meteor.startup(function() {
 	RocketChat.settings.addGroup('CAS', function() {
diff --git a/packages/rocketchat-cas/server/cas_server.js b/packages/rocketchat-cas/server/cas_server.js
index 3f03dbf65c8..dc8acd27ccb 100644
--- a/packages/rocketchat-cas/server/cas_server.js
+++ b/packages/rocketchat-cas/server/cas_server.js
@@ -1,9 +1,10 @@
-/* globals RoutePolicy, logger */
-/* jshint newcap: false */
 import { Meteor } from 'meteor/meteor';
 import { Accounts } from 'meteor/accounts-base';
 import { Random } from 'meteor/random';
 import { WebApp } from 'meteor/webapp';
+import { RocketChat } from 'meteor/rocketchat:lib';
+import { RoutePolicy } from 'meteor/routepolicy';
+import { logger } from './cas_rocketchat';
 import _ from 'underscore';
 
 import fiber from 'fibers';
diff --git a/packages/rocketchat-cas/server/index.js b/packages/rocketchat-cas/server/index.js
new file mode 100644
index 00000000000..451c7d5a8aa
--- /dev/null
+++ b/packages/rocketchat-cas/server/index.js
@@ -0,0 +1,3 @@
+import './models/CredentialTokens';
+import './cas_rocketchat';
+import './cas_server';
diff --git a/packages/rocketchat-cas/server/models/CredentialTokens.js b/packages/rocketchat-cas/server/models/CredentialTokens.js
index 63d00ff423f..a484eb978b3 100644
--- a/packages/rocketchat-cas/server/models/CredentialTokens.js
+++ b/packages/rocketchat-cas/server/models/CredentialTokens.js
@@ -1,3 +1,5 @@
+import { RocketChat } from 'meteor/rocketchat:lib';
+
 RocketChat.models.CredentialTokens = new class extends RocketChat.models._Base {
 	constructor() {
 		super('credential_tokens');