nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-15 10:08:14 -05:00
Code

license when no billing info

Browse Source
This commit is contained in:
Kyle Spearrin 2017-09-18 17:57:37 -04:00
parent 0caacaa5aa
commit 9b790b7edc
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Api/Controllers/AccountsController.cs
View File

@ -426,7 +426,8 @@ namespace Bit.Api.Controllers
} }
else else
{ {
return new BillingResponseModel(user); var license = await _userService.GenerateLicenseAsync(user);
return new BillingResponseModel(user, license);
} }
} }

3
src/Core/Models/Api/Response/BillingResponseModel.cs
View File

@ -23,12 +23,13 @@ namespace Bit.Core.Models.Api
Expiration = License.Expires; Expiration = License.Expires;
} }
public BillingResponseModel(User user) public BillingResponseModel(User user, UserLicense license)
: base("billing") : base("billing")
{ {
StorageName = user.Storage.HasValue ? Utilities.CoreHelpers.ReadableBytesSize(user.Storage.Value) : null; 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 StorageGb = user.Storage.HasValue ? Math.Round(user.Storage.Value / 1073741824D, 2) : 0; // 1 GB
MaxStorageGb = user.MaxStorageGb; MaxStorageGb = user.MaxStorageGb;
License = license;
Expiration = user.PremiumExpirationDate; Expiration = user.PremiumExpirationDate;
} }