org and user info

This commit is contained in:
Kyle Spearrin
2018-03-22 21:10:10 -04:00
parent 7075d8396d
commit e920c8e9d2
9 changed files with 159 additions and 55 deletions

View File

@@ -1,5 +1,7 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using Bit.Core;
using Bit.Core.Models.Table;
using Bit.Core.Utilities;
@@ -10,9 +12,10 @@ namespace Bit.Admin.Models
{
public UserEditModel() { }
public UserEditModel(User user, GlobalSettings globalSettings)
public UserEditModel(User user, IEnumerable<Cipher> ciphers, GlobalSettings globalSettings)
{
User = user;
CipherCount = ciphers.Count();
BraintreeMerchantId = globalSettings.Braintree.MerchantId;
Name = user.Name;
@@ -28,6 +31,7 @@ namespace Bit.Admin.Models
}
public User User { get; set; }
public int CipherCount { get; set; }
public string RandomLicenseKey => CoreHelpers.SecureRandomString(20);
public string OneYearExpirationDate => DateTime.Now.AddYears(1).ToString("yyyy-MM-ddTHH:mm");
public string BraintreeMerchantId { get; set; }