Logout functionality

Author: StuartCoope

app/public/js/controllers.js

@@ -17,10 +17,19 @@ var LoginCtrl = ['$scope', 'UserService', function($scope, UserService){
 		UserService.login($scope.loginForm.username, $scope.loginForm.password, function(res){
 			if(!res.success){
 				$scope.errorMessage = "<strong>Oh no!</strong> Invalid username or password";
+			}else{
+				//success, clear the form now in case it is reused later
+				$scope.loginForm.username = "";
+				$scope.loginForm.password = "";
 			}
 		});
 
 	};
+
+	$scope.logout = function(){
+		UserService.logout();
+	}
+
 }];
 
 var RegisterCtrl = ['$scope', 'UserService', function($scope, UserService){
@@ -38,9 +47,19 @@ var RegisterCtrl = ['$scope', 'UserService', function($scope, UserService){
 		}, function(res){
 			if(!res.success){
 				$scope.errorMessage = res.error;
+			}else{
+				//success, clear the form now in case it is reused later
+				$scope.registrationForm.username = "";
+				$scope.registrationForm.password = "";
+				$scope.registrationForm.email = "";
 			}
 		});
 	}
+
+	$scope.logout = function(){
+		UserService.logout();
+	}
+
 }];
 
 var PodiumCtrl = ['$scope', function($scope){

app/public/js/services.js

@@ -5,10 +5,16 @@ angular.module('podiumServices', ['ngResource'])
 	.factory('UserService', function($resource){
 
 		var loginRequest = $resource('api/login', {}, {});
+		var logoutRequest = $resource('api/logout', {}, {});
 		var registerRequest = $resource('api/register', {}, {});
+		var loginStatusRequest = $resource('api/loginstatus', {}, {});
 
 		var userService = {
 
+			//Consider either:
+				//pull defaults from local storage to prevent the flash while waiting for status on load
+				//nodeJS to interfere with the serving of index to push some state, how do others do this?
+
 			isLoggedIn: false,
 			user: false,
 
@@ -43,9 +49,28 @@ angular.module('podiumServices', ['ngResource'])
 					}
 					callback(res);
 				});
+			},
+
+			checkLoginStatus: function(){
+				loginStatusRequest.get({}, function(res){
+					userService.isLoggedIn = res.loggedIn;
+					userService.user = res.user;
+				});
+			},
+
+			logout: function(){
+				logoutRequest.get({}, function(res){
+					console.log(res);
+					if(res.success){
+						userService.isLoggedIn = false;
+						userService.user = false;
+					}
+				});
 			}
 		};
 
+		userService.checkLoginStatus();
+
 		return userService;
 
 	});

app/public/partials/login.html

@@ -1,6 +1,7 @@
 <div ng-controller="LoginCtrl" ng-switch="UserService.isLoggedIn" id="login-container">
   <div ng-switch-when="true">
-    <h2>Welcome {{loggedInAs}}</h2>
+    <h2>Welcome {{UserService.user.username}}</h2>
+    <button type="submit" id="btn-logout" class="btn btn-primary" ng-click="logout()">Logout</button>
   </div>
   <div ng-switch-when="false">
       <form method="post" id="login-form" class="well span4">

app/public/partials/register.html

@@ -19,5 +19,6 @@ <h2>Register</h2>
 	</div>
 	<div ng-switch-when="true">
 		<h2>You are already registered</h2>
+		<button type="submit" id="btn-logout" class="btn btn-primary" ng-click="logout()">Logout</button>
 	</div>
 </div>

app/server/controllers/userController.js

@@ -36,17 +36,6 @@ var login = function (username, password, callback){
 	});
 }
 
-var ifValid = function(fn){
-	return function(){
-
-		if(arguments.length === 0){
-			return;
-		}
-		
-		return fn.apply(this, arguments);
-	}
-}
-
 var register = function(user, callback){
 	user.roles = [ "authenticated" ]
 	userDatasource.create(user, function(record){

app/server/routes/userRoute.js

@@ -92,15 +92,17 @@ var performLogin = function(username, password, req, res){
 
 exports.logout = function(req, res){
 	req.session.destroy();
-	res.send();
+	res.jsonp({success: true});
 };
 
 // route to test if the user is logged in or not 
 exports.loginStatus = function(req, res) { 
 
 	var publicUserData = false;
+	var loggedIn = false;
 
 	if(req.session.loggedIn){
+		loggedIn = true;
 		publicUserData = {
 			id: req.session.user.id,
 			username: req.session.user.username,
@@ -109,7 +111,7 @@ exports.loginStatus = function(req, res) {
 	}
 
 	res.jsonp({
-		loggedin: req.session.loggedIn,
+		loggedIn: loggedIn,
 		user: publicUserData
 	});
 	//res.send(req.session["loggedIn"] ? 'true' : 'false');