refactoring: add globalUsing: api.core

This commit is contained in:
Anton Suhorukov 2022-01-26 11:06:31 +03:00
parent 3a330181e7
commit 6a918e52a2
28 changed files with 106 additions and 301 deletions

View File

@ -1,21 +1,4 @@
using System; namespace ASC.Api.Core.Auth
using System.Collections.Generic;
using System.Net;
using System.Security.Authentication;
using System.Security.Claims;
using System.Text.Encodings.Web;
using System.Threading.Tasks;
using ASC.Common;
using ASC.Core;
using ASC.Security.Cryptography;
using Microsoft.AspNetCore.Authentication;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
namespace ASC.Api.Core.Auth
{ {
[Scope(Additional = typeof(ConfirmAuthHandlerExtension))] [Scope(Additional = typeof(ConfirmAuthHandlerExtension))]
public class ConfirmAuthHandler : AuthenticationHandler<AuthenticationSchemeOptions> public class ConfirmAuthHandler : AuthenticationHandler<AuthenticationSchemeOptions>

View File

@ -1,18 +1,4 @@
using System.Net; namespace ASC.Api.Core.Auth
using System.Security.Authentication;
using System.Text.Encodings.Web;
using System.Threading.Tasks;
using ASC.Common;
using ASC.Core;
using ASC.Web.Core;
using ASC.Web.Core.Helpers;
using Microsoft.AspNetCore.Authentication;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
namespace ASC.Api.Core.Auth
{ {
[Scope] [Scope]
public class CookieAuthHandler : AuthenticationHandler<AuthenticationSchemeOptions> public class CookieAuthHandler : AuthenticationHandler<AuthenticationSchemeOptions>

View File

@ -1,9 +1,4 @@
using System; namespace ASC.Api.Core.Convention
using System.Linq;
using Microsoft.AspNetCore.Mvc.ApplicationModels;
namespace ASC.Api.Core.Convention
{ {
[AttributeUsage(AttributeTargets.Class)] [AttributeUsage(AttributeTargets.Class)]
public class ControllerNameAttribute : Attribute public class ControllerNameAttribute : Attribute

View File

@ -23,17 +23,6 @@
* *
*/ */
using System;
using System.Linq;
using System.Security.Claims;
using ASC.Common;
using ASC.Core;
using ASC.Core.Tenants;
using Microsoft.AspNetCore.Http;
namespace ASC.Api.Core namespace ASC.Api.Core
{ {
[Scope] [Scope]

View File

@ -23,17 +23,6 @@
* *
*/ */
using System;
using System.ComponentModel;
using System.Globalization;
using System.Text.Json;
using System.Text.Json.Serialization;
using ASC.Common;
using ASC.Common.Utils;
using ASC.Core;
namespace ASC.Api.Core namespace ASC.Api.Core
{ {
[TypeConverter(typeof(ApiDateTimeTypeConverter))] [TypeConverter(typeof(ApiDateTimeTypeConverter))]

View File

@ -1,43 +1,4 @@
using System; namespace ASC.Api.Core
using System.Reflection;
using System.Text.Json.Serialization;
using ASC.Api.Core.Auth;
using ASC.Api.Core.Convention;
using ASC.Api.Core.Core;
using ASC.Api.Core.Middleware;
using ASC.Common;
using ASC.Common.Caching;
using ASC.Common.DependencyInjection;
using ASC.Common.Logging;
using ASC.Common.Mapping;
using ASC.Common.Utils;
using ASC.Webhooks.Core;
using Autofac;
using HealthChecks.UI.Client;
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Diagnostics.HealthChecks;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http.Extensions;
using Microsoft.AspNetCore.HttpOverrides;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Authorization;
using Microsoft.AspNetCore.Mvc.Formatters;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using NLog;
using NLog.Extensions.Logging;
using StackExchange.Redis.Extensions.Core.Configuration;
namespace ASC.Api.Core
{ {
public abstract class BaseStartup public abstract class BaseStartup
{ {

View File

@ -1,13 +1,4 @@
using ASC.Api.Core.Core; namespace ASC.Api.Core
using HealthChecks.UI.Client;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Diagnostics.HealthChecks;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
namespace ASC.Api.Core
{ {
public class BaseWorkerStartup public class BaseWorkerStartup
{ {

View File

@ -1,14 +1,4 @@
using System.Collections.Generic; namespace ASC.Api.Core.Core
using System.Linq;
using ASC.Web.Api.Routing;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Routing;
using Microsoft.AspNetCore.Routing.Patterns;
using Microsoft.Extensions.Primitives;
namespace ASC.Api.Core.Core
{ {
public class CustomEndpointDataSource : EndpointDataSource public class CustomEndpointDataSource : EndpointDataSource
{ {

View File

@ -1,16 +1,4 @@
using System; namespace ASC.Api.Core.Core
using System.Linq;
using ASC.Common.Caching;
using ASC.Common.Utils;
using Confluent.Kafka;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Diagnostics.HealthChecks;
namespace ASC.Api.Core.Core
{ {
public static class CustomHealthCheck public static class CustomHealthCheck
{ {

View File

@ -23,14 +23,6 @@
* *
*/ */
#region usings
using System.Collections.Generic;
using System.Runtime.Serialization;
#endregion
namespace ASC.Api.Collections namespace ASC.Api.Collections
{ {
[CollectionDataContract(Name = "hash", Namespace = "", ItemName = "entry", KeyName = "key", ValueName = "value")] [CollectionDataContract(Name = "hash", Namespace = "", ItemName = "entry", KeyName = "key", ValueName = "value")]

View File

@ -1,8 +1,4 @@
using System; namespace ASC.Api.Core
using ASC.Web.Core;
namespace ASC.Api.Core
{ {
public class Module public class Module
{ {

View File

@ -24,9 +24,6 @@
*/ */
using System;
using System.Collections.Generic;
using ASC.Common.Web; using ASC.Common.Web;
namespace ASC.Api.Utils namespace ASC.Api.Utils

View File

@ -1,15 +1,4 @@
using System.Threading.Tasks; namespace ASC.Api.Core.Core
using System.Xml.Linq;
using ASC.Common.Web;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc.Formatters;
using Newtonsoft.Json;
using Newtonsoft.Json.Serialization;
namespace ASC.Api.Core.Core
{ {
public class XmlOutputFormatter : IOutputFormatter public class XmlOutputFormatter : IOutputFormatter
{ {

View File

@ -0,0 +1,84 @@
global using System;
global using System.Collections.Generic;
global using System.ComponentModel;
global using System.Globalization;
global using System.Linq;
global using System.Linq.Expressions;
global using System.Net;
global using System.Net.Http;
global using System.Reflection;
global using System.Runtime.Serialization;
global using System.Security;
global using System.Security.Authentication;
global using System.Security.Claims;
global using System.Text.Encodings.Web;
global using System.Text.Json;
global using System.Text.Json.Serialization;
global using System.Threading;
global using System.Threading.Tasks;
global using System.Web;
global using System.Xml.Linq;
global using ASC.Api.Core;
global using ASC.Api.Core.Auth;
global using ASC.Api.Core.Convention;
global using ASC.Api.Core.Core;
global using ASC.Api.Core.Middleware;
global using ASC.Common;
global using ASC.Common.Caching;
global using ASC.Common.DependencyInjection;
global using ASC.Common.Logging;
global using ASC.Common.Mapping;
global using ASC.Common.Notify.Engine;
global using ASC.Common.Utils;
global using ASC.Common.Web;
global using ASC.Core;
global using ASC.Core.Common.EF;
global using ASC.Core.Tenants;
global using ASC.Core.Users;
global using ASC.IPSecurity;
global using ASC.Security.Cryptography;
global using ASC.Web.Api.Routing;
global using ASC.Web.Core;
global using ASC.Web.Core.Helpers;
global using ASC.Web.Core.Users;
global using ASC.Web.Studio.Utility;
global using ASC.Webhooks.Core;
global using Autofac;
global using Confluent.Kafka;
global using HealthChecks.UI.Client;
global using Microsoft.AspNetCore.Authentication;
global using Microsoft.AspNetCore.Authorization;
global using Microsoft.AspNetCore.Builder;
global using Microsoft.AspNetCore.Diagnostics.HealthChecks;
global using Microsoft.AspNetCore.Hosting;
global using Microsoft.AspNetCore.Http;
global using Microsoft.AspNetCore.HttpOverrides;
global using Microsoft.AspNetCore.Mvc;
global using Microsoft.AspNetCore.Mvc.ApplicationModels;
global using Microsoft.AspNetCore.Mvc.Authorization;
global using Microsoft.AspNetCore.Mvc.Controllers;
global using Microsoft.AspNetCore.Mvc.Filters;
global using Microsoft.AspNetCore.Mvc.Formatters;
global using Microsoft.AspNetCore.Mvc.Routing;
global using Microsoft.AspNetCore.Routing;
global using Microsoft.AspNetCore.Routing.Patterns;
global using Microsoft.Extensions.Configuration;
global using Microsoft.Extensions.DependencyInjection;
global using Microsoft.Extensions.Diagnostics.HealthChecks;
global using Microsoft.Extensions.Hosting;
global using Microsoft.Extensions.Logging;
global using Microsoft.Extensions.Options;
global using Microsoft.Extensions.Primitives;
global using Newtonsoft.Json;
global using Newtonsoft.Json.Serialization;
global using NLog;
global using NLog.Extensions.Logging;
global using StackExchange.Redis.Extensions.Core.Configuration;

View File

@ -1,9 +1,4 @@
using System; namespace ASC.Api.Core.Middleware
using System.Collections.Generic;
using System.Linq;
using System.Net;
namespace ASC.Api.Core.Middleware
{ {
public abstract class CommonApiResponse public abstract class CommonApiResponse
{ {

View File

@ -1,13 +1,4 @@
using System.Globalization; namespace ASC.Api.Core.Middleware
using System.Threading;
using System.Threading.Tasks;
using ASC.Core;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Http;
namespace ASC.Api.Core.Middleware
{ {
public class CultureMiddleware public class CultureMiddleware
{ {

View File

@ -1,11 +1,4 @@
using System.Threading.Tasks; namespace ASC.Api.Core.Middleware
using ASC.Common.Web;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Http;
namespace ASC.Api.Core.Middleware
{ {
public class DisposeMiddleware public class DisposeMiddleware
{ {

View File

@ -1,13 +1,6 @@
using System.Net; using ASC.IPSecurity;
using ASC.Common;
using ASC.Common.Logging;
using ASC.Core;
using ASC.IPSecurity;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.Extensions.Options;
namespace ASC.Api.Core.Middleware namespace ASC.Api.Core.Middleware
{ {

View File

@ -1,18 +1,4 @@
using System.Linq; namespace ASC.Api.Core.Middleware
using System.Net;
using System.Web;
using ASC.Common;
using ASC.Common.Logging;
using ASC.Web.Api.Routing;
using ASC.Web.Studio.Utility;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Controllers;
using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.Extensions.Options;
namespace ASC.Api.Core.Middleware
{ {
[Scope] [Scope]
public class PaymentFilter : IResourceFilter public class PaymentFilter : IResourceFilter

View File

@ -1,19 +1,6 @@
using System; using ASC.Common.Notify.Engine;
using System.Collections.Generic;
using System.Net;
using System.Reflection;
using ASC.Common;
using ASC.Common.Logging;
using ASC.Common.Notify.Engine;
using ASC.Core;
using ASC.Web.Core;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Controllers;
using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.AspNetCore.Mvc.Routing; using Microsoft.AspNetCore.Mvc.Routing;
using Microsoft.Extensions.Options;
namespace ASC.Api.Core.Middleware namespace ASC.Api.Core.Middleware
{ {

View File

@ -1,11 +1,4 @@
using System; using System.Security;
using System.Net;
using System.Security;
using ASC.Common.Web;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Filters;
namespace ASC.Api.Core.Middleware namespace ASC.Api.Core.Middleware
{ {

View File

@ -1,15 +1,4 @@
using System.Net; namespace ASC.Api.Core.Middleware
using ASC.Common;
using ASC.Common.Logging;
using ASC.Core;
using ASC.Core.Tenants;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.Extensions.Options;
namespace ASC.Api.Core.Middleware
{ {
[Scope] [Scope]
public class TenantStatusFilter : IResourceFilter public class TenantStatusFilter : IResourceFilter

View File

@ -1,16 +1,4 @@
using System; namespace ASC.Api.Core.Middleware
using System.Collections.Generic;
using System.Text.Json;
using ASC.Common;
using ASC.Webhooks.Core;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.AspNetCore.Routing;
namespace ASC.Api.Core.Middleware
{ {
[Scope] [Scope]
public class WebhooksGlobalFilterAttribute : ResultFilterAttribute public class WebhooksGlobalFilterAttribute : ResultFilterAttribute
@ -49,7 +37,7 @@ namespace ASC.Api.Core.Middleware
if (context.Result is ObjectResult objectResult) if (context.Result is ObjectResult objectResult)
{ {
var resultContent = JsonSerializer.Serialize(objectResult.Value, jsonSerializerOptions); var resultContent = System.Text.Json.JsonSerializer.Serialize(objectResult.Value, jsonSerializerOptions);
var eventName = $"method: {method}, route: {routePattern}"; var eventName = $"method: {method}, route: {routePattern}";

View File

@ -23,17 +23,6 @@
* *
*/ */
using System;
using ASC.Api.Core;
using ASC.Common;
using ASC.Core;
using ASC.Core.Users;
using ASC.Web.Core.Users;
using ASC.Web.Studio.Utility;
namespace ASC.Web.Api.Models namespace ASC.Web.Api.Models
{ {
public class EmployeeWraper public class EmployeeWraper

View File

@ -23,22 +23,6 @@
* *
*/ */
using System;
using System.Collections.Generic;
using System.Linq;
using System.Linq.Expressions;
using ASC.Api.Core;
using ASC.Common;
using ASC.Core;
using ASC.Core.Common.EF;
using ASC.Core.Users;
using ASC.Web.Core;
using ASC.Web.Core.Users;
using ASC.Web.Studio.Utility;
namespace ASC.Web.Api.Models namespace ASC.Web.Api.Models
{ {
public class EmployeeWraperFull : EmployeeWraper public class EmployeeWraperFull : EmployeeWraper

View File

@ -23,17 +23,11 @@
* *
*/ */
using System;
using ASC.Core;
using ASC.Core.Users;
namespace ASC.Web.Api.Models namespace ASC.Web.Api.Models
{ {
public class GroupWrapperSummary public class GroupWrapperSummary
{ {
public GroupWrapperSummary(GroupInfo group, UserManager userManager) public GroupWrapperSummary(ASC.Core.Users.GroupInfo group, UserManager userManager)
{ {
Id = group.ID; Id = group.ID;
Name = group.Name; Name = group.Name;

View File

@ -1,6 +1,4 @@
using Microsoft.AspNetCore.Mvc; namespace ASC.Web.Api.Routing
namespace ASC.Web.Api.Routing
{ {
public class DefaultRouteAttribute : RouteAttribute public class DefaultRouteAttribute : RouteAttribute
{ {

View File

@ -1,9 +1,4 @@
using System.Collections.Generic; namespace ASC.Web.Api.Routing
using System.Net.Http;
using Microsoft.AspNetCore.Mvc.Routing;
namespace ASC.Web.Api.Routing
{ {
public abstract class CustomHttpMethodAttribute : HttpMethodAttribute public abstract class CustomHttpMethodAttribute : HttpMethodAttribute
{ {