From 961d1113c321fb81f9c6d6afae6c6d629ddad955 Mon Sep 17 00:00:00 2001
From: Yaman <ybq987@gmail.com>
Date: Sun, 1 Feb 2015 22:09:52 -0500
Subject: [PATCH] fix router not logged in stuff

---
 chromebook-checkout-meteor/client/router.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/chromebook-checkout-meteor/client/router.js b/chromebook-checkout-meteor/client/router.js
index 7b43b3f..f50c626 100644
--- a/chromebook-checkout-meteor/client/router.js
+++ b/chromebook-checkout-meteor/client/router.js
@@ -3,7 +3,7 @@
 })
 
 Router.route('/checkout', function() {
-  if (Meteor.user()._id != null) {
+  if (Meteor.user() != null) {
     this.render("checkout");
   } else {
     this.redirect('/login');
@@ -11,15 +11,16 @@ Router.route('/checkout', function() {
 });
 
 Router.route('/login', function() {
-  if (Roles.userIsInRole(Meteor.user()._id, ['admin'])) {
+  if (Meteor.user() == null) {
+    this.render("login");
+  } else if (Roles.userIsInRole(Meteor.user()._id, ['admin'])) {
     this.redirect('/admin');
   } else if (Roles.userIsInRole(Meteor.user()._id, ['teacher'])) {
     this.redirect('/teacher');
-  } else if (Meteor.user()._id != null) {
+  } else if (Meteor.user() != null) {
     this.redirect('/checkout');
-  }
-  else {
-    this.render('login')
+  } else {
+    this.redirect('')
   }
 });