Merge branch 'develop' into bugfix/components-fix
This commit is contained in:
commit
2c9ee55055
@ -1186,7 +1186,7 @@ namespace ASC.Web.Files.Services.WCFService
|
||||
MessageAction messageAction;
|
||||
if (string.IsNullOrEmpty(thirdPartyParams.ProviderId))
|
||||
{
|
||||
ErrorIf(!ThirdpartyConfiguration.SupportInclusion
|
||||
ErrorIf(!ThirdpartyConfiguration.SupportInclusion(DaoFactory)
|
||||
||
|
||||
(!FilesSettingsHelper.EnableThirdParty
|
||||
&& !CoreBaseSettings.Personal)
|
||||
|
@ -89,7 +89,7 @@ namespace ASC.Files.Thirdparty
|
||||
private InstanceCrypto InstanceCrypto { get; }
|
||||
private SecurityContext SecurityContext { get; }
|
||||
private ConsumerFactory ConsumerFactory { get; }
|
||||
public ThirdpartyConfiguration ThirdpartyConfiguration { get; }
|
||||
private ThirdpartyConfiguration ThirdpartyConfiguration { get; }
|
||||
|
||||
public ProviderAccountDao(
|
||||
IServiceProvider serviceProvider,
|
||||
|
@ -41,7 +41,6 @@ namespace ASC.Web.Files.Helpers
|
||||
public class ThirdpartyConfiguration
|
||||
{
|
||||
private IConfiguration Configuration { get; }
|
||||
private IDaoFactory DaoFactory { get; }
|
||||
private Lazy<BoxLoginProvider> BoxLoginProvider { get; }
|
||||
private Lazy<DropboxLoginProvider> DropboxLoginProvider { get; }
|
||||
private Lazy<OneDriveLoginProvider> OneDriveLoginProvider { get; }
|
||||
@ -50,11 +49,9 @@ namespace ASC.Web.Files.Helpers
|
||||
|
||||
public ThirdpartyConfiguration(
|
||||
IConfiguration configuration,
|
||||
IDaoFactory daoFactory,
|
||||
ConsumerFactory consumerFactory)
|
||||
{
|
||||
Configuration = configuration;
|
||||
DaoFactory = daoFactory;
|
||||
BoxLoginProvider = new Lazy<BoxLoginProvider>(() => consumerFactory.Get<BoxLoginProvider>());
|
||||
DropboxLoginProvider = new Lazy<DropboxLoginProvider>(() => consumerFactory.Get<DropboxLoginProvider>());
|
||||
OneDriveLoginProvider = new Lazy<OneDriveLoginProvider>(() => consumerFactory.Get<OneDriveLoginProvider>());
|
||||
@ -67,16 +64,13 @@ namespace ASC.Web.Files.Helpers
|
||||
get { return (Configuration.GetSection("files:thirdparty:enable").Get<string[]>() ?? new string[] { }).ToList(); }
|
||||
}
|
||||
|
||||
public bool SupportInclusion
|
||||
public bool SupportInclusion(IDaoFactory daoFactory)
|
||||
{
|
||||
get
|
||||
{
|
||||
var providerDao = DaoFactory.ProviderDao;
|
||||
var providerDao = daoFactory.ProviderDao;
|
||||
if (providerDao == null) return false;
|
||||
|
||||
return SupportBoxInclusion || SupportDropboxInclusion || SupportDocuSignInclusion || SupportGoogleDriveInclusion || SupportOneDriveInclusion || SupportSharePointInclusion || SupportWebDavInclusion || SupportNextcloudInclusion || SupportOwncloudInclusion || SupportkDriveInclusion || SupportYandexInclusion;
|
||||
}
|
||||
}
|
||||
|
||||
public bool SupportBoxInclusion
|
||||
{
|
||||
|
@ -109,7 +109,7 @@ namespace ASC.Web.Files.Configuration
|
||||
var folderDao = DaoFactory.GetFolderDao<int>();
|
||||
result = folderDao.SearchFolders(text).Where(security.CanRead);
|
||||
|
||||
if (ThirdpartyConfiguration.SupportInclusion
|
||||
if (ThirdpartyConfiguration.SupportInclusion(DaoFactory)
|
||||
&& FilesSettingsHelper.EnableThirdParty)
|
||||
{
|
||||
var id = GlobalFolderHelper.FolderMy;
|
||||
|
@ -497,7 +497,7 @@ namespace ASC.Web.Files.Utils
|
||||
var folderList = new List<Folder<string>>();
|
||||
|
||||
if ((parent.ID.Equals(GlobalFolderHelper.FolderMy) || parent.ID.Equals(GlobalFolderHelper.FolderCommon))
|
||||
&& ThirdpartyConfiguration.SupportInclusion
|
||||
&& ThirdpartyConfiguration.SupportInclusion(DaoFactory)
|
||||
&& (FilesSettingsHelper.EnableThirdParty
|
||||
|| CoreBaseSettings.Personal))
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user