nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-06-30 07:36:14 -05:00
Code Activity

SendGrid Mail Delivery Provider (#1892)

Browse Source 
* add sendgrid mail delivery service

* <

* remove duplicate code

* fix test by using ISendGridClient interface
This commit is contained in:
Kyle Spearrin
2022-03-01 19:09:51 -05:00
committed by GitHub
parent 5dd6a05615
commit 4cbe05da3c
32 changed files with 741 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/Admin/packages.lock.json
View File

@ -1692,6 +1692,15 @@
"resolved": "4.4.0",
"contentHash": "YhEdSQUsTx+C8m8Bw7ar5/VesXvCFMItyZF7G1AUY+OM0VPZUOeAVpJ4Wl6fydBGUYZxojTDR3I6Bj/+BPkJNA=="
},
"SendGrid": {
"type": "Transitive",
"resolved": "9.25.3",
"contentHash": "Dldhsc4+jV28rfa53W+09A549lDfKqGEFFtdOU4uOxHvS/pFhBN8lRkAEzvbMbycwZJJCzfrDdKc/qT1MxWynQ==",
"dependencies": {
"Newtonsoft.Json": "9.0.1",
"starkbank-ecdsa": "[1.3.3, 2.0.0)"
}
},
"Sentry": {
"type": "Transitive",
"resolved": "2.1.5",
@ -1907,6 +1916,11 @@
"System.Threading.Timer": "4.3.0"
}
},
"starkbank-ecdsa": {
"type": "Transitive",
"resolved": "1.3.3",
"contentHash": "OblOaKb1enXn+dSp7tsx9yjwV+/BEKM9jFhshIkZTwCk7LuTFTp+wSon6rFzuPiIiTGtvVWQNUw2slHjGktJog=="
},
"Stripe.net": {
"type": "Transitive",
"resolved": "37.26.0",
@ -3408,7 +3422,7 @@
"commcore": {
"type": "Project",
"dependencies": {
"Core": "1.46.0"
"Core": "1.46.2"
}
},
"core": {
@ -3438,6 +3452,7 @@
"Newtonsoft.Json": "12.0.3",
"Otp.NET": "1.2.2",
"Quartz": "3.1.0",
"SendGrid": "9.25.3",
"Sentry.Serilog": "2.1.5",
"Serilog.AspNetCore": "3.4.0",
"Serilog.Extensions.Logging": "3.0.1",
@ -3452,7 +3467,7 @@
"infrastructure.dapper": {
"type": "Project",
"dependencies": {
"Core": "1.46.0",
"Core": "1.46.2",
"Dapper": "2.0.123",
"System.Data.SqlClient": "4.8.3"
}
@ -3461,7 +3476,7 @@
"type": "Project",
"dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "8.0.1",
"Core": "1.46.0",
"Core": "1.46.2",
"Microsoft.EntityFrameworkCore.Relational": "5.0.12",
"Npgsql.EntityFrameworkCore.PostgreSQL": "5.0.2",
"Pomelo.EntityFrameworkCore.MySql": "5.0.3",
@ -3471,7 +3486,7 @@
"migrator": {
"type": "Project",
"dependencies": {
"Core": "1.46.0",
"Core": "1.46.2",
"Microsoft.Extensions.Logging": "5.0.0",
"dbup-sqlserver": "4.4.0"
}
@ -3479,9 +3494,9 @@
"sharedweb": {
"type": "Project",
"dependencies": {
"Core": "1.46.0",
"Infrastructure.Dapper": "1.46.0",
"Infrastructure.EntityFramework": "1.46.0"
"Core": "1.46.2",
"Infrastructure.Dapper": "1.46.2",
"Infrastructure.EntityFramework": "1.46.2"
}
}
}

27
src/Api/packages.lock.json
View File

@ -1629,6 +1629,15 @@
"resolved": "4.4.0",
"contentHash": "YhEdSQUsTx+C8m8Bw7ar5/VesXvCFMItyZF7G1AUY+OM0VPZUOeAVpJ4Wl6fydBGUYZxojTDR3I6Bj/+BPkJNA=="
},
"SendGrid": {
"type": "Transitive",
"resolved": "9.25.3",
"contentHash": "Dldhsc4+jV28rfa53W+09A549lDfKqGEFFtdOU4uOxHvS/pFhBN8lRkAEzvbMbycwZJJCzfrDdKc/qT1MxWynQ==",
"dependencies": {
"Newtonsoft.Json": "9.0.1",
"starkbank-ecdsa": "[1.3.3, 2.0.0)"
}
},
"Sentry": {
"type": "Transitive",
"resolved": "2.1.5",
@ -1844,6 +1853,11 @@
"System.Threading.Timer": "4.3.0"
}
},
"starkbank-ecdsa": {
"type": "Transitive",
"resolved": "1.3.3",
"contentHash": "OblOaKb1enXn+dSp7tsx9yjwV+/BEKM9jFhshIkZTwCk7LuTFTp+wSon6rFzuPiIiTGtvVWQNUw2slHjGktJog=="
},
"Stripe.net": {
"type": "Transitive",
"resolved": "37.26.0",
@ -3347,7 +3361,7 @@
"commcore": {
"type": "Project",
"dependencies": {
"Core": "1.46.0"
"Core": "1.46.2"
}
},
"core": {
@ -3377,6 +3391,7 @@
"Newtonsoft.Json": "12.0.3",
"Otp.NET": "1.2.2",
"Quartz": "3.1.0",
"SendGrid": "9.25.3",
"Sentry.Serilog": "2.1.5",
"Serilog.AspNetCore": "3.4.0",
"Serilog.Extensions.Logging": "3.0.1",
@ -3391,7 +3406,7 @@
"infrastructure.dapper": {
"type": "Project",
"dependencies": {
"Core": "1.46.0",
"Core": "1.46.2",
"Dapper": "2.0.123",
"System.Data.SqlClient": "4.8.3"
}
@ -3400,7 +3415,7 @@
"type": "Project",
"dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "8.0.1",
"Core": "1.46.0",
"Core": "1.46.2",
"Microsoft.EntityFrameworkCore.Relational": "5.0.12",
"Npgsql.EntityFrameworkCore.PostgreSQL": "5.0.2",
"Pomelo.EntityFrameworkCore.MySql": "5.0.3",
@ -3410,9 +3425,9 @@
"sharedweb": {
"type": "Project",
"dependencies": {
"Core": "1.46.0",
"Infrastructure.Dapper": "1.46.0",
"Infrastructure.EntityFramework": "1.46.0"
"Core": "1.46.2",
"Infrastructure.Dapper": "1.46.2",
"Infrastructure.EntityFramework": "1.46.2"
}
}
}

25
src/Billing/packages.lock.json
View File

@ -1661,6 +1661,15 @@
"resolved": "4.4.0",
"contentHash": "YhEdSQUsTx+C8m8Bw7ar5/VesXvCFMItyZF7G1AUY+OM0VPZUOeAVpJ4Wl6fydBGUYZxojTDR3I6Bj/+BPkJNA=="
},
"SendGrid": {
"type": "Transitive",
"resolved": "9.25.3",
"contentHash": "Dldhsc4+jV28rfa53W+09A549lDfKqGEFFtdOU4uOxHvS/pFhBN8lRkAEzvbMbycwZJJCzfrDdKc/qT1MxWynQ==",
"dependencies": {
"Newtonsoft.Json": "9.0.1",
"starkbank-ecdsa": "[1.3.3, 2.0.0)"
}
},
"Sentry": {
"type": "Transitive",
"resolved": "2.1.5",
@ -1876,6 +1885,11 @@
"System.Threading.Timer": "4.3.0"
}
},
"starkbank-ecdsa": {
"type": "Transitive",
"resolved": "1.3.3",
"contentHash": "OblOaKb1enXn+dSp7tsx9yjwV+/BEKM9jFhshIkZTwCk7LuTFTp+wSon6rFzuPiIiTGtvVWQNUw2slHjGktJog=="
},
"Stripe.net": {
"type": "Transitive",
"resolved": "37.26.0",
@ -3401,6 +3415,7 @@
"Newtonsoft.Json": "12.0.3",
"Otp.NET": "1.2.2",
"Quartz": "3.1.0",
"SendGrid": "9.25.3",
"Sentry.Serilog": "2.1.5",
"Serilog.AspNetCore": "3.4.0",
"Serilog.Extensions.Logging": "3.0.1",
@ -3415,7 +3430,7 @@
"infrastructure.dapper": {
"type": "Project",
"dependencies": {
"Core": "1.46.0",
"Core": "1.46.2",
"Dapper": "2.0.123",
"System.Data.SqlClient": "4.8.3"
}
@ -3424,7 +3439,7 @@
"type": "Project",
"dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "8.0.1",
"Core": "1.46.0",
"Core": "1.46.2",
"Microsoft.EntityFrameworkCore.Relational": "5.0.12",
"Npgsql.EntityFrameworkCore.PostgreSQL": "5.0.2",
"Pomelo.EntityFrameworkCore.MySql": "5.0.3",
@ -3434,9 +3449,9 @@
"sharedweb": {
"type": "Project",
"dependencies": {
"Core": "1.46.0",
"Infrastructure.Dapper": "1.46.0",
"Infrastructure.EntityFramework": "1.46.0"
"Core": "1.46.2",
"Infrastructure.Dapper": "1.46.2",
"Infrastructure.EntityFramework": "1.46.2"
}
}
}

1
src/Core/Core.csproj
View File

@ -37,6 +37,7 @@
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="5.0.9" />
<PackageReference Include="Quartz" Version="3.1.0" />
<PackageReference Include="SendGrid" Version="9.25.3" />
<PackageReference Include="Serilog.AspNetCore" Version="3.4.0" />
<PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
<PackageReference Include="Serilog.Extensions.Logging.File" Version="2.0.0" />

19
src/Core/Services/Implementations/MultiServiceMailDeliveryService.cs
View File

@ -1,5 +1,4 @@
using System;
using System.Net.Http;
using System.Threading.Tasks;
using Bit.Core.Models.Mail;
using Bit.Core.Settings;
@ -11,32 +10,30 @@ namespace Bit.Core.Services
public class MultiServiceMailDeliveryService : IMailDeliveryService
{
private readonly IMailDeliveryService _sesService;
private readonly IMailDeliveryService _postalService;
private readonly int _postalPercentage;
private readonly IMailDeliveryService _sendGridService;
private readonly int _sendGridPercentage;
private static Random _random = new Random();
public MultiServiceMailDeliveryService(
GlobalSettings globalSettings,
IWebHostEnvironment hostingEnvironment,
IHttpClientFactory httpClientFactory,
ILogger<AmazonSesMailDeliveryService> sesLogger,
ILogger<PostalMailDeliveryService> postalLogger)
ILogger<SendGridMailDeliveryService> sendGridLogger)
{
_sesService = new AmazonSesMailDeliveryService(globalSettings, hostingEnvironment, sesLogger);
_postalService = new PostalMailDeliveryService(globalSettings, postalLogger, hostingEnvironment,
httpClientFactory);
_sendGridService = new SendGridMailDeliveryService(globalSettings, hostingEnvironment, sendGridLogger);
// 2% by default
_postalPercentage = (globalSettings.Mail?.PostalPercentage).GetValueOrDefault(2);
// disabled by default (-1)
_sendGridPercentage = (globalSettings.Mail?.SendGridPercentage).GetValueOrDefault(-1);
}
public async Task SendEmailAsync(MailMessage message)
{
var roll = _random.Next(0, 99);
if (roll < _postalPercentage)
if (roll < _sendGridPercentage)
{
await _postalService.SendEmailAsync(message);
await _sendGridService.SendEmailAsync(message);
}
else
{

116
src/Core/Services/Implementations/PostalMailDeliveryService.cs
View File

@ -1,116 +0,0 @@
using System;
using System.Collections.Generic;
using System.Net.Http;
using System.Net.Http.Json;
using System.Threading.Tasks;
using Bit.Core.Settings;
using Bit.Core.Utilities;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Logging;
namespace Bit.Core.Services
{
public class PostalMailDeliveryService : IMailDeliveryService
{
private readonly GlobalSettings _globalSettings;
private readonly ILogger<PostalMailDeliveryService> _logger;
private readonly IHttpClientFactory _clientFactory;
private readonly string _baseTag;
private readonly string _from;
private readonly string _reply;
public PostalMailDeliveryService(
GlobalSettings globalSettings,
ILogger<PostalMailDeliveryService> logger,
IWebHostEnvironment hostingEnvironment,
IHttpClientFactory clientFactory)
{
var postalDomain = CoreHelpers.PunyEncode(globalSettings.Mail.PostalDomain);
var replyToEmail = CoreHelpers.PunyEncode(globalSettings.Mail.ReplyToEmail);
_globalSettings = globalSettings;
_logger = logger;
_clientFactory = clientFactory;
_baseTag = $"Env_{hostingEnvironment.EnvironmentName}-" +
$"Server_{globalSettings.ProjectName?.Replace(' ', '_')}";
_from = $"\"{globalSettings.SiteName}\" <no-reply@{postalDomain}>";
_reply = $"\"{globalSettings.SiteName}\" <{replyToEmail}>";
}
public async Task SendEmailAsync(Models.Mail.MailMessage message)
{
var httpClient = _clientFactory.CreateClient("PostalMailDeliveryService");
httpClient.DefaultRequestHeaders.Add("X-Server-API-Key", _globalSettings.Mail.PostalApiKey);
var request = new PostalRequest
{
subject = message.Subject,
from = _from,
reply_to = _reply,
html_body = message.HtmlContent,
to = new List<string>(),
tag = _baseTag
};
foreach (var address in message.ToEmails)
{
request.to.Add(CoreHelpers.PunyEncode(address));
}
if (message.BccEmails != null)
{
request.bcc = new List<string>();
foreach (var address in message.BccEmails)
{
request.bcc.Add(CoreHelpers.PunyEncode(address));
}
}
if (!string.IsNullOrWhiteSpace(message.TextContent))
{
request.plain_body = message.TextContent;
}
if (!string.IsNullOrWhiteSpace(message.Category))
{
request.tag = string.Concat(request.tag, "-Cat_", message.Category);
}
var responseMessage = await httpClient.PostAsJsonAsync(
$"https://{_globalSettings.Mail.PostalDomain}/api/v1/send/message",
request);
if (responseMessage.IsSuccessStatusCode)
{
var response = await responseMessage.Content.ReadFromJsonAsync<PostalResponse>();
if (response.status != "success")
{
_logger.LogError("Postal send status was not successful: {0}, {1}",
response.status, response.message);
}
}
else
{
_logger.LogError("Postal send failed: {0}", responseMessage.StatusCode);
}
}
public class PostalRequest
{
public List<string> to { get; set; }
public List<string> cc { get; set; }
public List<string> bcc { get; set; }
public string tag { get; set; }
public string from { get; set; }
public string reply_to { get; set; }
public string plain_body { get; set; }
public string html_body { get; set; }
public string subject { get; set; }
}
public class PostalResponse
{
public string status { get; set; }
public string message { get; set; }
}
}
}

118
src/Core/Services/Implementations/SendGridMailDeliveryService.cs Normal file
View File

@ -0,0 +1,118 @@
using System;
using System.Linq;
using System.Threading.Tasks;
using Bit.Core.Models.Mail;
using Bit.Core.Settings;
using Bit.Core.Utilities;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Logging;
using SendGrid;
using SendGrid.Helpers.Mail;
namespace Bit.Core.Services
{
public class SendGridMailDeliveryService : IMailDeliveryService, IDisposable
{
private readonly GlobalSettings _globalSettings;
private readonly IWebHostEnvironment _hostingEnvironment;
private readonly ILogger<SendGridMailDeliveryService> _logger;
private readonly ISendGridClient _client;
private readonly string _senderTag;
private readonly string _replyToEmail;
public SendGridMailDeliveryService(
GlobalSettings globalSettings,
IWebHostEnvironment hostingEnvironment,
ILogger<SendGridMailDeliveryService> logger)
: this(new SendGridClient(globalSettings.Mail.SendGridApiKey),
globalSettings, hostingEnvironment, logger)
{
}
public void Dispose()
{
// TODO: nothing to dispose
}
public SendGridMailDeliveryService(
ISendGridClient client,
GlobalSettings globalSettings,
IWebHostEnvironment hostingEnvironment,
ILogger<SendGridMailDeliveryService> logger)
{
if (string.IsNullOrWhiteSpace(globalSettings.Mail?.SendGridApiKey))
{
throw new ArgumentNullException(nameof(globalSettings.Mail.SendGridApiKey));
}
_globalSettings = globalSettings;
_hostingEnvironment = hostingEnvironment;
_logger = logger;
_client = client;
_senderTag = $"Server_{globalSettings.ProjectName?.Replace(' ', '_')}";
_replyToEmail = CoreHelpers.PunyEncode(globalSettings.Mail.ReplyToEmail);
}
public async Task SendEmailAsync(MailMessage message)
{
var msg = new SendGridMessage();
msg.SetFrom(new EmailAddress(_replyToEmail, _globalSettings.SiteName));
msg.AddTos(message.ToEmails.Select(e => new EmailAddress(CoreHelpers.PunyEncode(e))).ToList());
if (message.BccEmails?.Any() ?? false)
{
msg.AddBccs(message.BccEmails.Select(e => new EmailAddress(CoreHelpers.PunyEncode(e))).ToList());
}
msg.SetSubject(message.Subject);
msg.AddContent(MimeType.Text, message.TextContent);
msg.AddContent(MimeType.Html, message.HtmlContent);
msg.AddCategory($"type:{message.Category}");
msg.AddCategory($"env:{_hostingEnvironment.EnvironmentName}");
msg.AddCategory($"sender:{_senderTag}");
msg.SetClickTracking(false, false);
msg.SetOpenTracking(false);
if (message.MetaData != null &&
message.MetaData.ContainsKey("SendGridBypassListManagement") &&
Convert.ToBoolean(message.MetaData["SendGridBypassListManagement"]))
{
msg.SetBypassListManagement(true);
}
try
{
var success = await SendAsync(msg, false);
if (!success)
{
_logger.LogWarning("Failed to send email. Retrying...");
await SendAsync(msg, true);
}
}
catch (Exception e)
{
_logger.LogWarning(e, "Failed to send email (with exception). Retrying...");
await SendAsync(msg, true);
throw;
}
}
private async Task<bool> SendAsync(SendGridMessage message, bool retry)
{
if (retry)
{
// wait and try again
await Task.Delay(2000);
}
var response = await _client.SendEmailAsync(message);
if (!response.IsSuccessStatusCode)
{
var responseBody = await response.Body.ReadAsStringAsync();
_logger.LogError("SendGrid email sending failed with {0}: {1}", response.StatusCode, responseBody);
}
return response.IsSuccessStatusCode;
}
}
}

5
src/Core/Settings/GlobalSettings.cs
View File

@ -280,9 +280,8 @@ namespace Bit.Core.Settings
public string ReplyToEmail { get; set; }
public string AmazonConfigSetName { get; set; }
public SmtpSettings Smtp { get; set; } = new SmtpSettings();
public string PostalDomain { get; set; }
public string PostalApiKey { get; set; }
public int? PostalPercentage { get; set; }
public string SendGridApiKey { get; set; }
public int? SendGridPercentage { get; set; }
public class SmtpSettings
{

15
src/Core/packages.lock.json
View File

@ -247,6 +247,16 @@
"System.Diagnostics.DiagnosticSource": "4.7.1"
}
},
"SendGrid": {
"type": "Direct",
"requested": "[9.25.3, )",
"resolved": "9.25.3",
"contentHash": "Dldhsc4+jV28rfa53W+09A549lDfKqGEFFtdOU4uOxHvS/pFhBN8lRkAEzvbMbycwZJJCzfrDdKc/qT1MxWynQ==",
"dependencies": {
"Newtonsoft.Json": "9.0.1",
"starkbank-ecdsa": "[1.3.3, 2.0.0)"
}
},
"Sentry.Serilog": {
"type": "Direct",
"requested": "[2.1.5, )",
@ -1718,6 +1728,11 @@
"System.Threading.Timer": "4.3.0"
}
},
"starkbank-ecdsa": {
"type": "Transitive",
"resolved": "1.3.3",
"contentHash": "OblOaKb1enXn+dSp7tsx9yjwV+/BEKM9jFhshIkZTwCk7LuTFTp+wSon6rFzuPiIiTGtvVWQNUw2slHjGktJog=="
},
"System.AppContext": {
"type": "Transitive",
"resolved": "4.3.0",

25
src/Events/packages.lock.json
View File

@ -1589,6 +1589,15 @@
"resolved": "4.4.0",
"contentHash": "YhEdSQUsTx+C8m8Bw7ar5/VesXvCFMItyZF7G1AUY+OM0VPZUOeAVpJ4Wl6fydBGUYZxojTDR3I6Bj/+BPkJNA=="
},
"SendGrid": {
"type": "Transitive",
"resolved": "9.25.3",
"contentHash": "Dldhsc4+jV28rfa53W+09A549lDfKqGEFFtdOU4uOxHvS/pFhBN8lRkAEzvbMbycwZJJCzfrDdKc/qT1MxWynQ==",
"dependencies": {
"Newtonsoft.Json": "9.0.1",
"starkbank-ecdsa": "[1.3.3, 2.0.0)"
}
},
"Sentry": {
"type": "Transitive",
"resolved": "2.1.5",
@ -1804,6 +1813,11 @@
"System.Threading.Timer": "4.3.0"
}
},
"starkbank-ecdsa": {
"type": "Transitive",
"resolved": "1.3.3",
"contentHash": "OblOaKb1enXn+dSp7tsx9yjwV+/BEKM9jFhshIkZTwCk7LuTFTp+wSon6rFzuPiIiTGtvVWQNUw2slHjGktJog=="
},
"Stripe.net": {
"type": "Transitive",
"resolved": "37.26.0",
@ -3310,6 +3324,7 @@
"Newtonsoft.Json": "12.0.3",
"Otp.NET": "1.2.2",
"Quartz": "3.1.0",
"SendGrid": "9.25.3",
"Sentry.Serilog": "2.1.5",
"Serilog.AspNetCore": "3.4.0",
"Serilog.Extensions.Logging": "3.0.1",
@ -3324,7 +3339,7 @@
"infrastructure.dapper": {
"type": "Project",
"dependencies": {
"Core": "1.46.0",
"Core": "1.46.2",
"Dapper": "2.0.123",
"System.Data.SqlClient": "4.8.3"
}
@ -3333,7 +3348,7 @@
"type": "Project",
"dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "8.0.1",
"Core": "1.46.0",
"Core": "1.46.2",
"Microsoft.EntityFrameworkCore.Relational": "5.0.12",
"Npgsql.EntityFrameworkCore.PostgreSQL": "5.0.2",
"Pomelo.EntityFrameworkCore.MySql": "5.0.3",
@ -3343,9 +3358,9 @@
"sharedweb": {
"type": "Project",
"dependencies": {
"Core": "1.46.0",
"Infrastructure.Dapper": "1.46.0",
"Infrastructure.EntityFramework": "1.46.0"
"Core": "1.46.2",
"Infrastructure.Dapper": "1.46.2",
"Infrastructure.EntityFramework": "1.46.2"
}
}
}

25
src/EventsProcessor/packages.lock.json
View File

@ -1583,6 +1583,15 @@
"resolved": "4.4.0",
"contentHash": "YhEdSQUsTx+C8m8Bw7ar5/VesXvCFMItyZF7G1AUY+OM0VPZUOeAVpJ4Wl6fydBGUYZxojTDR3I6Bj/+BPkJNA=="
},
"SendGrid": {
"type": "Transitive",
"resolved": "9.25.3",
"contentHash": "Dldhsc4+jV28rfa53W+09A549lDfKqGEFFtdOU4uOxHvS/pFhBN8lRkAEzvbMbycwZJJCzfrDdKc/qT1MxWynQ==",
"dependencies": {
"Newtonsoft.Json": "9.0.1",
"starkbank-ecdsa": "[1.3.3, 2.0.0)"
}
},
"Sentry": {
"type": "Transitive",
"resolved": "2.1.5",
@ -1798,6 +1807,11 @@
"System.Threading.Timer": "4.3.0"
}
},
"starkbank-ecdsa": {
"type": "Transitive",
"resolved": "1.3.3",
"contentHash": "OblOaKb1enXn+dSp7tsx9yjwV+/BEKM9jFhshIkZTwCk7LuTFTp+wSon6rFzuPiIiTGtvVWQNUw2slHjGktJog=="
},
"Stripe.net": {
"type": "Transitive",
"resolved": "37.26.0",
@ -3304,6 +3318,7 @@
"Newtonsoft.Json": "12.0.3",
"Otp.NET": "1.2.2",
"Quartz": "3.1.0",
"SendGrid": "9.25.3",
"Sentry.Serilog": "2.1.5",
"Serilog.AspNetCore": "3.4.0",
"Serilog.Extensions.Logging": "3.0.1",
@ -3318,7 +3333,7 @@
"infrastructure.dapper": {
"type": "Project",
"dependencies": {
"Core": "1.46.0",
"Core": "1.46.2",
"Dapper": "2.0.123",
"System.Data.SqlClient": "4.8.3"
}
@ -3327,7 +3342,7 @@
"type": "Project",
"dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "8.0.1",
"Core": "1.46.0",
"Core": "1.46.2",
"Microsoft.EntityFrameworkCore.Relational": "5.0.12",
"Npgsql.EntityFrameworkCore.PostgreSQL": "5.0.2",
"Pomelo.EntityFrameworkCore.MySql": "5.0.3",
@ -3337,9 +3352,9 @@
"sharedweb": {
"type": "Project",
"dependencies": {
"Core": "1.46.0",
"Infrastructure.Dapper": "1.46.0",
"Infrastructure.EntityFramework": "1.46.0"
"Core": "1.46.2",
"Infrastructure.Dapper": "1.46.2",
"Infrastructure.EntityFramework": "1.46.2"
}
}
}

25
src/Icons/packages.lock.json
View File

@ -1592,6 +1592,15 @@
"resolved": "4.4.0",
"contentHash": "YhEdSQUsTx+C8m8Bw7ar5/VesXvCFMItyZF7G1AUY+OM0VPZUOeAVpJ4Wl6fydBGUYZxojTDR3I6Bj/+BPkJNA=="
},
"SendGrid": {
"type": "Transitive",
"resolved": "9.25.3",
"contentHash": "Dldhsc4+jV28rfa53W+09A549lDfKqGEFFtdOU4uOxHvS/pFhBN8lRkAEzvbMbycwZJJCzfrDdKc/qT1MxWynQ==",
"dependencies": {
"Newtonsoft.Json": "9.0.1",
"starkbank-ecdsa": "[1.3.3, 2.0.0)"
}
},
"Sentry": {
"type": "Transitive",
"resolved": "2.1.5",
@ -1807,6 +1816,11 @@
"System.Threading.Timer": "4.3.0"
}
},
"starkbank-ecdsa": {
"type": "Transitive",
"resolved": "1.3.3",
"contentHash": "OblOaKb1enXn+dSp7tsx9yjwV+/BEKM9jFhshIkZTwCk7LuTFTp+wSon6rFzuPiIiTGtvVWQNUw2slHjGktJog=="
},
"Stripe.net": {
"type": "Transitive",
"resolved": "37.26.0",
@ -3313,6 +3327,7 @@
"Newtonsoft.Json": "12.0.3",
"Otp.NET": "1.2.2",
"Quartz": "3.1.0",
"SendGrid": "9.25.3",
"Sentry.Serilog": "2.1.5",
"Serilog.AspNetCore": "3.4.0",
"Serilog.Extensions.Logging": "3.0.1",
@ -3327,7 +3342,7 @@
"infrastructure.dapper": {
"type": "Project",
"dependencies": {
"Core": "1.46.0",
"Core": "1.46.2",
"Dapper": "2.0.123",
"System.Data.SqlClient": "4.8.3"
}
@ -3336,7 +3351,7 @@
"type": "Project",
"dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "8.0.1",
"Core": "1.46.0",
"Core": "1.46.2",
"Microsoft.EntityFrameworkCore.Relational": "5.0.12",
"Npgsql.EntityFrameworkCore.PostgreSQL": "5.0.2",
"Pomelo.EntityFrameworkCore.MySql": "5.0.3",
@ -3346,9 +3361,9 @@
"sharedweb": {
"type": "Project",
"dependencies": {
"Core": "1.46.0",
"Infrastructure.Dapper": "1.46.0",
"Infrastructure.EntityFramework": "1.46.0"
"Core": "1.46.2",
"Infrastructure.Dapper": "1.46.2",
"Infrastructure.EntityFramework": "1.46.2"
}
}
}

25
src/Identity/packages.lock.json
View File

@ -1589,6 +1589,15 @@
"resolved": "4.4.0",
"contentHash": "YhEdSQUsTx+C8m8Bw7ar5/VesXvCFMItyZF7G1AUY+OM0VPZUOeAVpJ4Wl6fydBGUYZxojTDR3I6Bj/+BPkJNA=="
},
"SendGrid": {
"type": "Transitive",
"resolved": "9.25.3",
"contentHash": "Dldhsc4+jV28rfa53W+09A549lDfKqGEFFtdOU4uOxHvS/pFhBN8lRkAEzvbMbycwZJJCzfrDdKc/qT1MxWynQ==",
"dependencies": {
"Newtonsoft.Json": "9.0.1",
"starkbank-ecdsa": "[1.3.3, 2.0.0)"
}
},
"Sentry": {
"type": "Transitive",
"resolved": "2.1.5",
@ -1804,6 +1813,11 @@
"System.Threading.Timer": "4.3.0"
}
},
"starkbank-ecdsa": {
"type": "Transitive",
"resolved": "1.3.3",
"contentHash": "OblOaKb1enXn+dSp7tsx9yjwV+/BEKM9jFhshIkZTwCk7LuTFTp+wSon6rFzuPiIiTGtvVWQNUw2slHjGktJog=="
},
"Stripe.net": {
"type": "Transitive",
"resolved": "37.26.0",
@ -3310,6 +3324,7 @@
"Newtonsoft.Json": "12.0.3",
"Otp.NET": "1.2.2",
"Quartz": "3.1.0",
"SendGrid": "9.25.3",
"Sentry.Serilog": "2.1.5",
"Serilog.AspNetCore": "3.4.0",
"Serilog.Extensions.Logging": "3.0.1",
@ -3324,7 +3339,7 @@
"infrastructure.dapper": {
"type": "Project",
"dependencies": {
"Core": "1.46.0",
"Core": "1.46.2",
"Dapper": "2.0.123",
"System.Data.SqlClient": "4.8.3"
}
@ -3333,7 +3348,7 @@
"type": "Project",
"dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "8.0.1",
"Core": "1.46.0",
"Core": "1.46.2",
"Microsoft.EntityFrameworkCore.Relational": "5.0.12",
"Npgsql.EntityFrameworkCore.PostgreSQL": "5.0.2",
"Pomelo.EntityFrameworkCore.MySql": "5.0.3",
@ -3343,9 +3358,9 @@
"sharedweb": {
"type": "Project",
"dependencies": {
"Core": "1.46.0",
"Infrastructure.Dapper": "1.46.0",
"Infrastructure.EntityFramework": "1.46.0"
"Core": "1.46.2",
"Infrastructure.Dapper": "1.46.2",
"Infrastructure.EntityFramework": "1.46.2"
}
}
}

15
src/Infrastructure.Dapper/packages.lock.json
View File

@ -1489,6 +1489,15 @@
"resolved": "4.4.0",
"contentHash": "YhEdSQUsTx+C8m8Bw7ar5/VesXvCFMItyZF7G1AUY+OM0VPZUOeAVpJ4Wl6fydBGUYZxojTDR3I6Bj/+BPkJNA=="
},
"SendGrid": {
"type": "Transitive",
"resolved": "9.25.3",
"contentHash": "Dldhsc4+jV28rfa53W+09A549lDfKqGEFFtdOU4uOxHvS/pFhBN8lRkAEzvbMbycwZJJCzfrDdKc/qT1MxWynQ==",
"dependencies": {
"Newtonsoft.Json": "9.0.1",
"starkbank-ecdsa": "[1.3.3, 2.0.0)"
}
},
"Sentry": {
"type": "Transitive",
"resolved": "2.1.5",
@ -1704,6 +1713,11 @@
"System.Threading.Timer": "4.3.0"
}
},
"starkbank-ecdsa": {
"type": "Transitive",
"resolved": "1.3.3",
"contentHash": "OblOaKb1enXn+dSp7tsx9yjwV+/BEKM9jFhshIkZTwCk7LuTFTp+wSon6rFzuPiIiTGtvVWQNUw2slHjGktJog=="
},
"Stripe.net": {
"type": "Transitive",
"resolved": "37.26.0",
@ -3230,6 +3244,7 @@
"Newtonsoft.Json": "12.0.3",
"Otp.NET": "1.2.2",
"Quartz": "3.1.0",
"SendGrid": "9.25.3",
"Sentry.Serilog": "2.1.5",
"Serilog.AspNetCore": "3.4.0",
"Serilog.Extensions.Logging": "3.0.1",

15
src/Infrastructure.EntityFramework/packages.lock.json
View File

@ -1558,6 +1558,15 @@
"resolved": "4.3.2",
"contentHash": "leXiwfiIkW7Gmn7cgnNcdtNAU70SjmKW3jxGj1iKHOvdn0zRWsgv/l2OJUO5zdGdiv2VRFnAsxxhDgMzofPdWg=="
},
"SendGrid": {
"type": "Transitive",
"resolved": "9.25.3",
"contentHash": "Dldhsc4+jV28rfa53W+09A549lDfKqGEFFtdOU4uOxHvS/pFhBN8lRkAEzvbMbycwZJJCzfrDdKc/qT1MxWynQ==",
"dependencies": {
"Newtonsoft.Json": "9.0.1",
"starkbank-ecdsa": "[1.3.3, 2.0.0)"
}
},
"Sentry": {
"type": "Transitive",
"resolved": "2.1.5",
@ -1773,6 +1782,11 @@
"System.Threading.Timer": "4.3.0"
}
},
"starkbank-ecdsa": {
"type": "Transitive",
"resolved": "1.3.3",
"contentHash": "OblOaKb1enXn+dSp7tsx9yjwV+/BEKM9jFhshIkZTwCk7LuTFTp+wSon6rFzuPiIiTGtvVWQNUw2slHjGktJog=="
},
"Stripe.net": {
"type": "Transitive",
"resolved": "37.26.0",
@ -3269,6 +3283,7 @@
"Newtonsoft.Json": "12.0.3",
"Otp.NET": "1.2.2",
"Quartz": "3.1.0",
"SendGrid": "9.25.3",
"Sentry.Serilog": "2.1.5",
"Serilog.AspNetCore": "3.4.0",
"Serilog.Extensions.Logging": "3.0.1",

25
src/Notifications/packages.lock.json
View File

@ -1657,6 +1657,15 @@
"resolved": "4.4.0",
"contentHash": "YhEdSQUsTx+C8m8Bw7ar5/VesXvCFMItyZF7G1AUY+OM0VPZUOeAVpJ4Wl6fydBGUYZxojTDR3I6Bj/+BPkJNA=="
},
"SendGrid": {
"type": "Transitive",
"resolved": "9.25.3",
"contentHash": "Dldhsc4+jV28rfa53W+09A549lDfKqGEFFtdOU4uOxHvS/pFhBN8lRkAEzvbMbycwZJJCzfrDdKc/qT1MxWynQ==",
"dependencies": {
"Newtonsoft.Json": "9.0.1",
"starkbank-ecdsa": "[1.3.3, 2.0.0)"
}
},
"Sentry": {
"type": "Transitive",
"resolved": "2.1.5",
@ -1883,6 +1892,11 @@
"System.Threading.Timer": "4.3.0"
}
},
"starkbank-ecdsa": {
"type": "Transitive",
"resolved": "1.3.3",
"contentHash": "OblOaKb1enXn+dSp7tsx9yjwV+/BEKM9jFhshIkZTwCk7LuTFTp+wSon6rFzuPiIiTGtvVWQNUw2slHjGktJog=="
},
"Stripe.net": {
"type": "Transitive",
"resolved": "37.26.0",
@ -3404,6 +3418,7 @@
"Newtonsoft.Json": "12.0.3",
"Otp.NET": "1.2.2",
"Quartz": "3.1.0",
"SendGrid": "9.25.3",
"Sentry.Serilog": "2.1.5",
"Serilog.AspNetCore": "3.4.0",
"Serilog.Extensions.Logging": "3.0.1",
@ -3418,7 +3433,7 @@
"infrastructure.dapper": {
"type": "Project",
"dependencies": {
"Core": "1.46.0",
"Core": "1.46.2",
"Dapper": "2.0.123",
"System.Data.SqlClient": "4.8.3"
}
@ -3427,7 +3442,7 @@
"type": "Project",
"dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "8.0.1",
"Core": "1.46.0",
"Core": "1.46.2",
"Microsoft.EntityFrameworkCore.Relational": "5.0.12",
"Npgsql.EntityFrameworkCore.PostgreSQL": "5.0.2",
"Pomelo.EntityFrameworkCore.MySql": "5.0.3",
@ -3437,9 +3452,9 @@
"sharedweb": {
"type": "Project",
"dependencies": {
"Core": "1.46.0",
"Infrastructure.Dapper": "1.46.0",
"Infrastructure.EntityFramework": "1.46.0"
"Core": "1.46.2",
"Infrastructure.Dapper": "1.46.2",
"Infrastructure.EntityFramework": "1.46.2"
}
}
}

3
src/SharedWeb/Utilities/ServiceCollectionExtensions.cs
View File

@ -156,8 +156,7 @@ namespace Bit.SharedWeb.Utilities
}
var awsConfigured = CoreHelpers.SettingHasValue(globalSettings.Amazon?.AccessKeySecret);
if (!globalSettings.SelfHosted && awsConfigured &&
CoreHelpers.SettingHasValue(globalSettings.Mail?.PostalApiKey))
if (awsConfigured && CoreHelpers.SettingHasValue(globalSettings.Mail?.SendGridApiKey))
{
services.AddSingleton<IMailDeliveryService, MultiServiceMailDeliveryService>();
}

19
src/SharedWeb/packages.lock.json
View File

@ -1583,6 +1583,15 @@
"resolved": "4.4.0",
"contentHash": "YhEdSQUsTx+C8m8Bw7ar5/VesXvCFMItyZF7G1AUY+OM0VPZUOeAVpJ4Wl6fydBGUYZxojTDR3I6Bj/+BPkJNA=="
},
"SendGrid": {
"type": "Transitive",
"resolved": "9.25.3",
"contentHash": "Dldhsc4+jV28rfa53W+09A549lDfKqGEFFtdOU4uOxHvS/pFhBN8lRkAEzvbMbycwZJJCzfrDdKc/qT1MxWynQ==",
"dependencies": {
"Newtonsoft.Json": "9.0.1",
"starkbank-ecdsa": "[1.3.3, 2.0.0)"
}
},
"Sentry": {
"type": "Transitive",
"resolved": "2.1.5",
@ -1798,6 +1807,11 @@
"System.Threading.Timer": "4.3.0"
}
},
"starkbank-ecdsa": {
"type": "Transitive",
"resolved": "1.3.3",
"contentHash": "OblOaKb1enXn+dSp7tsx9yjwV+/BEKM9jFhshIkZTwCk7LuTFTp+wSon6rFzuPiIiTGtvVWQNUw2slHjGktJog=="
},
"Stripe.net": {
"type": "Transitive",
"resolved": "37.26.0",
@ -3304,6 +3318,7 @@
"Newtonsoft.Json": "12.0.3",
"Otp.NET": "1.2.2",
"Quartz": "3.1.0",
"SendGrid": "9.25.3",
"Sentry.Serilog": "2.1.5",
"Serilog.AspNetCore": "3.4.0",
"Serilog.Extensions.Logging": "3.0.1",
@ -3318,7 +3333,7 @@
"infrastructure.dapper": {
"type": "Project",
"dependencies": {
"Core": "1.46.0",
"Core": "1.46.2",
"Dapper": "2.0.123",
"System.Data.SqlClient": "4.8.3"
}
@ -3327,7 +3342,7 @@
"type": "Project",
"dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "8.0.1",
"Core": "1.46.0",
"Core": "1.46.2",
"Microsoft.EntityFrameworkCore.Relational": "5.0.12",
"Npgsql.EntityFrameworkCore.PostgreSQL": "5.0.2",
"Pomelo.EntityFrameworkCore.MySql": "5.0.3",