Must reload page for login/out to take effect

Author: WolfElkan

client/app.js

@@ -2,39 +2,28 @@ var app = angular.module('app', ['ngRoute','ngCookies'])
 
 app.config(function($routeProvider) {
 	var $cookies;
-	angular.injector(['ngCookies']).invoke(['$cookies', function(_$cookies_) {
-		$cookies = _$cookies_;
+	angular.injector(['ngCookies']).invoke(['$cookies', function(cookies) {
+		$cookies = cookies;
 	}])
-	$routeProvider.when('/',{
-		templateUrl : $cookies.get('user_id') ? 'partials/home.html' : 'partials/users/entrance.html',
-		controller  : 'users_cxr'
-	})
-	$routeProvider.when('/login',{
-		templateUrl : 'partials/users/entrance.html',
-		controller  : 'users_cxr'
-	})
+	if ($cookies.get('user_id')) {
+		$routeProvider.when('/home',{
+			templateUrl : 'partials/home.html',
+			controller  : 'users_cxr'
+		})
+		$routeProvider.otherwise({
+			redirectTo: '/home'
+		})
+	} else {	
+		$routeProvider.when('/login',{
+			templateUrl : 'partials/users/entrance.html',
+			controller  : 'users_cxr'
+		})
+		$routeProvider.otherwise({
+			redirectTo: '/login'
+		})
+	}
 	$routeProvider.when('/users',{
 		templateUrl : 'partials/users/index.html',
 		controller  : 'users_cxr'
 	})
-	$routeProvider.when('/home',{
-		templateUrl : 'partials/home.html',
-		controller  : 'users_cxr'
-	})
-	// $routeProvider.when('/users/show/:id',{
-	// 	templateUrl : 'partials/users/show.html',
-	// 	controller  : 'users_cxr'
-	// })
-	// $routeProvider.when('/users/edit/:id',{
-	// 	templateUrl : 'partials/users/edit.html',
-	// 	controller  : 'users_cxr'
-	// })
-	$routeProvider.otherwise({
-		redirectTo: '/'
-	})
-})
-
-// myApp.config(function() {
-
-//   // here you can use $cookies as usual
-// });
+})

client/assets/controllers/users_cxr.js

@@ -12,7 +12,7 @@ app.controller('users_cxr',['$scope','$location','$cookies','UserFactory',functi
 					console.log('cxr: password correct')
 					$cookies.put('user_id',returned.data.user_id)
 				//	$cookies.put('sescode',returned.data.sescode)
-					$location.url('/home')
+					$location.url('/')
 				} else {
 					console.log('cxr: password incorrect')
 				}
@@ -39,10 +39,11 @@ app.controller('users_cxr',['$scope','$location','$cookies','UserFactory',functi
 	})
 
 	$scope.logout = function() {
-		console.log('cxr: logout')
-		$cookies.remove('user_id')
-	//	$cookies.remove('sescode')
-		$location.url('/login')
+		console.log('cxr: logging out...')
+			$cookies.remove('user_id')
+		//	$cookies.remove('sescode')
+			console.log($cookies.get('user_id'))
+			$location.url('/')
 	}
 
 	$scope.isbcrypt = function(pw) {

server/models/session.js

@@ -2,7 +2,7 @@
 
 // var SessionSchema = new mongoose.Schema({
 // 	user_id : ObjectId,
-// 	sescode : 
+// 	sescode : Buffer
 // },{	timestamps: { 
 // 		createdAt: 'created_at', 
 // 		updatedAt: 'terminated',