From 3d97f27deee4ecd4fb4e50a459546e43b9dd4d38 Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Mon, 16 Jul 2018 02:38:09 +0200 Subject: [PATCH] for token, &refactoring --- .../FileSystem/FileSystemHelpers.cs | 1 - .../Messaging/RdvQueryProviderInfo.cs | 1 - Yavsc.Abstract/Templates/Template.cs | 1 - Yavsc.Abstract/Workflow/Process/Rule.cs | 1 - Yavsc.Abstract/Workflow/Tasks/IRequisition.cs | 4 --- Yavsc.Abstract/Workflow/Tasks/ITaskRunner.cs | 2 -- .../Validation/YaRegularExpression.cs | 1 - Yavsc.Server/Helpers/ResourcesHelpers.cs | 2 -- Yavsc.Server/Interfaces/IBillingService.cs | 8 ------ .../Access/CircleAuthorizationToBlogPost.cs | 1 - .../Models/HairCut/Views/HaircutQueryInfo.cs | 2 -- Yavsc.Server/Models/IT/SourceCode/GitBatch.cs | 3 --- .../Models/Identity/BlackListedUserName.cs | 3 --- .../Identity/GoogleCloudMobileDeclaration.cs | 2 -- .../Models/Identity/IWatchedUserName.cs | 4 --- .../Models/Identity/ReservedUserName.cs | 3 --- .../Models/Messaging/EstimationEvent.cs | 2 -- .../Models/Relationship/LocationKind.cs | 3 --- .../Templates/UserOrientedTemplate.cs | 1 - .../ViewModels/Administration/RoleInfo.cs | 2 -- .../Administration/RoleUserCollection.cs | 2 -- .../Relationship/CirclesViewModel.cs | 2 ++ Yavsc/ApiControllers/AccountController.cs | 1 + .../ApiControllers/BookQueryApiController.cs | 2 +- Yavsc/ApiControllers/ContactsApiController.cs | 2 +- .../FrontOfficeApiController.cs | 1 - .../MailTemplatingApiController.cs | 3 --- .../accounting/ProfileApiController.cs | 7 +---- .../ManageGitHookHandler.cs | 2 -- .../Accounting/AccountController.cs | 1 - .../AdministrationController.cs | 2 +- .../MailingTemplateController.cs | 1 - Yavsc/Controllers/Contracting/DoController.cs | 1 - .../Contracting/EstimateController.cs | 1 - .../Controllers/Deliver/BlogspotController.cs | 1 - Yavsc/Controllers/IT/GitController.cs | 3 --- Yavsc/Controllers/ProjectController.cs | 1 - Yavsc/Helpers/Ansi2HtmlEncoder.cs | 1 - Yavsc/Helpers/AuthHelpers.cs | 4 +-- Yavsc/Helpers/EventHelpers.cs | 1 + Yavsc/Helpers/FileSystemHelpers.cs | 1 - Yavsc/Helpers/PageHelpers.cs | 3 --- Yavsc/Helpers/WorkflowHelpers.cs | 1 - ...0180420213912_mailingTemplates.Designer.cs | 1 - .../20180420213912_mailingTemplates.cs | 1 - ...03100246_userAllowMonthlyEmail.Designer.cs | 1 - .../20180503100246_userAllowMonthlyEmail.cs | 1 - .../Migrations/20180625113528_Git.Designer.cs | 1 - Yavsc/Migrations/20180625113528_Git.cs | 2 -- ...8_wrongProjectConfigForeignKey.Designer.cs | 1 - ...0703224638_wrongProjectConfigForeignKey.cs | 2 -- ...rongProjectConfigForeignKeyBis.Designer.cs | 1 - ...3231814_wrongProjectConfigForeignKeyBis.cs | 2 -- .../ApplicationDbContextModelSnapshot.cs | 2 -- Yavsc/Models/ApplicationDbContext.cs | 2 +- Yavsc/Services/BillingService.cs | 1 - Yavsc/Services/Coding.cs | 11 +++----- Yavsc/Services/GitClone.cs | 2 -- Yavsc/Services/MailSender.cs | 2 +- Yavsc/Services/MessageServices.cs | 27 ------------------- Yavsc/Startup/Startup.cs | 3 --- .../CirclesControlViewComponent.cs | 2 ++ .../FrontOffice/PerformerProfileViewModel.cs | 2 -- cli/project.json | 6 ++--- rc-num.txt | 2 +- 65 files changed, 21 insertions(+), 145 deletions(-) delete mode 100644 Yavsc.Server/Interfaces/IBillingService.cs delete mode 100755 Yavsc/Services/MessageServices.cs diff --git a/Yavsc.Abstract/FileSystem/FileSystemHelpers.cs b/Yavsc.Abstract/FileSystem/FileSystemHelpers.cs index d54456fc..35e7566b 100644 --- a/Yavsc.Abstract/FileSystem/FileSystemHelpers.cs +++ b/Yavsc.Abstract/FileSystem/FileSystemHelpers.cs @@ -1,4 +1,3 @@ -using System.IO; using System.Linq; using System.Security.Claims; using System.Text; diff --git a/Yavsc.Abstract/Messaging/RdvQueryProviderInfo.cs b/Yavsc.Abstract/Messaging/RdvQueryProviderInfo.cs index 6cab0764..9409093e 100644 --- a/Yavsc.Abstract/Messaging/RdvQueryProviderInfo.cs +++ b/Yavsc.Abstract/Messaging/RdvQueryProviderInfo.cs @@ -3,7 +3,6 @@ using Yavsc.Abstract.Identity; namespace Yavsc.Models { - using Models.Messaging; public class RdvQueryProviderInfo { diff --git a/Yavsc.Abstract/Templates/Template.cs b/Yavsc.Abstract/Templates/Template.cs index d7fff39c..24377661 100644 --- a/Yavsc.Abstract/Templates/Template.cs +++ b/Yavsc.Abstract/Templates/Template.cs @@ -1,4 +1,3 @@ -using System; using System.Text; using System.Threading.Tasks; diff --git a/Yavsc.Abstract/Workflow/Process/Rule.cs b/Yavsc.Abstract/Workflow/Process/Rule.cs index f037be04..1e0689fc 100644 --- a/Yavsc.Abstract/Workflow/Process/Rule.cs +++ b/Yavsc.Abstract/Workflow/Process/Rule.cs @@ -1,4 +1,3 @@ -using System; using System.ComponentModel.DataAnnotations; namespace Yavsc.Models.Process diff --git a/Yavsc.Abstract/Workflow/Tasks/IRequisition.cs b/Yavsc.Abstract/Workflow/Tasks/IRequisition.cs index 12c92513..4d6885a0 100644 --- a/Yavsc.Abstract/Workflow/Tasks/IRequisition.cs +++ b/Yavsc.Abstract/Workflow/Tasks/IRequisition.cs @@ -1,7 +1,3 @@ - -using System.Collections.Generic; -using Yavsc.Abstract.Workflow; - namespace Yavsc.Models { public interface IRequisition diff --git a/Yavsc.Abstract/Workflow/Tasks/ITaskRunner.cs b/Yavsc.Abstract/Workflow/Tasks/ITaskRunner.cs index c5f89930..18ad9cc8 100644 --- a/Yavsc.Abstract/Workflow/Tasks/ITaskRunner.cs +++ b/Yavsc.Abstract/Workflow/Tasks/ITaskRunner.cs @@ -1,5 +1,3 @@ -using System.Threading.Tasks; - namespace Yavsc.Abstract.Workflow { public interface ITaskRunner diff --git a/Yavsc.Server/Attributes/Validation/YaRegularExpression.cs b/Yavsc.Server/Attributes/Validation/YaRegularExpression.cs index eb42373b..dfe0739b 100644 --- a/Yavsc.Server/Attributes/Validation/YaRegularExpression.cs +++ b/Yavsc.Server/Attributes/Validation/YaRegularExpression.cs @@ -1,4 +1,3 @@ -using System.Resources; namespace Yavsc.Attributes.Validation { diff --git a/Yavsc.Server/Helpers/ResourcesHelpers.cs b/Yavsc.Server/Helpers/ResourcesHelpers.cs index cb10c6c6..17ff88d7 100644 --- a/Yavsc.Server/Helpers/ResourcesHelpers.cs +++ b/Yavsc.Server/Helpers/ResourcesHelpers.cs @@ -1,5 +1,3 @@ -using System; -using System.Resources; using Microsoft.Extensions.Localization; public static class ResourcesHelpers { diff --git a/Yavsc.Server/Interfaces/IBillingService.cs b/Yavsc.Server/Interfaces/IBillingService.cs deleted file mode 100644 index 55b7bdf7..00000000 --- a/Yavsc.Server/Interfaces/IBillingService.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System.Collections.Generic; - - -namespace Yavsc { - interface IBillingService_deux { - } - -} diff --git a/Yavsc.Server/Models/Access/CircleAuthorizationToBlogPost.cs b/Yavsc.Server/Models/Access/CircleAuthorizationToBlogPost.cs index 8762810a..2ea1a654 100644 --- a/Yavsc.Server/Models/Access/CircleAuthorizationToBlogPost.cs +++ b/Yavsc.Server/Models/Access/CircleAuthorizationToBlogPost.cs @@ -3,7 +3,6 @@ namespace Yavsc.Models.Access using System.ComponentModel.DataAnnotations.Schema; using Models.Relationship; using Newtonsoft.Json; - using Yavsc; using Blog; using Yavsc.Abstract.Identity.Security; diff --git a/Yavsc.Server/Models/HairCut/Views/HaircutQueryInfo.cs b/Yavsc.Server/Models/HairCut/Views/HaircutQueryInfo.cs index bfc6691a..479e831f 100644 --- a/Yavsc.Server/Models/HairCut/Views/HaircutQueryInfo.cs +++ b/Yavsc.Server/Models/HairCut/Views/HaircutQueryInfo.cs @@ -23,8 +23,6 @@ using System; using System.ComponentModel.DataAnnotations; using Yavsc.Abstract.Identity; -using Yavsc.Abstract.Identity; -using Yavsc.Models.Auth; using Yavsc.Models.Relationship; namespace Yavsc.Models.Haircut.Views diff --git a/Yavsc.Server/Models/IT/SourceCode/GitBatch.cs b/Yavsc.Server/Models/IT/SourceCode/GitBatch.cs index b2aaecec..d961e0cc 100644 --- a/Yavsc.Server/Models/IT/SourceCode/GitBatch.cs +++ b/Yavsc.Server/Models/IT/SourceCode/GitBatch.cs @@ -1,8 +1,5 @@ -using System; using System.Diagnostics; using System.IO; -using System.Threading.Tasks; -using Yavsc.Abstract.Interfaces; namespace Yavsc.Server.Models.IT.SourceCode { diff --git a/Yavsc.Server/Models/Identity/BlackListedUserName.cs b/Yavsc.Server/Models/Identity/BlackListedUserName.cs index 94da8045..d4548902 100644 --- a/Yavsc.Server/Models/Identity/BlackListedUserName.cs +++ b/Yavsc.Server/Models/Identity/BlackListedUserName.cs @@ -1,7 +1,4 @@ -using System; using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Newtonsoft.Json; namespace Yavsc.Models.Identity { diff --git a/Yavsc.Server/Models/Identity/GoogleCloudMobileDeclaration.cs b/Yavsc.Server/Models/Identity/GoogleCloudMobileDeclaration.cs index a30b4dd3..ae634d33 100644 --- a/Yavsc.Server/Models/Identity/GoogleCloudMobileDeclaration.cs +++ b/Yavsc.Server/Models/Identity/GoogleCloudMobileDeclaration.cs @@ -5,8 +5,6 @@ using Newtonsoft.Json; namespace Yavsc.Models.Identity { - using Yavsc; - [JsonObject] public class GoogleCloudMobileDeclaration { diff --git a/Yavsc.Server/Models/Identity/IWatchedUserName.cs b/Yavsc.Server/Models/Identity/IWatchedUserName.cs index d0a263de..0dfa02d6 100644 --- a/Yavsc.Server/Models/Identity/IWatchedUserName.cs +++ b/Yavsc.Server/Models/Identity/IWatchedUserName.cs @@ -1,7 +1,3 @@ -using System; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Newtonsoft.Json; using Yavsc.Interfaces; namespace Yavsc.Models.Identity diff --git a/Yavsc.Server/Models/Identity/ReservedUserName.cs b/Yavsc.Server/Models/Identity/ReservedUserName.cs index c1a20db6..52bf8225 100644 --- a/Yavsc.Server/Models/Identity/ReservedUserName.cs +++ b/Yavsc.Server/Models/Identity/ReservedUserName.cs @@ -1,7 +1,4 @@ -using System; using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Newtonsoft.Json; namespace Yavsc.Models.Identity { diff --git a/Yavsc.Server/Models/Messaging/EstimationEvent.cs b/Yavsc.Server/Models/Messaging/EstimationEvent.cs index 79d4f781..7c5a89ff 100644 --- a/Yavsc.Server/Models/Messaging/EstimationEvent.cs +++ b/Yavsc.Server/Models/Messaging/EstimationEvent.cs @@ -1,5 +1,3 @@ -using System.Linq; -using Microsoft.Data.Entity; using Microsoft.Extensions.Localization; namespace Yavsc.Models.Messaging diff --git a/Yavsc.Server/Models/Relationship/LocationKind.cs b/Yavsc.Server/Models/Relationship/LocationKind.cs index 55da06a0..3afdee95 100644 --- a/Yavsc.Server/Models/Relationship/LocationKind.cs +++ b/Yavsc.Server/Models/Relationship/LocationKind.cs @@ -1,6 +1,3 @@ -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; - namespace Yavsc.Models.Relationship { public enum LocationKind diff --git a/Yavsc.Server/Templates/UserOrientedTemplate.cs b/Yavsc.Server/Templates/UserOrientedTemplate.cs index 9985c56f..edefe0ee 100644 --- a/Yavsc.Server/Templates/UserOrientedTemplate.cs +++ b/Yavsc.Server/Templates/UserOrientedTemplate.cs @@ -1,6 +1,5 @@ using Yavsc.Abstract.Templates; using Yavsc.Models; -using System.Threading.Tasks; namespace Yavsc.Templates { diff --git a/Yavsc.Server/ViewModels/Administration/RoleInfo.cs b/Yavsc.Server/ViewModels/Administration/RoleInfo.cs index 2a1574ee..4067e314 100644 --- a/Yavsc.Server/ViewModels/Administration/RoleInfo.cs +++ b/Yavsc.Server/ViewModels/Administration/RoleInfo.cs @@ -1,5 +1,3 @@ -using System.Linq; - namespace Yavsc.ViewModels.Administration { public class RoleInfo diff --git a/Yavsc.Server/ViewModels/Administration/RoleUserCollection.cs b/Yavsc.Server/ViewModels/Administration/RoleUserCollection.cs index 2a3a68bc..b6ebb7cd 100644 --- a/Yavsc.Server/ViewModels/Administration/RoleUserCollection.cs +++ b/Yavsc.Server/ViewModels/Administration/RoleUserCollection.cs @@ -1,6 +1,4 @@ using Yavsc.Abstract.Identity; -using Yavsc.Abstract.Identity; -using Yavsc.Models.Auth; namespace Yavsc.ViewModels.Administration { diff --git a/Yavsc.Server/ViewModels/Relationship/CirclesViewModel.cs b/Yavsc.Server/ViewModels/Relationship/CirclesViewModel.cs index 2a476c16..1ce82844 100644 --- a/Yavsc.Server/ViewModels/Relationship/CirclesViewModel.cs +++ b/Yavsc.Server/ViewModels/Relationship/CirclesViewModel.cs @@ -1,3 +1,5 @@ +using Yavsc.Abstract.Identity.Security; + namespace Yavsc.ViewModels.Relationship { public class CirclesViewModel diff --git a/Yavsc/ApiControllers/AccountController.cs b/Yavsc/ApiControllers/AccountController.cs index b6c5cdf0..f2b2035b 100644 --- a/Yavsc/ApiControllers/AccountController.cs +++ b/Yavsc/ApiControllers/AccountController.cs @@ -15,6 +15,7 @@ namespace Yavsc.WebApi.Controllers using System.Linq; using Microsoft.Data.Entity; using Microsoft.AspNet.Identity.EntityFramework; + using Yavsc.Abstract.Identity; [Authorize(),Route("~/api/account")] public class ApiAccountController : Controller diff --git a/Yavsc/ApiControllers/BookQueryApiController.cs b/Yavsc/ApiControllers/BookQueryApiController.cs index 851b0ca1..e4dab0d1 100644 --- a/Yavsc/ApiControllers/BookQueryApiController.cs +++ b/Yavsc/ApiControllers/BookQueryApiController.cs @@ -10,10 +10,10 @@ using Microsoft.Extensions.Logging; namespace Yavsc.Controllers { using System; - using Yavsc.Models.Messaging; using Yavsc.Models; using Yavsc.Models.Workflow; using Yavsc.Models.Billing; + using Yavsc.Abstract.Identity; [Produces("application/json")] [Route("api/bookquery"), Authorize(Roles = "Performer,Administrator")] diff --git a/Yavsc/ApiControllers/ContactsApiController.cs b/Yavsc/ApiControllers/ContactsApiController.cs index ee1f6234..63dec6c1 100644 --- a/Yavsc/ApiControllers/ContactsApiController.cs +++ b/Yavsc/ApiControllers/ContactsApiController.cs @@ -3,8 +3,8 @@ using System.Security.Claims; using Microsoft.AspNet.Http; using Microsoft.AspNet.Mvc; using Microsoft.Data.Entity; +using Yavsc.Abstract.Identity; using Yavsc.Models; -using Yavsc.Models.Messaging; namespace Yavsc.Controllers { diff --git a/Yavsc/ApiControllers/FrontOfficeApiController.cs b/Yavsc/ApiControllers/FrontOfficeApiController.cs index 5e0ad710..8eff06a8 100644 --- a/Yavsc/ApiControllers/FrontOfficeApiController.cs +++ b/Yavsc/ApiControllers/FrontOfficeApiController.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using Microsoft.AspNet.Mvc; using Yavsc.Helpers; using Yavsc.Models; -using Yavsc.Models.Workflow; using Yavsc.Services; using Yavsc.ViewModels.FrontOffice; diff --git a/Yavsc/ApiControllers/MailTemplatingApiController.cs b/Yavsc/ApiControllers/MailTemplatingApiController.cs index 0e68d89c..56f948fd 100644 --- a/Yavsc/ApiControllers/MailTemplatingApiController.cs +++ b/Yavsc/ApiControllers/MailTemplatingApiController.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; using Microsoft.AspNet.Mvc; -using Yavsc.Services; namespace Yavsc.ApiControllers { diff --git a/Yavsc/ApiControllers/accounting/ProfileApiController.cs b/Yavsc/ApiControllers/accounting/ProfileApiController.cs index 876b88b9..c087d8e6 100644 --- a/Yavsc/ApiControllers/accounting/ProfileApiController.cs +++ b/Yavsc/ApiControllers/accounting/ProfileApiController.cs @@ -1,15 +1,10 @@ using Microsoft.AspNet.Identity; -using Microsoft.AspNet.Authorization; using Microsoft.AspNet.Mvc; -using Microsoft.Extensions.Logging; -using Microsoft.Data.Entity; -using Microsoft.AspNet.Identity.EntityFramework; using System.Security.Claims; using System.Threading.Tasks; using System.Linq; using Yavsc.Models; -using Yavsc.Models.Auth; -using Yavsc.Helpers; +using Yavsc.Abstract.Identity; namespace Yavsc.ApiControllers.accounting { diff --git a/Yavsc/AuthorizationHandlers/ManageGitHookHandler.cs b/Yavsc/AuthorizationHandlers/ManageGitHookHandler.cs index 69136eff..f87c8dd3 100644 --- a/Yavsc/AuthorizationHandlers/ManageGitHookHandler.cs +++ b/Yavsc/AuthorizationHandlers/ManageGitHookHandler.cs @@ -1,6 +1,4 @@ using Microsoft.AspNet.Authorization; -using System.Security.Claims; -using Yavsc.Models.IT; using Yavsc.Server.Models.IT.SourceCode; using Yavsc.ViewModels.Auth; diff --git a/Yavsc/Controllers/Accounting/AccountController.cs b/Yavsc/Controllers/Accounting/AccountController.cs index 373960aa..a0155ae6 100644 --- a/Yavsc/Controllers/Accounting/AccountController.cs +++ b/Yavsc/Controllers/Accounting/AccountController.cs @@ -20,7 +20,6 @@ using Newtonsoft.Json; namespace Yavsc.Controllers { - using Microsoft.AspNet.Http.Authentication; using Yavsc.Abstract.Manage; using Yavsc.Helpers; diff --git a/Yavsc/Controllers/Administration/AdministrationController.cs b/Yavsc/Controllers/Administration/AdministrationController.cs index 6ecddbbb..95194b37 100644 --- a/Yavsc/Controllers/Administration/AdministrationController.cs +++ b/Yavsc/Controllers/Administration/AdministrationController.cs @@ -7,8 +7,8 @@ using Microsoft.AspNet.Identity; using Microsoft.AspNet.Identity.EntityFramework; using Microsoft.AspNet.Mvc; using Microsoft.Data.Entity; +using Yavsc.Abstract.Identity; using Yavsc.Models; -using Yavsc.Models.Auth; using Yavsc.ViewModels.Administration; namespace Yavsc.Controllers diff --git a/Yavsc/Controllers/Administration/MailingTemplateController.cs b/Yavsc/Controllers/Administration/MailingTemplateController.cs index 03226326..d006eb12 100644 --- a/Yavsc/Controllers/Administration/MailingTemplateController.cs +++ b/Yavsc/Controllers/Administration/MailingTemplateController.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Threading.Tasks; using System.Security.Claims; using Microsoft.AspNet.Mvc; diff --git a/Yavsc/Controllers/Contracting/DoController.cs b/Yavsc/Controllers/Contracting/DoController.cs index aedf7ef9..6a36d52f 100644 --- a/Yavsc/Controllers/Contracting/DoController.cs +++ b/Yavsc/Controllers/Contracting/DoController.cs @@ -13,7 +13,6 @@ namespace Yavsc.Controllers using Yavsc.ViewModels.Workflow; using Yavsc.Services; using System.Threading.Tasks; - using Newtonsoft.Json; [Authorize] public class DoController : Controller diff --git a/Yavsc/Controllers/Contracting/EstimateController.cs b/Yavsc/Controllers/Contracting/EstimateController.cs index 93922472..a65a742d 100644 --- a/Yavsc/Controllers/Contracting/EstimateController.cs +++ b/Yavsc/Controllers/Contracting/EstimateController.cs @@ -12,7 +12,6 @@ using Microsoft.Extensions.OptionsModel; namespace Yavsc.Controllers { - using Helpers; using Models; using Models.Billing; using Models.Workflow; diff --git a/Yavsc/Controllers/Deliver/BlogspotController.cs b/Yavsc/Controllers/Deliver/BlogspotController.cs index 395d7ccc..9f46304f 100644 --- a/Yavsc/Controllers/Deliver/BlogspotController.cs +++ b/Yavsc/Controllers/Deliver/BlogspotController.cs @@ -11,7 +11,6 @@ using Microsoft.Extensions.OptionsModel; using Yavsc.Models; using Yavsc.ViewModels.Auth; using Microsoft.AspNet.Mvc.Rendering; -using Yavsc.ViewModels.Blogspot; using Yavsc.Models.Blog; // For more information on enabling Web API for empty projects, visit http://go.microsoft.com/fwlink/?LinkID=397860 diff --git a/Yavsc/Controllers/IT/GitController.cs b/Yavsc/Controllers/IT/GitController.cs index edd22340..0af04581 100644 --- a/Yavsc/Controllers/IT/GitController.cs +++ b/Yavsc/Controllers/IT/GitController.cs @@ -1,9 +1,6 @@ using System.Linq; using System.Security.Claims; using System.Threading.Tasks; -using System; -using System.Diagnostics; -using System.IO; using Microsoft.AspNet.Authorization; using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.Rendering; diff --git a/Yavsc/Controllers/ProjectController.cs b/Yavsc/Controllers/ProjectController.cs index df86c807..332614c5 100644 --- a/Yavsc/Controllers/ProjectController.cs +++ b/Yavsc/Controllers/ProjectController.cs @@ -1,4 +1,3 @@ -using System.Linq; using System.Threading.Tasks; using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.Rendering; diff --git a/Yavsc/Helpers/Ansi2HtmlEncoder.cs b/Yavsc/Helpers/Ansi2HtmlEncoder.cs index 67ec9e27..4f553950 100644 --- a/Yavsc/Helpers/Ansi2HtmlEncoder.cs +++ b/Yavsc/Helpers/Ansi2HtmlEncoder.cs @@ -3,7 +3,6 @@ // paul schneider 19/06/2018 15:58 20182018 6 19 // */ -using System; using System.IO; using System.Diagnostics; using System.Threading.Tasks; diff --git a/Yavsc/Helpers/AuthHelpers.cs b/Yavsc/Helpers/AuthHelpers.cs index 229793c5..02ba797c 100644 --- a/Yavsc/Helpers/AuthHelpers.cs +++ b/Yavsc/Helpers/AuthHelpers.cs @@ -2,10 +2,10 @@ using System; using System.Linq; using System.Collections.Generic; using Microsoft.AspNet.Http; -using Microsoft.AspNet.Http.Authentication; using Yavsc.ViewModels.Account; -namespace Yavsc.Helpers { +namespace Yavsc.Helpers +{ public static class HttpContextExtensions { public static IEnumerable GetExternalProviders(this HttpContext context) { if (context == null) { diff --git a/Yavsc/Helpers/EventHelpers.cs b/Yavsc/Helpers/EventHelpers.cs index 96f8277c..7e23b26d 100644 --- a/Yavsc/Helpers/EventHelpers.cs +++ b/Yavsc/Helpers/EventHelpers.cs @@ -7,6 +7,7 @@ namespace Yavsc.Helpers using Yavsc.Models.Haircut; using Yavsc.Models; using Yavsc.Models.Billing; + using Yavsc.Abstract.Identity; public static class EventHelpers { diff --git a/Yavsc/Helpers/FileSystemHelpers.cs b/Yavsc/Helpers/FileSystemHelpers.cs index 7704def3..48d08ad5 100644 --- a/Yavsc/Helpers/FileSystemHelpers.cs +++ b/Yavsc/Helpers/FileSystemHelpers.cs @@ -13,7 +13,6 @@ using Yavsc.Exceptions; using Yavsc.Models; using Yavsc.Models.FileSystem; using Yavsc.ViewModels; -using Yavsc.ViewModels.UserFiles; namespace Yavsc.Helpers { diff --git a/Yavsc/Helpers/PageHelpers.cs b/Yavsc/Helpers/PageHelpers.cs index 5910d275..0348e4ce 100644 --- a/Yavsc/Helpers/PageHelpers.cs +++ b/Yavsc/Helpers/PageHelpers.cs @@ -1,9 +1,6 @@ using System; using System.Collections.Generic; -using Microsoft.AspNet.Http; using Microsoft.AspNet.Mvc.Rendering; -using Microsoft.AspNet.Mvc; -using Microsoft.Data.Entity; namespace Yavsc.Server.Helpers { diff --git a/Yavsc/Helpers/WorkflowHelpers.cs b/Yavsc/Helpers/WorkflowHelpers.cs index 40887703..eaf9662d 100644 --- a/Yavsc/Helpers/WorkflowHelpers.cs +++ b/Yavsc/Helpers/WorkflowHelpers.cs @@ -5,7 +5,6 @@ namespace Yavsc.Helpers using System.Collections.Generic; using System.Linq; using Microsoft.Data.Entity; - using Models.Workflow; using Yavsc.Models; using Yavsc.Services; using Yavsc.ViewModels.FrontOffice; diff --git a/Yavsc/Migrations/20180420213912_mailingTemplates.Designer.cs b/Yavsc/Migrations/20180420213912_mailingTemplates.Designer.cs index 87230116..8ed43de1 100644 --- a/Yavsc/Migrations/20180420213912_mailingTemplates.Designer.cs +++ b/Yavsc/Migrations/20180420213912_mailingTemplates.Designer.cs @@ -1,7 +1,6 @@ using System; using Microsoft.Data.Entity; using Microsoft.Data.Entity.Infrastructure; -using Microsoft.Data.Entity.Metadata; using Microsoft.Data.Entity.Migrations; using Yavsc.Models; diff --git a/Yavsc/Migrations/20180420213912_mailingTemplates.cs b/Yavsc/Migrations/20180420213912_mailingTemplates.cs index ec8ebd8f..e265aa3e 100644 --- a/Yavsc/Migrations/20180420213912_mailingTemplates.cs +++ b/Yavsc/Migrations/20180420213912_mailingTemplates.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using Microsoft.Data.Entity.Migrations; namespace Yavsc.Migrations diff --git a/Yavsc/Migrations/20180503100246_userAllowMonthlyEmail.Designer.cs b/Yavsc/Migrations/20180503100246_userAllowMonthlyEmail.Designer.cs index f4deb3df..f944d535 100644 --- a/Yavsc/Migrations/20180503100246_userAllowMonthlyEmail.Designer.cs +++ b/Yavsc/Migrations/20180503100246_userAllowMonthlyEmail.Designer.cs @@ -1,7 +1,6 @@ using System; using Microsoft.Data.Entity; using Microsoft.Data.Entity.Infrastructure; -using Microsoft.Data.Entity.Metadata; using Microsoft.Data.Entity.Migrations; using Yavsc.Models; diff --git a/Yavsc/Migrations/20180503100246_userAllowMonthlyEmail.cs b/Yavsc/Migrations/20180503100246_userAllowMonthlyEmail.cs index 28308a1b..09b30b07 100644 --- a/Yavsc/Migrations/20180503100246_userAllowMonthlyEmail.cs +++ b/Yavsc/Migrations/20180503100246_userAllowMonthlyEmail.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using Microsoft.Data.Entity.Migrations; namespace Yavsc.Migrations diff --git a/Yavsc/Migrations/20180625113528_Git.Designer.cs b/Yavsc/Migrations/20180625113528_Git.Designer.cs index 1e111f8a..3369072f 100644 --- a/Yavsc/Migrations/20180625113528_Git.Designer.cs +++ b/Yavsc/Migrations/20180625113528_Git.Designer.cs @@ -1,7 +1,6 @@ using System; using Microsoft.Data.Entity; using Microsoft.Data.Entity.Infrastructure; -using Microsoft.Data.Entity.Metadata; using Microsoft.Data.Entity.Migrations; using Yavsc.Models; diff --git a/Yavsc/Migrations/20180625113528_Git.cs b/Yavsc/Migrations/20180625113528_Git.cs index eb7c80e2..b49cfe06 100644 --- a/Yavsc/Migrations/20180625113528_Git.cs +++ b/Yavsc/Migrations/20180625113528_Git.cs @@ -1,7 +1,5 @@ using System; -using System.Collections.Generic; using Microsoft.Data.Entity.Migrations; -using Yavsc.Models.Relationship; namespace Yavsc.Migrations { diff --git a/Yavsc/Migrations/20180703224638_wrongProjectConfigForeignKey.Designer.cs b/Yavsc/Migrations/20180703224638_wrongProjectConfigForeignKey.Designer.cs index c1d0d237..50b17c73 100644 --- a/Yavsc/Migrations/20180703224638_wrongProjectConfigForeignKey.Designer.cs +++ b/Yavsc/Migrations/20180703224638_wrongProjectConfigForeignKey.Designer.cs @@ -1,7 +1,6 @@ using System; using Microsoft.Data.Entity; using Microsoft.Data.Entity.Infrastructure; -using Microsoft.Data.Entity.Metadata; using Microsoft.Data.Entity.Migrations; using Yavsc.Models; diff --git a/Yavsc/Migrations/20180703224638_wrongProjectConfigForeignKey.cs b/Yavsc/Migrations/20180703224638_wrongProjectConfigForeignKey.cs index 7c11a11b..2f1954a9 100644 --- a/Yavsc/Migrations/20180703224638_wrongProjectConfigForeignKey.cs +++ b/Yavsc/Migrations/20180703224638_wrongProjectConfigForeignKey.cs @@ -1,5 +1,3 @@ -using System; -using System.Collections.Generic; using Microsoft.Data.Entity.Migrations; namespace Yavsc.Migrations diff --git a/Yavsc/Migrations/20180703231814_wrongProjectConfigForeignKeyBis.Designer.cs b/Yavsc/Migrations/20180703231814_wrongProjectConfigForeignKeyBis.Designer.cs index 707f16eb..263f22ca 100644 --- a/Yavsc/Migrations/20180703231814_wrongProjectConfigForeignKeyBis.Designer.cs +++ b/Yavsc/Migrations/20180703231814_wrongProjectConfigForeignKeyBis.Designer.cs @@ -1,7 +1,6 @@ using System; using Microsoft.Data.Entity; using Microsoft.Data.Entity.Infrastructure; -using Microsoft.Data.Entity.Metadata; using Microsoft.Data.Entity.Migrations; using Yavsc.Models; diff --git a/Yavsc/Migrations/20180703231814_wrongProjectConfigForeignKeyBis.cs b/Yavsc/Migrations/20180703231814_wrongProjectConfigForeignKeyBis.cs index 96c4ae8f..8b699cd9 100644 --- a/Yavsc/Migrations/20180703231814_wrongProjectConfigForeignKeyBis.cs +++ b/Yavsc/Migrations/20180703231814_wrongProjectConfigForeignKeyBis.cs @@ -1,5 +1,3 @@ -using System; -using System.Collections.Generic; using Microsoft.Data.Entity.Migrations; namespace Yavsc.Migrations diff --git a/Yavsc/Migrations/ApplicationDbContextModelSnapshot.cs b/Yavsc/Migrations/ApplicationDbContextModelSnapshot.cs index 349e769f..8bda01a5 100644 --- a/Yavsc/Migrations/ApplicationDbContextModelSnapshot.cs +++ b/Yavsc/Migrations/ApplicationDbContextModelSnapshot.cs @@ -1,8 +1,6 @@ using System; using Microsoft.Data.Entity; using Microsoft.Data.Entity.Infrastructure; -using Microsoft.Data.Entity.Metadata; -using Microsoft.Data.Entity.Migrations; using Yavsc.Models; namespace Yavsc.Migrations diff --git a/Yavsc/Models/ApplicationDbContext.cs b/Yavsc/Models/ApplicationDbContext.cs index 7560043e..8646a9be 100644 --- a/Yavsc/Models/ApplicationDbContext.cs +++ b/Yavsc/Models/ApplicationDbContext.cs @@ -35,8 +35,8 @@ namespace Yavsc.Models using Payment; using Yavsc.Models.Calendar; using Blog; - using Yavsc.Server.Helpers; using Newtonsoft.Json.Linq; + using Yavsc.Abstract.Identity; public class ApplicationDbContext : IdentityDbContext { diff --git a/Yavsc/Services/BillingService.cs b/Yavsc/Services/BillingService.cs index cf00bd6e..1af23c07 100644 --- a/Yavsc/Services/BillingService.cs +++ b/Yavsc/Services/BillingService.cs @@ -4,7 +4,6 @@ using System.Linq; using System.Reflection; using System.Threading.Tasks; using Microsoft.Extensions.Logging; -using Newtonsoft.Json; using Yavsc.Abstract.Workflow; using Yavsc.Models; using Microsoft.Data.Entity; diff --git a/Yavsc/Services/Coding.cs b/Yavsc/Services/Coding.cs index 84be9e7c..3de3a008 100644 --- a/Yavsc/Services/Coding.cs +++ b/Yavsc/Services/Coding.cs @@ -8,21 +8,16 @@ using Yavsc.Templates; using Microsoft.CodeAnalysis; using Microsoft.Extensions.Localization; using Microsoft.Extensions.Logging; -using Microsoft.CSharp; using Microsoft.AspNet.Identity.EntityFramework; -using Newtonsoft.Json; -using Microsoft.AspNet.Razor.Parser; - +using Microsoft.CodeAnalysis.CSharp; +using Microsoft.CodeAnalysis.Emit; + using Yavsc.Models; -using Yavsc.Models.Identity; using Yavsc.Services; using System.Collections.Generic; using System.Linq; using System.IO; using System.Reflection; -using Microsoft.CodeAnalysis.CSharp; -using Microsoft.CodeAnalysis.Emit; -using Microsoft.Extensions.Logging.Console; using Yavsc.Abstract.Templates; namespace Yavsc.Lib diff --git a/Yavsc/Services/GitClone.cs b/Yavsc/Services/GitClone.cs index 66228c94..8f579360 100644 --- a/Yavsc/Services/GitClone.cs +++ b/Yavsc/Services/GitClone.cs @@ -2,10 +2,8 @@ // /* // paul 21/06/2018 11:27 20182018 6 21 // */ -using System; using Yavsc.Server.Models.IT.SourceCode; using Yavsc.Server.Models.IT; -using System.Threading.Tasks; using System.Diagnostics; using System.IO; diff --git a/Yavsc/Services/MailSender.cs b/Yavsc/Services/MailSender.cs index e3e169c5..e2c0ebd6 100644 --- a/Yavsc/Services/MailSender.cs +++ b/Yavsc/Services/MailSender.cs @@ -62,7 +62,7 @@ namespace Yavsc.Services smtpSettings.Host, smtpSettings.Port, SecureSocketOptions.None); - sc.Send(msg); + await sc.SendAsync(msg); model.MessageId = msg.MessageId; } } diff --git a/Yavsc/Services/MessageServices.cs b/Yavsc/Services/MessageServices.cs deleted file mode 100755 index 67b99c3b..00000000 --- a/Yavsc/Services/MessageServices.cs +++ /dev/null @@ -1,27 +0,0 @@ - -using System.Threading.Tasks; -using MailKit.Net.Smtp; -using MimeKit; -using MailKit.Security; -using System; -using Yavsc.Models.Messaging; -using Yavsc.Models; -using Yavsc.Models.Google.Messaging; -using System.Collections.Generic; -using Yavsc.Models.Haircut; -using Yavsc.Interfaces.Workflow; -using System.Linq; -using Newtonsoft.Json; -using Yavsc.Server.Helpers; -using Yavsc.Abstract.Manage; -using Microsoft.AspNet.Identity; -using Microsoft.Extensions.Logging; -using Microsoft.Extensions.OptionsModel; - -namespace Yavsc.Services -{ - // This class is used by the application to send Email and SMS - // when you turn on two-factor authentication in ASP.NET Identity. - // For more details see this link http://go.microsoft.com/fwlink/?LinkID=532713 - -} diff --git a/Yavsc/Startup/Startup.cs b/Yavsc/Startup/Startup.cs index 69c311d6..f8f7f690 100755 --- a/Yavsc/Startup/Startup.cs +++ b/Yavsc/Startup/Startup.cs @@ -9,8 +9,6 @@ using Microsoft.AspNet.Authorization; using Microsoft.AspNet.Builder; using Microsoft.AspNet.Diagnostics; using Microsoft.AspNet.Hosting; -using Microsoft.AspNet.Identity; -using Microsoft.AspNet.Identity.EntityFramework; using Microsoft.AspNet.Localization; using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.Filters; @@ -35,7 +33,6 @@ namespace Yavsc using Services; using ViewModels.Auth.Handlers; using Yavsc.Abstract.FileSystem; - using Yavsc.Server.Helpers; using static System.Environment; public partial class Startup diff --git a/Yavsc/ViewComponents/CirclesControlViewComponent.cs b/Yavsc/ViewComponents/CirclesControlViewComponent.cs index 5ba02628..d22a2f2b 100644 --- a/Yavsc/ViewComponents/CirclesControlViewComponent.cs +++ b/Yavsc/ViewComponents/CirclesControlViewComponent.cs @@ -7,6 +7,8 @@ namespace Yavsc.ViewComponents using Models; using ViewModels.Controls; using ViewModels.Relationship; + using Yavsc.Abstract.Identity.Security; + public class CirclesControlViewComponent : ViewComponent { ApplicationDbContext dbContext; diff --git a/Yavsc/ViewModels/FrontOffice/PerformerProfileViewModel.cs b/Yavsc/ViewModels/FrontOffice/PerformerProfileViewModel.cs index 2705eec7..661f8f5a 100644 --- a/Yavsc/ViewModels/FrontOffice/PerformerProfileViewModel.cs +++ b/Yavsc/ViewModels/FrontOffice/PerformerProfileViewModel.cs @@ -1,6 +1,4 @@ -using System; using System.Linq; -using Yavsc.Models; using Yavsc.Models.Workflow; namespace Yavsc.ViewModels.FrontOffice diff --git a/cli/project.json b/cli/project.json index a7caf892..e97893be 100644 --- a/cli/project.json +++ b/cli/project.json @@ -44,15 +44,15 @@ "Microsoft.Framework.ConfigurationModel.Json": "1.0.0-beta4", "Newtonsoft.Json": "9.0.1", "Yavsc": { - "version": "1.0.5-rc21-beta8", + "version": "1.0.5-rc21-beta9", "target": "package" }, "Yavsc.Abstract": { - "version": "1.0.5-rc21-beta8", + "version": "1.0.5-rc21-beta9", "target": "package" }, "Yavsc.Server": { - "version": "1.0.5-rc21-beta8", + "version": "1.0.5-rc21-beta9", "target": "package" }, "Yavsc.Lib.Portable": "1.0.2" diff --git a/rc-num.txt b/rc-num.txt index 03e9fadc..ee809e88 100644 --- a/rc-num.txt +++ b/rc-num.txt @@ -1 +1 @@ -21-beta8 +21-beta9