IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/files

Browse Source
This commit is contained in:
Ilya Oleshko 2020-04-16 13:36:11 +03:00
commit 8be78a2444
5 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/ASC.FederatedLogin/LoginProviders/BoxLoginProvider.cs
View File

@ -72,7 +72,7 @@ namespace ASC.FederatedLogin.LoginProviders
{
public static DIHelper AddBoxLoginProviderService(this DIHelper services)
{
services.TryAddScoped<BoxLoginProvider>();
//services.TryAddScoped<BoxLoginProvider>();
return services
.AddConsumerFactoryService()
.AddKafkaService()

2
common/ASC.FederatedLogin/LoginProviders/DocuSignLoginProvider.cs
View File

@ -132,7 +132,7 @@ namespace ASC.FederatedLogin.LoginProviders
{
public static DIHelper AddDocuSignLoginProviderService(this DIHelper services)
{
services.TryAddScoped<DocuSignLoginProvider>();
//services.TryAddScoped<DocuSignLoginProvider>();
return services
.AddConsumerFactoryService()
.AddKafkaService()

2
common/ASC.FederatedLogin/LoginProviders/GoogleLoginProvider.cs
View File

@ -185,7 +185,7 @@ namespace ASC.FederatedLogin.LoginProviders
{
public static DIHelper AddGoogleLoginProviderService(this DIHelper services)
{
services.TryAddScoped<GoogleLoginProvider>();
//services.TryAddScoped<GoogleLoginProvider>();
return services
.AddConsumerFactoryService()
.AddKafkaService()

2
common/ASC.FederatedLogin/LoginProviders/OneDriveLoginProvider.cs
View File

@ -75,7 +75,7 @@ namespace ASC.FederatedLogin.LoginProviders
{
public static DIHelper AddOneDriveLoginProviderService(this DIHelper services)
{
services.TryAddScoped<OneDriveLoginProvider>();
//services.TryAddScoped<OneDriveLoginProvider>();
return services
.AddConsumerFactoryService()
.AddKafkaService()

6
products/ASC.Files/Server/Helpers/DocuSignHelper.cs
View File

@ -73,8 +73,7 @@ namespace ASC.Web.Files.Helpers
public TokenHelper TokenHelper { get; }
public AuthContext AuthContext { get; }
public ConsumerFactory ConsumerFactory { get; }
public DocuSignLoginProvider DocuSignLoginProvider { get; }
public ConsumerFactory ConsumerFactory { get; }
public DocuSignToken(
TokenHelper tokenHelper,
@ -154,7 +153,6 @@ namespace ASC.Web.Files.Helpers
public static int MaxEmailLength = 10000;
public DocuSignToken DocuSignToken { get; }
public DocuSignLoginProvider DocuSignLoginProvider { get; }
public FileSecurity FileSecurity { get; }
public IDaoFactory DaoFactory { get; }
public BaseCommonLinkUtility BaseCommonLinkUtility { get; }
@ -170,7 +168,6 @@ namespace ASC.Web.Files.Helpers
public DocuSignHelper(
DocuSignToken docuSignToken,
DocuSignLoginProvider docuSignLoginProvider,
FileSecurity fileSecurity,
IDaoFactory daoFactory,
IOptionsMonitor<ILog> options,
@ -186,7 +183,6 @@ namespace ASC.Web.Files.Helpers
ConsumerFactory consumerFactory)
{
DocuSignToken = docuSignToken;
DocuSignLoginProvider = docuSignLoginProvider;
FileSecurity = fileSecurity;
DaoFactory = daoFactory;
BaseCommonLinkUtility = baseCommonLinkUtility;