Commit Graph

233 Commits

Author SHA1 Message Date
26bb1567f7 ProductSecurityFilter: fix 2020-10-12 19:00:04 +03:00
b120d801aa Confirm: fix 2020-10-12 18:58:38 +03:00
e01ee037f2 Merge branch 'master' into feature/fix-messages
# Conflicts:
#	common/ASC.Core.Common/Billing/TariffService.cs
#	common/ASC.Core.Common/EF/Context/BaseDbContext.cs
#	common/ASC.Core.Common/EF/Context/CoreDbContext.cs
#	common/ASC.Core.Common/EF/Context/DbContext.cs
#	common/ASC.Core.Common/EF/Context/DbContextManager.cs
#	common/ASC.Core.Common/EF/Context/FeedDbContext.cs
#	common/ASC.Core.Common/EF/Context/FilesDbContext.cs
#	common/ASC.Core.Common/EF/Context/MessagesContext.cs
#	common/ASC.Core.Common/EF/Context/ResourceDbContext.cs
#	common/ASC.Core.Common/EF/Context/TelegramDbContext.cs
#	common/ASC.Core.Common/EF/Context/WebstudioDbContext.cs
#	common/ASC.Core.Common/EF/Model/AccountLinks.cs
#	common/ASC.Core.Common/EF/Model/Core/Acl.cs
#	common/ASC.Core.Common/EF/Model/Core/DbCoreSettings.cs
#	common/ASC.Core.Common/EF/Model/Core/DbSubscriptionMethod.cs
#	common/ASC.Core.Common/EF/Model/Core/Subscription.cs
#	common/ASC.Core.Common/EF/Model/DbWebstudioSettings.cs
#	common/ASC.Core.Common/EF/Model/DbWebstudioUservisit.cs
#	common/ASC.Core.Common/EF/Model/Feed/FeedReaded.cs
#	common/ASC.Core.Common/EF/Model/Feed/FeedUsers.cs
#	common/ASC.Core.Common/EF/Model/FilesConverts.cs
#	common/ASC.Core.Common/EF/Model/MobileAppInstall.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResAuthorsFile.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResAuthorsLang.cs
#	common/ASC.Core.Common/EF/Model/TelegramUser.cs
#	common/ASC.Core.Common/EF/Model/Tenant/DbButton.cs
#	common/ASC.Core.Common/EF/Model/Tenant/DbQuotaRow.cs
#	common/ASC.Core.Common/EF/Model/User/UserGroup.cs
#	common/ASC.Core.Common/HostedSolution.cs
#	common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
#	common/ASC.Data.Reassigns/QueueWorker.cs
#	common/ASC.Data.Reassigns/ReassignProgressItem.cs
#	common/ASC.Data.Reassigns/RemoveProgressItem.cs
#	common/ASC.VoipService/Dao/CachedVoipDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/DaoFactory.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/EF/DbEncryptedData.cs
#	products/ASC.Files/Core/Core/EF/DbFile.cs
#	products/ASC.Files/Core/Core/EF/DbFilesBunchObjects.cs
#	products/ASC.Files/Core/Core/EF/DbFilesSecurity.cs
#	products/ASC.Files/Core/Core/EF/DbFilesTagLink.cs
#	products/ASC.Files/Core/Core/EF/DbFilesThirdpartyApp.cs
#	products/ASC.Files/Core/Core/EF/DbFilesThirdpartyIdMapping.cs
#	products/ASC.Files/Core/Core/EF/DbFolderTree.cs
#	products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
#	products/ASC.Files/Core/Core/Search/FactoryIndexerFolder.cs
#	products/ASC.Files/Core/Core/Thirdparty/CachedProviderAccountDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderTagDao.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	products/ASC.Files/Server/Startup.cs
#	web/ASC.Web.Studio/Startup.cs
2020-10-09 15:40:44 +03:00
08590b6b58 Fix confirm 2020-10-07 13:45:53 +03:00
SuhorukovAnton
edbc0f247c fix-messages: IDE0022 2020-09-30 17:47:42 +03:00
SuhorukovAnton
ba1ed22345 fix-messages: IDE0058 2020-09-30 14:50:39 +03:00
SuhorukovAnton
754ac38e3e fix-messages: IDE0074 2020-09-29 12:18:16 +03:00
SuhorukovAnton
2d34d70a4e fix-messages: IDE0051 and IDE0052 2020-09-29 11:57:37 +03:00
SuhorukovAnton
29ec562a78 fix-messages: IDE0038 2020-09-28 18:21:29 +03:00
5271c7f2f5 Api: fix error response 2020-09-03 12:38:13 +03:00
maksim
8282f3f658 fix 2020-08-27 17:01:37 +03:00
4501d3229a Nuget: replaced thirdparty 2020-08-20 17:50:08 +03:00
f00a964c32 Merge branch 'master' into feature/private
# Conflicts:
#	common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
2020-08-14 17:19:36 +03:00
SuhorukovAnton
df8b6fd8b0 private: firtst version 2020-08-12 12:58:08 +03:00
Artem Tarasov
1a8aacebdc Merge branch 'master' into feature/Wizard
# Conflicts:
#	common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
#	common/ASC.Resource.Manager/Startup.cs
#	web/ASC.Web.Components/src/components/password-input/index.js
2020-07-21 13:13:47 +03:00
562abfcdc9 DI: refactoring 2020-07-17 13:52:28 +03:00
e10ac2ccfa BaseStartup: refactoring 2020-07-15 15:33:44 +03:00
7f095f03d1 Merge branch 'master' into feature/Wizard
# Conflicts:
#	common/ASC.Resource.Manager/Startup.cs
#	config/kafka.json
#	web/ASC.Web.Core/PublicResources/UserControlsCommonResource.Designer.cs
#	web/ASC.Web.Core/PublicResources/UserControlsCommonResource.de.resx
#	web/ASC.Web.Core/PublicResources/UserControlsCommonResource.es.resx
#	web/ASC.Web.Core/PublicResources/UserControlsCommonResource.fr.resx
#	web/ASC.Web.Core/PublicResources/UserControlsCommonResource.it.resx
#	web/ASC.Web.Core/PublicResources/UserControlsCommonResource.resx
#	web/ASC.Web.Core/PublicResources/UserControlsCommonResource.ru.resx
#	web/ASC.Web.Core/TariffSettings.cs
2020-07-15 15:23:28 +03:00
baa71247d8 Merge branch 'master' into feature/general-startup 2020-07-15 13:06:32 +03:00
5988855b61 Fix License 2020-07-08 18:30:23 +03:00
SuhorukovAnton
8b5ab8c9a4 api-defaultvalue: delete DataContracts 2020-07-08 13:10:09 +03:00
SuhorukovAnton
9d069de30a general-startup: transform GeneralStartup to BaseStartup 2020-07-07 23:00:39 +03:00
SuhorukovAnton
00558dd95f general-startup: fix 2020-07-06 10:56:17 +03:00
SuhorukovAnton
71d90ebfa2 general-startup: fix 2020-07-03 18:57:59 +03:00
SuhorukovAnton
2f5491f1ba general-startup: first version 2020-07-03 14:47:27 +03:00
c9a64ca377 Added NullIfDefault 2020-07-02 18:15:52 +03:00
da9423bfdc Wizard: api 2020-07-02 17:11:59 +03:00
d14313c6c1 References updated 2020-06-25 14:38:34 +03:00
bb6f32e36a Api: fix 2020-05-18 15:08:03 +03:00
ecd66902a0 Merge branch 'master' into feature/system-json 2020-05-18 14:16:03 +03:00
550b0dd20e Sln: packages updated 2020-05-18 10:27:22 +03:00
47c79d57f0 Optimization 2020-05-17 16:08:20 +03:00
c47bcebff3 Core: removed Custom Resolver 2020-05-14 18:51:22 +03:00
3a747ef8e4 Merge branch 'master' into feature/system-json
# Conflicts:
#	common/ASC.Api.Core/Core/ApiContext.cs
#	common/ASC.Api.Core/Core/ApiDateTime.cs
#	common/ASC.Api.Core/Model/EmployeeWraper.cs
#	common/ASC.Api.Core/Model/EmployeeWraperFull.cs
#	common/ASC.Core.Common/Caching/CachedUserService.cs
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	products/ASC.People/Server/Models/GroupWrapperFull.cs
#	products/ASC.People/Server/Startup.cs
#	web/ASC.Web.Api/Models/BuildVersion.cs
2020-05-07 10:28:20 +03:00
7fd2cd206b Api: Update 2020-04-20 15:54:13 +03:00
212fb746c9 Files: thirdparty fix 2020-03-16 11:25:39 +03:00
35e2e20049 Files: added model 2020-02-25 15:21:48 +03:00
44ec45ebb6 Merge branch 'master' into feature/elastic
# Conflicts:
#	common/ASC.Common/Security/Cryptography/InstanceCrypto.cs
#	common/ASC.Core.Common/Billing/TariffService.cs
#	common/ASC.Core.Common/Caching/CachedQuotaService.cs
#	common/ASC.Core.Common/Caching/CachedTenantService.cs
#	common/ASC.Core.Common/Caching/CachedUserService.cs
#	common/ASC.Core.Common/Context/Impl/AuthManager.cs
#	common/ASC.Core.Common/Context/Impl/CoreConfiguration.cs
#	common/ASC.Core.Common/Context/Impl/TenantManager.cs
#	common/ASC.Core.Common/Context/SecurityContext.cs
#	common/ASC.Core.Common/Data/DbSettingsManager.cs
#	common/ASC.Core.Common/Tenants/TenantUtil.cs
#	common/ASC.Data.Reassigns/QueueWorker.cs
#	common/ASC.IPSecurity/IPSecurity.cs
#	common/services/ASC.Studio.Notify/Program.cs
#	products/ASC.People/Server/Startup.cs
#	web/ASC.Web.Core/CookiesManager.cs
#	web/ASC.Web.Core/Tfa/TfaManager.cs
2020-02-25 11:24:45 +03:00
a90b1fb424 People: added GetExpression 2020-02-25 11:02:13 +03:00
9db8b26985 Replaced NewtonsoftJson with System.Text.Json 2020-02-21 16:19:32 +03:00
bc6e1d5e9e updated dependecies 2020-02-21 11:13:01 +03:00
a5280a1694 Added DIHelper 2020-02-17 11:58:14 +03:00
08db3b32b3 Merge branch 'master' into feature/ef
# Conflicts:
#	common/ASC.Common/ASC.Common.csproj
#	common/ASC.Core.Common/ASC.Core.Common.csproj
#	common/ASC.Resource.Manager/ASC.Resource.Manager.csproj
#	web/ASC.Web.Api/ASC.Web.Api.csproj
2019-12-06 12:25:18 +03:00
c9939b0da1 .net core up to 3.1 2019-12-06 12:12:51 +03:00
3dc8c87a94 EF: DbTenantService 2019-12-03 18:20:21 +03:00
26c8d56219 DI: refactoring. Added EmployeeWraperHelper 2019-11-11 18:42:07 +03:00
3e35efc027 ApiDateTime: removed TenantManager from param 2019-11-11 12:15:18 +03:00
9d2862bf9e Renamed all "*factory" classes to "*Extension"
https://github.com/ONLYOFFICE/AppServer/pull/7#pullrequestreview-314756136
2019-11-11 12:03:49 +03:00
32781a87e2 DI: refactoring. Extract settings helpers 2019-11-08 15:21:51 +03:00
db4ef4a17a DI: Log. refactoring. 2019-11-06 18:03:09 +03:00
0be2995e83 DI: filters and handlers 2019-11-01 12:37:02 +03:00
402c4d908d DI: refactoring 2019-10-31 14:28:30 +03:00
0bbc383266 Merge branch 'master' into refactoring/di
# Conflicts:
#	common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
#	common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
#	web/ASC.Web.Api/Controllers/PortalController.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Core/Notify/StudioNotifyService.cs
2019-10-30 11:45:55 +03:00
8ca3a63e24 DI: refactoring 2019-10-22 19:08:37 +03:00
6b2f6b0a7b DI: log 2019-10-17 18:55:35 +03:00
55138419b4 Confirm: fix auth 2019-09-27 18:53:40 +03:00
665ed9eb3c Settings: GetPasswordSettings available for everyone
ConfirmAuthHandler: handle ArgumentNullException
2019-09-27 17:03:24 +03:00
c8573b8301 Confirm: fixed invite link 2019-09-27 15:28:51 +03:00
d8fb67f683 Merge branch 'master' into refactoring/di
# Conflicts:
#	common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
#	common/ASC.Core.Common/Context/SecurityContext.cs
#	common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
#	web/ASC.Web.Api/Controllers/AuthenticationController.cs
#	web/ASC.Web.Api/Controllers/PortalController.cs
#	web/ASC.Web.Core/Notify/StudioNotifyService.cs
#	web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs
#	web/ASC.Web.Core/Utility/CommonLinkUtility.cs
2019-09-27 13:45:37 +03:00
1afcd2442c ConfirmAuthHandler: auth by uid 2019-09-27 12:18:48 +03:00
84ba343460 Auth: added check confirm method 2019-09-26 16:36:53 +03:00
22e4d19458 PasswordChange: added userId 2019-09-26 12:15:01 +03:00
710a3f62fa Merge branch 'master' into refactoring/di
# Conflicts:
#	common/ASC.Common/ASC.Common.csproj
#	common/ASC.Core.Common/ASC.Core.Common.csproj
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	products/ASC.People/Server/Controllers/PeopleController.cs
2019-09-25 18:56:28 +03:00
6d815608a0 ConfirmAuth: PasswordChange 2019-09-24 15:27:13 +03:00
afb1f90e9a .net core up to 3.0.0 2019-09-24 14:20:58 +03:00
dec4bb266e DI: configuration 2019-09-24 13:32:12 +03:00
00849598f0 Merge branch 'master' into refactoring/di
# Conflicts:
#	common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
#	common/ASC.Core.Common/Context/SecurityContext.cs
#	products/ASC.People/Server/Controllers/GroupController.cs
#	products/ASC.People/Server/Controllers/PeopleController.cs
2019-09-23 19:27:36 +03:00
23c00b458b Auth: added additional roles 2019-09-23 18:36:22 +03:00
6de13b9d50 DI: configuration 2019-09-23 15:20:08 +03:00
1e946b19b6 DI: refactoring 2019-09-20 18:53:27 +03:00
8184492a4f DI: ConfigurationManager 2019-09-20 18:08:45 +03:00
e13049c21f DI: CommonLinkUtility 2019-09-19 18:55:44 +03:00
c171e2c903 Merge branch 'master' into refactoring/di
# Conflicts:
#	common/ASC.Api.Core/ASC.Api.Core.csproj
#	common/ASC.Common/ASC.Common.csproj
#	common/ASC.Core.Common/ASC.Core.Common.csproj
#	common/ASC.Data.Storage/ASC.Data.Storage.csproj
#	common/ASC.FederatedLogin/ASC.FederatedLogin.csproj
#	common/ASC.IPSecurity/ASC.IPSecurity.csproj
#	common/ASC.Resource.Manager/ASC.Resource.Manager.csproj
#	common/ASC.VoipService/ASC.VoipService.csproj
#	web/ASC.Web.Api/ASC.Web.Api.csproj
#	web/ASC.Web.Core/ASC.Web.Core.csproj
#	web/ASC.Web.Studio/ASC.Web.Studio.csproj
2019-09-18 13:32:39 +03:00
152c5d9697 .net core up to 3.0.0-rc1 2019-09-18 12:29:17 +03:00
f34dca4ebb DI: ApiDateTime 2019-09-17 18:38:06 +03:00
4e2c04c9f7 DI: TenantManager 2019-09-17 15:42:32 +03:00
a46a092890 DI: TenantManager 2019-09-17 11:07:46 +03:00
547e589420 Removed TenantProvider 2019-09-16 17:51:39 +03:00
de16476542 Merge branch 'master' into refactoring/di
# Conflicts:
#	common/ASC.Api.Core/Core/ApiContext.cs
#	common/ASC.Core.Common/Context/SecurityContext.cs
#	products/ASC.People/Server/Controllers/PeopleController.cs
#	web/ASC.Web.Core/Users/UserPhotoManager.cs
2019-09-16 15:35:44 +03:00
86c5e64b20 added AuthByClaim 2019-09-16 12:21:10 +03:00
473207f9a4 DI: BaseSettings 2019-09-13 14:18:27 +03:00
deb8231f26 revert f85711b736 2019-09-12 14:34:58 +03:00
e0cb81adc4 Merge branch 'master' into refactoring/di
# Conflicts:
#	products/ASC.People/Server/Controllers/PeopleController.cs
2019-09-11 21:21:21 +03:00
c50b5b0fc9 csproj: remove pdb file from release build configuration 2019-09-10 16:38:20 +03:00
22bc8d1ad7 ConfirmAuthHandler di 2019-09-10 16:31:03 +03:00
7cd8e53d2c Merge branch 'master' into refactoring/di 2019-09-10 16:15:15 +03:00
02efce033f Api: added confirm auth scheme 2019-09-10 15:42:15 +03:00
e2a4311a29 Dependency injection
Packages updated
2019-09-09 15:56:33 +03:00
a26d8d24ce Api: added CustomJsonOptionsWrapper. optimization 2019-09-03 12:31:15 +03:00
12747318c6 Optimization 2019-08-30 15:40:57 +03:00
0c4b70e208 ApiDateTime: fix ReadJson 2019-08-22 16:41:13 +03:00
3cd4131f21 IDE0039, IDE0041, IDE0044 2019-08-15 17:36:08 +03:00
d9be7211f6 IDE0018 2019-08-15 16:05:50 +03:00
58fb60ba65 IDE0007 2019-08-15 16:03:57 +03:00
f6d78d3cba Code Cleanup 2019-08-15 15:04:42 +03:00
b6937c987b CultureMiddleWare: fixed 2019-08-13 16:01:03 +03:00
731ddefc82 Added CultureMiddleware and DisposeMiddleware 2019-08-12 15:52:55 +03:00
a26a6db0ea Api: added settings controller 2019-08-12 13:53:12 +03:00
49b259abff refactoring 2019-08-09 15:28:19 +03:00
f7327b0c79 Api: limit removed 2019-08-08 16:34:25 +03:00
f85711b736 Optimization 2019-08-08 12:26:58 +03:00
52a9770f5c Core: fix 2019-08-05 15:24:26 +03:00
8a4807daaa Api: fix 2019-08-05 10:50:11 +03:00
1de8fd7398 Api: fields 2019-08-02 17:40:33 +03:00
9e620d0ca1 Api: fix count 2019-07-30 16:36:08 +03:00
7dd4dd5a38 Api: added total 2019-07-29 13:51:14 +03:00
aad452174e Api: added module id 2019-07-29 13:04:43 +03:00
324ac1be9c Added XmlOutputFormatter 2019-07-24 13:48:45 +03:00
1ad03ec6d8 Added auth to StorageHandler 2019-07-09 13:29:53 +03:00
2757a9ac17 Api: remove set cookie 2019-07-08 17:18:31 +03:00
fabbcfffff Api: SetCookies. Searching dll and resources in valid path 2019-07-08 15:15:24 +03:00
73ba76d57b People as external product
nginx reverse proxy
2019-07-05 16:58:04 +03:00
ca6fdb500d Remove HttpContext.Current 2019-07-02 18:30:31 +03:00
676e7610b9 Api: IpSecurityFilter 2019-06-25 17:33:17 +03:00
c386c00b05 Api: extracted PaymentFilter and TenantStatusFilter 2019-06-25 17:26:32 +03:00
fcaae79140 Api: refactoring method attribute 2019-06-25 14:17:04 +03:00
460d9a33ed Api: format endpoint via datasource 2019-06-25 13:46:10 +03:00
d743e0883c API: Added ProductSecurityFilter 2019-06-25 10:34:27 +03:00
ef0b3162e6 People: GroupController 2019-06-21 12:07:49 +03:00
0b52eb9d26 Api: FormatRoute rename to Read 2019-06-14 11:15:28 +03:00
e9242435f5 Api: removed FormatIndexRoute. 2019-06-13 18:01:29 +03:00
a56dfd498e Api: replace middleware with filter 2019-06-13 15:12:21 +03:00
8b174a9cf7 Api: ApiDateTime 2019-06-13 12:25:53 +03:00
fe44b9ff2c Api: added ApiContext 2019-06-13 12:04:46 +03:00
8ad94d7d0d Api: get modules via WebItemManager 2019-06-10 15:17:45 +03:00
84fe95768a fix HttpContext.Current 2019-06-06 11:44:38 +03:00
af712c7ea8 fix AllowAnonymous 2019-05-31 13:47:47 +03:00
8eec776f32 Api: auth via header 2019-05-30 18:21:30 +03:00
62f831eea9 Api: refactoring 2019-05-30 17:57:15 +03:00
f2e373244c fix fd0466e286 2019-05-30 13:31:00 +03:00
fd0466e286 Api: exception handling 2019-05-30 12:28:21 +03:00
bea25886b2 Added CustomApiAttribute 2019-05-29 18:19:36 +03:00
c2d61517a5 Added ASC.Api.Core.csproj
added build.bat
PeopleController replaced to ASC.People
2019-05-29 17:44:37 +03:00