fixing logout/leave flow.

Author: rcreasey

app/js/EventList.js

@@ -38,8 +38,7 @@ var EventList = {
 
   handleEvent: function (event) {
     if (event.type === 'memberjoined') {
-      // foo
-
+      MemberList.sortAndRenderAll();
     } else if (event.type === 'memberleft') {
       MemberList.sortAndRenderAll();
     }

app/js/UIPanels.js

@@ -61,7 +61,7 @@ var UIPanels = {
       formitems: [
         {input:  {label: 'Fleet Password', id: 'create-fleet-password', class: 'submit-key'}},
         {button: {class: 'submit-key', text: 'Create Fleet', onClick: 'createFleetButtonClick(this)'}},
-        {submit: {class: 'submit-join', text: '<i class="fa fa-arrow-circle-left"></i> Go Back', onClick: 'UIPanels.showJoinPanel()'}}
+        {submit: {class: 'submit-join', text: '<i class="fa fa-arrow-circle-left"></i> Go Back', onClick: 'UIPanels.showStartPanel()'}}
       ],
        error: error
      };

app/styles/main.css

@@ -1163,6 +1163,11 @@ border-top: 0.16rem solid #333;
 	color: #faa;
 }
 
+#link .error a,
+#login .error a {
+	display: block;
+}
+	
 
 .atlwdg-trigger {
 	z-index: 9001;

server/controllers/fleet.js

@@ -58,48 +58,58 @@ exports.leave = function(req, res, next){
 
   Member.findOneQ({key: key})
     .then(function(member) {
-      var event = Event.prepare('memberLeft', member.fleetKey, member.toObject())
-      event.saveQ();
-      member.removeQ();
-
+      if (member) {
+        var event = Event.prepare('memberLeft', member.fleetKey, member.toObject());
+        event.saveQ();
+        member.removeQ();
+        
+      }
+      
       return response.success(res);
     })
     .catch(function(error) {
       console.log(error)
-      return response.error(res, 'state', 'Error joining fleet: ' + error);
+      return response.error(res, 'state', 'Error leaving fleet: ' + error);
     })
     .done();
 
 };
 
 exports.status = function(req, res, next) {
+  if (!req.session) return next();
+  
   if (!req.session.fleetKey || !req.session.memberKey) {
     var self = Member.prepare('none', header_parser(req))
     var event = Event.prepare('statusSelf', 'none', self.toObject())
 
     return response.success(res, [ event ]);
   }
 
+  var events = [];
+  
   Member.findOneQ({key: req.session.memberKey})
     .then(function(member) {
-      var events = [];
+      if (!member) throw 'Invalid Member key.';            
       events.push( Event.prepare('statusSelf', member.fleetKey, member.toObject()) );
 
+      return Fleet.findOne({key: member.fleetKey}).execQ();
+    })
+    .then(function(fleet) {
+      if (!fleet) throw 'Invalid Fleet.';
+      events.push( Event.prepare('statusFleet', fleet.key, fleet.toObject()) );
+      
       var tasks = [
-        Fleet.findOne({key: member.fleetKey}).execQ().then(function(fleet) {
-          return Event.prepare('statusFleet', member.fleetKey, fleet.toObject());
+        Event.find({fleetKey: fleet.key}).execQ().then(function(events) {
+          return Event.prepare('statusEvents', fleet.key, _.map(events, function(event) { return event.toObject(); }));
         }),
-        Event.find({fleetKey: member.fleetKey}).execQ().then(function(events) {
-          return Event.prepare('statusEvents', member.fleetKey, _.map(events, function(event) { return event.toObject(); }));
+        Member.find({fleetKey: fleet.key}).execQ().then(function(members) {
+          return Event.prepare('statusMembers', fleet.key, _.map(members, function(member) { return member.toObject(); }));
         }),
-        Member.find({fleetKey: member.fleetKey}).execQ().then(function(members) {
-          return Event.prepare('statusMembers', member.fleetKey, _.map(members, function(member) { return member.toObject(); }));
+        Hostile.find({fleetKey: fleet.key}).execQ().then(function(hostiles) {
+          return Event.prepare('statusHostiles', fleet.key, _.map(hostiles, function(hostile) { return hostile.toObject(); }));
         }),
-        Hostile.find({fleetKey: member.fleetKey}).execQ().then(function(hostiles) {
-          return Event.prepare('statusHostiles', member.fleetKey, _.map(hostiles, function(hostile) { return hostile.toObject(); }));
-        }),
-        Scan.find({fleetKey: member.fleetKey}).execQ().then(function(scans) {
-          return Event.prepare('statusScans', member.fleetKey, _.map(scans, function(scan) { return scan.toObject(); }));
+        Scan.find({fleetKey: fleet.key}).execQ().then(function(scans) {
+          return Event.prepare('statusScans', fleet.key, _.map(scans, function(scan) { return scan.toObject(); }));
         })
       ];
 
@@ -110,13 +120,21 @@ exports.status = function(req, res, next) {
         })
         .catch(function(error) {
           console.log(error)
-          return response.error(res, 'state', 'Error fetching fleet tasks.');
+          req.sessionStore.destroy( req.session.id, function(err) {
+            delete req.session;
+          });
+          
+          return response.error(res, 'status', 'Error fetching fleet tasks.');
         })
         .done();
     })
     .catch(function(error) {
       console.log(error)
-      return response.error(res, 'state', 'Error fetching fleet status.');
+      req.sessionStore.destroy( req.session.id, function(err) {
+        delete req.session;
+      });
+      
+      return response.error(res, 'status', 'Error fetching fleet status.');
     })
     .done();
 

server/views/login/index.jade

@@ -15,4 +15,7 @@ block content
           button(type='submit', name='submit')
             i.fa.fa-arrow-right.fa-large
         if error != ''
-          span.error=error
+          span.error
+            = error 
+            a(href='https://goonfleet.com/esa/') Password problems?
+