diff --git a/src/Api/Api.csproj b/src/Api/Api.csproj
index 1fa86da7c6..c172a119ee 100644
--- a/src/Api/Api.csproj
+++ b/src/Api/Api.csproj
@@ -14,14 +14,14 @@
-
+
-
+
-
+
diff --git a/src/Api/Models/InvoiceModel.cs b/src/Api/Models/InvoiceModel.cs
index 1ea4362a73..e97cae3496 100644
--- a/src/Api/Models/InvoiceModel.cs
+++ b/src/Api/Models/InvoiceModel.cs
@@ -59,9 +59,9 @@ namespace Bit.Api.Models
{
Description = item.Description;
}
- else if(!string.IsNullOrWhiteSpace(item.Plan?.Name) && item.Quantity.GetValueOrDefault() > 0)
+ else if(!string.IsNullOrWhiteSpace(item.Plan?.Nickname) && item.Quantity.GetValueOrDefault() > 0)
{
- Description = $"{item.Quantity} x {item.Plan.Name}";
+ Description = $"{item.Quantity} x {item.Plan.Nickname}";
}
else
{
diff --git a/src/Billing/Billing.csproj b/src/Billing/Billing.csproj
index 497b62760f..f6cc136db7 100644
--- a/src/Billing/Billing.csproj
+++ b/src/Billing/Billing.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/src/Core/Core.csproj b/src/Core/Core.csproj
index bd1338bb9d..449313cafc 100644
--- a/src/Core/Core.csproj
+++ b/src/Core/Core.csproj
@@ -52,26 +52,26 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
-
-
-
+
+
+
@@ -80,7 +80,7 @@
-
+
diff --git a/src/Core/IdentityServer/StaticClients.cs b/src/Core/IdentityServer/StaticClients.cs
index 61c2a2ce8b..fe954f6f52 100644
--- a/src/Core/IdentityServer/StaticClients.cs
+++ b/src/Core/IdentityServer/StaticClients.cs
@@ -32,7 +32,7 @@ namespace Bit.Core.IdentityServer
RefreshTokenExpiration = TokenExpiration.Sliding;
RefreshTokenUsage = TokenUsage.ReUse;
SlidingRefreshTokenLifetime = 86400 * refreshTokenSlidingDays;
- AbsoluteRefreshTokenLifetime = int.MaxValue; // forever
+ AbsoluteRefreshTokenLifetime = 0; // forever
UpdateAccessTokenClaimsOnRefresh = true;
AccessTokenLifetime = 3600 * accessTokenLifetimeHours;
AllowOfflineAccess = true;
diff --git a/src/Core/Models/Business/BillingInfo.cs b/src/Core/Models/Business/BillingInfo.cs
index df3db64bda..9da8207c7a 100644
--- a/src/Core/Models/Business/BillingInfo.cs
+++ b/src/Core/Models/Business/BillingInfo.cs
@@ -163,7 +163,7 @@ namespace Bit.Core.Models.Business
{
if(item.Plan != null)
{
- Name = item.Plan.Name;
+ Name = item.Plan.Nickname;
Amount = item.Plan.Amount / 100M;
Interval = item.Plan.Interval;
}
diff --git a/src/Events/Events.csproj b/src/Events/Events.csproj
index 3519428238..67874cc3bd 100644
--- a/src/Events/Events.csproj
+++ b/src/Events/Events.csproj
@@ -9,8 +9,8 @@
-
-
+
+
diff --git a/src/EventsProcessor/EventsProcessor.csproj b/src/EventsProcessor/EventsProcessor.csproj
index 7dcb86fd71..63235f3663 100644
--- a/src/EventsProcessor/EventsProcessor.csproj
+++ b/src/EventsProcessor/EventsProcessor.csproj
@@ -5,8 +5,8 @@
Bit.EventsProcessor
-
-
+
+
diff --git a/src/Icons/Icons.csproj b/src/Icons/Icons.csproj
index 043d880cae..dda79376c3 100644
--- a/src/Icons/Icons.csproj
+++ b/src/Icons/Icons.csproj
@@ -9,7 +9,7 @@
-
+
diff --git a/src/Scim/Scim.csproj b/src/Scim/Scim.csproj
index 8b191817f1..f14b6622b7 100644
--- a/src/Scim/Scim.csproj
+++ b/src/Scim/Scim.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/util/Function/Function.csproj b/util/Function/Function.csproj
index faabffc880..0a4cd03145 100644
--- a/util/Function/Function.csproj
+++ b/util/Function/Function.csproj
@@ -4,8 +4,8 @@
Bit.Function
-
-
+
+
diff --git a/util/Mail/Mail.csproj b/util/Mail/Mail.csproj
index dcf9ad463e..4076b642e8 100644
--- a/util/Mail/Mail.csproj
+++ b/util/Mail/Mail.csproj
@@ -12,7 +12,7 @@
-
+
diff --git a/util/Server/Server.csproj b/util/Server/Server.csproj
index 8a45ebce62..9c18b7c91e 100644
--- a/util/Server/Server.csproj
+++ b/util/Server/Server.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/util/Setup/Setup.csproj b/util/Setup/Setup.csproj
index b9474579ba..88b2f0de50 100644
--- a/util/Setup/Setup.csproj
+++ b/util/Setup/Setup.csproj
@@ -21,8 +21,8 @@
-
-
+
+