paul/yavsc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drop useless Abort function

Browse Source
This commit is contained in:
Paul Schneider
2019-06-08 21:51:39 +01:00
parent 8528e3e725
commit 4da630a8f6
3 changed files with 18 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/Yavsc/Hubs/ChatHub.cs
View File

@ -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}");
}
}
}

4
src/Yavsc/wwwroot/js/chat.js
View File

@ -263,8 +263,8 @@ window.ChatHubHandler = (function ($) {
return encodedValue;
}
$(window).unload(function () { chat.server.abort(); });
// FIXME cx clean shutdown
// $(window).unload(function () { });
};

3
src/sampleWebAsWebApiClient/Controllers/HomeController.cs
View File

@ -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)
{