Commit Graph

97 Commits

Author SHA1 Message Date
89059cf32e Structured Logging 2022-04-28 12:15:33 +03:00
13bbce8ea4 Custom logger replaced with Microsoft.Extensions.Logging 2022-04-26 20:53:48 +03:00
97b45d3bd5 ILog: refactoring 2022-04-25 21:02:18 +03:00
1dff9e18c4 Merge branch 'develop' into feature/backend-refactor
# Conflicts:
#	common/ASC.Api.Core/ASC.Api.Core.csproj
#	common/ASC.Api.Core/Core/CustomHealthCheck.cs
#	common/ASC.Api.Core/Middleware/IpSecurityFilter.cs
#	common/ASC.Api.Core/Model/EmployeeWraperFull.cs
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
#	common/ASC.IPSecurity/IPRestrictionsRepository.cs
#	common/ASC.IPSecurity/IPRestrictionsService.cs
#	common/ASC.IPSecurity/IPSecurity.cs
#	common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
#	products/ASC.Files/Core/Utils/FileMarker.cs
#	products/ASC.Files/Core/Utils/FileSharing.cs
#	products/ASC.Files/Server/Controllers/FilesController.cs
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
#	products/ASC.People/Server/Controllers/PeopleController.cs
#	web/ASC.Web.Api/Controllers/PortalController.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Api/Models/SettingsWrapper.cs
#	web/ASC.Web.Core/Users/UserManagerWrapper.cs
2022-04-21 17:51:31 +03:00
6ecc8e7071 code cleanup 2022-04-14 22:42:15 +03:00
f138ff7c79 fixed warnings 2022-04-14 22:23:57 +03:00
66cbc3aa48 Elastic: fix 2022-04-12 15:01:33 +03:00
abae61f2db IDE1006 2022-03-25 19:26:06 +03:00
679aecbc76 Merge branch 'feature/backend-refactor' into feature/license-refactor
# Conflicts:
#	common/services/ASC.Webhooks.Service/WebhookSender.cs
#	products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs
2022-03-20 16:47:31 +03:00
868492b562 Merge branch 'develop' into feature/backend-refactor
# Conflicts:
#	common/ASC.Common/Threading/DistributedTaskQueue.cs
#	common/ASC.Core.Common/Billing/BillingClient.cs
#	common/ASC.Core.Common/Billing/TariffService.cs
#	common/ASC.Core.Common/Notify/Context.cs
#	common/ASC.FederatedLogin/Helpers/OAuth20TokenHelper.cs
#	common/ASC.FederatedLogin/Helpers/RequestHelper.cs
#	common/ASC.FederatedLogin/LoginProviders/DocuSignLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/FacebookLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/GoogleLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/GosUslugiLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/LinkedInLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/MailRuLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/VKLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/WordpressLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/YandexLoginProvider.cs
#	common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs
#	common/services/ASC.Studio.Notify/Program.cs
#	common/services/ASC.Webhooks.Service/WebhookSender.cs
#	products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxProviderInfo.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveProviderInfo.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveProviderInfo.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs
#	products/ASC.Files/Core/Helpers/DocuSignHelper.cs
#	products/ASC.Files/Core/Helpers/EasyBibHelper.cs
#	products/ASC.Files/Core/Helpers/WordpressHelper.cs
#	products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs
#	products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/Token.cs
#	products/ASC.Files/Server/Controllers/FilesController.cs
2022-03-19 22:16:03 +03:00
65db98f65c added new license headers 2022-03-15 21:00:53 +03:00
3d50d7977b removed past license headers 2022-03-15 19:59:24 +03:00
5c820fdcd5 Index: create index only in service 2022-03-14 21:47:34 +03:00
7ad1462b81 Merge branch 'feature/backend-refactor' into feature/asc-core-common-refactor 2022-02-21 12:51:45 +03:00
434b1d261b ElastichSearch: fix 2022-02-17 20:35:08 +03:00
f18ac08851 ElasticSearch: fix 2022-02-17 20:25:38 +03:00
ca7140186d Core: resolve properties for mapping, add mapping/projection 2022-02-15 13:30:05 +03:00
481581e424 Core: private properties replaced by private fields, add braces 2022-02-15 00:02:57 +03:00
b67d3cc11c Merge branch 'feature/backend-refactor' into feature/asc-elasticsearch-refactor 2022-02-14 19:03:56 +03:00
8288f3c4ca Common: return IEventBust to ICacheNotify 2022-02-14 12:05:05 +03:00
dba3efb235 Merge branch 'feature/backend-refactor' into feature/asc-common-refactor
# Conflicts:
#	common/ASC.Api.Core/GlobalUsings.cs
#	common/ASC.Common/Caching/AscCache.cs
#	common/ASC.Common/Collections/CachedDictionaryBase.cs
#	common/ASC.Common/Collections/HttpRequestDictionary.cs
#	common/ASC.Common/DIHelper.cs
#	common/ASC.Common/Data/StreamExtension.cs
#	common/ASC.Common/Data/TempStream.cs
#	common/ASC.Common/DependencyInjection/AutofacExtension.cs
#	common/ASC.Common/Logging/Log.cs
#	common/ASC.Common/Logging/SelfCleaningTarget.cs
#	common/ASC.Common/Logging/SpecialFolderPathConverter.cs
#	common/ASC.Common/Mapping/MappingProfile.cs
#	common/ASC.Common/Security/AscRandom.cs
#	common/ASC.Common/Security/Authorizing/AuthorizingException.cs
#	common/ASC.Common/Security/Authorizing/Constants.cs
#	common/ASC.Common/Security/Authorizing/Domain/Role.cs
#	common/ASC.Common/Security/Cryptography/Hasher.cs
#	common/ASC.Common/Threading/DistributedTask.cs
#	common/ASC.Common/Threading/DistributedTaskQueue.cs
#	common/ASC.Common/Utils/DnsLookup.cs
#	common/ASC.Common/Utils/HtmlUtil.cs
#	common/ASC.Common/Utils/HttpRequestExtensions.cs
#	common/ASC.Common/Utils/JsonWebToken.cs
#	common/ASC.Common/Utils/MailAddressUtils.cs
#	common/ASC.Common/Utils/RandomString.cs
#	common/ASC.Common/Utils/TimeZoneConverter/TimeZoneConverter.cs
#	common/ASC.Common/Utils/VelocityFormatter.cs
#	common/ASC.Common/Utils/Wildcard.cs
#	common/ASC.Common/Web/MimeMapping.cs
#	common/ASC.Common/Web/VirtualPathUtility.cs
#	common/services/ASC.ClearEvents/Program.cs
#	products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
2022-02-11 16:17:55 +03:00
54dde2e54c ElasticSearch: refactor 2022-02-11 13:06:30 +03:00
53237d8c6f ElasticSearch: used file-scoped namespaces 2022-02-10 16:45:41 +03:00
20bb3fb8ff ElasticSearch: add braces 2022-02-10 16:24:25 +03:00
a5268d3d8f ElasticSearch: reordered methods according to access modifier, cosmetic changes 2022-02-10 16:14:03 +03:00
45d7c1d44e ElasticSearch: removed 's' prefix 2022-02-10 15:42:49 +03:00
402dedb49b ElasticSearch: private properties replaced by private fileds, used keyword readonly 2022-02-10 14:56:13 +03:00
320a1f2250 Merge branch 'develop' into feature/backend-refactor
# Conflicts:
#	common/ASC.Api.Core/Core/BaseStartup.cs
#	common/ASC.Common/Caching/AscCache.cs
#	common/ASC.Common/Data/StreamExtension.cs
#	common/ASC.Common/Utils/RandomString.cs
#	common/ASC.Core.Common/Billing/CouponManager.cs
#	common/ASC.Core.Common/Billing/License/LicenseReader.cs
#	common/ASC.Core.Common/Core/UserGroupRef.cs
#	common/ASC.Core.Common/Data/DbTenantService.cs
#	common/ASC.Core.Common/Notify/Jabber/JabberServiceClientWcf.cs
#	common/ASC.Core.Common/Notify/Telegram/Dao/CachedTelegramDao.cs
#	common/ASC.Data.Backup.Core/Core/DbHelper.cs
#	common/ASC.Data.Backup.Core/Storage/BackupRepository.cs
#	common/ASC.Data.Backup.Core/Tasks/Data/TableInfo.cs
#	common/ASC.Data.Storage/BaseStorage.cs
#	common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
#	common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
#	common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
#	common/ASC.Data.Storage/S3/S3Storage.cs
#	common/ASC.Notify.Textile/JabberStyler.cs
#	common/ASC.Textile/Blocks/GlyphBlockModifier.cs
#	common/ASC.Textile/States/TableRowFormatterState.cs
#	common/services/ASC.ApiSystem/Classes/CommonMethods.cs
#	common/services/ASC.ApiSystem/Controllers/PortalController.cs
#	common/services/ASC.ClearEvents/Program.cs
#	common/services/ASC.TelegramService/Startup.cs
#	common/services/ASC.UrlShortener.Svc/Program.cs
#	products/ASC.Files/Core/Core/Entries/File.cs
#	products/ASC.Files/Core/Core/Entries/FileEntry.cs
#	products/ASC.Files/Core/Core/Entries/FileHelper.cs
#	products/ASC.Files/Core/Core/Entries/Folder.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs
#	products/ASC.Files/Core/Helpers/ThirdpartyConfiguration.cs
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/Services/DocumentService/Configuration.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceConnector.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
#	products/ASC.Files/Server/Startup.cs
#	products/ASC.Files/Service/Thumbnail/Builder.cs
#	products/ASC.Files/Service/Thumbnail/FileDataProvider.cs
#	products/ASC.People/Server/Startup.cs
#	web/ASC.Web.Core/Files/DocumentService.cs
#	web/ASC.Web.Core/Files/DocumentServiceLicense.cs
#	web/ASC.Web.Core/QuotaSync.cs
#	web/ASC.Web.Core/Sms/SmsKeyStorage.cs
#	web/ASC.Web.Core/Users/UserManagerWrapper.cs
#	web/ASC.Web.HealthChecks.UI/Program.cs
#	web/ASC.Web.Studio/Startup.cs
2022-02-10 13:16:33 +03:00
812241a69a Analyzers: fix 2022-02-07 17:53:58 +03:00
973624c30b Merge branch 'feature/refactoring' into feature/asc-common-refactor 2022-02-03 17:30:13 +03:00
f2c0f3ec77 Common: ICahcheNotify is reduced to IEventBus 2022-02-01 14:38:03 +03:00
34ff334692 Merge branch 'develop' into feature/analizators 2022-01-31 14:35:16 +03:00
2ddb37dedf refactoring: add globalUsing: elasticSeach 2022-01-26 14:41:26 +03:00
fce8d26cef analizators/ca1507 2022-01-24 13:49:00 +03:00
f3d8b8d17a analizators/s1854 2022-01-21 16:36:36 +03:00
143f0a5dda Analizators/s1854 2022-01-21 16:22:56 +03:00
fb65d3a09d analizators/1481 2022-01-21 16:15:15 +03:00
2029c34f9c analizators/s1121 2022-01-21 14:02:17 +03:00
a0a1a1c50c Elastic: fix ping 2022-01-21 13:54:09 +03:00
fa10791720 Elastic: fix ping 2022-01-21 11:40:59 +03:00
0630a43b58 Elastic: fix ping 2022-01-21 11:26:25 +03:00
fbb50e676e analizators/U2U1202 2022-01-19 12:51:30 +03:00
0ee1a35424 analizators/U2U1115 2022-01-17 11:22:52 +03:00
4bf841581f Analizators/U2U1104 2022-01-14 16:12:37 +03:00
3ff7aeca3b analizators/U2U1015 2022-01-12 13:27:06 +03:00
50c0596eff analizators/U2U1009 2022-01-11 18:37:19 +03:00
d9619e1151 analizators/U2U1006 2022-01-10 18:13:54 +03:00
6273539207 analizators/s2583 2021-12-30 14:03:50 +03:00
c87a831b89 Files: optimization 2021-12-08 13:14:44 +03:00
1882f9db43 Fixed settings issue 2021-10-29 17:21:51 +03:00