Merge pull request #13 from bryan-m-hughes/timob-11361

[TIMOB-11361] Added support for better logout logging

lib/auth.js

@@ -142,7 +142,7 @@ exports.logout = function (callback) {
 							response = JSON.parse(e.toString());
 							result = createLoggedOutSessionFile();
 							if (response.success) {
-								callback && callback(mix(result, { success: true }));
+								callback && callback(mix(result, { success: true, alreadyLoggedOut: false }));
 							} else {
 								result.error = 'Error logging out from server: ' + response.reason;
 								callback && callback(result);
@@ -163,15 +163,15 @@ exports.logout = function (callback) {
 					callback && callback(result);
 				});
 			} else {
-				callback && callback(mix(session, { success: true }));
+				callback && callback(mix(session, { success: true, alreadyLoggedOut: true }));
 			}
 		} catch(e) { // Invalid session file. This should never happen
 			result = createLoggedOutSessionFile();
-			callback && callback(mix(result, { success: true }));
+			callback && callback(mix(result, { success: true, alreadyLoggedOut: true }));
 		}
-	} else { // Create a default (logged out, expired) session file
+	} else { // Create a default (logged out) session file
 		result = createLoggedOutSessionFile();
-		callback && callback(mix(result, { success: true }));
+		callback && callback(mix(result, { success: true, alreadyLoggedOut: true }));
 	}
 };
 
@@ -191,20 +191,11 @@ exports.status = function () {
 				email: session.data && session.data.email,
 				cookie: session.cookie
 			};
-			if (!session.loggedIn) {
-				// If we are offline, calculated whether or not we are expired
-				if (session.offlineExpires) {
-					result.offlineExpires = session.offlineExpires;
-					result.expired = result.offlineExpires < Date.now();
-				} else {
-					result.expired = true;
-				}
-			}
 		} catch(e) { // Invalid session file. This should never happen
-			result = mix(createLoggedOutSessionFile(), { expired: true });
+			result = createLoggedOutSessionFile();
 		}
 	} else {
-		result = mix(createLoggedOutSessionFile(), { expired: true }); // No prior history, create a new logged out file
+		result = createLoggedOutSessionFile(); // No prior history, create a new logged out file
 	}
 
 	return statusCache = result;
@@ -261,26 +252,7 @@ exports.getMID = function (callback) {
 };
 
 function createLoggedOutSessionFile() {
-	var offlineExpires,
-		session,
-		result = { loggedIn: false };
-
-	// Read the existing file to parse out the previous session_allowed_duration, if it exists
-	if (fs.existsSync(sessionFile)) {
-		try {
-			session = JSON.parse(fs.readFileSync(sessionFile));
-			if (session.loggedIn) {
-				offlineExpires = session.data && session.data.session_allowed_duration;
-			}
-		} catch(e) {}
-	} else if (!fs.existsSync(titaniumConfigFolder)) {
-		wrench.mkdirSyncRecursive(titaniumConfigFolder);
-	}
-
-	// Create the new session file
-	offlineExpires && (result.offlineExpires = Date.now() + offlineExpires * 60 * 60 * 1000);
+	var result = { loggedIn: false };
 	fs.writeFileSync(sessionFile, JSON.stringify(result));
-
-	// Add the expired flag and return
 	return result;
 }