1
0
mirror of https://github.com/bitwarden/server.git synced 2025-04-17 19:18:16 -05:00

fixes for freshdesk endpoint

This commit is contained in:
Kyle Spearrin 2020-02-06 16:28:44 -05:00
parent 7dddf9fd8b
commit b679c2b2db

View File

@ -1,5 +1,4 @@
using Bit.Core; using Bit.Core.Repositories;
using Bit.Core.Repositories;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
@ -90,10 +89,12 @@ namespace Bit.Billing.Controllers
{ {
foreach(var org in orgs) foreach(var org in orgs)
{ {
tags.Add("Org:" + GetAttribute<DisplayAttribute>(org.PlanType).Name); tags.Add(string.Format("Org: {0}",
GetAttribute<DisplayAttribute>(org.PlanType).Name.Split(" ").FirstOrDefault()));
} }
} }
var hasPaidOrg = orgs.Any(o => o.PlanType != Core.Enums.PlanType.Free); var hasPaidOrg = orgs.Any(o => o.PlanType != Core.Enums.PlanType.Free &&
o.PlanType != Core.Enums.PlanType.Custom);
if(user.Premium || hasPaidOrg) if(user.Premium || hasPaidOrg)
{ {
updateBody.Add("priority", 3); updateBody.Add("priority", 3);
@ -138,7 +139,7 @@ namespace Bit.Billing.Controllers
throw; throw;
} }
} }
await Task.Delay(60000 * (retriedCount + 1)); await Task.Delay(30000 * (retriedCount + 1));
return await CallFreshdeskApiAsync(request, retriedCount++); return await CallFreshdeskApiAsync(request, retriedCount++);
} }