Merge branch 'refactor/server_startup_#24'

Ryan Glover
2 parents 514173a0cc c2a6cf38e1
Showing 4 changed files Show diff stats
server/admin/browser-policies.js
server/admin/startup-functions/browser-policies.js
server/admin/startup-functions/test-accounts.js
server/admin/startup.js
@@ -1,5 +0,0 @@
-/*
-* Browser Policies
-* Browser policy customizations.
-* Documentation: https://atmospherejs.com/meteor/browser-policy
-*/
@@ -0,0 +1,9 @@
+/*
+* Browser Policies
+* Browser policy customizations.
+* Documentation: https://atmospherejs.com/meteor/browser-policy
+*/
+
+customBrowserPolicies = function(){
+  // Define any custom browser policies here.
+}
@@ -0,0 +1,29 @@
+/*
+* Generate Test Accounts
+* Creates a collection of test accounts automatically on startup.
+*/
+
+generateTestAccounts = function(){
+  // Create an array of user accounts.
+  var users = [
+    { name: "Admin", email: "admin@admin.com", password: "password" }
+  ]
+
+  // Loop through array of user accounts.
+  for(i=0; i < users.length; i++){
+    // Check if the user already exists in the DB.
+    var userEmail = users[i].email,
+        checkUser = Meteor.users.findOne({"emails.address": userEmail});
+
+    // If an existing user is not found, create the account.
+    if ( !checkUser ) {
+      Accounts.createUser({
+        email: userEmail,
+        password: users[i].password,
+        profile: {
+          name: users[i].name
+        }
+      });
+    }
+  }
+}
 /*
 * Startup
-* Collection of methods and functions to run on server startup.
+* Functions to run on server startup. Note: this file is for calling functions
+* only. Define functions in /server/admin/startup-functions.
 */
  
-/*
-* Generate Test Accounts
-* Creates a collection of test accounts automatically on startup.
-*/
+Meteor.startup(function(){
  
-// Create an array of user accounts.
-var users = [
-  { name: "Admin", email: "admin@admin.com", password: "password" }
-]
+  // Custom Browser Policies
+  customBrowserPolicies();
  
-// Loop through array of user accounts.
-for(i=0; i < users.length; i++){
-  // Check if the user already exists in the DB.
-  var userEmail = users[i].email,
-      checkUser = Meteor.users.findOne({"emails.address": userEmail});
+  // Generate Test Accounts
+  generateTestAccounts();
  
-  // If an existing user is not found, create the account.
-  if( !checkUser ){
-    Accounts.createUser({
-      email: userEmail,
-      password: users[i].password,
-      profile: {
-        name: users[i].name
-      }
-    });
-  }
-}
+});
...	...	@@ -1,5 +0,0 @@
1		-/*
2		-* Browser Policies
3		-* Browser policy customizations.
4		-* Documentation: https://atmospherejs.com/meteor/browser-policy
5		-*/
...	...	@@ -0,0 +1,9 @@
	1	+/*
	2	+* Browser Policies
	3	+* Browser policy customizations.
	4	+* Documentation: https://atmospherejs.com/meteor/browser-policy
	5	+*/
	6	+
	7	+customBrowserPolicies = function(){
	8	+ // Define any custom browser policies here.
	9	+}
...	...
...	...	@@ -0,0 +1,29 @@
	1	+/*
	2	+* Generate Test Accounts
	3	+* Creates a collection of test accounts automatically on startup.
	4	+*/
	5	+
	6	+generateTestAccounts = function(){
	7	+ // Create an array of user accounts.
	8	+ var users = [
	9	+ { name: "Admin", email: "admin@admin.com", password: "password" }
	10	+ ]
	11	+
	12	+ // Loop through array of user accounts.
	13	+ for(i=0; i < users.length; i++){
	14	+ // Check if the user already exists in the DB.
	15	+ var userEmail = users[i].email,
	16	+ checkUser = Meteor.users.findOne({"emails.address": userEmail});
	17	+
	18	+ // If an existing user is not found, create the account.
	19	+ if ( !checkUser ) {
	20	+ Accounts.createUser({
	21	+ email: userEmail,
	22	+ password: users[i].password,
	23	+ profile: {
	24	+ name: users[i].name
	25	+ }
	26	+ });
	27	+ }
	28	+ }
	29	+}
...	...
1	1	/*
2	2	* Startup
3		-* Collection of methods and functions to run on server startup.
	3	+* Functions to run on server startup. Note: this file is for calling functions
	4	+* only. Define functions in /server/admin/startup-functions.
4	5	*/
5	6
6		-/*
7		-* Generate Test Accounts
8		-* Creates a collection of test accounts automatically on startup.
9		-*/
	7	+Meteor.startup(function(){
10	8
11		-// Create an array of user accounts.
12		-var users = [
13		- { name: "Admin", email: "admin@admin.com", password: "password" }
14		-]
	9	+ // Custom Browser Policies
	10	+ customBrowserPolicies();
15	11
16		-// Loop through array of user accounts.
17		-for(i=0; i < users.length; i++){
18		- // Check if the user already exists in the DB.
19		- var userEmail = users[i].email,
20		- checkUser = Meteor.users.findOne({"emails.address": userEmail});
	12	+ // Generate Test Accounts
	13	+ generateTestAccounts();
21	14
22		- // If an existing user is not found, create the account.
23		- if( !checkUser ){
24		- Accounts.createUser({
25		- email: userEmail,
26		- password: users[i].password,
27		- profile: {
28		- name: users[i].name
29		- }
30		- });
31		- }
32		-}
	15	+});
...	...