bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2026-01-08 11:33:26 +00:00
Code Issues Releases Wiki Activity

hub configurations

Browse Source
This commit is contained in:
Kyle Spearrin
2018-08-16 13:35:16 -04:00
parent 030f85278c
commit 42d3a2d8e3
6 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Hub/AzureQueueHostedService.cs
View File

@@ -58,7 +58,7 @@ namespace Bit.Hub
{
var storageAccount = CloudStorageAccount.Parse(_globalSettings.Events.ConnectionString);
var queueClient = storageAccount.CreateCloudQueueClient();
_queue = queueClient.GetQueueReference("sync");
_queue = queueClient.GetQueueReference("notifications");
while(!cancellationToken.IsCancellationRequested)
{

6
src/Hub/Controllers/NotificationController.cs → src/Hub/Controllers/NotificationsController.cs
View File

@@ -9,16 +9,16 @@ namespace Bit.Hub
{
[Authorize("Internal")]
[SelfHosted(SelfHostedOnly = true)]
public class NotificationController : Controller
public class NotificationsController : Controller
{
private readonly IHubContext<SyncHub> _syncHubContext;
public NotificationController(IHubContext<SyncHub> syncHubContext)
public NotificationsController(IHubContext<SyncHub> syncHubContext)
{
_syncHubContext = syncHubContext;
}
[HttpPost("~/notification")]
[HttpPost("~/notifications")]
public async Task PostNotification([FromBody]PushNotificationData<object> model)
{
await HubHelpers.SendNotificationToHubAsync(model, _syncHubContext);

16
src/Hub/HubHelpers.cs
View File

@@ -1,8 +1,8 @@
using System;
using System.Threading;
using System.Threading;
using System.Threading.Tasks;
using Bit.Core.Models;
using Microsoft.AspNetCore.SignalR;
using Newtonsoft.Json;
namespace Bit.Hub
{
@@ -17,8 +17,8 @@ namespace Bit.Hub
case Core.Enums.PushType.SyncCipherCreate:
case Core.Enums.PushType.SyncCipherDelete:
case Core.Enums.PushType.SyncLoginDelete:
var cipherPayload = (SyncCipherPushNotification)Convert.ChangeType(
notification.Payload, typeof(SyncCipherPushNotification));
var cipherPayload = JsonConvert.DeserializeObject<SyncCipherPushNotification>(
JsonConvert.SerializeObject(notification.Payload));
if(cipherPayload.UserId.HasValue)
{
await hubContext.Clients.User(cipherPayload.UserId.ToString())
@@ -34,8 +34,8 @@ namespace Bit.Hub
case Core.Enums.PushType.SyncFolderUpdate:
case Core.Enums.PushType.SyncFolderCreate:
case Core.Enums.PushType.SyncFolderDelete:
var folderPayload = (SyncFolderPushNotification)Convert.ChangeType(
notification.Payload, typeof(SyncFolderPushNotification));
var folderPayload = JsonConvert.DeserializeObject<SyncFolderPushNotification>(
JsonConvert.SerializeObject(notification.Payload));
await hubContext.Clients.User(folderPayload.UserId.ToString())
.SendAsync("ReceiveMessage", notification, cancellationToken);
break;
@@ -43,8 +43,8 @@ namespace Bit.Hub
case Core.Enums.PushType.SyncVault:
case Core.Enums.PushType.SyncOrgKeys:
case Core.Enums.PushType.SyncSettings:
var userPayload = (SyncUserPushNotification)Convert.ChangeType(
notification.Payload, typeof(SyncUserPushNotification));
var userPayload = JsonConvert.DeserializeObject<SyncUserPushNotification>(
JsonConvert.SerializeObject(notification.Payload));
await hubContext.Clients.User(userPayload.UserId.ToString())
.SendAsync("ReceiveMessage", notification, cancellationToken);
break;