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

fixes access to closed session

Browse Source
This commit is contained in:
Paul Schneider
2019-06-14 13:03:14 +01:00
parent f44cee5d25
commit c70358d5ab
7 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Yavsc/Controllers/Accounting/AccountController.cs
View File

@ -308,6 +308,7 @@ namespace Yavsc.Controllers
public async Task<IActionResult> LogOff(string returnUrl = null)
{
await _signInManager.SignOutAsync();
HttpContext.Session.Clear();
_logger.LogInformation(4, "User logged out.");
if (returnUrl == null) return RedirectToAction(nameof(HomeController.Index), "Home");
return Redirect(returnUrl);

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

@ -326,7 +326,6 @@ namespace Yavsc
_logger.LogError($"NotifyErrorToCallerInRoom: {room}, {reason}");
}
public void Send([Required] string roomName, [Required] string message)
{
var groupname = ChatHubConstants.HubGroupRomsPrefix + roomName;

4
src/Yavsc/Services/ChatHubConnexionManager.cs
View File

@ -39,7 +39,8 @@ namespace Yavsc.Services
static ConcurrentDictionary<string, List<string>> ChatCxIds = new ConcurrentDictionary<string, List<string>>();
/// <summary>
/// by user name
/// by user name,
/// the list of its chat rooms
/// </summary>
/// <returns></returns>
static ConcurrentDictionary<string, List<string>> ChatRoomPresence = new ConcurrentDictionary<string, List<string>>();
@ -208,6 +209,7 @@ namespace Yavsc.Services
if (Channels.TryAdd(roomName, chanInfo))
{
ChatRoomPresence[userName].Add(roomName);
_logger.LogInformation("new room joint");
return (chanInfo);
}

4
src/Yavsc/wwwroot/css/main/site.css
View File

@ -402,6 +402,10 @@ h6 {
div.chatbar {
border-bottom: rgb(24, 24, 167) solid 2px;
}
div.chatctl {
float: right;
}
div.roomlist {
display:inline-block;

1
src/Yavsc/wwwroot/css/main/site.min.css vendored
View File

@ -22,5 +22,6 @@ p{font-size:20px;}
p.small{font-size:16px;}.smalltext{font-size:10px;}
h1,h2,h3,h4,h5,h6{font-family:"Montserrat","Helvetica Neue",Helvetica,Arial,sans-serif;font-weight:700;}
div.chatbar{border-bottom:rgb(24,24,167)solid 2px;}
div.chatctl{float:right;}
div.roomlist{display:inline-block;}
div.chatlist{color:#008;background-color:rgb(231,229,199);}#chatview ul.notifs li.error{color:#a94442;background-color:white;font-style:italic;font-family:Impact,Haettenschweiler,'Arial Narrow Bold',sans-serif;border-bottom-style:ridge;border-bottom-width:1pt;}

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

@ -113,20 +113,22 @@ window.ChatHubHandler = (function ($) {
var setActiveChan = function (chanId) {
if (frontChanId != chanId) {
$('#sel_' + frontChanId).addClass('btn-primary');
$('#v' + frontChanId).addClass('hidden');
if (frontChanId) {
$('#sel_' + frontChanId).addClass('btn-primary');
$('#v' + frontChanId).addClass('hidden');
}
frontChanId = chanId;
$('#sel_' + chanId).removeClass('btn-primary');
$('#v' + chanId).removeClass('hidden');
$('#inp_' + chanId).focus();
}
frontChanId = chanId;
$('#sel_' + chanId).removeClass('btn-primary');
$('#v' + chanId).removeClass('hidden');
$('#inp_' + chanId).focus();
};
function join(roomName)
{
chat.server.join(roomName).done(function (chatInfo) {
setChanInfo(chatInfo);
setActiveChan(chatInfo.Name);
setActiveChan('r'+chatInfo.Name);
});
}

6
src/Yavsc/wwwroot/js/chat.min.js vendored
View File

@ -3,9 +3,9 @@ window.ChatHubHandler=(function($){$.fn.filterByData=function(prop,val){return t
buildPv(name);$('#u'+name).append('<li class="pv"><strong>'+htmlEncode(name)+'</strong>: '+htmlEncode(message)+'</li>');};chat.client.notifyRoom=function(tag,targetid,message){if(tag==='connected'||tag==='reconnected'){onUserConnected(targetid,message);return;}else if(tag==='disconnected'){onUserDisconnected(targetid,message);return;}
$('<li></li>').addClass(tag).append(tag+': '+targetid+' ').append(message).addClass(tag).appendTo($('#room_'+targetid));};chat.client.notifyUser=function(tag,targetid,message){if(tag==='connected'||tag==='reconnected'){onUserConnected(targetid,message);return;}else if(tag==='disconnected'){onUserDisconnected(targetid,message);return;}
$('<li></li>').append(tag+': '+targetid+': ').append(message.Value).addClass(tag).appendTo(notifications);};var setChanInfo=function(chanInfo){var chanId='r'+chanInfo.Name;$('#tv_'+chanId).replaceWith(chanInfo.Topic);}
var setActiveChan=function(chanId){if(frontChanId!=chanId){$('#sel_'+frontChanId).addClass('btn-primary');$('#v'+frontChanId).addClass('hidden');}
frontChanId=chanId;$('#sel_'+chanId).removeClass('btn-primary');$('#v'+chanId).removeClass('hidden');$('#inp_'+chanId).focus();};function join(roomName)
{chat.server.join(roomName).done(function(chatInfo){setChanInfo(chatInfo);setActiveChan(chatInfo.Name);});}
var setActiveChan=function(chanId){if(frontChanId!=chanId){if(frontChanId){$('#sel_'+frontChanId).addClass('btn-primary');$('#v'+frontChanId).addClass('hidden');}
frontChanId=chanId;$('#sel_'+chanId).removeClass('btn-primary');$('#v'+chanId).removeClass('hidden');$('#inp_'+chanId).focus();}};function join(roomName)
{chat.server.join(roomName).done(function(chatInfo){setChanInfo(chatInfo);setActiveChan('r'+chatInfo.Name);});}
var chatbar=$('<div class="chatbar"></div>');var roomjoin=$('<div class="chatctl" class="form-control"></div>');var roomlist=$('<div class="roomlist"></div>');roomlist.appendTo(chatbar);$('<label for="channame">Join&nbsp;:</label>').appendTo(roomjoin);var chanName=$('<input id="channame" title="channel name" hint="yavsc" >');chanName.appendTo(roomjoin);roomjoin.appendTo(chatbar);chatbar.appendTo($view);var chatlist=$('<div class="chatlist" ></div>');chatlist.appendTo($view);var buildChan=function(chdp,chanType,chanName,sendCmd){var chanId=chanType+chanName;var roomTag=$('<a>'+chdp+chanName+'</a>').addClass('btn');roomTag.prop('id','sel_'+chanId).click(function(){setActiveChan(chanId);$(this).removeClass('btn-primary');});roomTag.appendTo(roomlist);var roomview=$('<div></div>').addClass('container');roomview.appendTo(chatlist);roomview.prop('id','v'+chanId);$('<div></div>').prop('id','tv_'+chanId).appendTo(roomview);var msglist=$('<ul></ul>').addClass('mesglist');msglist.prop('id',chanId);msglist.appendTo(roomview);$('<input type="text">').prop('id','inp_'+chanId).prop('enable',false).prop('hint','hello').prop('title','send to '+chanName).addClass('form-control').keydown(function(ev){if(ev.which==13){if(this.value.length==0)return;sendCmd(chanName,this.value);this.value='';}}).appendTo(roomview);if(chanType=='r')chans.push(chanName);else if(chanType=='u'||chanType=='a')userlist.push(chanName);setActiveChan(chanId);};var buildRoom=function(roomName){if(chans.some(function(cname){return cname==roomName;}))setActiveChan('r'+roomName);else buildChan('#','r',roomName,chat.server.send);};var buildPv=function(userName){if(userlist.some(function(uname){return uname==userName;}))setActiveChan('u'+userName);else
if(userName[0]=='?')buildChan('@?','a',userName.slice(1),chat.server.sendPV);else buildChan('@','u',userName,chat.server.sendPV);};$view.data('chans').split(',').forEach(function(chan){buildRoom(chan);});function onCx(){$view.removeClass('disabled');setTimeout(function(){chans.forEach(function(chan){join(chan);});},120);}
function onDisCx(){$view.addClass('disabled');}