From 4da630a8f66f785f0f862dfdf9495dcc22802611 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Sat, 8 Jun 2019 21:51:39 +0100
Subject: [PATCH] drop useless Abort function

---
 src/Yavsc/Hubs/ChatHub.cs                     | 36 ++++++++-----------
 src/Yavsc/wwwroot/js/chat.js                  |  4 +--
 .../Controllers/HomeController.cs             |  3 +-
 3 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/src/Yavsc/Hubs/ChatHub.cs b/src/Yavsc/Hubs/ChatHub.cs
index a2e60aed..fdf39d29 100644
--- a/src/Yavsc/Hubs/ChatHub.cs
+++ b/src/Yavsc/Hubs/ChatHub.cs
@@ -129,25 +129,21 @@ namespace Yavsc
         public override Task OnDisconnected(bool stopCalled)
         {
             string userName = Context.User?.Identity.Name;
-            if (userName != null)
-            {
+            if (userName!=null) {
+                var user = _dbContext.Users.FirstOrDefault(u => u.UserName == userName);
+                var userId = user.Id;
+                Clients.Group(Constants.HubGroupFollowingPrefix+userId).notifyuser(NotificationTypes.DisConnected, userName, null);
+
                 var cx = _dbContext.ChatConnection.SingleOrDefault(c => c.ConnectionId == Context.ConnectionId);
                 if (cx != null)
                 {
-                    if (stopCalled)
-                    {
-                        var user = _dbContext.Users.Single(u => u.UserName == userName);
-                        user.Connections.Remove(cx);
-                        ChatUserNames[Context.ConnectionId] = null;
-                    }
-                    else
-                    {
-                        cx.Connected = false;
-                    }
+                    _dbContext.ChatConnection.Remove(cx);
                     _dbContext.SaveChanges();
                 }
-            }
-            Clients.Group("authenticated").notifyUser(NotificationTypes.DisConnected, userName, "disconnected");
+                else 
+                    _logger.LogError($"Could not remove user cx {Context.ConnectionId}");
+            } 
+            Abort();
             return base.OnDisconnected(stopCalled);
         }
 
@@ -382,14 +378,12 @@ namespace Yavsc
             cli.addStreamInfo(sender, streamId, message);
         }
 
-        public void Abort()
+        void Abort()
         {
-            var cx = _dbContext.ChatConnection.SingleOrDefault(c => c.ConnectionId == Context.ConnectionId);
-            if (cx != null)
-            {
-                _dbContext.ChatConnection.Remove(cx);
-                _dbContext.SaveChanges();
-            }
+           string cxId;
+            if (!ChatUserNames.TryRemove(Context.ConnectionId, out cxId ))
+                _logger.LogError($"Could not remove user cx {Context.ConnectionId}");
+            
         }
     }
 }
diff --git a/src/Yavsc/wwwroot/js/chat.js b/src/Yavsc/wwwroot/js/chat.js
index c4aabf05..b6135b75 100644
--- a/src/Yavsc/wwwroot/js/chat.js
+++ b/src/Yavsc/wwwroot/js/chat.js
@@ -263,8 +263,8 @@ window.ChatHubHandler = (function ($) {
       return encodedValue;
     }
 
-
-    $(window).unload(function () { chat.server.abort(); });
+    // FIXME cx clean shutdown
+    // $(window).unload(function () {  });
 
   };
 
diff --git a/src/sampleWebAsWebApiClient/Controllers/HomeController.cs b/src/sampleWebAsWebApiClient/Controllers/HomeController.cs
index 7e4893ff..761b4395 100755
--- a/src/sampleWebAsWebApiClient/Controllers/HomeController.cs
+++ b/src/sampleWebAsWebApiClient/Controllers/HomeController.cs
@@ -10,8 +10,6 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Mvc;
 using Microsoft.Extensions.Logging;
-using Yavsc.Server.Helpers;
-using Yavsc.Server.Model;
 
 namespace testOauthClient.Controllers
 {
@@ -36,6 +34,7 @@ namespace testOauthClient.Controllers
         {
             return View();
         }
+        
         [HttpPost]
         public async Task<IActionResult> GetUserInfo(CancellationToken cancellationToken)
         {