Convert rocketchat-oauth2-server-config to main module structure

packages/rocketchat-oauth2-server-config/client/admin/collection.js

@@ -0,0 +1,3 @@
+import { Mongo } from 'meteor/mongo';
+
+export const ChatOAuthApps = new Mongo.Collection('rocketchat_oauth_apps');

packages/rocketchat-oauth2-server-config/admin/client/route.js → packages/rocketchat-oauth2-server-config/client/admin/route.js

@@ -1,5 +1,6 @@
 import { FlowRouter } from 'meteor/kadira:flow-router' ;
 import { BlazeLayout } from 'meteor/kadira:blaze-layout';
+import { t } from 'meteor/rocketchat:ui';
 
 FlowRouter.route('/admin/oauth-apps', {
 	name: 'admin-oauth-apps',

packages/rocketchat-oauth2-server-config/admin/client/startup.js → packages/rocketchat-oauth2-server-config/client/admin/startup.js

@@ -1,3 +1,5 @@
+import { RocketChat } from 'meteor/rocketchat:lib';
+
 RocketChat.AdminBox.addOption({
 	href: 'admin-oauth-apps',
 	i18nLabel: 'OAuth Apps',

packages/rocketchat-oauth2-server-config/admin/client/views/oauthApp.js → packages/rocketchat-oauth2-server-config/client/admin/views/oauthApp.js

@@ -1,10 +1,11 @@
-/* globals ChatOAuthApps */
-
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
 import { TAPi18n } from 'meteor/tap:i18n';
+import { RocketChat, handleError } from 'meteor/rocketchat:lib';
+import { t, modal } from 'meteor/rocketchat:ui';
+import { ChatOAuthApps } from '../collection';
 import toastr from 'toastr';
 
 Template.oauthApp.onCreated(function() {

packages/rocketchat-oauth2-server-config/admin/client/views/oauthApps.js → packages/rocketchat-oauth2-server-config/client/admin/views/oauthApps.js

@@ -1,5 +1,6 @@
-/* globals ChatOAuthApps */
 import { Template } from 'meteor/templating';
+import { RocketChat } from 'meteor/rocketchat:lib';
+import { ChatOAuthApps } from '../collection';
 import moment from 'moment';
 
 Template.oauthApps.onCreated(function() {

packages/rocketchat-oauth2-server-config/client/index.js

@@ -0,0 +1,9 @@
+import './oauth/stylesheets/oauth2.css';
+import './oauth/oauth2-client.html';
+import './oauth/oauth2-client';
+import './admin/startup';
+import './admin/route';
+import './admin/views/oauthApp.html';
+import './admin/views/oauthApp';
+import './admin/views/oauthApps.html';
+import './admin/views/oauthApps';

packages/rocketchat-oauth2-server-config/oauth/client/oauth2-client.js → packages/rocketchat-oauth2-server-config/client/oauth/oauth2-client.js

@@ -1,9 +1,8 @@
-// @ChatOAuthApps = new Mongo.Collection 'rocketchat_oauth_apps'
-/* globals ChatOAuthApps */
 import { Meteor } from 'meteor/meteor';
 import { FlowRouter } from 'meteor/kadira:flow-router' ;
 import { BlazeLayout } from 'meteor/kadira:blaze-layout';
 import { Template } from 'meteor/templating';
+import { ChatOAuthApps } from '../admin/collection';
 
 FlowRouter.route('/oauth/authorize', {
 	action(params, queryParams) {

packages/rocketchat-oauth2-server-config/package.js

@@ -5,47 +5,18 @@ Package.describe({
 });
 
 Package.onUse(function(api) {
-	api.use('webapp');
-	api.use('mongo');
-	api.use('ecmascript');
-	api.use('rocketchat:lib');
-	api.use('rocketchat:api');
-	api.use('rocketchat:theme');
-	api.use('rocketchat:oauth2-server');
-
-	api.use('templating', 'client');
-	api.use('kadira:flow-router', 'client');
-	api.use('kadira:blaze-layout', 'client');
-
-	// // General //
-	// Server
-	api.addFiles('server/models/OAuthApps.js', 'server');
-
-	// // OAuth //
-	// Server
-	api.addFiles('oauth/server/oauth2-server.js', 'server');
-	api.addFiles('oauth/server/default-services.js', 'server');
-
-	api.addFiles('oauth/client/stylesheets/oauth2.css', 'client');
-
-	// Client
-	api.addFiles('oauth/client/oauth2-client.html', 'client');
-	api.addFiles('oauth/client/oauth2-client.js', 'client');
-
-
-	// // Admin //
-	// Client
-	api.addFiles('admin/client/startup.js', 'client');
-	api.addFiles('admin/client/collection.js', 'client');
-	api.addFiles('admin/client/route.js', 'client');
-	api.addFiles('admin/client/views/oauthApp.html', 'client');
-	api.addFiles('admin/client/views/oauthApp.js', 'client');
-	api.addFiles('admin/client/views/oauthApps.html', 'client');
-	api.addFiles('admin/client/views/oauthApps.js', 'client');
-
-	// Server
-	api.addFiles('admin/server/publications/oauthApps.js', 'server');
-	api.addFiles('admin/server/methods/addOAuthApp.js', 'server');
-	api.addFiles('admin/server/methods/updateOAuthApp.js', 'server');
-	api.addFiles('admin/server/methods/deleteOAuthApp.js', 'server');
+	api.use([
+		'ecmascript',
+		'webapp',
+		'mongo',
+		'rocketchat:lib',
+		'rocketchat:api',
+		'rocketchat:theme',
+		'rocketchat:oauth2-server',
+		'templating',
+		'kadira:flow-router',
+		'kadira:blaze-layout',
+	]);
+	api.mainModule('client/index.js', 'client');
+	api.mainModule('server/index.js', 'server');
 });

packages/rocketchat-oauth2-server-config/admin/server/methods/addOAuthApp.js → packages/rocketchat-oauth2-server-config/server/admin/methods/addOAuthApp.js

@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Random } from 'meteor/random';
+import { RocketChat } from 'meteor/rocketchat:lib';
 import _ from 'underscore';
 
 Meteor.methods({

packages/rocketchat-oauth2-server-config/admin/server/methods/deleteOAuthApp.js → packages/rocketchat-oauth2-server-config/server/admin/methods/deleteOAuthApp.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 Meteor.methods({
 	deleteOAuthApp(applicationId) {

packages/rocketchat-oauth2-server-config/admin/server/methods/updateOAuthApp.js → packages/rocketchat-oauth2-server-config/server/admin/methods/updateOAuthApp.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
 import _ from 'underscore';
 
 Meteor.methods({

packages/rocketchat-oauth2-server-config/admin/server/publications/oauthApps.js → packages/rocketchat-oauth2-server-config/server/admin/publications/oauthApps.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 Meteor.publish('oauthApps', function() {
 	if (!this.userId) {

packages/rocketchat-oauth2-server-config/server/index.js

@@ -0,0 +1,7 @@
+import './models/OAuthApps';
+import './oauth/oauth2-server';
+import './oauth/default-services';
+import './admin/publications/oauthApps';
+import './admin/methods/addOAuthApp';
+import './admin/methods/updateOAuthApp';
+import './admin/methods/deleteOAuthApp';

packages/rocketchat-oauth2-server-config/server/models/OAuthApps.js

@@ -1,3 +1,5 @@
+import { RocketChat } from 'meteor/rocketchat:lib';
+
 RocketChat.models.OAuthApps = new class extends RocketChat.models._Base {
 	constructor() {
 		super('oauth_apps');

packages/rocketchat-oauth2-server-config/oauth/server/default-services.js → packages/rocketchat-oauth2-server-config/server/oauth/default-services.js

@@ -1,3 +1,5 @@
+import { RocketChat } from 'meteor/rocketchat:lib';
+
 if (!RocketChat.models.OAuthApps.findOne('zapier')) {
 	RocketChat.models.OAuthApps.insert({
 		_id: 'zapier',

packages/rocketchat-oauth2-server-config/oauth/server/oauth2-server.js → packages/rocketchat-oauth2-server-config/server/oauth/oauth2-server.js

@@ -1,6 +1,7 @@
-/* global OAuth2Server */
 import { Meteor } from 'meteor/meteor';
 import { WebApp } from 'meteor/webapp';
+import { RocketChat } from 'meteor/rocketchat:lib';
+import { OAuth2Server } from 'meteor/rocketchat:oauth2-server';
 
 const oauth2server = new OAuth2Server({
 	accessTokensCollectionName: 'rocketchat_oauth_access_tokens',