From 8a6353f3daba7f4e952fa5396f5a96165c9db999 Mon Sep 17 00:00:00 2001 From: Uncled1023 Date: Sun, 27 Jan 2019 15:28:03 -0800 Subject: [PATCH] Added Feature infrastructure and changed email accounts to start disabled for new accounts. --- MailService/HMailService.cs | 6 + MailService/IMailService.cs | 2 + Teknik/Areas/About/Views/About/Index.cshtml | 26 +- .../Areas/Contact/Views/Contact/Index.cshtml | 21 +- Teknik/Areas/User/Models/Feature.cs | 18 + Teknik/Areas/User/Models/LoginInfo.cs | 22 - Teknik/Areas/User/Models/User.cs | 4 +- Teknik/Areas/User/Models/UserFeature.cs | 20 + Teknik/Areas/User/Utility/UserExtensions.cs | 28 + Teknik/Areas/User/Utility/UserHelper.cs | 35 +- .../20190127224049_Features.Designer.cs | 767 ++++++++++++++++++ .../Migrations/20190127224049_Features.cs | 100 +++ .../Migrations/TeknikEntitiesModelSnapshot.cs | 76 +- Teknik/Data/TeknikEntities.cs | 14 +- 14 files changed, 1055 insertions(+), 84 deletions(-) create mode 100644 Teknik/Areas/User/Models/Feature.cs delete mode 100644 Teknik/Areas/User/Models/LoginInfo.cs create mode 100644 Teknik/Areas/User/Models/UserFeature.cs create mode 100644 Teknik/Areas/User/Utility/UserExtensions.cs create mode 100644 Teknik/Data/Migrations/20190127224049_Features.Designer.cs create mode 100644 Teknik/Data/Migrations/20190127224049_Features.cs diff --git a/MailService/HMailService.cs b/MailService/HMailService.cs index 18eeb49..1ca513a 100644 --- a/MailService/HMailService.cs +++ b/MailService/HMailService.cs @@ -128,5 +128,11 @@ namespace Teknik.MailService var domain = _App.Domains.ItemByName[_Domain]; return domain.Accounts.ItemByAddress[username]; } + + public bool Enabled(string username) + { + var account = GetAccount(username); + return account.Active; + } } } diff --git a/MailService/IMailService.cs b/MailService/IMailService.cs index d81d065..9ea63a3 100644 --- a/MailService/IMailService.cs +++ b/MailService/IMailService.cs @@ -8,6 +8,8 @@ namespace Teknik.MailService DateTime LastActive(string username); + bool Enabled(string username); + void CreateAccount(string username, string password, int size); void EditPassword(string username, string password); diff --git a/Teknik/Areas/About/Views/About/Index.cshtml b/Teknik/Areas/About/Views/About/Index.cshtml index c179d0e..bb1c27d 100644 --- a/Teknik/Areas/About/Views/About/Index.cshtml +++ b/Teknik/Areas/About/Views/About/Index.cshtml @@ -45,24 +45,12 @@ - Email Storage - 5GB Storage - 1GB Storage + Email Account + - - - Outbound Emails - Unlimited - 100 per Day - - Email Account - - - - Git Repositories Unlimited Public & Private Repos @@ -76,14 +64,14 @@ - Vault Editing + Vault and Paste Editing - View Content History: + View and Delete Previous Content: