From 9b790b7edca995cf0f331227a739648d41a7c149 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Mon, 18 Sep 2017 17:57:37 -0400 Subject: [PATCH] license when no billing info --- src/Api/Controllers/AccountsController.cs | 3 ++- src/Core/Models/Api/Response/BillingResponseModel.cs | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Api/Controllers/AccountsController.cs b/src/Api/Controllers/AccountsController.cs index 23a487fa4a..b547dc6d74 100644 --- a/src/Api/Controllers/AccountsController.cs +++ b/src/Api/Controllers/AccountsController.cs @@ -426,7 +426,8 @@ namespace Bit.Api.Controllers } else { - return new BillingResponseModel(user); + var license = await _userService.GenerateLicenseAsync(user); + return new BillingResponseModel(user, license); } } diff --git a/src/Core/Models/Api/Response/BillingResponseModel.cs b/src/Core/Models/Api/Response/BillingResponseModel.cs index b9bfeedc73..2d0d340511 100644 --- a/src/Core/Models/Api/Response/BillingResponseModel.cs +++ b/src/Core/Models/Api/Response/BillingResponseModel.cs @@ -23,12 +23,13 @@ namespace Bit.Core.Models.Api Expiration = License.Expires; } - public BillingResponseModel(User user) + public BillingResponseModel(User user, UserLicense license) : base("billing") { StorageName = user.Storage.HasValue ? Utilities.CoreHelpers.ReadableBytesSize(user.Storage.Value) : null; StorageGb = user.Storage.HasValue ? Math.Round(user.Storage.Value / 1073741824D, 2) : 0; // 1 GB MaxStorageGb = user.MaxStorageGb; + License = license; Expiration = user.PremiumExpirationDate; }