nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-05-24 04:51:03 -05:00
Code

freshdesk webhook improvements

Browse Source
This commit is contained in:
Kyle Spearrin 2020-02-06 16:32:48 -05:00
parent b679c2b2db
commit 726ce2510f
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Billing/Controllers/FreshdeskController.cs
View File

@ -24,6 +24,7 @@ namespace Bit.Billing.Controllers
private readonly IOrganizationUserRepository _organizationUserRepository; private readonly IOrganizationUserRepository _organizationUserRepository;
private readonly ILogger<AppleController> _logger; private readonly ILogger<AppleController> _logger;
private readonly HttpClient _httpClient = new HttpClient(); private readonly HttpClient _httpClient = new HttpClient();
private readonly string _freshdeskAuthkey;
public FreshdeskController( public FreshdeskController(
IUserRepository userRepository, IUserRepository userRepository,
@ -37,6 +38,8 @@ namespace Bit.Billing.Controllers
_organizationRepository = organizationRepository; _organizationRepository = organizationRepository;
_organizationUserRepository = organizationUserRepository; _organizationUserRepository = organizationUserRepository;
_logger = logger; _logger = logger;
_freshdeskAuthkey = Convert.ToBase64String(
Encoding.UTF8.GetBytes($"{_billingSettings.FreshdeskApiKey}:X"));
} }
[HttpPost("webhook")] [HttpPost("webhook")]
@ -85,12 +88,12 @@ namespace Bit.Billing.Controllers
tags.Add("Premium"); tags.Add("Premium");
} }
var orgs = await _organizationRepository.GetManyByUserIdAsync(user.Id); var orgs = await _organizationRepository.GetManyByUserIdAsync(user.Id);
if(orgs.Any())
{
foreach(var org in orgs) foreach(var org in orgs)
{ {
tags.Add(string.Format("Org: {0}", var planName = GetAttribute<DisplayAttribute>(org.PlanType).Name.Split(" ").FirstOrDefault();
GetAttribute<DisplayAttribute>(org.PlanType).Name.Split(" ").FirstOrDefault())); if(!string.IsNullOrWhiteSpace(planName))
{
tags.Add(string.Format("Org: {0}", planName));
} }
} }
var hasPaidOrg = orgs.Any(o => o.PlanType != Core.Enums.PlanType.Free && var hasPaidOrg = orgs.Any(o => o.PlanType != Core.Enums.PlanType.Free &&
@ -124,8 +127,7 @@ namespace Bit.Billing.Controllers
{ {
try try
{ {
var authKey = Convert.ToBase64String(Encoding.UTF8.GetBytes($"{_billingSettings.FreshdeskApiKey}:X")); request.Headers.Add("Authorization", _freshdeskAuthkey);
request.Headers.Add("Authorization", authKey);
var response = await _httpClient.SendAsync(request); var response = await _httpClient.SendAsync(request);
if(response.StatusCode != System.Net.HttpStatusCode.TooManyRequests || retriedCount > 3) if(response.StatusCode != System.Net.HttpStatusCode.TooManyRequests || retriedCount > 3)
{ {