Merge branch 'refactor/filters_to_hooks_#25'

Ryan Glover
2 parents 0c2fb2c227 03f51985e0
Showing 2 changed files Show diff stats
client/routes/filters.js
client/routes/hooks.js
@@ -1,58 +0,0 @@
-/*
-* Route Filters
-* Filters for managing user access to application routes.
-*/
-
-/*
-* Define Filters
-*/
-
-/*
-* Filter: Check if a User is Logged In
-* If a user is not logged in and attempts to go to an authenticated route,
-* re-route them to the login screen.
-*/
-
-checkUserLoggedIn = function(){
-  if( !Meteor.loggingIn() && !Meteor.user() ) {
-    Router.go('/login');
-  } else {
-    this.next();
-  }
-}
-
-/*
-* Filter: Check if a User Exists
-* If a user is logged in and attempts to go to a public route, re-route
-* them to the main "logged in" screen.
-*/
-
-userAuthenticated = function(){
-  if( !Meteor.loggingIn() && Meteor.user() ){
-    Router.go('/');
-  } else {
-    this.next();
-  }
-}
-
-/*
-* Run Filters
-*/
-
-Router.onBeforeAction(checkUserLoggedIn, {
-  except: [
-    'signup',
-    'login',
-    'recover-password',
-    'reset-password'
-  ]
-});
-
-Router.onBeforeAction(userAuthenticated, {
-  only: [
-    'signup',
-    'login',
-    'recover-password',
-    'reset-password'
-  ]
-});
@@ -0,0 +1,58 @@
+/*
+* Route Hooks
+* Hook functions for managing user access to routes.
+*/
+
+/*
+* Define Hook Functions
+*/
+
+/*
+* Hook: Check if a User is Logged In
+* If a user is not logged in and attempts to go to an authenticated route,
+* re-route them to the login screen.
+*/
+
+checkUserLoggedIn = function(){
+  if( !Meteor.loggingIn() && !Meteor.user() ) {
+    Router.go('/login');
+  } else {
+    this.next();
+  }
+}
+
+/*
+* Hook: Check if a User Exists
+* If a user is logged in and attempts to go to a public route, re-route
+* them to the index path.
+*/
+
+userAuthenticated = function(){
+  if( !Meteor.loggingIn() && Meteor.user() ){
+    Router.go('/');
+  } else {
+    this.next();
+  }
+}
+
+/*
+* Run Hooks
+*/
+
+Router.onBeforeAction(checkUserLoggedIn, {
+  except: [
+    'signup',
+    'login',
+    'recover-password',
+    'reset-password'
+  ]
+});
+
+Router.onBeforeAction(userAuthenticated, {
+  only: [
+    'signup',
+    'login',
+    'recover-password',
+    'reset-password'
+  ]
+});
...	...	@@ -1,58 +0,0 @@
1		-/*
2		-* Route Filters
3		-* Filters for managing user access to application routes.
4		-*/
5		-
6		-/*
7		-* Define Filters
8		-*/
9		-
10		-/*
11		-* Filter: Check if a User is Logged In
12		-* If a user is not logged in and attempts to go to an authenticated route,
13		-* re-route them to the login screen.
14		-*/
15		-
16		-checkUserLoggedIn = function(){
17		- if( !Meteor.loggingIn() && !Meteor.user() ) {
18		- Router.go('/login');
19		- } else {
20		- this.next();
21		- }
22		-}
23		-
24		-/*
25		-* Filter: Check if a User Exists
26		-* If a user is logged in and attempts to go to a public route, re-route
27		-* them to the main "logged in" screen.
28		-*/
29		-
30		-userAuthenticated = function(){
31		- if( !Meteor.loggingIn() && Meteor.user() ){
32		- Router.go('/');
33		- } else {
34		- this.next();
35		- }
36		-}
37		-
38		-/*
39		-* Run Filters
40		-*/
41		-
42		-Router.onBeforeAction(checkUserLoggedIn, {
43		- except: [
44		- 'signup',
45		- 'login',
46		- 'recover-password',
47		- 'reset-password'
48		- ]
49		-});
50		-
51		-Router.onBeforeAction(userAuthenticated, {
52		- only: [
53		- 'signup',
54		- 'login',
55		- 'recover-password',
56		- 'reset-password'
57		- ]
58		-});
...	...	@@ -0,0 +1,58 @@
	1	+/*
	2	+* Route Hooks
	3	+* Hook functions for managing user access to routes.
	4	+*/
	5	+
	6	+/*
	7	+* Define Hook Functions
	8	+*/
	9	+
	10	+/*
	11	+* Hook: Check if a User is Logged In
	12	+* If a user is not logged in and attempts to go to an authenticated route,
	13	+* re-route them to the login screen.
	14	+*/
	15	+
	16	+checkUserLoggedIn = function(){
	17	+ if( !Meteor.loggingIn() && !Meteor.user() ) {
	18	+ Router.go('/login');
	19	+ } else {
	20	+ this.next();
	21	+ }
	22	+}
	23	+
	24	+/*
	25	+* Hook: Check if a User Exists
	26	+* If a user is logged in and attempts to go to a public route, re-route
	27	+* them to the index path.
	28	+*/
	29	+
	30	+userAuthenticated = function(){
	31	+ if( !Meteor.loggingIn() && Meteor.user() ){
	32	+ Router.go('/');
	33	+ } else {
	34	+ this.next();
	35	+ }
	36	+}
	37	+
	38	+/*
	39	+* Run Hooks
	40	+*/
	41	+
	42	+Router.onBeforeAction(checkUserLoggedIn, {
	43	+ except: [
	44	+ 'signup',
	45	+ 'login',
	46	+ 'recover-password',
	47	+ 'reset-password'
	48	+ ]
	49	+});
	50	+
	51	+Router.onBeforeAction(userAuthenticated, {
	52	+ only: [
	53	+ 'signup',
	54	+ 'login',
	55	+ 'recover-password',
	56	+ 'reset-password'
	57	+ ]
	58	+});
...	...