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

Merge branch 'develop' into feature/copy-paste-hotkeys

Browse Source
This commit is contained in:
Nikita Gopienko 2023-09-08 11:29:08 +03:00
commit b22b216d95
85 changed files with 1936 additions and 2016 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/ASC.Core.Common/Configuration/Consumer.cs
View File

@ -219,11 +219,7 @@ public class Consumer : IDictionary<string, string>
private void Set(string name, string value)
{
if (!CanSet)
{
throw new NotSupportedException("Key for read only. Key " + name);
}
if (!ManagedKeys.Contains(name))
{
if (_additional.ContainsKey(name))
@ -238,6 +234,11 @@ public class Consumer : IDictionary<string, string>
return;
}
if (!CanSet)
{
throw new NotSupportedException("Key for read only. Key " + name);
}
var tenant = CoreBaseSettings.Standalone
? Tenant.DefaultTenant
: TenantManager.GetCurrentTenant().Id;

237
common/ASC.Data.Backup.Core/Core/DbBackupProvider.cs
View File

@ -1,237 +0,0 @@
// (c) Copyright Ascensio System SIA 2010-2022
//
// This program is a free software product.
// You can redistribute it and/or modify it under the terms
// of the GNU Affero General Public License (AGPL) version 3 as published by the Free Software
// Foundation. In accordance with Section 7(a) of the GNU AGPL its Section 15 shall be amended
// to the effect that Ascensio System SIA expressly excludes the warranty of non-infringement of
// any third-party rights.
//
// This program is distributed WITHOUT ANY WARRANTY, without even the implied warranty
// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For details, see
// the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
//
// You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021.
//
// The interactive user interfaces in modified source and object code versions of the Program must
// display Appropriate Legal Notices, as required under Section 5 of the GNU AGPL version 3.
//
// Pursuant to Section 7(b) of the License you must retain the original Product logo when
// distributing the program. Pursuant to Section 7(e) we decline to grant you any rights under
// trademark law for use of our trademarks.
//
// All the Product's GUI elements, including illustrations and icon sets, as well as technical writing
// content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0
// International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
using ConfigurationManager = System.Configuration.ConfigurationManager;
namespace ASC.Data.Backup;
[Scope]
public class DbBackupProvider : IBackupProvider
{
public string Name => "databases";
private readonly List<string> _processedTables = new List<string>();
private readonly DbHelper _dbHelper;
private readonly TempStream _tempStream;
public DbBackupProvider(DbHelper dbHelper, TempStream tempStream)
{
_dbHelper = dbHelper;
_tempStream = tempStream;
}
public event EventHandler<ProgressChangedEventArgs> ProgressChanged;
public async Task<IEnumerable<XElement>> GetElements(int tenant, string[] configs, IDataWriteOperator writer)
{
_processedTables.Clear();
var xml = new List<XElement>();
var connectionKeys = new Dictionary<string, string>();
foreach (var connectionString in GetConnectionStrings(configs))
{
//do not save the base, having the same provider and connection string is not to duplicate
//data, but also expose the ref attribute of repetitive bases for the correct recovery
var node = new XElement(connectionString.Name);
xml.Add(node);
var connectionKey = connectionString.ProviderName + connectionString.ConnectionString;
if (connectionKeys.TryGetValue(connectionKey, out var value))
{
node.Add(new XAttribute("ref", value));
}
else
{
connectionKeys.Add(connectionKey, connectionString.Name);
node.Add(await BackupDatabase(tenant, connectionString, writer));
}
}
return xml.AsEnumerable();
}
public async Task LoadFromAsync(IEnumerable<XElement> elements, int tenant, string[] configs, IDataReadOperator reader)
{
_processedTables.Clear();
foreach (var connectionString in GetConnectionStrings(configs))
{
await RestoreDatabaseAsync(connectionString, elements, reader);
}
}
public IEnumerable<ConnectionStringSettings> GetConnectionStrings(string[] configs)
{
/* if (configs.Length == 0)
{
configs = new string[] { AppDomain.CurrentDomain.SetupInformation.ConfigurationFile };
}
var connectionStrings = new List<ConnectionStringSettings>();
foreach (var config in configs)
{
connectionStrings.AddRange(GetConnectionStrings(GetConfiguration(config)));
}
return connectionStrings.GroupBy(cs => cs.Name).Select(g => g.First());*/
return null;
}
public IEnumerable<ConnectionStringSettings> GetConnectionStrings(Configuration cfg)
{
var connectionStrings = new List<ConnectionStringSettings>();
foreach (ConnectionStringSettings connectionString in cfg.ConnectionStrings.ConnectionStrings)
{
if (connectionString.Name == "LocalSqlServer" || connectionString.Name == "readonly")
{
continue;
}
connectionStrings.Add(connectionString);
if (connectionString.ConnectionString.Contains("|DataDirectory|"))
{
connectionString.ConnectionString = connectionString.ConnectionString.Replace("|DataDirectory|", Path.GetDirectoryName(cfg.FilePath) + '\\');
}
}
return connectionStrings;
}
private void OnProgressChanged(string status, int progress)
{
ProgressChanged?.Invoke(this, new ProgressChangedEventArgs(status, progress));
}
private Configuration GetConfiguration(string config)
{
if (config.Contains(Path.DirectorySeparatorChar) && !Uri.IsWellFormedUriString(config, UriKind.Relative))
{
var map = new ExeConfigurationFileMap
{
ExeConfigFilename = string.Equals(Path.GetExtension(config), ".config", StringComparison.OrdinalIgnoreCase) ? config : CrossPlatform.PathCombine(config, "Web.config")
};
return ConfigurationManager.OpenMappedExeConfiguration(map, ConfigurationUserLevel.None);
}
return ConfigurationManager.OpenExeConfiguration(config);
}
private async Task<List<XElement>> BackupDatabase(int tenant, ConnectionStringSettings connectionString, IDataWriteOperator writer)
{
var xml = new List<XElement>();
var errors = 0;
var timeout = TimeSpan.FromSeconds(1);
var tables = _dbHelper.GetTables();
for (var i = 0; i < tables.Count; i++)
{
var table = tables[i];
OnProgressChanged(table, (int)(i / (double)tables.Count * 100));
if (_processedTables.Contains(table, StringComparer.InvariantCultureIgnoreCase))
{
continue;
}
xml.Add(new XElement(table));
DataTable dataTable;
while (true)
{
try
{
dataTable = _dbHelper.GetTable(table, tenant);
break;
}
catch
{
errors++;
if (20 < errors)
{
throw;
}
Thread.Sleep(timeout);
}
}
foreach (DataColumn c in dataTable.Columns)
{
if (c.DataType == typeof(DateTime))
{
c.DateTimeMode = DataSetDateTime.Unspecified;
}
}
await using (var file = _tempStream.Create())
{
dataTable.WriteXml(file, XmlWriteMode.WriteSchema);
await writer.WriteEntryAsync($"{Name}\\{connectionString.Name}\\{table}".ToLower(), file);
}
_processedTables.Add(table);
}
return xml;
}
private async Task RestoreDatabaseAsync(ConnectionStringSettings connectionString, IEnumerable<XElement> elements, IDataReadOperator reader)
{
var dbName = connectionString.Name;
var dbElement = elements.SingleOrDefault(e => string.Equals(e.Name.LocalName, connectionString.Name, StringComparison.OrdinalIgnoreCase));
if (dbElement != null && dbElement.Attribute("ref") != null)
{
dbName = dbElement.Attribute("ref").Value;
dbElement = elements.Single(e => string.Equals(e.Name.LocalName, dbElement.Attribute("ref").Value, StringComparison.OrdinalIgnoreCase));
}
if (dbElement == null)
{
return;
}
var tables = _dbHelper.GetTables();
for (var i = 0; i < tables.Count; i++)
{
var table = tables[i];
OnProgressChanged(table, (int)(i / (double)tables.Count * 100));
if (_processedTables.Contains(table, StringComparer.InvariantCultureIgnoreCase))
{
continue;
}
if (dbElement.Element(table) != null)
{
await using (var stream = reader.GetEntry($"{Name}\\{dbName}\\{table}".ToLower()))
{
var data = new DataTable();
data.ReadXml(stream);
await _dbHelper.SetTableAsync(data);
}
_processedTables.Add(table);
}
}
}
}

310
common/ASC.Data.Backup.Core/Core/DbHelper.cs
View File

@ -1,310 +0,0 @@
// (c) Copyright Ascensio System SIA 2010-2022
//
// This program is a free software product.
// You can redistribute it and/or modify it under the terms
// of the GNU Affero General Public License (AGPL) version 3 as published by the Free Software
// Foundation. In accordance with Section 7(a) of the GNU AGPL its Section 15 shall be amended
// to the effect that Ascensio System SIA expressly excludes the warranty of non-infringement of
// any third-party rights.
//
// This program is distributed WITHOUT ANY WARRANTY, without even the implied warranty
// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For details, see
// the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
//
// You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021.
//
// The interactive user interfaces in modified source and object code versions of the Program must
// display Appropriate Legal Notices, as required under Section 5 of the GNU AGPL version 3.
//
// Pursuant to Section 7(b) of the License you must retain the original Product logo when
// distributing the program. Pursuant to Section 7(e) we decline to grant you any rights under
// trademark law for use of our trademarks.
//
// All the Product's GUI elements, including illustrations and icon sets, as well as technical writing
// content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0
// International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
namespace ASC.Data.Backup;
[Scope]
public class DbHelper : IDisposable
{
private readonly DbProviderFactory _factory;
private readonly DbConnection _connect;
private readonly DbCommandBuilder _builder;
private readonly DataTable _columns;
private readonly bool _mysql;
private readonly ILogger<DbHelper> _logger;
private readonly TenantDbContext _tenantDbContext;
private readonly CoreDbContext _coreDbContext;
private readonly IDictionary<string, string> _whereExceptions
= new Dictionary<string, string>();
public DbHelper(
ILogger<DbHelper> logger,
ConnectionStringSettings connectionString,
IDbContextFactory<TenantDbContext> tenantDbContext,
IDbContextFactory<CoreDbContext> coreDbContext)
{
_logger = logger;
_tenantDbContext = tenantDbContext.CreateDbContext();
_coreDbContext = coreDbContext.CreateDbContext();
var file = connectionString.ElementInformation.Source;
if ("web.connections.config".Equals(Path.GetFileName(file), StringComparison.InvariantCultureIgnoreCase))
{
file = CrossPlatform.PathCombine(Path.GetDirectoryName(file), "Web.config");
}
var xconfig = XDocument.Load(file);
var provider = xconfig.XPathSelectElement("/configuration/system.data/DbProviderFactories/add[@invariant='" + connectionString.ProviderName + "']");
_factory = (DbProviderFactory)Activator.CreateInstance(Type.GetType(provider.Attribute("type").Value, true));
_builder = _factory.CreateCommandBuilder();
_connect = _factory.CreateConnection();
_connect.ConnectionString = connectionString.ConnectionString;
_connect.Open();
_mysql = connectionString.ProviderName.Contains("mysql", StringComparison.OrdinalIgnoreCase);
if (_mysql)
{
CreateCommand("set @@session.sql_mode = concat(@@session.sql_mode, ',NO_AUTO_VALUE_ON_ZERO')").ExecuteNonQuery();
}
_columns = _connect.GetSchema("Columns");
_whereExceptions["calendar_calendar_item"] = " where calendar_id in (select id from calendar_calendars where tenant = {0}) ";
_whereExceptions["calendar_calendar_user"] = " where calendar_id in (select id from calendar_calendars where tenant = {0}) ";
_whereExceptions["calendar_event_item"] = " inner join calendar_events on calendar_event_item.event_id = calendar_events.id where calendar_events.tenant = {0} ";
_whereExceptions["calendar_event_user"] = " inner join calendar_events on calendar_event_user.event_id = calendar_events.id where calendar_events.tenant = {0} ";
_whereExceptions["crm_entity_contact"] = " inner join crm_contact on crm_entity_contact.contact_id = crm_contact.id where crm_contact.tenant_id = {0} ";
_whereExceptions["crm_entity_tag"] = " inner join crm_tag on crm_entity_tag.tag_id = crm_tag.id where crm_tag.tenant_id = {0} ";
_whereExceptions["files_folder_tree"] = " inner join files_folder on folder_id = id where tenant_id = {0} ";
_whereExceptions["forum_answer_variant"] = " where answer_id in (select id from forum_answer where tenantid = {0})";
_whereExceptions["forum_topic_tag"] = " where topic_id in (select id from forum_topic where tenantid = {0})";
_whereExceptions["forum_variant"] = " where question_id in (select id from forum_question where tenantid = {0})";
_whereExceptions["projects_project_participant"] = " inner join projects_projects on projects_project_participant.project_id = projects_projects.id where projects_projects.tenant_id = {0} ";
_whereExceptions["projects_following_project_participant"] = " inner join projects_projects on projects_following_project_participant.project_id = projects_projects.id where projects_projects.tenant_id = {0} ";
_whereExceptions["projects_project_tag"] = " inner join projects_projects on projects_project_tag.project_id = projects_projects.id where projects_projects.tenant_id = {0} ";
_whereExceptions["tenants_tenants"] = " where id = {0}";
_whereExceptions["core_acl"] = " where tenant = {0} or tenant = -1";
_whereExceptions["core_subscription"] = " where tenant = {0} or tenant = -1";
_whereExceptions["core_subscriptionmethod"] = " where tenant = {0} or tenant = -1";
}
public List<string> GetTables()
{
var allowTables = new List<string>
{
"blogs_",
"bookmarking_",
"calendar_",
"core_",
"crm_",
"events_",
"files_",
"forum_",
"photo_",
"projects_",
"tenants_",
"webstudio_",
"wiki_",
};
var disallowTables = new List<string>
{
"core_settings",
"webstudio_uservisit",
"webstudio_useractivity",
"tenants_forbiden",
};
IEnumerable<string> tables;
if (_mysql)
{
tables = ExecuteList(CreateCommand("show tables"));
}
else
{
tables = _connect
.GetSchema("Tables")
.Select(@"TABLE_TYPE <> 'SYSTEM_TABLE'")
.Select(row => (string)row["TABLE_NAME"]);
}
return tables
.Where(t => allowTables.Any(a => t.StartsWith(a)) && !disallowTables.Any(d => t.StartsWith(d)))
.ToList();
}
public DataTable GetTable(string table, int tenant)
{
try
{
var dataTable = new DataTable(table);
var adapter = _factory.CreateDataAdapter();
adapter.SelectCommand = CreateCommand("select " + Quote(table) + ".* from " + Quote(table) + GetWhere(table, tenant));
_logger.Debug(adapter.SelectCommand.CommandText);
adapter.Fill(dataTable);
return dataTable;
}
catch (Exception error)
{
_logger.ErrorTableString(table, error);
throw;
}
}
public async Task SetTableAsync(DataTable table)
{
await using var tx = _connect.BeginTransaction();
try
{
if ("tenants_tenants".Equals(table.TableName, StringComparison.InvariantCultureIgnoreCase))
{
// remove last tenant
var tenant = await Queries.LastTenantAsync(_tenantDbContext);
if (tenant != null)
{
_tenantDbContext.Tenants.Remove(tenant);
await _tenantDbContext.SaveChangesAsync();
}
/* var tenantid = CreateCommand("select id from tenants_tenants order by id desc limit 1").ExecuteScalar();
CreateCommand("delete from tenants_tenants where id = " + tenantid).ExecuteNonQuery();*/
if (table.Columns.Contains("mappeddomain"))
{
foreach (var r in table.Rows.Cast<DataRow>())
{
r[table.Columns["mappeddomain"]] = null;
if (table.Columns.Contains("id"))
{
var tariff = await Queries.TariffAsync(_coreDbContext, tenant.Id);
tariff.TenantId = (int)r[table.Columns["id"]];
tariff.CreateOn = DateTime.Now;
// CreateCommand("update tenants_tariff set tenant = " + r[table.Columns["id"]] + " where tenant = " + tenantid).ExecuteNonQuery();
_coreDbContext.Entry(tariff).State = EntityState.Modified;
await _coreDbContext.SaveChangesAsync();
}
}
}
}
var sql = new StringBuilder("replace into " + Quote(table.TableName) + "(");
var tableColumns = GetColumnsFrom(table.TableName)
.Intersect(table.Columns.Cast<DataColumn>().Select(c => c.ColumnName), StringComparer.InvariantCultureIgnoreCase)
.ToList();
tableColumns.ForEach(column => sql.Append($"{Quote(column)}, "));
sql.Replace(", ", ") values (", sql.Length - 2, 2);
var insert = _connect.CreateCommand();
tableColumns.ForEach(column =>
{
sql.Append($"@{column}, ");
var p = insert.CreateParameter();
p.ParameterName = "@" + column;
insert.Parameters.Add(p);
});
sql.Replace(", ", ")", sql.Length - 2, 2);
insert.CommandText = sql.ToString();
foreach (var r in table.Rows.Cast<DataRow>())
{
foreach (var c in tableColumns)
{
((IDbDataParameter)insert.Parameters["@" + c]).Value = r[c];
}
insert.ExecuteNonQuery();
}
tx.Commit();
}
catch (Exception e)
{
_logger.ErrorTable(table, e);
}
}
public void Dispose()
{
_builder.Dispose();
_connect.Dispose();
}
public DbCommand CreateCommand(string sql)
{
var command = _connect.CreateCommand();
command.CommandText = sql;
return command;
}
public List<string> ExecuteList(DbCommand command)
{
var list = new List<string>();
using (var result = command.ExecuteReader())
{
while (result.Read())
{
list.Add(result.GetString(0));
}
}
return list;
}
private string Quote(string identifier)
{
return identifier;
}
private IEnumerable<string> GetColumnsFrom(string table)
{
if (_mysql)
{
return ExecuteList(CreateCommand("show columns from " + Quote(table)));
}
else
{
return _columns.Select($"TABLE_NAME = '{table}'")
.Select(r => r["COLUMN_NAME"].ToString());
}
}
private string GetWhere(string tableName, int tenant)
{
if (tenant == -1)
{
return string.Empty;
}
if (_whereExceptions.TryGetValue(tableName.ToLower(), out var exc))
{
return string.Format(exc, tenant);
}
var tenantColumn = GetColumnsFrom(tableName).FirstOrDefault(c => c.StartsWith("tenant", StringComparison.OrdinalIgnoreCase));
return tenantColumn != null ?
" where " + Quote(tenantColumn) + " = " + tenant :
" where 1 = 0";
}
}
static file class Queries
{
public static readonly Func<TenantDbContext, Task<DbTenant>> LastTenantAsync =
Microsoft.EntityFrameworkCore.EF.CompileAsyncQuery(
(TenantDbContext ctx) =>
ctx.Tenants.LastOrDefault());
public static readonly Func<CoreDbContext, int, Task<DbTariff>> TariffAsync =
Microsoft.EntityFrameworkCore.EF.CompileAsyncQuery(
(CoreDbContext ctx, int tenantId) =>
ctx.Tariffs.FirstOrDefault(t => t.TenantId == tenantId));
}

7
common/ASC.Data.Backup.Core/GlobalUsings.cs
View File

@ -38,20 +38,18 @@ global using System.Text.Json.Serialization;
global using System.Text.RegularExpressions;
global using System.Xml;
global using System.Xml.Linq;
global using System.Xml.XPath;
global using ASC.Api.Utils;
global using ASC.Common;
global using ASC.Common.Caching;
global using ASC.Common.Log;
global using ASC.Common.Threading;
global using ASC.Common.Threading;
global using ASC.Common.Utils;
global using ASC.Core;
global using ASC.Core.Billing;
global using ASC.Core.ChunkedUploader;
global using ASC.Core.Common.Configuration;
global using ASC.Core.Common.EF;
global using ASC.Core.Common.EF.Context;
global using ASC.Core.Common.EF.Model;
global using ASC.Core.Tenants;
global using ASC.Core.Users;
@ -72,7 +70,8 @@ global using ASC.Data.Backup.Utils;
global using ASC.Data.Storage;
global using ASC.Data.Storage.Configuration;
global using ASC.Data.Storage.DiscStorage;
global using ASC.Data.Storage.ZipOperators;
global using ASC.Data.Storage.S3;
global using ASC.Data.Storage.DataOperators;
global using ASC.EventBus.Events;
global using ASC.Files.Core;
global using ASC.MessagingSystem.Core;

39
common/ASC.Data.Backup.Core/Service/BackupWorker.cs
View File

@ -222,7 +222,7 @@ public class BackupWorker
}
}
internal static string GetBackupHash(string path)
internal static string GetBackupHashSHA(string path)
{
using (var sha256 = SHA256.Create())
using (var fileStream = File.OpenRead(path))
@ -231,6 +231,43 @@ public class BackupWorker
var hash = sha256.ComputeHash(fileStream);
return BitConverter.ToString(hash).Replace("-", string.Empty);
}
}
internal static string GetBackupHashMD5(string path, long chunkSize)
{
using (var md5 = MD5.Create())
using (var fileStream = File.OpenRead(path))
{var multipartSplitCount = 0;
var splitCount = fileStream.Length / chunkSize;
var mod = (int)(fileStream.Length - chunkSize * splitCount);
IEnumerable<byte> concatHash = new byte[] { };
for (var i = 0; i < splitCount; i++)
{
var offset = i == 0 ? 0 : chunkSize * i;
var chunk = GetChunk(fileStream, offset, (int)chunkSize);
var hash = md5.ComputeHash(chunk);
concatHash = concatHash.Concat(hash);
multipartSplitCount++;
}
if (mod != 0)
{
var chunk = GetChunk(fileStream, chunkSize * splitCount, mod);
var hash = md5.ComputeHash(chunk);
concatHash = concatHash.Concat(hash);
multipartSplitCount++;
}
var multipartHash = BitConverter.ToString(md5.ComputeHash(concatHash.ToArray())).Replace("-", string.Empty);
return multipartHash + "-" + multipartSplitCount;
}
}
private static byte[] GetChunk(Stream sourceStream, long offset, int count)
{
var buffer = new byte[count];
sourceStream.Position = offset;
sourceStream.Read(buffer, 0, count);
return buffer;
}
private BackupProgress ToBackupProgress(BaseBackupProgressItem progressItem)

21
common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs
View File

@ -31,9 +31,7 @@ namespace ASC.Data.Backup.Services;
public class BackupProgressItem : BaseBackupProgressItem
{
public Dictionary<string, string> StorageParams { get; set; }
public string TempFolder { get; set; }
private const string ArchiveFormat = "tar.gz";
public string TempFolder { get; set; }
private bool _isScheduled;
private Guid _userId;
@ -97,16 +95,21 @@ public class BackupProgressItem : BaseBackupProgressItem
_tempStream = scope.ServiceProvider.GetService<TempStream>();
var dateTime = _coreBaseSettings.Standalone ? DateTime.Now : DateTime.UtcNow;
var backupName = string.Format("{0}_{1:yyyy-MM-dd_HH-mm-ss}.{2}", (await _tenantManager.GetTenantAsync(TenantId)).Alias, dateTime, ArchiveFormat);
var tempFile = CrossPlatform.PathCombine(TempFolder, backupName);
var storagePath = tempFile;
string hash;
var tempFile = "";
var storagePath = "";
try
{
var backupStorage = await _backupStorageFactory.GetBackupStorageAsync(_storageType, TenantId, StorageParams);
var writer = await ZipWriteOperatorFactory.GetWriteOperatorAsync(_tempStream, _storageBasePath, backupName, TempFolder, _userId, backupStorage as IGetterWriteOperator);
var getter = backupStorage as IGetterWriteOperator;
var backupName = string.Format("{0}_{1:yyyy-MM-dd_HH-mm-ss}.{2}", (await _tenantManager.GetTenantAsync(TenantId)).Alias, dateTime, await getter.GetBackupExtensionAsync(_storageBasePath));
tempFile = CrossPlatform.PathCombine(TempFolder, backupName);
storagePath = tempFile;
var writer = await DataOperatorFactory.GetWriteOperatorAsync(_tempStream, _storageBasePath, backupName, TempFolder, _userId, getter);
_backupPortalTask.Init(TenantId, tempFile, _limit, writer);
@ -121,7 +124,7 @@ public class BackupProgressItem : BaseBackupProgressItem
if (writer.NeedUpload)
{
storagePath = await backupStorage.UploadAsync(_storageBasePath, tempFile, _userId);
hash = BackupWorker.GetBackupHash(tempFile);
hash = BackupWorker.GetBackupHashSHA(tempFile);
}
else
{

25
common/ASC.Data.Backup.Core/Service/ProgressItems/RestoreProgressItem.cs
View File

@ -47,8 +47,8 @@
* in every copy of the program you distribute.
* Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
*
*/
*/
namespace ASC.Data.Backup.Services;
[Transient(Additional = typeof(RestoreProgressItemExtention))]
@ -82,7 +82,7 @@ public class RestoreProgressItem : BaseBackupProgressItem
_notifyHelper = notifyHelper;
_coreBaseSettings = coreBaseSettings;
BackupProgressItemEnum = BackupProgressItemEnum.Restore;
BackupProgressItemEnum = BackupProgressItemEnum.Restore;
}
public BackupStorageType StorageType { get; set; }
@ -106,9 +106,7 @@ public class RestoreProgressItem : BaseBackupProgressItem
protected override async Task DoJob()
{
Tenant tenant = null;
var tempFile = PathHelper.GetTempFileName(TempFolder);
var tempFile = "";
try
{
await using var scope = _serviceScopeProvider.CreateAsyncScope();
@ -127,16 +125,21 @@ public class RestoreProgressItem : BaseBackupProgressItem
var storage = await _backupStorageFactory.GetBackupStorageAsync(StorageType, TenantId, StorageParams);
await storage.DownloadAsync(StoragePath, tempFile);
tempFile = await storage.DownloadAsync(StoragePath, TempFolder);
if (!_coreBaseSettings.Standalone)
{
var backupHash = BackupWorker.GetBackupHash(tempFile);
var record = await _backupRepository.GetBackupRecordAsync(backupHash, TenantId);
var shaHash = BackupWorker.GetBackupHashSHA(tempFile);
var record = await _backupRepository.GetBackupRecordAsync(shaHash, TenantId);
if (record == null)
{
throw new Exception(BackupResource.BackupNotFound);
{
var md5Hash = BackupWorker.GetBackupHashMD5(tempFile, S3Storage.ChunkSize);
record = await _backupRepository.GetBackupRecordAsync(md5Hash, TenantId);
if (record == null)
{
throw new Exception(BackupResource.BackupNotFound);
}
}
}

13
common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs
View File

@ -73,11 +73,13 @@ public class ConsumerBackupStorage : IBackupStorage, IGetterWriteOperator
return storagePath;
}
public async Task DownloadAsync(string storagePath, string targetLocalPath)
public async Task<string> DownloadAsync(string storagePath, string targetLocalPath)
{
var tempPath = Path.Combine(targetLocalPath, Path.GetFileName(storagePath));
await using var source = await _store.GetReadStreamAsync(Domain, storagePath);
await using var destination = File.OpenWrite(targetLocalPath);
await using var destination = File.OpenWrite(tempPath);
await source.CopyToAsync(destination);
return tempPath;
}
public async Task DeleteAsync(string storagePath)
@ -119,6 +121,11 @@ public class ConsumerBackupStorage : IBackupStorage, IGetterWriteOperator
TempPath = title,
UploadId = await _store.InitiateChunkedUploadAsync(Domain, title)
};
return _store.CreateDataWriteOperator(session, _sessionHolder);
return _store.CreateDataWriteOperator(session, _sessionHolder, true);
}
public Task<string> GetBackupExtensionAsync(string storageBasePath)
{
return Task.FromResult(_store.GetBackupExtension(true));
}
}

30
common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
View File

@ -85,18 +85,16 @@ public class DocumentsBackupStorage : IBackupStorage, IGetterWriteOperator
return await Upload(folderId, localPath);
}
public async Task DownloadAsync(string fileId, string targetLocalPath)
public async Task<string> DownloadAsync(string fileId, string targetLocalPath)
{
await _tenantManager.SetCurrentTenantAsync(_tenantId);
if (int.TryParse(fileId, out var fId))
{
await DownloadDaoAsync(fId, targetLocalPath);
return;
return await DownloadDaoAsync(fId, targetLocalPath);
}
await DownloadDaoAsync(fileId, targetLocalPath);
return await DownloadDaoAsync(fileId, targetLocalPath);
}
public async Task DeleteAsync(string fileId)
@ -166,7 +164,7 @@ public class DocumentsBackupStorage : IBackupStorage, IGetterWriteOperator
return file.Id;
}
private async Task DownloadDaoAsync<T>(T fileId, string targetLocalPath)
private async Task<string> DownloadDaoAsync<T>(T fileId, string targetLocalPath)
{
await _tenantManager.SetCurrentTenantAsync(_tenantId);
var fileDao = await GetFileDaoAsync<T>();
@ -177,8 +175,10 @@ public class DocumentsBackupStorage : IBackupStorage, IGetterWriteOperator
}
await using var source = await fileDao.GetFileStreamAsync(file);
await using var destination = File.OpenWrite(targetLocalPath);
var destPath = Path.Combine(targetLocalPath, file.Title);
await using var destination = File.OpenWrite(destPath);
await source.CopyToAsync(destination);
return destPath;
}
private async Task DeleteDaoAsync<T>(T fileId)
@ -192,7 +192,6 @@ public class DocumentsBackupStorage : IBackupStorage, IGetterWriteOperator
var fileDao = await GetFileDaoAsync<T>();
try
{
var file = await fileDao.GetFileAsync(fileId);
return file != null && file.RootFolderType != FolderType.TRASH;
@ -229,6 +228,21 @@ public class DocumentsBackupStorage : IBackupStorage, IGetterWriteOperator
}
}
public async Task<string> GetBackupExtensionAsync(string storageBasePath)
{
await _tenantManager.SetCurrentTenantAsync(_tenantId);
if (int.TryParse(storageBasePath, out var fId))
{
var folderDao = GetFolderDao<int>();
return await folderDao.GetBackupExtensionAsync(fId);
}
else
{
var folderDao = GetFolderDao<string>();
return await folderDao.GetBackupExtensionAsync(storageBasePath);
}
}
private async Task<CommonChunkedUploadSession> InitUploadChunkAsync<T>(T folderId, string title)
{
var folderDao = GetFolderDao<T>();

2
common/ASC.Data.Backup.Core/Storage/IBackupStorage.cs
View File

@ -32,5 +32,5 @@ public interface IBackupStorage
Task<string> GetPublicLinkAsync(string storagePath);
Task<string> UploadAsync(string storageBasePath, string localPath, Guid userId);
Task DeleteAsync(string storagePath);
Task DownloadAsync(string storagePath, string targetLocalPath);
Task<string> DownloadAsync(string storagePath, string targetLocalPath);
}

10
common/ASC.Data.Backup.Core/Storage/LocalBackupStorage.cs
View File

@ -45,10 +45,11 @@ public class LocalBackupStorage : IBackupStorage, IGetterWriteOperator
return Task.FromResult(storagePath);
}
public Task DownloadAsync(string storagePath, string targetLocalPath)
public Task<string> DownloadAsync(string storagePath, string targetLocalPath)
{
var tempPath = Path.Combine(storagePath, Path.GetFileName(targetLocalPath));
File.Copy(storagePath, targetLocalPath, true);
return Task.CompletedTask;
return Task.FromResult(tempPath);
}
public Task DeleteAsync(string storagePath)
@ -71,4 +72,9 @@ public class LocalBackupStorage : IBackupStorage, IGetterWriteOperator
{
return Task.FromResult<IDataWriteOperator>(null);
}
public Task<string> GetBackupExtensionAsync(string storageBasePath)
{
return Task.FromResult("tar.gz");
}
}

14
common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
View File

@ -710,17 +710,13 @@ public class BackupPortalTask : PortalTaskBase
foreach (var file in group)
{
var storage = await StorageFactory.GetStorageAsync(TenantId, group.Key);
var file1 = file;
Stream fileStream = null;
await ActionInvoker.Try(async state =>
try
{
var f = (BackupFileInfo)state;
fileStream = await storage.GetReadStreamAsync(f.Domain, f.Path);
}, file, 5, error => _logger.WarningCanNotBackupFile(file1.Module, file1.Path, error));
if(fileStream != null)
await writer.WriteEntryAsync(file.GetZipKey(), file.Domain, file.Path, storage);
}
catch(Exception error)
{
await writer.WriteEntryAsync(file1.GetZipKey(), fileStream);
fileStream.Dispose();
_logger.WarningCanNotBackupFile(file.Module, file.Path, error);
}
SetCurrentStepProgress((int)(++filesProcessed * 100 / (double)filesCount));
}

2
common/ASC.Data.Backup.Core/Tasks/DeletePortalTask.cs
View File

@ -94,7 +94,7 @@ public class DeletePortalTask : PortalTaskBase
var domains = StorageFactoryConfig.GetDomainList(module);
foreach (var domain in domains)
{
await ActionInvoker.Try(async state => await storage.DeleteFilesAsync((string)state, "\\", "*.*", true), domain, 5,
await ActionInvoker.TryAsync(async state => await storage.DeleteFilesAsync((string)state, "\\", "*.*", true), domain, 5,
onFailure: error => _logger.WarningCanNotDeleteFilesForDomain(domain, error));
}
await storage.DeleteFilesAsync("\\", "*.*", true);

4
common/ASC.Data.Backup.Core/Tasks/RestorePortalTask.cs
View File

@ -90,7 +90,7 @@ public class RestorePortalTask : PortalTaskBase
_options.DebugBeginRestoreData();
using (var dataReader = new ZipReadOperator(BackupFilePath))
using (var dataReader = DataOperatorFactory.GetReadOperator(BackupFilePath))
{
await using (var entry = dataReader.GetEntry(KeyHelper.GetDumpKey()))
{
@ -421,7 +421,7 @@ public class RestorePortalTask : PortalTaskBase
foreach (var domain in domains)
{
await ActionInvoker.Try(
await ActionInvoker.TryAsync(
async state =>
{
if (await storage.IsDirectoryAsync((string)state))

2
common/ASC.Data.Backup.Core/Tasks/TransferPortalTask.cs
View File

@ -96,7 +96,7 @@ public class TransferPortalTask : PortalTaskBase
//save db data to temporary file
var backupTask = _serviceProvider.GetService<BackupPortalTask>();
backupTask.Init(TenantId, backupFilePath, Limit, ZipWriteOperatorFactory.GetDefaultWriteOperator(_tempStream, backupFilePath));
backupTask.Init(TenantId, backupFilePath, Limit, DataOperatorFactory.GetDefaultWriteOperator(_tempStream, backupFilePath));
backupTask.ProcessStorage = false;
backupTask.ProgressChanged += (sender, args) => SetCurrentStepProgress(args.Progress);
foreach (var moduleName in _ignoredModules)

7
common/ASC.Data.Storage/BaseStorage.cs
View File

@ -207,11 +207,16 @@ public abstract class BaseStorage : IDataStore
public virtual IDataWriteOperator CreateDataWriteOperator(
CommonChunkedUploadSession chunkedUploadSession,
CommonChunkedUploadSessionHolder sessionHolder)
CommonChunkedUploadSessionHolder sessionHolder, bool isConsumerStorage = false)
{
return new ChunkZipWriteOperator(_tempStream, chunkedUploadSession, sessionHolder);
}
public virtual string GetBackupExtension(bool isConsumerStorage = false)
{
return "tar.gz";
}
#endregion
public abstract Task DeleteAsync(string domain, string path);

21
common/ASC.Data.Storage/ChunkedUploader/CommonChunkedUploadSessionHolder.cs
View File

@ -32,8 +32,9 @@ public class CommonChunkedUploadSessionHolder
public static readonly TimeSpan SlidingExpiration = TimeSpan.FromHours(12);
private readonly TempPath _tempPath;
private readonly string _domain;
public readonly string Domain;
public long MaxChunkUploadSize;
public string TempDomain;
public const string StoragePath = "sessions";
private readonly object _locker = new object();
@ -46,24 +47,24 @@ public class CommonChunkedUploadSessionHolder
{
_tempPath = tempPath;
DataStore = dataStore;
_domain = domain;
Domain = domain;
MaxChunkUploadSize = maxChunkUploadSize;
}
public async Task StoreAsync(CommonChunkedUploadSession s)
{
await using var stream = s.Serialize();
await DataStore.SavePrivateAsync(_domain, GetPathWithId(s.Id), stream, s.Expired);
await DataStore.SavePrivateAsync(Domain, GetPathWithId(s.Id), stream, s.Expired);
}
public async Task RemoveAsync(CommonChunkedUploadSession s)
{
await DataStore.DeleteAsync(_domain, GetPathWithId(s.Id));
await DataStore.DeleteAsync(Domain, GetPathWithId(s.Id));
}
public async Task<Stream> GetStreamAsync(string sessionId)
{
return await DataStore.GetReadStreamAsync(_domain, GetPathWithId(sessionId));
return await DataStore.GetReadStreamAsync(Domain, GetPathWithId(sessionId));
}
public async ValueTask InitAsync(CommonChunkedUploadSession chunkedUploadSession)
@ -75,7 +76,7 @@ public class CommonChunkedUploadSessionHolder
}
var tempPath = Guid.NewGuid().ToString();
var uploadId = await DataStore.InitiateChunkedUploadAsync(_domain, tempPath);
var uploadId = await DataStore.InitiateChunkedUploadAsync(Domain, tempPath);
chunkedUploadSession.TempPath = tempPath;
chunkedUploadSession.UploadId = uploadId;
@ -87,13 +88,13 @@ public class CommonChunkedUploadSessionHolder
var uploadId = uploadSession.UploadId;
var eTags = uploadSession.GetItemOrDefault<Dictionary<int, string>>("ETag");
await DataStore.FinalizeChunkedUploadAsync(_domain, tempPath, uploadId, eTags);
await DataStore.FinalizeChunkedUploadAsync(Domain, tempPath, uploadId, eTags);
return Path.GetFileName(tempPath);
}
public async Task MoveAsync(CommonChunkedUploadSession chunkedUploadSession, string newPath, bool quotaCheckFileSize = true)
{
await DataStore.MoveAsync(_domain, chunkedUploadSession.TempPath, string.Empty, newPath, quotaCheckFileSize);
await DataStore.MoveAsync(Domain, chunkedUploadSession.TempPath, string.Empty, newPath, quotaCheckFileSize);
}
public async Task AbortAsync(CommonChunkedUploadSession uploadSession)
@ -103,7 +104,7 @@ public class CommonChunkedUploadSessionHolder
var tempPath = uploadSession.TempPath;
var uploadId = uploadSession.UploadId;
await DataStore.AbortChunkedUploadAsync(_domain, tempPath, uploadId);
await DataStore.AbortChunkedUploadAsync(Domain, tempPath, uploadId);
}
else if (!string.IsNullOrEmpty(uploadSession.ChunksBuffer))
{
@ -125,7 +126,7 @@ public class CommonChunkedUploadSessionHolder
uploadSession.BytesUploaded += length;
}
var eTag = await DataStore.UploadChunkAsync(_domain, tempPath, uploadId, stream, MaxChunkUploadSize, chunkNumber, length);
var eTag = await DataStore.UploadChunkAsync(Domain, tempPath, uploadId, stream, MaxChunkUploadSize, chunkNumber, length);
lock (_locker)
{

71
common/ASC.Data.Backup.Core/ActionInvoker.cs → common/ASC.Data.Storage/DataOperators/ActionInvoker.cs
View File

@ -1,30 +1,30 @@
// (c) Copyright Ascensio System SIA 2010-2022
//
// This program is a free software product.
// You can redistribute it and/or modify it under the terms
// of the GNU Affero General Public License (AGPL) version 3 as published by the Free Software
// Foundation. In accordance with Section 7(a) of the GNU AGPL its Section 15 shall be amended
// to the effect that Ascensio System SIA expressly excludes the warranty of non-infringement of
// any third-party rights.
//
// This program is distributed WITHOUT ANY WARRANTY, without even the implied warranty
// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For details, see
// the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
//
// You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021.
//
// The interactive user interfaces in modified source and object code versions of the Program must
// display Appropriate Legal Notices, as required under Section 5 of the GNU AGPL version 3.
//
// Pursuant to Section 7(b) of the License you must retain the original Product logo when
// distributing the program. Pursuant to Section 7(e) we decline to grant you any rights under
// trademark law for use of our trademarks.
//
// All the Product's GUI elements, including illustrations and icon sets, as well as technical writing
// content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0
// International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
namespace ASC.Data.Backup;
// (c) Copyright Ascensio System SIA 2010-2022
//
// This program is a free software product.
// You can redistribute it and/or modify it under the terms
// of the GNU Affero General Public License (AGPL) version 3 as published by the Free Software
// Foundation. In accordance with Section 7(a) of the GNU AGPL its Section 15 shall be amended
// to the effect that Ascensio System SIA expressly excludes the warranty of non-infringement of
// any third-party rights.
//
// This program is distributed WITHOUT ANY WARRANTY, without even the implied warranty
// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For details, see
// the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
//
// You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021.
//
// The interactive user interfaces in modified source and object code versions of the Program must
// display Appropriate Legal Notices, as required under Section 5 of the GNU AGPL version 3.
//
// Pursuant to Section 7(b) of the License you must retain the original Product logo when
// distributing the program. Pursuant to Section 7(e) we decline to grant you any rights under
// trademark law for use of our trademarks.
//
// All the Product's GUI elements, including illustrations and icon sets, as well as technical writing
// content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0
// International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
namespace ASC.Data.Storage.DataOperators;
public static class ActionInvoker
{
@ -47,7 +47,7 @@ public static class ActionInvoker
Action<Exception> onAttemptFailure = null,
int sleepMs = 1000,
bool isSleepExponential = true)
{
{
ArgumentNullException.ThrowIfNull(action);
var countAttempts = 0;
@ -77,7 +77,18 @@ public static class ActionInvoker
}
}
public static async Task Try(
public static async Task TryAsync(
Func<Task> action,
int maxAttempts,
Action<Exception> onFailure = null,
Action<Exception> onAttemptFailure = null,
int sleepMs = 1000,
bool isSleepExponential = true)
{
await TryAsync(state => action(), null, maxAttempts, onFailure, onAttemptFailure, sleepMs, isSleepExponential);
}
public static async Task TryAsync(
Func<object, Task> action,
object state,
int maxAttempts,
@ -85,7 +96,7 @@ public static class ActionInvoker
Action<Exception> onAttemptFailure = null,
int sleepMs = 1000,
bool isSleepExponential = true)
{
{
ArgumentNullException.ThrowIfNull(action);
var countAttempts = 0;

16
common/ASC.Data.Storage/ZipOperators/ZipWriteOperatorFactory.cs → common/ASC.Data.Storage/DataOperators/DataOperatorFactory.cs
View File

@ -24,9 +24,9 @@
// content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0
// International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
namespace ASC.Data.Storage.ZipOperators;
namespace ASC.Data.Storage.DataOperators;
public static class ZipWriteOperatorFactory
public static class DataOperatorFactory
{
public static async Task<IDataWriteOperator> GetWriteOperatorAsync(TempStream tempStream, string storageBasePath, string title, string tempFolder, Guid userId, IGetterWriteOperator getter)
{
@ -39,5 +39,17 @@ public static class ZipWriteOperatorFactory
{
return new ZipWriteOperator(tempStream, backupFilePath);
}
public static IDataReadOperator GetReadOperator(string targetFile)
{
if (targetFile.EndsWith("tar.gz"))
{
return new ZipReadOperator(targetFile);
}
else
{
return new TarReadOperator(targetFile);
}
}
}

5
common/ASC.Data.Storage/ZipOperators/IDataOperator.cs → common/ASC.Data.Storage/DataOperators/IDataOperator.cs
View File

@ -24,11 +24,12 @@
// content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0
// International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
namespace ASC.Data.Storage.ZipOperators;
namespace ASC.Data.Storage.DataOperators;
public interface IDataWriteOperator : IAsyncDisposable
{
Task WriteEntryAsync(string key, Stream stream);
Task WriteEntryAsync(string tarKey, Stream stream);
Task WriteEntryAsync(string tarKey, string domain, string path, IDataStore store);
bool NeedUpload { get; }
string Hash { get; }
string StoragePath { get; }

3
common/ASC.Data.Storage/ZipOperators/IGetterWriteOperator.cs → common/ASC.Data.Storage/DataOperators/IGetterWriteOperator.cs
View File

@ -24,9 +24,10 @@
// content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0
// International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
namespace ASC.Data.Storage.ZipOperators;
namespace ASC.Data.Storage.DataOperators;
public interface IGetterWriteOperator
{
Task<IDataWriteOperator> GetWriteOperatorAsync(string storageBasePath, string title, Guid userId);
Task<string> GetBackupExtensionAsync(string storageBasePath);
}

58
common/ASC.Data.Storage/DataOperators/ReadOperators/BaseReadOperator.cs Normal file
View File

@ -0,0 +1,58 @@
// (c) Copyright Ascensio System SIA 2010-2022
//
// This program is a free software product.
// You can redistribute it and/or modify it under the terms
// of the GNU Affero General Public License (AGPL) version 3 as published by the Free Software
// Foundation. In accordance with Section 7(a) of the GNU AGPL its Section 15 shall be amended
// to the effect that Ascensio System SIA expressly excludes the warranty of non-infringement of
// any third-party rights.
//
// This program is distributed WITHOUT ANY WARRANTY, without even the implied warranty
// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For details, see
// the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
//
// You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021.
//
// The interactive user interfaces in modified source and object code versions of the Program must
// display Appropriate Legal Notices, as required under Section 5 of the GNU AGPL version 3.
//
// Pursuant to Section 7(b) of the License you must retain the original Product logo when
// distributing the program. Pursuant to Section 7(e) we decline to grant you any rights under
// trademark law for use of our trademarks.
//
// All the Product's GUI elements, including illustrations and icon sets, as well as technical writing
// content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0
// International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
namespace ASC.Data.Storage.DataOperators;
public abstract class BaseReadOperator: IDataReadOperator
{
internal string _tmpdir;
public Stream GetEntry(string key)
{
var filePath = Path.Combine(_tmpdir, key);
return File.Exists(filePath) ? File.Open(filePath, FileMode.Open, FileAccess.ReadWrite, FileShare.Read) : null;
}
public IEnumerable<string> GetEntries(string key)
{
var path = Path.Combine(_tmpdir, key);
var files = Directory.EnumerateFiles(path);
return files;
}
public IEnumerable<string> GetDirectories(string key)
{
var path = Path.Combine(_tmpdir, key);
var files = Directory.EnumerateDirectories(path);
return files;
}
public void Dispose()
{
if (Directory.Exists(_tmpdir))
{
Directory.Delete(_tmpdir, true);
}
}
}

37
common/ASC.Data.Backup.Core/Core/IBackupProvider.cs → common/ASC.Data.Storage/DataOperators/ReadOperators/TarReadOperator.cs
View File

@ -1,4 +1,4 @@
// (c) Copyright Ascensio System SIA 2010-2022
// (c) Copyright Ascensio System SIA 2010-2022
//
// This program is a free software product.
// You can redistribute it and/or modify it under the terms
@ -24,30 +24,19 @@
// content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0
// International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
namespace ASC.Data.Backup;
public interface IBackupProvider
namespace ASC.Data.Storage.DataOperators;
public class TarReadOperator: BaseReadOperator
{
string Name { get; }
event EventHandler<ProgressChangedEventArgs> ProgressChanged;
Task<IEnumerable<XElement>> GetElements(int tenant, string[] configs, IDataWriteOperator writer);
Task LoadFromAsync(IEnumerable<XElement> elements, int tenant, string[] configs, IDataReadOperator reader);
}
public class ProgressChangedEventArgs : EventArgs
{
public string Status { get; private set; }
public double Progress { get; private set; }
public bool Completed { get; private set; }
public ProgressChangedEventArgs(string status, double progress)
: this(status, progress, false) { }
public ProgressChangedEventArgs(string status, double progress, bool completed)
public TarReadOperator(string targetFile)
{
Status = status;
Progress = progress;
Completed = completed;
_tmpdir = Path.Combine(Path.GetDirectoryName(targetFile), Path.GetFileNameWithoutExtension(targetFile).Replace('>', '_').Replace(':', '_').Replace('?', '_'));
using (var stream = File.OpenRead(targetFile))
using (var tarOutputStream = TarArchive.CreateInputTarArchive(stream, Encoding.UTF8))
{
tarOutputStream.ExtractContents(_tmpdir);
}
File.Delete(targetFile);
}
}

43
common/ASC.Data.Storage/DataOperators/ReadOperators/ZipReadOperator.cs Normal file
View File

@ -0,0 +1,43 @@
// (c) Copyright Ascensio System SIA 2010-2022
//
// This program is a free software product.
// You can redistribute it and/or modify it under the terms
// of the GNU Affero General Public License (AGPL) version 3 as published by the Free Software
// Foundation. In accordance with Section 7(a) of the GNU AGPL its Section 15 shall be amended
// to the effect that Ascensio System SIA expressly excludes the warranty of non-infringement of
// any third-party rights.
//
// This program is distributed WITHOUT ANY WARRANTY, without even the implied warranty
// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For details, see
// the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
//
// You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021.
//
// The interactive user interfaces in modified source and object code versions of the Program must
// display Appropriate Legal Notices, as required under Section 5 of the GNU AGPL version 3.
//
// Pursuant to Section 7(b) of the License you must retain the original Product logo when
// distributing the program. Pursuant to Section 7(e) we decline to grant you any rights under
// trademark law for use of our trademarks.
//
// All the Product's GUI elements, including illustrations and icon sets, as well as technical writing
// content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0
// International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
namespace ASC.Data.Storage.DataOperators;
public class ZipReadOperator : BaseReadOperator
{
public ZipReadOperator(string targetFile)
{
_tmpdir = Path.Combine(Path.GetDirectoryName(targetFile), Path.GetFileNameWithoutExtension(targetFile).Replace('>', '_').Replace(':', '_').Replace('?', '_'));
using (var stream = File.OpenRead(targetFile))
using (var reader = new GZipInputStream(stream))
using (var tarOutputStream = TarArchive.CreateInputTarArchive(reader, Encoding.UTF8))
{
tarOutputStream.ExtractContents(_tmpdir);
}
File.Delete(targetFile);
}
}

20
common/ASC.Data.Storage/ZipOperators/ChunkZipWriteOperator.cs → common/ASC.Data.Storage/DataOperators/WriteOperators/ChunkZipWriteOperator.cs
View File

@ -24,7 +24,7 @@
// content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0
// International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
namespace ASC.Data.Storage.ZipOperators;
namespace ASC.Data.Storage.DataOperators;
public class ChunkZipWriteOperator : IDataWriteOperator
{
@ -63,7 +63,21 @@ public class ChunkZipWriteOperator : IDataWriteOperator
_sha = SHA256.Create();
}
public async Task WriteEntryAsync(string key, Stream stream)
public async Task WriteEntryAsync(string tarKey, string domain, string path, IDataStore store)
{
Stream fileStream = null;
await ActionInvoker.TryAsync(async () =>
{
fileStream = await store.GetReadStreamAsync(domain, path);
}, 5, error => throw error);
if (fileStream != null)
{
await WriteEntryAsync(tarKey, fileStream);
fileStream.Dispose();
}
}
public async Task WriteEntryAsync(string tarKey, Stream stream)
{
if (_fileStream == null)
{
@ -73,7 +87,7 @@ public class ChunkZipWriteOperator : IDataWriteOperator
await using (var buffered = _tempStream.GetBuffered(stream))
{
var entry = TarEntry.CreateTarEntry(key);
var entry = TarEntry.CreateTarEntry(tarKey);
entry.Size = buffered.Length;
await _tarOutputStream.PutNextEntryAsync(entry, default);
buffered.Position = 0;

97
common/ASC.Data.Storage/DataOperators/WriteOperators/S3/S3TarWriteOperator.cs Normal file
View File

@ -0,0 +1,97 @@
// (c) Copyright Ascensio System SIA 2010-2022
//
// This program is a free software product.
// You can redistribute it and/or modify it under the terms
// of the GNU Affero General Public License (AGPL) version 3 as published by the Free Software
// Foundation. In accordance with Section 7(a) of the GNU AGPL its Section 15 shall be amended
// to the effect that Ascensio System SIA expressly excludes the warranty of non-infringement of
// any third-party rights.
//
// This program is distributed WITHOUT ANY WARRANTY, without even the implied warranty
// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For details, see
// the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
//
// You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021.
//
// The interactive user interfaces in modified source and object code versions of the Program must
// display Appropriate Legal Notices, as required under Section 5 of the GNU AGPL version 3.
//
// Pursuant to Section 7(b) of the License you must retain the original Product logo when
// distributing the program. Pursuant to Section 7(e) we decline to grant you any rights under
// trademark law for use of our trademarks.
//
// All the Product's GUI elements, including illustrations and icon sets, as well as technical writing
// content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0
// International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
namespace ASC.Data.Storage.DataOperators;
public class S3TarWriteOperator : IDataWriteOperator
{
private readonly CommonChunkedUploadSession _chunkedUploadSession;
private readonly CommonChunkedUploadSessionHolder _sessionHolder;
private readonly S3Storage _store;
private readonly string _domain;
private readonly string _key;
public string Hash { get; private set; }
public string StoragePath { get; private set; }
public bool NeedUpload => false;
public S3TarWriteOperator(CommonChunkedUploadSession chunkedUploadSession, CommonChunkedUploadSessionHolder sessionHolder)
{
_chunkedUploadSession = chunkedUploadSession;
_sessionHolder = sessionHolder;
_store = _sessionHolder.DataStore as S3Storage;
_key = _chunkedUploadSession.TempPath;
_domain = _sessionHolder.TempDomain;
}
public async Task WriteEntryAsync(string tarKey, string domain, string path, IDataStore store)
{
if (store is S3Storage)
{
var s3Store = store as S3Storage;
var fullPath = s3Store.MakePath(domain, path);
await _store.ConcatFileAsync(fullPath, tarKey, _domain, _key);
}
else
{
Stream fileStream = null;
await ActionInvoker.TryAsync(async () =>
{
fileStream = await store.GetReadStreamAsync(domain, path);
}, 5, error => throw error);
if (fileStream != null)
{
await WriteEntryAsync(tarKey, fileStream);
fileStream.Dispose();
}
}
}
public async Task WriteEntryAsync(string tarKey, Stream stream)
{
await _store.ConcatFileStreamAsync(stream, tarKey, _domain, _key);
}
public async ValueTask DisposeAsync()
{
await _store.AddEndAsync(_domain ,_key);
await _store.RemoveFirstBlockAsync(_domain ,_key);
var contentLength = await _store.GetFileSizeAsync(_domain, _key);
Hash = (await _store.GetFileEtagAsync(_domain, _key)).Trim('\"');
(var uploadId, var eTags, var partNumber) = await _store.InitiateConcatAsync(_domain, _key, lastInit: true);
_chunkedUploadSession.BytesUploaded = contentLength;
_chunkedUploadSession.BytesTotal = contentLength;
_chunkedUploadSession.UploadId = uploadId;
_chunkedUploadSession.Items["ETag"] = eTags.ToDictionary(e => e.PartNumber, e => e.ETag);
_chunkedUploadSession.Items["ChunksUploaded"] = (partNumber - 1).ToString();
StoragePath = await _sessionHolder.FinalizeAsync(_chunkedUploadSession);
}
}

20
common/ASC.Data.Storage/ZipOperators/S3ZipWriteOperator.cs → common/ASC.Data.Storage/DataOperators/WriteOperators/S3/S3ZipWriteOperator.cs
View File

@ -24,7 +24,7 @@
// content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0
// International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
namespace ASC.Data.Storage.ZipOperators;
namespace ASC.Data.Storage.DataOperators;
public class S3ZipWriteOperator : IDataWriteOperator
{
@ -67,7 +67,21 @@ public class S3ZipWriteOperator : IDataWriteOperator
_sha = SHA256.Create();
}
public async Task WriteEntryAsync(string key, Stream stream)
public async Task WriteEntryAsync(string tarKey, string domain, string path, IDataStore store)
{
Stream fileStream = null;
await ActionInvoker.TryAsync(async () =>
{
fileStream = await store.GetReadStreamAsync(domain, path);
}, 5, error => throw error);
if (fileStream != null)
{
await WriteEntryAsync(tarKey, fileStream);
fileStream.Dispose();
}
}
public async Task WriteEntryAsync(string tarKey, Stream stream)
{
if (_fileStream == null)
{
@ -77,7 +91,7 @@ public class S3ZipWriteOperator : IDataWriteOperator
await using (var buffered = _tempStream.GetBuffered(stream))
{
var entry = TarEntry.CreateTarEntry(key);
var entry = TarEntry.CreateTarEntry(tarKey);
entry.Size = buffered.Length;
await _tarOutputStream.PutNextEntryAsync(entry, default);
buffered.Position = 0;

67
common/ASC.Data.Storage/ZipOperators/ZipOperator.cs → common/ASC.Data.Storage/DataOperators/WriteOperators/ZipWriteOperator.cs
View File

@ -24,7 +24,7 @@
// content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0
// International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
namespace ASC.Data.Storage.ZipOperators;
namespace ASC.Data.Storage.DataOperators;
public class ZipWriteOperator : IDataWriteOperator
@ -54,11 +54,25 @@ public class ZipWriteOperator : IDataWriteOperator
_tarOutputStream = new TarOutputStream(_gZipOutputStream, Encoding.UTF8);
}
public async Task WriteEntryAsync(string key, Stream stream)
public async Task WriteEntryAsync(string tarKey, string domain, string path, IDataStore store)
{
Stream fileStream = null;
await ActionInvoker.TryAsync(async () =>
{
fileStream = await store.GetReadStreamAsync(domain, path);
}, 5, error => throw error);
if (fileStream != null)
{
await WriteEntryAsync(tarKey, fileStream);
fileStream.Dispose();
}
}
public async Task WriteEntryAsync(string tarKey, Stream stream)
{
await using (var buffered = _tempStream.GetBuffered(stream))
{
var entry = TarEntry.CreateTarEntry(key);
var entry = TarEntry.CreateTarEntry(tarKey);
entry.Size = buffered.Length;
await _tarOutputStream.PutNextEntryAsync(entry, default);
buffered.Position = 0;
@ -73,50 +87,3 @@ public class ZipWriteOperator : IDataWriteOperator
await _tarOutputStream.DisposeAsync();
}
}
public class ZipReadOperator : IDataReadOperator
{
private readonly string tmpdir;
public ZipReadOperator(string targetFile)
{
tmpdir = Path.Combine(Path.GetDirectoryName(targetFile), Path.GetFileNameWithoutExtension(targetFile).Replace('>', '_').Replace(':', '_').Replace('?', '_'));
using (var stream = File.OpenRead(targetFile))
using (var reader = new GZipInputStream(stream))
using (var tarOutputStream = TarArchive.CreateInputTarArchive(reader, Encoding.UTF8))
{
tarOutputStream.ExtractContents(tmpdir);
}
File.Delete(targetFile);
}
public Stream GetEntry(string key)
{
var filePath = Path.Combine(tmpdir, key);
return File.Exists(filePath) ? File.Open(filePath, FileMode.Open, FileAccess.ReadWrite, FileShare.Read) : null;
}
public IEnumerable<string> GetEntries(string key)
{
var path = Path.Combine(tmpdir, key);
var files = Directory.EnumerateFiles(path);
return files;
}
public IEnumerable<string> GetDirectories(string key)
{
var path = Path.Combine(tmpdir, key);
var files = Directory.EnumerateDirectories(path);
return files;
}
public void Dispose()
{
if (Directory.Exists(tmpdir))
{
Directory.Delete(tmpdir, true);
}
}
}

8
common/ASC.Data.Storage/GlobalUsings.cs
View File

@ -30,7 +30,7 @@ global using System.Net;
global using System.Net.Http.Headers;
global using System.Runtime.Serialization;
global using System.Security.Cryptography;
global using System.ServiceModel;
global using System.ServiceModel;
global using System.Text;
global using System.Text.Json;
global using System.Text.Json.Serialization;
@ -39,7 +39,10 @@ global using System.Web;
global using Amazon;
global using Amazon.CloudFront;
global using Amazon.CloudFront.Model;
global using Amazon.Extensions.S3.Encryption;
global using Amazon.Extensions.S3.Encryption.Primitives;
global using Amazon.S3;
global using Amazon.S3.Internal;
global using Amazon.S3.Model;
global using Amazon.S3.Transfer;
global using Amazon.Util;
@ -66,7 +69,8 @@ global using ASC.Data.Storage.GoogleCloud;
global using ASC.Data.Storage.Log;
global using ASC.Data.Storage.RackspaceCloud;
global using ASC.Data.Storage.S3;
global using ASC.Data.Storage.ZipOperators;
global using ASC.Data.Storage.Tar;
global using ASC.Data.Storage.DataOperators;
global using ASC.EventBus.Events;
global using ASC.Notify.Messages;
global using ASC.Protos.Migration;

4
common/ASC.Data.Storage/IDataStore.cs
View File

@ -33,7 +33,9 @@ public interface IDataStore
{
IDataWriteOperator CreateDataWriteOperator(
CommonChunkedUploadSession chunkedUploadSession,
CommonChunkedUploadSessionHolder sessionHolder);
CommonChunkedUploadSessionHolder sessionHolder,
bool isConsumerStorage = false);
string GetBackupExtension(bool isConsumerStorage = false);
IQuotaController QuotaController { get; set; }

302
common/ASC.Data.Storage/S3/S3Storage.cs
View File

@ -24,16 +24,13 @@
// content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0
// International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
using Amazon.Extensions.S3.Encryption;
using Amazon.Extensions.S3.Encryption.Primitives;
using Amazon.S3.Internal;
namespace ASC.Data.Storage.S3;
[Scope]
public class S3Storage : BaseStorage
{
public override bool IsSupportCdnUri => true;
public static long ChunkSize { get; } = 50 * 1024 * 1024;
public override bool IsSupportChunking => true;
private readonly List<string> _domains = new List<string>();
@ -60,7 +57,7 @@ public class S3Storage : BaseStorage
private EncryptionMethod _encryptionMethod = EncryptionMethod.None;
private string _encryptionKey;
private readonly IConfiguration _configuration;
private readonly CoreBaseSettings _coreBaseSettings;
public S3Storage(
TempStream tempStream,
@ -71,12 +68,12 @@ public class S3Storage : BaseStorage
ILoggerProvider factory,
ILogger<S3Storage> options,
IHttpClientFactory clientFactory,
IConfiguration configuration,
TenantQuotaFeatureStatHelper tenantQuotaFeatureStatHelper,
QuotaSocketManager quotaSocketManager)
QuotaSocketManager quotaSocketManager,
CoreBaseSettings coreBaseSettings)
: base(tempStream, tenantManager, pathUtils, emailValidationKeyProvider, httpContextAccessor, factory, options, clientFactory, tenantQuotaFeatureStatHelper, quotaSocketManager)
{
_configuration = configuration;
_coreBaseSettings = coreBaseSettings;
}
public Uri GetUriInternal(string path)
@ -461,9 +458,28 @@ public class S3Storage : BaseStorage
}
public override IDataWriteOperator CreateDataWriteOperator(CommonChunkedUploadSession chunkedUploadSession,
CommonChunkedUploadSessionHolder sessionHolder)
CommonChunkedUploadSessionHolder sessionHolder, bool isConsumerStorage = false)
{
return new S3ZipWriteOperator(_tempStream, chunkedUploadSession, sessionHolder);
if (_coreBaseSettings.Standalone || isConsumerStorage)
{
return new S3ZipWriteOperator(_tempStream, chunkedUploadSession, sessionHolder);
}
else
{
return new S3TarWriteOperator(chunkedUploadSession, sessionHolder);
}
}
public override string GetBackupExtension(bool isConsumerStorage = false)
{
if (_coreBaseSettings.Standalone || isConsumerStorage)
{
return "tar.gz";
}
else
{
return "tar";
}
}
#endregion
@ -570,9 +586,9 @@ public class S3Storage : BaseStorage
if (string.IsNullOrEmpty(QuotaController.ExcludePattern) ||
!Path.GetFileName(s3Object.Key).StartsWith(QuotaController.ExcludePattern))
{
await QuotaUsedDeleteAsync(domain, s3Object.Size);
}
}
await QuotaUsedDeleteAsync(domain, s3Object.Size);
}
}
}
}
@ -1052,7 +1068,7 @@ public class S3Storage : BaseStorage
_cdnKeyPairId = props["cdn_keyPairId"];
_cdnPrivateKeyPath = props["cdn_privateKeyPath"];
CdnDistributionDomain = props["cdn_distributionDomain"];
}
}
}
props.TryGetValue("subdir", out _subDir);
@ -1218,7 +1234,7 @@ public class S3Storage : BaseStorage
return s30Objects;
}
private string MakePath(string domain, string path)
public string MakePath(string domain, string path)
{
string result;
@ -1304,7 +1320,7 @@ public class S3Storage : BaseStorage
var uploadId = initResponse.UploadId;
var partSize = 500 * 1024 * 1024L;//500 megabytes
var partSize = ChunkSize;
var uploadTasks = new List<Task<CopyPartResponse>>();
@ -1369,6 +1385,260 @@ public class S3Storage : BaseStorage
}
}
public async Task ConcatFileStreamAsync(Stream stream, string tarKey, string destinationDomain, string destinationKey)
{
(var uploadId, var eTags, var partNumber) = await InitiateConcatAsync(destinationDomain, destinationKey);
using var s3 = GetClient();
var destinationPath = MakePath(destinationDomain, destinationKey);
var blockSize = 512;
long prevFileSize = 0;
try
{
var objResult = await s3.GetObjectMetadataAsync(_bucket, destinationPath);
prevFileSize = objResult.ContentLength;
}
catch { }
var header = BuilderHeaders.CreateHeader(tarKey, stream.Length);
var ms = new MemoryStream();
if (prevFileSize % blockSize != 0)
{
var endBlock = new byte[blockSize - prevFileSize % blockSize];
ms.Write(endBlock);
}
ms.Write(header);
stream.Position = 0;
stream.CopyTo(ms);
stream.Dispose();
stream = ms;
stream.Position = 0;
prevFileSize = stream.Length;
var uploadRequest = new UploadPartRequest
{
BucketName = _bucket,
Key = destinationPath,
UploadId = uploadId,
PartNumber = partNumber,
InputStream = stream
};
eTags.Add(new PartETag(partNumber, (await s3.UploadPartAsync(uploadRequest)).ETag));
var completeRequest = new CompleteMultipartUploadRequest
{
BucketName = _bucket,
Key = destinationPath,
UploadId = uploadId,
PartETags = eTags
};
await s3.CompleteMultipartUploadAsync(completeRequest);
}
public async Task ConcatFileAsync(string pathFile, string tarKey, string destinationDomain, string destinationKey)
{
(var uploadId, var eTags, var partNumber) = await InitiateConcatAsync(destinationDomain, destinationKey);
using var s3 = GetClient();
var destinationPath = MakePath(destinationDomain, destinationKey);
var blockSize = 512;
long prevFileSize = 0;
try
{
var objResult = await s3.GetObjectMetadataAsync(_bucket, destinationPath);
prevFileSize = objResult.ContentLength;
}
catch{}
var objFile = await s3.GetObjectMetadataAsync(_bucket, pathFile);
var header = BuilderHeaders.CreateHeader(tarKey, objFile.ContentLength);
using var stream = new MemoryStream();
if (prevFileSize % blockSize != 0)
{
var endBlock = new byte[blockSize - prevFileSize % blockSize];
stream.Write(endBlock);
}
stream.Write(header);
stream.Position = 0;
prevFileSize = objFile.ContentLength;
var uploadRequest = new UploadPartRequest
{
BucketName = _bucket,
Key = destinationPath,
UploadId = uploadId,
PartNumber = partNumber,
InputStream = stream
};
eTags.Add(new PartETag(partNumber, (await s3.UploadPartAsync(uploadRequest)).ETag));
var completeRequest = new CompleteMultipartUploadRequest
{
BucketName = _bucket,
Key = destinationPath,
UploadId = uploadId,
PartETags = eTags
};
var completeUploadResponse = await s3.CompleteMultipartUploadAsync(completeRequest);
/*******/
(uploadId, eTags, partNumber) = await InitiateConcatAsync(destinationDomain, destinationKey);
var copyRequest = new CopyPartRequest
{
DestinationBucket = _bucket,
DestinationKey = destinationPath,
SourceBucket = _bucket,
SourceKey = pathFile,
UploadId = uploadId,
PartNumber = partNumber
};
eTags.Add(new PartETag(partNumber, (await s3.CopyPartAsync(copyRequest)).ETag));
completeRequest = new CompleteMultipartUploadRequest
{
BucketName = _bucket,
Key = destinationPath,
UploadId = uploadId,
PartETags = eTags
};
completeUploadResponse = await s3.CompleteMultipartUploadAsync(completeRequest);
}
public async Task AddEndAsync(string domain, string key)
{
using var s3 = GetClient();
var path = MakePath(domain, key);
var blockSize = 512;
(var uploadId, var eTags, var partNumber) = await InitiateConcatAsync(domain, key);
var obj = await s3.GetObjectMetadataAsync(_bucket, path);
var buffer = new byte[blockSize - obj.ContentLength % blockSize + blockSize * 2];
var stream = new MemoryStream();
stream.Write(buffer);
stream.Position = 0;
var uploadRequest = new UploadPartRequest
{
BucketName = _bucket,
Key = path,
UploadId = uploadId,
PartNumber = partNumber,
InputStream = stream
};
eTags.Add(new PartETag(partNumber, (await s3.UploadPartAsync(uploadRequest)).ETag));
var completeRequest = new CompleteMultipartUploadRequest
{
BucketName = _bucket,
Key = path,
UploadId = uploadId,
PartETags = eTags
};
await s3.CompleteMultipartUploadAsync(completeRequest);
}
public async Task RemoveFirstBlockAsync(string domain, string key)
{
using var s3 = GetClient();
var path = MakePath(domain, key);
(var uploadId, var eTags, var partNumber) = await InitiateConcatAsync(domain, key, true, true);
var completeRequest = new CompleteMultipartUploadRequest
{
BucketName = _bucket,
Key = path,
UploadId = uploadId,
PartETags = eTags
};
await s3.CompleteMultipartUploadAsync(completeRequest);
}
public async Task<(string uploadId, List<PartETag> eTags, int partNumber)> InitiateConcatAsync(string domain, string key, bool removeFirstBlock = false, bool lastInit = false)
{
using var s3 = GetClient();
key = MakePath(domain, key);
var initiateRequest = new InitiateMultipartUploadRequest
{
BucketName = _bucket,
Key = key
};
var initResponse = await s3.InitiateMultipartUploadAsync(initiateRequest);
var eTags = new List<PartETag>();
try
{
var mb5 = 5 * 1024 * 1024;
long bytePosition = removeFirstBlock ? mb5 : 0;
var obj = await s3.GetObjectMetadataAsync(_bucket, key);
var objectSize = obj.ContentLength;
var partSize = ChunkSize;
var partNumber = 1;
for (var i = 1; bytePosition < objectSize; i++)
{
var copyRequest = new CopyPartRequest
{
DestinationBucket = _bucket,
DestinationKey = key,
SourceBucket = _bucket,
SourceKey = key,
UploadId = initResponse.UploadId,
FirstByte = bytePosition,
LastByte = bytePosition + partSize - 1 >= objectSize ? objectSize - 1 : bytePosition + partSize - 1,
PartNumber = i
};
partNumber = i + 1;
bytePosition += partSize;
var x = objectSize - bytePosition;
if (!lastInit && x < mb5 && x > 0)
{
copyRequest.LastByte = objectSize - 1;
bytePosition += partSize;
}
eTags.Add(new PartETag(i, (await s3.CopyPartAsync(copyRequest)).ETag));
}
return (initResponse.UploadId, eTags, partNumber);
}
catch
{
using var stream = new MemoryStream();
var buffer = new byte[5 * 1024 * 1024];
stream.Write(buffer);
stream.Position = 0;
var uploadRequest = new UploadPartRequest
{
BucketName = _bucket,
Key = key,
UploadId = initResponse.UploadId,
PartNumber = 1,
InputStream = stream
};
eTags.Add(new PartETag(1, (await s3.UploadPartAsync(uploadRequest)).ETag));
return (initResponse.UploadId, eTags, 2);
}
}
private IAmazonCloudFront GetCloudFrontClient()
{
var cfg = new AmazonCloudFrontConfig { MaxErrorRetry = 3 };

29
common/ASC.Data.Backup.Core/Log/DbHelperLogger.cs → common/ASC.Data.Storage/Tar/BuilderHeaders.cs
View File

@ -24,12 +24,27 @@
// content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0
// International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
namespace ASC.Data.Backup.Core.Log;
public static partial class DbHelperLogger
{
[LoggerMessage(Level = LogLevel.Error, Message = "Table {table}")]
public static partial void ErrorTableString(this ILogger<DbHelper> logger, string table, Exception exception);
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
[LoggerMessage(Level = LogLevel.Error, Message = "Table {table}")]
public static partial void ErrorTable(this ILogger<DbHelper> logger, DataTable table, Exception exception);
namespace ASC.Data.Storage.Tar;
public static class BuilderHeaders
{
public static byte[] CreateHeader(string name, long size)
{
var blockBuffer = new byte[512];
var tarHeader = new TarHeader()
{
Name = name,
Size = size
};
tarHeader.WriteHeader(blockBuffer, null);
return blockBuffer;
}
}

3
common/ASC.FederatedLogin/LoginProviders/ZoomLoginProvider.cs
View File

@ -24,8 +24,6 @@
// content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0
// International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
using AutoMapper;
using static System.Formats.Asn1.AsnWriter;
namespace ASC.FederatedLogin.LoginProviders;
@ -39,7 +37,6 @@ public class ZoomLoginProvider : BaseLoginProvider<ZoomLoginProvider>
public override string ClientSecret => this["zoomClientSecret"];
public override string CodeUrl => "https://zoom.us/oauth/authorize";
public override string Scopes => "";
public string ApiRedirectUri => this["zoomApiRedirectUrl"];
public const string ApiUrl = "https://api.zoom.us/v2";
private const string UserProfileUrl = $"{ApiUrl}/users/me";

2
common/Tools/ASC.MigrationPersonalToDocspace/MigrationCreator.cs
View File

@ -378,7 +378,7 @@ public class MigrationCreator
{
var storage = await _storageFactory.GetStorageAsync(_fromTenantId, group.Key);
var file1 = file;
await ActionInvoker.Try(async state =>
await ActionInvoker.TryAsync(async state =>
{
var f = (BackupFileInfo)state;
using var fileStream = await storage.GetReadStreamAsync(f.Domain, f.Path);

30
packages/client/public/locales/en/Settings.json
View File

@ -11,6 +11,9 @@
"AddTrustedDomain": "Add trusted domain",
"Admins": "Admins",
"AdminsMessage": "Administrator Message Settings",
"AdminsMessageSave": "Click the <strong>Save</strong> button at the bottom to apply.",
"AdminsMessageSettingDescription": "Enable this option to display the DocSpace administrator contact form on the Sign In page.",
"AdminsMessageMobileDescription": "Administrator Message Settings is a way to contact the portal administrator.",
"AdminsMessageDescription": "<1>Administrator Message Settings</1> is a way to contact the DocSpace administrator. <br> Enable this option to display the contact form on the <2>Sign In</2> page so that people could send the message to the space administrator in case they have troubles accessing the space. <br> To make the parameters you set take effect click the <3>Save</3> button at the bottom of the section.",
"AdminsMessageHelper": "Enable this option to display the contact form on the Sign In page so that people could send the message to the administrator in case they have troubles accessing your DocSpace.",
"AllDomains": "Any domains",
@ -70,10 +73,12 @@
"CustomTitles": "Custom titles",
"CustomTitlesFrom": "From",
"CustomTitlesSettingsDescription": "Welcome Page Settings is a way to change the default space title to be displayed on the Welcome Page. The same name is also used for the From field of the space email notifications.",
"CustomTitlesSettingsNavDescription": "Welcome Page Settings is a way to change the default portal title to be displayed on the Welcome Page of your portal. The same name is also used for the From field of your portal email notifications.",
"CustomTitlesSettingsTooltip": "<0>{{ welcomeText }}</0> is a way to change the default space title to be displayed on the <2>{{ text }}</2> of your space. The same name is also used for the <4>{{ from }}</4> field of the space email notifications.",
"CustomTitlesSettingsTooltipDescription": "Enter the name you like in the <1>{{ header }}</1> field.",
"CustomTitlesText": "Welcome Page",
"CustomTitlesWelcome": "Welcome Page Settings",
"CustomTitlesDescription": "Adjust the default space title displayed on the Welcome Page and in the From field of the email notifications.",
"DataBackup": "Data backup",
"Deactivate": "Deactivate",
"DeactivateOrDeletePortal": "Deactivate or delete space.",
@ -86,7 +91,8 @@
"DeveloperTools": "Developer Tools",
"Disabled": "Disabled",
"DNSSettings": "DNS Settings",
"DNSSettingsDescription": "DNS Settings is a way to set an alternative URL for your space.",
"DNSSettingsDescription": "Set an alternative URL address for your space. Send your request to our support team to get help with the settings.",
"DNSSettingsNavDescription": "DNS Settings is a way to set an alternative URL for your portal.",
"DNSSettingsMobile": "Send your request to our support team, and our specialists will help you with the settings.",
"DNSSettingsTooltipMain": "DNS Settings allow you to set an alternative URL address for your {{ organizationName }} space.",
"DNSSettingsTooltipStandalone": "Check the 'Custom domain name box' and specify your own domain name for the ONLYOFFICE space in the field below. To make the parameters you set take effect click the 'Save button' at the bottom of the section.",
@ -110,10 +116,13 @@
"ForcePathStyle": "Force Path Style",
"IntegrationRequest": "Missing a useful integration or component in ONLYOFFICE DocSpace? Leave a request to our team and we will look into that.",
"IPSecurity": "IP Security",
"IPSecuritySettingDescription": "Configure IP Security to restrict login possibility to select IP addresses. Use either exact IP addresses in the IPv4 format, IP range or CIDR masking. The IP security does not work for space owners, they can access the space from any IP address.",
"IPSecurityMobileDescription": "IP Security is used to restrict login to the portal from all IP addresses except certain addresses.",
"IPSecurityDescription": "<1>IP Security</1> is used to restrict login to the space from all IP addresses except certain addresses. You can set the allowed IP addresses using either exact IP addresses in the IPv4 format (#.#.#.#, where # is a numeric value from 0 to 255), IP range (in the #.#.#.#-#.#.#.# format), or CIDR masking (in the #.#.#.#/# format). The IP security does not work for space owners, they can access the space from any IP address. Rules set in the For all users section apply to full access administrators as well. At the same time, you can set additional rules for full access administrators in the corresponding section.",
"IPSecurityHelper": "You can set the allowed IP addresses using either exact IP addresses in the IPv4 format (#.#.#.#, where # is a numeric value from 0 to 255) or IP range (in the #.#.#.#-#.#.#.# format).",
"IPSecurityWarningHelper": "First, you need to specify your current IP or the IP range your current IP address belongs to, otherwise your space access will be blocked right after you save the settings. The space owner will have the space access from any IP address.",
"LanguageAndTimeZoneSettingsDescription": "Language and Time Zone Settings is a way to change the language of the space for all users and to configure the time zone so that all the actions will be shown with the correct date and time.",
"LanguageAndTimeZoneSettingsNavDescription": "Language and Time Zone Settings is a way to change the language of the whole portal for all portal users and to configure the time zone so that all the events of the portal will be shown with the correct date and time.",
"LanguageTimeSettingsTooltip": "<0>{{text}}</0> is a way to change the language of the space for all users and to configure the time zone so that all the actions of the {{ organizationName }} space will be shown with the correct date and time.",
"LanguageTimeSettingsTooltipDescription": "To make the parameters you set take effect click the <1>{{save}}</1> button at the bottom of the section.<3>{{learnMore}}</3>",
"Lifetime": "Lifetime (min)",
@ -145,6 +154,7 @@
"Plugins": "Plugins",
"PortalAccess": "DocSpace access",
"PortalAccessSubTitle": "This section allows you to provide users with safe and convenient ways to access the space.",
"PortalSecurityTitle": "This subsection allows you to provide users with secure and convenient ways to access the portal.",
"PortalDeactivation": "Deactivate DocSpace",
"PortalDeactivationDescription": "Use this option to deactivate your space temporarily.",
"PortalDeactivationHelper": "If you wish to deactivate this DocSpace, your space and all information associated with it will be blocked so that no one has access to it for a particular period. To do that, click the Deactivate button. A link to confirm the operation will be sent to the email address of the space owner.\nIn case you want to come back to the space and continue using it, you will need to use the second link provided in the confirmation email. So, please, keep this email in a safe place.",
@ -157,7 +167,10 @@
"PortalNameIncorrect": "Incorrect account name",
"PortalNameLength": "The account name must be between {{minLength}} and {{maxLength}} characters long",
"PortalRenaming": "DocSpace Renaming",
"PortalRenamingDescriptionText": "Change the space address that appears next to {{ domain }}.",
"PortalRenamingNote": "<strong>Note:</strong> Your old space address will become unavailable to new users once you click the Save button.",
"PortalRenamingDescription": "Here you can change your space address.",
"PortalRenamingNavDescription": "Here you can change your portal address.",
"PortalRenamingLabelText": "New space name",
"PortalRenamingMobile": "Enter the part that will appear next to the {{domain}} space address. Please note: your old space address will become unavailable to new users once you click the Save button.",
"PortalRenamingModalText": "You are about to rename your portal. Are you sure you want to continue?",
@ -176,9 +189,15 @@
"ServerSideEncryptionMethod": "Server Side Encryption Method",
"ServiceUrl": "Service Url",
"SessionLifetime": "Session Lifetime",
"SessionLifetimeSettingDescription": "Adjust Session Lifetime to define the time period before automatic logoff. After saving, logoff will be performed for all users.",
"SessionLifetimeMobileDescription": "Session Lifetime allows to set time (in minutes) before the DocSpace users will need to enter the space credentials again in order to access the space.",
"SessionLifetimeDescription": "<1>Session Lifetime</1> allows to set time (in minutes) before the space users will need to enter the space credentials again in order to access the space. After save all the users will be logged out from space.",
"SessionLifetimeHelper": "After saving, all the users will be logged out from the space.",
"SettingPasswordStrength": "Setting password strength",
"SettingPasswordTittle": "Password Strength Settings",
"SettingPasswordDescription": "Configure Password Strength Settings to enforce more secure, computation-resistant passwords.",
"SettingPasswordDescriptionSave": "Click the <strong>Save</strong> button at the bottom to apply.",
"SettingPasswordStrengthMobileDescription": "Password Strength Settings is a way to determine the effectiveness of a password in resisting guessing and brute-force attacks.",
"SettingPasswordStrengthDescription": "<1>Password Strength Settings</1> is a way to determine the effectiveness of a password in resisting guessing and brute-force attacks. <br> Use the <2>Minimum Password Length</2> bar to determine how long the password should be. Check the appropriate boxes below to determine the character set that must be used in the password. <br> To make the parameters you set take effect click the <3>Save</3> button at the bottom of the section.",
"SettingPasswordStrengthHelper": "Use the Minimum Password Length bar to determine how long the password should be. Check the appropriate boxes below to determine the character set that must be used in the password.",
"ShowFeedbackAndSupport": "Show Feedback & Support link",
@ -189,6 +208,8 @@
"SMTPSettingsDescription": "The SMTP settings are needed to set up an email account which will be used to send notifications from the portal using your own SMTP server instead of the one {{organizationName}} uses. Please fill in all the fields and click the 'Save' button. You can use the 'Send Test Mail' button to check if all the settings you entered are correct and work as supposed.",
"StoragePeriod": "Storage period",
"StudioTimeLanguageSettings": "Language and Time Zone Settings",
"TimeLanguageSettingsDescription": "Change Language and Time Zone Settings to adjust common DocSpace language and time.",
"TimeLanguageSettingsSave": "Click <strong>Save</strong> at the bottom to apply.",
"Submit": "Submit",
"SuccessfullySaveGreetingSettingsMessage": "Welcome Page settings have been successfully saved",
"SuccessfullySavePortalNameMessage": "Space has been renamed successfully",
@ -206,9 +227,16 @@
"ThirdPartyTitleDescription": "With Authorization keys, you can connect third-party services to your space. Sign in easily with Facebook, Google, or LinkedIn. Add Dropbox, OneDrive, and other accounts to work with files stored there.",
"TimeZone": "Time zone",
"TrustedMail": "Trusted mail domain settings",
"TrustedMailSettingDescription": "Configure Trusted Mail Domain Settings to specify the allowed mail servers to use for self-registration.",
"TrustedMailSave": "Click the <strong>Save</strong> button at the bottom to apply.",
"TrustedMailMobileDescription": "Trusted Mail Domain Settings is a way to specify the mail servers used for user self-registration.",
"TrustedMailDescription": "<1>Trusted Mail Domain Settings</1> is a way to specify the mail servers used for user self-registration. <br> You can either check the <2>Custom domains</2> option and enter the trusted mail server in the field below so that a person who has an account at it will be able to register him(her)self by clicking the Join link on the <3>Sign In</3> page or disable this option. <br> To make the parameters you set take effect, click the <4>Save</4> button at the bottom of the section.",
"TrustedMailHelper": "You can either check the Custom domains option and enter the trusted mail server in the field below so that a person who has an account at it will be able to register him(her)self by clicking the Join link on the Sign In page or disable this option.",
"TwoFactorAuth": "Two-factor authentication",
"TwoFactorAuthEnableDescription": "Enable two-factor authentication for a more secure DocSpace access for users.",
"TwoFactorAuthSave": "Click the <strong>Save</strong> button below to apply.",
"TwoFactorAuthNote": "<strong>Note:</strong> make sure to always have positive balance when SMS message option is chosen.",
"TwoFactorAuthMobileDescription": "Two-factor authentication is a more secure way for the users to enter the portal. After the credentials are entered, the user will have to enter the code from the SMS received to the mobile phone with the number which was specified at the first portal login or the code from an authentication application.",
"TwoFactorAuthDescription": "<1>Two-factor authentication</1> is a more secure way for the users to enter the DocSpace. After the credentials are entered, the user will have to enter the code from the SMS received to the mobile phone with the number which was specified at the first space login or the code from an authentication application. <br> Enable this option for a more secure DocSpace access by all the DocSpace users. <br> To apply the changes you made click the <2>Save</2> button below this section. <br> <3>Note</3>: SMS messages can be sent if you have a positive balance only. You can always check your current balance in your SMS provider account. Do not forget to replenish your balance in good time.",
"TwoFactorAuthHelper": "Note: SMS messages can be sent if you have a positive balance only. You can always check your current balance in your SMS provider account. Do not forget to replenish your balance in good time.",
"UnsavedChangesBody": "If you close the link settings menu right now, your changes will not be saved.",

6
packages/client/src/HOCs/withFileActions.js
View File

@ -240,7 +240,11 @@ export default function withFileActions(WrappedFileItem) {
let className = isDragging ? " droppable" : "";
if (draggable) className += " draggable";
let value = !item.isFolder ? `file_${id}` : `folder_${id}`;
let value = item.isFolder
? `folder_${id}`
: item.isDash
? `dash_${id}`
: `file_${id}`;
value += draggable ? "_draggable" : "_false";
value += `_index_${itemIndex}`;

13
packages/client/src/components/panels/UploadPanel/SubComponents/ErrorFileUpload.js
View File

@ -17,18 +17,16 @@ const ErrorFileUpload = ({ t, item, onTextClick, showPasswordInput }) => {
<div className="upload_panel-icon">
<StyledLoadErrorIcon
size="medium"
data-for="errorTooltip"
data-tip={item.error || t("Common:UnknownError")}
data-tooltip-id="errorTooltip"
data-tooltip-content={item.error || t("Common:UnknownError")}
/>
<Tooltip
id="errorTooltip"
offsetTop={0}
getContent={dataTip => (
getContent={({ content }) => (
<Text fontSize="13px" noSelect>
{dataTip}
{content}
</Text>
)}
effect="float"
place={placeTooltip}
maxWidth="320"
color="#f8f7bf"
@ -38,7 +36,8 @@ const ErrorFileUpload = ({ t, item, onTextClick, showPasswordInput }) => {
className="enter-password"
fontWeight="600"
color="#A3A9AE"
onClick={onTextClick}>
onClick={onTextClick}
>
{showPasswordInput ? t("HideInput") : t("EnterPassword")}
</Text>
)}

12
packages/client/src/pages/Confirm/sub-components/auth.js
View File

@ -3,11 +3,11 @@ import Loader from "@docspace/components/loader";
import Section from "@docspace/common/components/Section";
import { loginWithConfirmKey } from "@docspace/common/api/user";
import toastr from "@docspace/components/toast/toastr";
import { frameCallEvent } from "@docspace/common/utils";
const Auth = (props) => {
console.log("Auth render");
//console.log("Auth render");
const { linkData } = props;
useEffect(() => {
loginWithConfirmKey({
ConfirmData: {
@ -16,11 +16,15 @@ const Auth = (props) => {
},
})
.then((res) => {
console.log("Login with confirm key success", res);
//console.log("Login with confirm key success", res);
frameCallEvent({ event: "onAuthSuccess" });
if (typeof res === "string") window.location.replace(res);
else window.location.replace("/");
})
.catch((error) => toastr.error(error));
.catch((error) => {
frameCallEvent({ event: "onAppError", data: error });
toastr.error(error);
});
});
return <Loader className="pageLoader" type="rombs" size="40px" />;

12
packages/client/src/pages/Home/InfoPanel/Body/views/Members/sub-components/PublicRoomBlock.js
View File

@ -47,8 +47,10 @@ const PublicRoomBlock = (props) => {
</Text>
<div
data-for="emailTooltip"
data-tip={t("Files:MaximumNumberOfExternalLinksCreated")}
data-tooltip-id="emailTooltip"
data-tooltip-content={t(
"Files:MaximumNumberOfExternalLinksCreated"
)}
>
<IconButton
className="link-to-viewing-icon"
@ -61,11 +63,11 @@ const PublicRoomBlock = (props) => {
{externalLinks.length >= LINKS_LIMIT_COUNT && (
<Tooltip
float
id="emailTooltip"
getContent={(dataTip) => (
<Text fontSize="12px">{dataTip}</Text>
getContent={({ content }) => (
<Text fontSize="12px">{content}</Text>
)}
effect="float"
place="bottom"
/>
)}

8
packages/client/src/pages/Home/Section/Body/TableView/sub-components/RoomCell.js
View File

@ -36,17 +36,17 @@ const RoomCell = ({ sideColor, item }) => {
color={sideColor}
className="row_update-text"
truncate
data-for={"" + item.id}
data-tooltip-id={"" + item.id}
data-tip={""}
data-place={"bottom"}
>
{originRoomTitle || originTitle || "—"}
</StyledText>,
<Tooltip
id={"" + item.id}
float
place="bottom"
key={"tooltip"}
effect={"float"}
id={"" + item.id}
afterShow={getPath}
getContent={() => (
<span>

18
packages/client/src/pages/PortalSettings/categories/common/Customization/StyledSettings.js
View File

@ -5,6 +5,7 @@ import ArrowRightIcon from "PUBLIC_DIR/images/arrow.right.react.svg";
import commonIconsStyles from "@docspace/components/utils/common-icons-style";
import { Base } from "@docspace/components/themes";
import { UnavailableStyles } from "../../../utils/commonSettingsStyles";
import { mobile } from "@docspace/components/utils/device";
const menuHeight = "48px";
const sectionHeight = "50px";
@ -96,6 +97,23 @@ const StyledSettingsComponent = styled.div`
}
}
.link-learn-more {
display: block;
margin: 4px 0 16px 0;
font-weight: 600;
}
.category-item-description {
p,
a {
color: ${(props) => props.theme.client.settings.common.descriptionColor};
}
@media ${mobile} {
padding-right: 8px;
}
}
@media (max-width: 599px) {
${props =>
props.hasScroll &&

43
packages/client/src/pages/PortalSettings/categories/common/Customization/dns-settings.js
View File

@ -11,7 +11,6 @@ import { useNavigate } from "react-router-dom";
import { isMobileOnly } from "react-device-detect";
import { isSmallTablet } from "@docspace/components/utils/device";
import checkScrollSettingsBlock from "../utils";
import { DNSSettingsTooltip } from "../sub-components/common-tooltips";
import { StyledSettingsComponent, StyledScrollbar } from "./StyledSettings";
import { setDocumentTitle } from "SRC_DIR/helpers/utils";
import LoaderCustomization from "../sub-components/loaderCustomization";
@ -19,6 +18,8 @@ import withLoading from "SRC_DIR/HOCs/withLoading";
import Badge from "@docspace/components/badge";
import toastr from "@docspace/components/toast/toastr";
import ToggleButton from "@docspace/components/toggle-button";
import Text from "@docspace/components/text";
import Link from "@docspace/components/link";
const toggleStyle = {
position: "static",
@ -58,6 +59,7 @@ const DNSSettings = (props) => {
dnsName,
enable,
isDefaultDNS,
dnsSettingsUrl,
} = props;
const [hasScroll, setHasScroll] = useState(false);
const isLoadedSetting = isLoaded && tReady;
@ -82,9 +84,8 @@ const DNSSettings = (props) => {
}
// TODO: Remove div with height 64 and remove settings-mobile class
const settingsMobile = document.getElementsByClassName(
"settings-mobile"
)[0];
const settingsMobile =
document.getElementsByClassName("settings-mobile")[0];
if (settingsMobile) {
settingsMobile.style.display = "none";
@ -153,15 +154,6 @@ const DNSSettings = (props) => {
}
}, [isSmallTablet, setIsCustomizationView]);
const tooltipDNSSettingsTooltip = (
<DNSSettingsTooltip
t={t}
currentColorScheme={currentColorScheme}
helpLink={helpLink}
standalone={standalone}
/>
);
const settingsBlock = (
<div className="settings-block">
{standalone ? (
@ -233,13 +225,6 @@ const DNSSettings = (props) => {
{isCustomizationView && !isMobileView && (
<div className="category-item-heading">
<div className="category-item-title">{t("DNSSettings")}</div>
<HelpButton
offsetRight={0}
iconName={CombinedShapeSvgUrl}
size={12}
tooltipContent={tooltipDNSSettingsTooltip}
className="dns-setting_helpbutton "
/>
{!isSettingPaid && (
<Badge
className="paid-badge"
@ -250,6 +235,20 @@ const DNSSettings = (props) => {
)}
</div>
)}
<div className="category-item-description">
<Text fontSize="13px" fontWeight={400}>
{t("DNSSettingsDescription")}
</Text>
<Link
className="link-learn-more"
color={currentColorScheme.main.accent}
target="_blank"
isHovered
href={dnsSettingsUrl}
>
{t("Common:LearnMore")}
</Link>
</div>
{(isMobileOnly && isSmallTablet()) || isSmallTablet() ? (
<StyledScrollbar stype="mediumBlack">{settingsBlock}</StyledScrollbar>
) : (
@ -261,7 +260,8 @@ const DNSSettings = (props) => {
};
export default inject(({ auth, common }) => {
const { helpLink, currentColorScheme, standalone } = auth.settingsStore;
const { helpLink, currentColorScheme, standalone, dnsSettingsUrl } =
auth.settingsStore;
const {
isLoaded,
setIsLoadedDNSSettings,
@ -293,5 +293,6 @@ export default inject(({ auth, common }) => {
standalone,
setIsEnableDNS,
saveDNSSettings,
dnsSettingsUrl,
};
})(withLoading(withTranslation(["Settings", "Common"])(observer(DNSSettings))));

51
packages/client/src/pages/PortalSettings/categories/common/Customization/language-and-time-zone.js
View File

@ -1,18 +1,14 @@
import CombinedShapeSvgUrl from "PUBLIC_DIR/images/combined.shape.svg?url";
import React from "react";
import { withTranslation } from "react-i18next";
import React from "react";
import { withTranslation, Trans } from "react-i18next";
import FieldContainer from "@docspace/components/field-container";
import ComboBox from "@docspace/components/combobox";
import toastr from "@docspace/components/toast/toastr";
import HelpButton from "@docspace/components/help-button";
import SaveCancelButtons from "@docspace/components/save-cancel-buttons";
import { saveToSessionStorage, getFromSessionStorage } from "../../../utils";
import { setDocumentTitle } from "SRC_DIR/helpers/utils";
import { inject, observer } from "mobx-react";
import { LANGUAGE, COOKIE_EXPIRATION_YEAR } from "@docspace/common/constants";
import { LanguageTimeSettingsTooltip } from "../sub-components/common-tooltips";
import { combineUrl, setCookie } from "@docspace/common/utils";
import config from "PACKAGE_FILE";
import { setCookie } from "@docspace/common/utils";
import { useNavigate } from "react-router-dom";
import { isMobileOnly } from "react-device-detect";
import { isSmallTablet } from "@docspace/components/utils/device";
@ -20,6 +16,8 @@ import checkScrollSettingsBlock from "../utils";
import { StyledSettingsComponent, StyledScrollbar } from "./StyledSettings";
import LoaderCustomization from "../sub-components/loaderCustomization";
import withLoading from "SRC_DIR/HOCs/withLoading";
import Text from "@docspace/components/text";
import Link from "@docspace/components/link";
const mapTimezonesToArray = (timezones) => {
return timezones.map((timezone) => {
@ -60,7 +58,7 @@ const LanguageAndTimeZone = (props) => {
t,
setIsLoaded,
timezone,
languageAndTimeZoneSettingsUrl,
initSettings,
} = props;
@ -428,16 +426,6 @@ const LanguageAndTimeZone = (props) => {
const timezones = mapTimezonesToArray(rawTimezones);
const cultureNamesNew = mapCulturesToArray(cultures, i18n);
const tooltipLanguageTimeSettings = (
<LanguageTimeSettingsTooltip
theme={theme}
t={t}
helpLink={helpLink}
organizationName={organizationName}
currentColorScheme={currentColorScheme}
/>
);
const settingsBlock = !(state.language && state.timezone) ? null : (
<div className="settings-block">
<FieldContainer
@ -499,15 +487,26 @@ const LanguageAndTimeZone = (props) => {
<div className="category-item-title">
{t("StudioTimeLanguageSettings")}
</div>
<HelpButton
className="language-time-zone-help-button"
offsetRight={0}
iconName={CombinedShapeSvgUrl}
size={12}
tooltipContent={tooltipLanguageTimeSettings}
/>
</div>
)}
<div className="category-item-description">
<Text fontSize="13px" fontWeight={400}>
{t("TimeLanguageSettingsDescription")}
</Text>
<Text>
<Trans t={t} i18nKey="TimeLanguageSettingsSave" />
</Text>
<Link
className="link-learn-more"
color={currentColorScheme.main.accent}
target="_blank"
isHovered
href={languageAndTimeZoneSettingsUrl}
>
{t("Common:LearnMore")}
</Link>
</div>
{(isMobileOnly && isSmallTablet()) || isSmallTablet() ? (
<StyledScrollbar stype="mediumBlack">{settingsBlock}</StyledScrollbar>
) : (
@ -543,6 +542,7 @@ export default inject(({ auth, setup, common }) => {
cultures,
helpLink,
currentColorScheme,
languageAndTimeZoneSettingsUrl,
} = auth.settingsStore;
const { user } = auth.userStore;
@ -569,6 +569,7 @@ export default inject(({ auth, setup, common }) => {
initSettings,
setIsLoaded,
currentColorScheme,
languageAndTimeZoneSettingsUrl,
};
})(
withLoading(

52
packages/client/src/pages/PortalSettings/categories/common/Customization/portal-renaming.js
View File

@ -1,8 +1,6 @@
import CombinedShapeSvgUrl from "PUBLIC_DIR/images/combined.shape.svg?url";
import React, { useState, useEffect, useCallback } from "react";
import { withTranslation } from "react-i18next";
import React, { useState, useEffect, useCallback } from "react";
import { withTranslation, Trans } from "react-i18next";
import toastr from "@docspace/components/toast/toastr";
import HelpButton from "@docspace/components/help-button";
import FieldContainer from "@docspace/components/field-container";
import TextInput from "@docspace/components/text-input";
import SaveCancelButtons from "@docspace/components/save-cancel-buttons";
@ -11,13 +9,14 @@ import { useNavigate } from "react-router-dom";
import { isMobileOnly } from "react-device-detect";
import { isSmallTablet } from "@docspace/components/utils/device";
import checkScrollSettingsBlock from "../utils";
import { PortalRenamingTooltip } from "../sub-components/common-tooltips";
import { StyledSettingsComponent, StyledScrollbar } from "./StyledSettings";
import { saveToSessionStorage, getFromSessionStorage } from "../../../utils";
import { setDocumentTitle } from "SRC_DIR/helpers/utils";
import LoaderCustomization from "../sub-components/loaderCustomization";
import withLoading from "SRC_DIR/HOCs/withLoading";
import { PortalRenamingDialog } from "SRC_DIR/components/dialogs";
import Text from "@docspace/components/text";
import Link from "@docspace/components/link";
const PortalRenaming = (props) => {
const {
@ -33,6 +32,8 @@ const PortalRenaming = (props) => {
setIsLoaded,
getAllSettings,
domain,
currentColorScheme,
renamingSettingsUrl,
} = props;
const navigate = useNavigate();
@ -271,16 +272,10 @@ const PortalRenaming = (props) => {
setIsShowModal(false);
};
const tooltipPortalRenamingTooltip = (
<PortalRenamingTooltip t={t} domain={domain} />
);
const hasError = errorValue === null ? false : true;
const settingsBlock = (
<div className="settings-block">
<div className="settings-block-description">
{t("PortalRenamingMobile", { domain })}
</div>
<FieldContainer
id="fieldContainerPortalRenaming"
className="field-container-width"
@ -312,15 +307,25 @@ const PortalRenaming = (props) => {
{isCustomizationView && !isMobileView && (
<div className="category-item-heading">
<div className="category-item-title">{t("PortalRenaming")}</div>
<HelpButton
className="portal-renaming-help-button"
offsetRight={0}
iconName={CombinedShapeSvgUrl}
size={12}
tooltipContent={tooltipPortalRenamingTooltip}
/>
</div>
)}
<div className="category-item-description">
<Text fontSize="13px" fontWeight={400}>
{t("PortalRenamingDescriptionText", { domain })}
</Text>
<Text fontSize="13px" fontWeight={400}>
<Trans t={t} i18nKey="PortalRenamingNote" />
</Text>
<Link
className="link-learn-more"
color={currentColorScheme.main.accent}
target="_blank"
isHovered
href={renamingSettingsUrl}
>
{t("Common:LearnMore")}
</Link>
</div>
{(isMobileOnly && isSmallTablet()) || isSmallTablet() ? (
<StyledScrollbar stype="mediumBlack">{settingsBlock}</StyledScrollbar>
) : (
@ -352,10 +357,17 @@ const PortalRenaming = (props) => {
};
export default inject(({ auth, setup, common }) => {
const { theme, tenantAlias, baseDomain } = auth.settingsStore;
const {
theme,
tenantAlias,
baseDomain,
currentColorScheme,
renamingSettingsUrl,
} = auth.settingsStore;
const { setPortalRename, getAllSettings } = setup;
const { isLoaded, setIsLoadedPortalRenaming, initSettings, setIsLoaded } =
common;
return {
theme,
setPortalRename,
@ -366,6 +378,8 @@ export default inject(({ auth, setup, common }) => {
setIsLoaded,
getAllSettings,
domain: baseDomain,
currentColorScheme,
renamingSettingsUrl,
};
})(
withLoading(withTranslation(["Settings", "Common"])(observer(PortalRenaming)))

40
packages/client/src/pages/PortalSettings/categories/common/Customization/welcome-page-settings.js
View File

@ -9,7 +9,6 @@ import SaveCancelButtons from "@docspace/components/save-cancel-buttons";
import { saveToSessionStorage, getFromSessionStorage } from "../../../utils";
import { setDocumentTitle } from "SRC_DIR/helpers/utils";
import { inject, observer } from "mobx-react";
import { CustomTitlesTooltip } from "../sub-components/common-tooltips";
import config from "PACKAGE_FILE";
import { useNavigate } from "react-router-dom";
import { isMobileOnly } from "react-device-detect";
@ -18,6 +17,8 @@ import checkScrollSettingsBlock from "../utils";
import { StyledSettingsComponent, StyledScrollbar } from "./StyledSettings";
import LoaderCustomization from "../sub-components/loaderCustomization";
import withLoading from "SRC_DIR/HOCs/withLoading";
import Text from "@docspace/components/text";
import Link from "@docspace/components/link";
let greetingTitleFromSessionStorage = "";
let greetingTitleDefaultFromSessionStorage = "";
@ -40,6 +41,8 @@ const WelcomePageSettings = (props) => {
getSettings,
getGreetingSettingsIsDefault,
currentColorScheme,
welcomePageSettingsUrl,
} = props;
const navigate = useNavigate();
@ -290,8 +293,6 @@ const WelcomePageSettings = (props) => {
navigate(e.target.pathname);
};
const tooltipCustomTitlesTooltip = <CustomTitlesTooltip t={t} />;
const settingsBlock = (
<div className="settings-block">
<FieldContainer
@ -325,15 +326,22 @@ const WelcomePageSettings = (props) => {
{state.isCustomizationView && !isMobileView && (
<div className="category-item-heading">
<div className="category-item-title">{t("CustomTitlesWelcome")}</div>
<HelpButton
className="welcome-page-help-button"
offsetRight={0}
iconName={CombinedShapeSvgUrl}
size={12}
tooltipContent={tooltipCustomTitlesTooltip}
/>
</div>
)}
<div className="category-item-description">
<Text fontSize="13px" fontWeight={400}>
{t("CustomTitlesDescription")}
</Text>
<Link
className="link-learn-more"
color={currentColorScheme.main.accent}
target="_blank"
isHovered
href={welcomePageSettingsUrl}
>
{t("Common:LearnMore")}
</Link>
</div>
{(isMobileOnly && isSmallTablet()) || isSmallTablet() ? (
<StyledScrollbar stype="mediumBlack">{settingsBlock}</StyledScrollbar>
) : (
@ -360,8 +368,14 @@ const WelcomePageSettings = (props) => {
};
export default inject(({ auth, setup, common }) => {
const { greetingSettings, organizationName, theme, getSettings } =
auth.settingsStore;
const {
greetingSettings,
organizationName,
theme,
getSettings,
currentColorScheme,
welcomePageSettingsUrl,
} = auth.settingsStore;
const { setGreetingTitle, restoreGreetingTitle } = setup;
const {
isLoaded,
@ -384,6 +398,8 @@ export default inject(({ auth, setup, common }) => {
getSettings,
initSettings,
setIsLoaded,
currentColorScheme,
welcomePageSettingsUrl,
};
})(
withLoading(

28
packages/client/src/pages/PortalSettings/categories/common/appearance.js
View File

@ -48,19 +48,16 @@ const Appearance = (props) => {
const [showColorSchemeDialog, setShowColorSchemeDialog] = useState(false);
const [headerColorSchemeDialog, setHeaderColorSchemeDialog] = useState(
headerEditTheme
);
const [headerColorSchemeDialog, setHeaderColorSchemeDialog] =
useState(headerEditTheme);
const [currentColorAccent, setCurrentColorAccent] = useState(null);
const [currentColorButtons, setCurrentColorButtons] = useState(null);
const [openHexColorPickerAccent, setOpenHexColorPickerAccent] = useState(
false
);
const [openHexColorPickerButtons, setOpenHexColorPickerButtons] = useState(
false
);
const [openHexColorPickerAccent, setOpenHexColorPickerAccent] =
useState(false);
const [openHexColorPickerButtons, setOpenHexColorPickerButtons] =
useState(false);
const [appliedColorAccent, setAppliedColorAccent] = useState(
defaultAppliedColorAccent
@ -69,12 +66,10 @@ const Appearance = (props) => {
defaultAppliedColorButtons
);
const [changeCurrentColorAccent, setChangeCurrentColorAccent] = useState(
false
);
const [changeCurrentColorButtons, setChangeCurrentColorButtons] = useState(
false
);
const [changeCurrentColorAccent, setChangeCurrentColorAccent] =
useState(false);
const [changeCurrentColorButtons, setChangeCurrentColorButtons] =
useState(false);
const [isSmallWindow, setIsSmallWindow] = useState(false);
@ -697,7 +692,7 @@ const Appearance = (props) => {
</div>
<div
data-for="theme-add"
data-tooltip-id="theme-add"
data-tip="tooltip"
className="theme-add"
onClick={onAddTheme}
@ -707,7 +702,6 @@ const Appearance = (props) => {
id="theme-add"
offsetBottom={0}
offsetRight={130}
effect="solid"
place="bottom"
getContent={textTooltip}
maxWidth="300px"

72
packages/client/src/pages/PortalSettings/categories/common/customization-navbar.js
View File

@ -21,13 +21,13 @@ const StyledComponent = styled.div`
}
.category-item-wrapper {
padding-bottom: 20px;
padding-bottom: 22px;
.category-item-heading {
padding-bottom: 8px;
svg {
padding-bottom: 5px;
${props =>
${(props) =>
props.theme.interfaceDirection === "rtl" &&
css`
transform: scaleX(-1);
@ -39,7 +39,7 @@ const StyledComponent = styled.div`
}
display: flex;
svg {
${props =>
${(props) =>
props.theme.interfaceDirection === "rtl" &&
css`
transform: scaleX(-1);
@ -50,14 +50,15 @@ const StyledComponent = styled.div`
}
.category-item-description {
color: ${props => props.theme.client.settings.common.descriptionColor};
color: ${(props) => props.theme.client.settings.common.descriptionColor};
font-size: 13px;
font-weight: 400px;
max-width: 1024px;
line-height: 20px;
}
.inherit-title-link {
${props =>
${(props) =>
props.theme.interfaceDirection === "rtl"
? css`
margin-left: 4px;
@ -68,10 +69,6 @@ const StyledComponent = styled.div`
font-size: 16px;
font-weight: 700;
}
.link-learn-more {
line-height: 15px;
font-weight: 600;
}
}
`;
@ -79,15 +76,11 @@ StyledComponent.defaultProps = { theme: Base };
const CustomizationNavbar = ({
t,
theme,
isLoaded,
tReady,
setIsLoadedCustomizationNavbar,
isLoadedPage,
isSettingPaid,
currentColorScheme,
languageAndTimeZoneSettingsUrl,
dnsSettingsUrl,
}) => {
const isLoadedSetting = isLoaded && tReady;
const navigate = useNavigate();
@ -96,7 +89,7 @@ const CustomizationNavbar = ({
if (isLoadedSetting) setIsLoadedCustomizationNavbar(isLoadedSetting);
}, [isLoadedSetting]);
const onClickLink = e => {
const onClickLink = (e) => {
e.preventDefault();
navigate(e.target.pathname);
};
@ -113,24 +106,15 @@ const CustomizationNavbar = ({
truncate={true}
href={
"portal-settings/customization/general/language-and-time-zone"
}>
}
>
{t("StudioTimeLanguageSettings")}
</Link>
<StyledArrowRightIcon size="small" color="#333333" />
</div>
<Text className="category-item-description">
{t("LanguageAndTimeZoneSettingsDescription")}
{t("LanguageAndTimeZoneSettingsNavDescription")}
</Text>
<Box paddingProp="10px 0 3px 0">
<Link
className="link-learn-more"
color={currentColorScheme.main.accent}
target="_blank"
isHovered={true}
href={languageAndTimeZoneSettingsUrl}>
{t("Common:LearnMore")}
</Link>
</Box>
</div>
<div className="category-item-wrapper">
<div className="category-item-heading">
@ -140,13 +124,14 @@ const CustomizationNavbar = ({
onClick={onClickLink}
href={
"/portal-settings/customization/general/welcome-page-settings"
}>
}
>
{t("CustomTitlesWelcome")}
</Link>
<StyledArrowRightIcon size="small" color="#333333" />
</div>
<Text className="category-item-description">
{t("CustomTitlesSettingsDescription")}
{t("CustomTitlesSettingsNavDescription")}
</Text>
</div>
@ -157,7 +142,8 @@ const CustomizationNavbar = ({
truncate={true}
className="inherit-title-link header"
onClick={onClickLink}
href={"/portal-settings/customization/general/dns-settings"}>
href={"/portal-settings/customization/general/dns-settings"}
>
{t("DNSSettings")}
</Link>
{!isSettingPaid && (
@ -172,17 +158,8 @@ const CustomizationNavbar = ({
</div>
</div>
<Text className="category-item-description">
{t("DNSSettingsDescription")}
{t("DNSSettingsNavDescription")}
</Text>
<Box paddingProp="10px 0 3px 0">
<Link
color={currentColorScheme.main.accent}
target="_blank"
isHovered={true}
href={dnsSettingsUrl}>
{t("Common:LearnMore")}
</Link>
</Box>
</div>
<div className="category-item-wrapper">
@ -191,34 +168,25 @@ const CustomizationNavbar = ({
truncate={true}
className="inherit-title-link header"
onClick={onClickLink}
href={"/portal-settings/customization/general/portal-renaming"}>
href={"/portal-settings/customization/general/portal-renaming"}
>
{t("PortalRenaming")}
</Link>
<StyledArrowRightIcon size="small" color="#333333" />
</div>
<Text className="category-item-description">
{t("PortalRenamingDescription")}
{t("PortalRenamingNavDescription")}
</Text>
</div>
</StyledComponent>
);
};
export default inject(({ auth, common }) => {
const {
theme,
currentColorScheme,
languageAndTimeZoneSettingsUrl,
dnsSettingsUrl,
} = auth.settingsStore;
export default inject(({ common }) => {
const { isLoaded, setIsLoadedCustomizationNavbar } = common;
return {
theme,
isLoaded,
setIsLoadedCustomizationNavbar,
currentColorScheme,
languageAndTimeZoneSettingsUrl,
dnsSettingsUrl,
};
})(
withCultureNames(

170
packages/client/src/pages/PortalSettings/categories/common/sub-components/common-tooltips.js
View File

@ -1,170 +0,0 @@
import React from "react";
import styled from "styled-components";
import { Trans } from "react-i18next";
import Link from "@docspace/components/link";
const StyledTooltip = styled.div`
.font-size {
font-size: 12px;
}
.bold {
font-weight: 600;
}
.display-inline {
display: inline;
}
.display-block {
margin-top: 10px;
display: block;
margin-top: 10px;
}
`;
export const LanguageTimeSettingsTooltip = ({
t,
theme,
helpLink,
organizationName,
}) => {
const learnMore = t("Common:LearnMore");
const text = t("Settings:StudioTimeLanguageSettings");
const save = t("Common:SaveButton");
return (
<StyledTooltip>
<div className="font-size">
<Trans ns="Settings" i18nKey="LanguageTimeSettingsTooltip" text={text}>
<div className="bold display-inline font-size">{{ text }}</div>
{{ organizationName }}
</Trans>
</div>
<div className="font-size">
<Trans
ns="Settings"
i18nKey="LanguageTimeSettingsTooltipDescription"
learnMore={learnMore}
save={save}
>
To make the parameters you set take effect click the
<div className="bold display-inline font-size"> {{ save }}</div>
button at the bottom of the section.
<Link
className="display-block"
color="#333333"
fontSize="13px"
isHovered
isBold
target="_blank"
href={`${helpLink}/administration/docspace-settings.aspx#DocSpacelanguage`}
>
{{ learnMore }}
</Link>
</Trans>
</div>
</StyledTooltip>
);
};
export const CustomTitlesTooltip = ({ t }) => {
const welcomeText = t("Settings:CustomTitlesWelcome");
const text = t("Settings:CustomTitlesText");
const from = t("Settings:CustomTitlesFrom");
const header = t("Common:Title");
return (
<StyledTooltip>
<div className="font-size">
<Trans
ns="Settings"
i18nKey="CustomTitlesSettingsTooltip"
welcomeText={welcomeText}
text={text}
from={from}
>
<div className="bold display-inline font-size">{{ welcomeText }}</div>
is a way to change the default portal title to be displayed on the
<div className="bold display-inline font-size"> {{ text }}</div>
of your portal. The same name is also used for the
<div className="bold display-inline font-size"> {{ from }}</div>
field of your portal email notifications.
</Trans>
</div>
<div className="font-size">
<Trans
ns="Settings"
i18nKey="CustomTitlesSettingsTooltipDescription"
header={header}
>
Enter the name you like in the
<div className="bold display-inline font-size">{{ header }}</div>
field.
</Trans>
</div>
</StyledTooltip>
);
};
export const DNSSettingsTooltip = ({
t,
helpLink,
organizationName,
standalone,
}) => {
return (
<StyledTooltip>
<div className="font-size">
{t("DNSSettingsTooltipMain", { organizationName })}{" "}
{standalone
? t("DNSSettingsTooltipStandalone", { organizationName })
: t("DNSSettingsMobile")}
<Link
color="#333333"
className="display-block"
fontSize="13px"
isBold
isHovered
target="_blank"
href={`${helpLink}/administration/docspace-settings.aspx#alternativeurl`}
>
{t("Common:LearnMore")}
</Link>
</div>
</StyledTooltip>
);
};
export const PortalRenamingTooltip = ({ t, domain }) => {
const text = t("Settings:PortalRenamingDescription");
const pleaseNote = t("Settings:PleaseNote");
const save = t("Common:SaveButton");
return (
<StyledTooltip>
<div className="font-size">
<Trans
ns="Settings"
i18nKey="PortalRenamingSettingsTooltip"
text={text}
domain={domain}
>
<div className="display-inline font-size"> {{ text }}</div>
Enter the part that will appear next to the
{{ domain }} portal address.
</Trans>
</div>
<div className="font-size">
<Trans
ns="Settings"
i18nKey="PleaseNoteDescription"
pleaseNote={pleaseNote}
save={save}
>
<div className="bold display-inline font-size"> {{ pleaseNote }}</div>
: your old portal address will become available to new users once you
click the
<div className="bold display-inline font-size"> {{ save }}</div>
button.
</Trans>
</div>
</StyledTooltip>
);
};

33
packages/client/src/pages/PortalSettings/categories/security/StyledSecurity.js
View File

@ -2,6 +2,7 @@ import styled from "styled-components";
import ArrowRightIcon from "PUBLIC_DIR/images/arrow.right.react.svg";
import commonIconsStyles from "@docspace/components/utils/common-icons-style";
import { Base } from "@docspace/components/themes";
import { mobile } from "@docspace/components/utils/device";
export const StyledArrowRightIcon = styled(ArrowRightIcon)`
${commonIconsStyles}
@ -33,6 +34,26 @@ export const MainContainer = styled.div`
${({ theme }) =>
theme.interfaceDirection === "rtl" ? `right: 50%;` : `left: 50%;`}
}
.category-item-description {
margin-top: 8px;
max-width: 700px;
.link-learn-more {
display: block;
margin: 4px 0 16px 0;
font-weight: 600;
}
p,
a {
color: ${(props) => props.theme.client.settings.common.descriptionColor};
}
@media ${mobile} {
padding-right: 8px;
}
}
`;
MainContainer.defaultProps = { theme: Base };
@ -92,10 +113,20 @@ StyledMobileCategoryWrapper.defaultProps = { theme: Base };
export const LearnMoreWrapper = styled.div`
display: none;
.link-learn-more {
font-weight: 600;
}
p,
a {
color: ${(props) => props.theme.client.settings.common.descriptionColor};
}
@media (max-width: 600px) {
display: flex;
flex-direction: column;
margin-bottom: 20px;
padding-right: 8px;
line-height: 20px;
}
@ -129,6 +160,7 @@ export const StyledBruteForceProtection = styled.div`
.input-container {
margin-bottom: 8px;
margin-right: 8px;
}
.mobile-description {
@ -141,6 +173,7 @@ export const StyledBruteForceProtection = styled.div`
.page-subtitle {
line-height: 20px;
padding-right: 8px;
color: ${(props) =>
props.theme.client.settings.security.descriptionColor};
padding-bottom: 7px;

9
packages/client/src/pages/PortalSettings/categories/security/access-portal/adminMessage.js
View File

@ -1,7 +1,7 @@
import React, { useState, useEffect } from "react";
import styled from "styled-components";
import { useNavigate, useLocation } from "react-router-dom";
import { withTranslation } from "react-i18next";
import { withTranslation, Trans } from "react-i18next";
import { inject, observer } from "mobx-react";
import RadioButtonGroup from "@docspace/components/radio-button-group";
import Text from "@docspace/components/text";
@ -125,8 +125,13 @@ const AdminMessage = (props) => {
return (
<MainContainer>
<LearnMoreWrapper>
<Text className="page-subtitle">{t("AdminsMessageHelper")}</Text>
<Text>{t("AdminsMessageSettingDescription")}</Text>
<Text fontSize="13px" fontWeight="400" className="learn-subtitle">
<Trans t={t} i18nKey="AdminsMessageSave" />
</Text>
<Link
className="link-learn-more"
color={currentColorScheme.main.accent}
target="_blank"
isHovered

260
packages/client/src/pages/PortalSettings/categories/security/access-portal/index.js
View File

@ -11,10 +11,10 @@ import AdminMessageSection from "./adminMessage";
import SessionLifetimeSection from "./sessionLifetime";
import BruteForceProtectionSection from "./bruteForceProtection";
import MobileView from "./mobileView";
import CategoryWrapper from "../sub-components/category-wrapper";
import StyledSettingsSeparator from "SRC_DIR/pages/PortalSettings/StyledSettingsSeparator";
import { size } from "@docspace/components/utils/device";
import { inject, observer } from "mobx-react";
import Link from "@docspace/components/link";
const AccessPortal = (props) => {
const {
@ -24,6 +24,8 @@ const AccessPortal = (props) => {
tfaSettingsUrl,
trustedMailDomainSettingsUrl,
administratorMessageSettingsUrl,
lifetimeSettingsUrl,
ipSettingsUrl,
} = props;
const [isMobileView, setIsMobileView] = useState(false);
@ -43,135 +45,159 @@ const AccessPortal = (props) => {
if (isMobileView) return <MobileView />;
return (
<MainContainer className="desktop-view">
<Text className="subtitle">{t("PortalAccessSubTitle")}</Text>
<CategoryWrapper
t={t}
title={t("SettingPasswordStrength")}
tooltipTitle={
<Trans
i18nKey="SettingPasswordStrengthDescription"
ns="Settings"
t={t}
components={{
1: <strong></strong>,
2: <strong></strong>,
3: <strong></strong>,
}}
/>
}
tooltipUrl={passwordStrengthSettingsUrl}
currentColorScheme={currentColorScheme}
classNameTooltip="password-strength"
/>
<Text className="subtitle">{t("PortalSecurityTitle")}</Text>
<Text fontSize="16px" fontWeight="700">
{t("SettingPasswordTittle")}
</Text>
<div className="category-item-description">
<Text fontSize="13px" fontWeight="400">
{t("SettingPasswordDescription")}
</Text>
<Text fontSize="13px" fontWeight="400">
<Trans t={t} i18nKey="SettingPasswordDescriptionSave" />
</Text>
<Link
className="link-learn-more"
target="_blank"
isHovered
color={currentColorScheme.main.accent}
href={passwordStrengthSettingsUrl}
>
{t("Common:LearnMore")}
</Link>
</div>
<PasswordStrengthSection />
<StyledSettingsSeparator />
<CategoryWrapper
t={t}
title={t("TwoFactorAuth")}
tooltipTitle={
<Trans
i18nKey="TwoFactorAuthDescription"
ns="Settings"
t={t}
components={{
1: <strong></strong>,
2: <strong></strong>,
3: <strong></strong>,
}}
/>
}
tooltipUrl={tfaSettingsUrl}
currentColorScheme={currentColorScheme}
classNameTooltip="two-factor-auth"
/>
<Text fontSize="16px" fontWeight="700">
{t("TwoFactorAuth")}
</Text>
<div className="category-item-description">
<Text fontSize="13px" fontWeight="400">
{t("TwoFactorAuthEnableDescription")}
</Text>
<Text fontSize="13px" fontWeight="400">
<Trans t={t} i18nKey="TwoFactorAuthSave" />
</Text>
<Text fontSize="13px" fontWeight="400">
<Trans t={t} i18nKey="TwoFactorAuthNote" />
</Text>
<Link
className="link-learn-more"
target="_blank"
isHovered
color={currentColorScheme.main.accent}
href={tfaSettingsUrl}
>
{t("Common:LearnMore")}
</Link>
</div>
<TfaSection />
<StyledSettingsSeparator />
<CategoryWrapper
t={t}
title={t("TrustedMail")}
tooltipTitle={
<Trans
i18nKey="TrustedMailDescription"
ns="Settings"
t={t}
components={{
1: <strong></strong>,
2: <strong></strong>,
3: <strong></strong>,
4: <strong></strong>,
}}
/>
}
tooltipUrl={trustedMailDomainSettingsUrl}
currentColorScheme={currentColorScheme}
classNameTooltip="trusted-mail"
/>
<Text fontSize="16px" fontWeight="700">
{t("TrustedMail")}
</Text>
<div className="category-item-description">
<Text fontSize="13px" fontWeight="400">
{t("TrustedMailSettingDescription")}
</Text>
<Text fontSize="13px" fontWeight="400">
<Trans t={t} i18nKey="TrustedMailSave" />
</Text>
<Link
className="link-learn-more"
target="_blank"
isHovered
color={currentColorScheme.main.accent}
href={trustedMailDomainSettingsUrl}
>
{t("Common:LearnMore")}
</Link>
</div>
<TrustedMailSection />
<StyledSettingsSeparator />
<CategoryWrapper
t={t}
title={t("IPSecurity")}
tooltipTitle={
<Trans
i18nKey="IPSecurityDescription"
ns="Settings"
t={t}
components={{
1: <strong></strong>,
}}
/>
}
tooltipContent={t("IPSecurityDescription")}
classNameTooltip="ip-security"
/>
<Text fontSize="16px" fontWeight="700">
{t("IPSecurity")}
</Text>
<div className="category-item-description">
<Text fontSize="13px" fontWeight="400">
{t("IPSecuritySettingDescription")}
</Text>
<Link
className="link-learn-more"
target="_blank"
isHovered
color={currentColorScheme.main.accent}
href={ipSettingsUrl}
>
{t("Common:LearnMore")}
</Link>
</div>
<IpSecuritySection />
<StyledSettingsSeparator />
<CategoryWrapper
notTooltip={true}
t={t}
title={t("BruteForceProtection")}
/>
<Text fontSize="16px" fontWeight="700">
{t("BruteForceProtection")}
</Text>
<BruteForceProtectionSection />
<StyledSettingsSeparator />
<CategoryWrapper
t={t}
title={t("AdminsMessage")}
tooltipTitle={
<Trans
i18nKey="AdminsMessageDescription"
ns="Settings"
t={t}
components={{
1: <strong></strong>,
2: <strong></strong>,
3: <strong></strong>,
}}
/>
}
tooltipUrl={administratorMessageSettingsUrl}
currentColorScheme={currentColorScheme}
classNameTooltip="admins-message"
/>
<Text fontSize="16px" fontWeight="700">
{t("AdminsMessage")}
</Text>
<div className="category-item-description">
<Text fontSize="13px" fontWeight="400">
{t("AdminsMessageSettingDescription")}
</Text>
<Text fontSize="13px" fontWeight="400">
<Trans t={t} i18nKey="AdminsMessageSave" />
</Text>
<Link
className="link-learn-more"
target="_blank"
isHovered
color={currentColorScheme.main.accent}
href={administratorMessageSettingsUrl}
>
{t("Common:LearnMore")}
</Link>
</div>
<AdminMessageSection />
<StyledSettingsSeparator />
<CategoryWrapper
t={t}
title={t("SessionLifetime")}
tooltipTitle={
<Trans
i18nKey="SessionLifetimeDescription"
ns="Settings"
t={t}
components={{
1: <strong></strong>,
}}
/>
}
classNameTooltip="session-lifetime"
/>
<Text fontSize="16px" fontWeight="700">
{t("SessionLifetime")}
</Text>
<div className="category-item-description">
<Text fontSize="13px" fontWeight="400">
{t("SessionLifetimeSettingDescription")}
</Text>
<Link
className="link-learn-more"
target="_blank"
isHovered
color={currentColorScheme.main.accent}
href={lifetimeSettingsUrl}
>
{t("Common:LearnMore")}
</Link>
</div>
<SessionLifetimeSection />
</MainContainer>
);
@ -184,6 +210,8 @@ export default inject(({ auth }) => {
tfaSettingsUrl,
trustedMailDomainSettingsUrl,
administratorMessageSettingsUrl,
lifetimeSettingsUrl,
ipSettingsUrl,
} = auth.settingsStore;
return {
currentColorScheme,
@ -191,5 +219,7 @@ export default inject(({ auth }) => {
tfaSettingsUrl,
trustedMailDomainSettingsUrl,
administratorMessageSettingsUrl,
lifetimeSettingsUrl,
ipSettingsUrl,
};
})(withTranslation(["Settings", "Profile"])(observer(AccessPortal)));

29
packages/client/src/pages/PortalSettings/categories/security/access-portal/ipSecurity.js
View File

@ -4,6 +4,7 @@ import { useNavigate, useLocation } from "react-router-dom";
import { withTranslation } from "react-i18next";
import { inject, observer } from "mobx-react";
import Text from "@docspace/components/text";
import Link from "@docspace/components/link";
import RadioButtonGroup from "@docspace/components/radio-button-group";
import toastr from "@docspace/components/toast/toastr";
import { LearnMoreWrapper } from "../StyledSecurity";
@ -18,6 +19,10 @@ import IpSecurityLoader from "../sub-components/loaders/ip-security-loader";
const MainContainer = styled.div`
width: 100%;
.ip-security_warning {
max-width: 700px;
}
.page-subtitle {
margin-bottom: 10px;
}
@ -42,13 +47,14 @@ const MainContainer = styled.div`
const IpSecurity = (props) => {
const {
t,
ipRestrictionEnable,
setIpRestrictionsEnable,
ipRestrictions,
setIpRestrictions,
initSettings,
isInit,
ipSettingsUrl,
currentColorScheme,
} = props;
const navigate = useNavigate();
@ -182,7 +188,18 @@ const IpSecurity = (props) => {
return (
<MainContainer>
<LearnMoreWrapper>
<Text className="page-subtitle">{t("IPSecurityHelper")}</Text>
<Text className="page-subtitle">
{t("IPSecuritySettingDescription")}
</Text>
<Link
className="link-learn-more"
color={currentColorScheme.main.accent}
target="_blank"
isHovered
href={ipSettingsUrl}
>
{t("Common:LearnMore")}
</Link>
</LearnMoreWrapper>
<RadioButtonGroup
@ -231,7 +248,9 @@ const IpSecurity = (props) => {
>
{t("Common:Warning")}!
</Text>
<Text>{t("IPSecurityWarningHelper")}</Text>
<Text className="ip-security_warning">
{t("IPSecurityWarningHelper")}
</Text>
</>
)}
@ -259,6 +278,8 @@ export default inject(({ auth, setup }) => {
setIpRestrictionsEnable,
ipRestrictions,
setIpRestrictions,
ipSettingsUrl,
currentColorScheme,
} = auth.settingsStore;
const { initSettings, isInit } = setup;
@ -270,5 +291,7 @@ export default inject(({ auth, setup }) => {
setIpRestrictions,
initSettings,
isInit,
ipSettingsUrl,
currentColorScheme,
};
})(withTranslation(["Settings", "Common"])(observer(IpSecurity)));

18
packages/client/src/pages/PortalSettings/categories/security/access-portal/mobileView.js
View File

@ -25,7 +25,7 @@ const MobileView = (props) => {
title={t("SettingPasswordStrength")}
subtitle={
<Trans
i18nKey="SettingPasswordStrengthDescription"
i18nKey="SettingPasswordStrengthMobileDescription"
ns="Settings"
t={t}
/>
@ -36,7 +36,7 @@ const MobileView = (props) => {
<MobileCategoryWrapper
title={t("TwoFactorAuth")}
subtitle={
<Trans i18nKey="TwoFactorAuthDescription" ns="Settings" t={t} />
<Trans i18nKey="TwoFactorAuthMobileDescription" ns="Settings" t={t} />
}
url="/portal-settings/security/access-portal/tfa"
onClickLink={onClickLink}
@ -44,14 +44,16 @@ const MobileView = (props) => {
<MobileCategoryWrapper
title={t("TrustedMail")}
subtitle={
<Trans i18nKey="TrustedMailDescription" ns="Settings" t={t} />
<Trans i18nKey="TrustedMailMobileDescription" ns="Settings" t={t} />
}
url="/portal-settings/security/access-portal/trusted-mail"
onClickLink={onClickLink}
/>
<MobileCategoryWrapper
title={t("IPSecurity")}
subtitle={<Trans i18nKey="IPSecurityDescription" ns="Settings" t={t} />}
subtitle={
<Trans i18nKey="IPSecurityMobileDescription" ns="Settings" t={t} />
}
url="/portal-settings/security/access-portal/ip"
onClickLink={onClickLink}
/>
@ -64,7 +66,7 @@ const MobileView = (props) => {
<MobileCategoryWrapper
title={t("AdminsMessage")}
subtitle={
<Trans i18nKey="AdminsMessageDescription" ns="Settings" t={t} />
<Trans i18nKey="AdminsMessageMobileDescription" ns="Settings" t={t} />
}
url="/portal-settings/security/access-portal/admin-message"
onClickLink={onClickLink}
@ -72,7 +74,11 @@ const MobileView = (props) => {
<MobileCategoryWrapper
title={t("SessionLifetime")}
subtitle={
<Trans i18nKey="SessionLifetimeDescription" ns="Settings" t={t} />
<Trans
i18nKey="SessionLifetimeMobileDescription"
ns="Settings"
t={t}
/>
}
url="/portal-settings/security/access-portal/lifetime"
onClickLink={onClickLink}

10
packages/client/src/pages/PortalSettings/categories/security/access-portal/passwordStrength.js
View File

@ -1,7 +1,7 @@
import React, { useState, useEffect } from "react";
import styled, { css } from "styled-components";
import { useNavigate, useLocation } from "react-router-dom";
import { withTranslation } from "react-i18next";
import { withTranslation, Trans } from "react-i18next";
import { inject, observer } from "mobx-react";
import Box from "@docspace/components/box";
import Text from "@docspace/components/text";
@ -195,10 +195,14 @@ const PasswordStrength = props => {
return (
<MainContainer>
<LearnMoreWrapper>
<Text className="learn-subtitle">
{t("SettingPasswordStrengthHelper")}
<Text fontSize="13px" fontWeight="400">
{t("SettingPasswordDescription")}
</Text>
<Text fontSize="13px" fontWeight="400" className="learn-subtitle">
<Trans t={t} i18nKey="SettingPasswordDescriptionSave" />
</Text>
<Link
className="link-learn-more"
color={currentColorScheme.main.accent}
target="_blank"
isHovered

20
packages/client/src/pages/PortalSettings/categories/security/access-portal/sessionLifetime.js
View File

@ -5,6 +5,7 @@ import { withTranslation } from "react-i18next";
import { inject, observer } from "mobx-react";
import RadioButtonGroup from "@docspace/components/radio-button-group";
import Text from "@docspace/components/text";
import Link from "@docspace/components/link";
import TextInput from "@docspace/components/text-input";
import toastr from "@docspace/components/toast/toastr";
import { LearnMoreWrapper } from "../StyledSecurity";
@ -42,6 +43,8 @@ const SessionLifetime = (props) => {
setSessionLifetimeSettings,
initSettings,
isInit,
lifetimeSettingsUrl,
currentColorScheme,
} = props;
const [type, setType] = useState(false);
const [sessionLifetime, setSessionLifetime] = useState("1440");
@ -189,7 +192,18 @@ const SessionLifetime = (props) => {
return (
<MainContainer>
<LearnMoreWrapper>
<Text>{t("SessionLifetimeHelper")}</Text>
<Text className="learn-subtitle">
{t("SessionLifetimeSettingDescription")}
</Text>
<Link
className="link-learn-more"
color={currentColorScheme.main.accent}
target="_blank"
isHovered
href={lifetimeSettingsUrl}
>
{t("Common:LearnMore")}
</Link>
</LearnMoreWrapper>
<RadioButtonGroup
@ -255,6 +269,8 @@ export default inject(({ auth, setup }) => {
sessionLifetime,
enabledSessionLifetime,
setSessionLifetimeSettings,
lifetimeSettingsUrl,
currentColorScheme,
} = auth.settingsStore;
const { initSettings, isInit } = setup;
@ -264,5 +280,7 @@ export default inject(({ auth, setup }) => {
setSessionLifetimeSettings,
initSettings,
isInit,
lifetimeSettingsUrl,
currentColorScheme,
};
})(withTranslation(["Settings", "Common"])(observer(SessionLifetime)));

10
packages/client/src/pages/PortalSettings/categories/security/access-portal/tfa.js
View File

@ -1,7 +1,7 @@
import React, { useState, useEffect } from "react";
import styled from "styled-components";
import { useNavigate, useLocation } from "react-router-dom";
import { withTranslation } from "react-i18next";
import { withTranslation, Trans } from "react-i18next";
import { inject, observer } from "mobx-react";
import RadioButtonGroup from "@docspace/components/radio-button-group";
import Text from "@docspace/components/text";
@ -133,8 +133,14 @@ const TwoFactorAuth = (props) => {
return (
<MainContainer>
<LearnMoreWrapper>
<Text className="learn-subtitle">{t("TwoFactorAuthHelper")}</Text>
<Text fontSize="13px" fontWeight="400">
{t("TwoFactorAuthEnableDescription")}
</Text>
<Text fontSize="13px" fontWeight="400" className="learn-subtitle">
<Trans t={t} i18nKey="TwoFactorAuthNote" />
</Text>
<Link
className="link-learn-more"
color={currentColorScheme.main.accent}
target="_blank"
isHovered

10
packages/client/src/pages/PortalSettings/categories/security/access-portal/trustedMail.js
View File

@ -1,7 +1,7 @@
import React, { useState, useEffect } from "react";
import styled from "styled-components";
import { useLocation, useNavigate } from "react-router-dom";
import { withTranslation } from "react-i18next";
import { withTranslation, Trans } from "react-i18next";
import { inject, observer } from "mobx-react";
import Text from "@docspace/components/text";
import Link from "@docspace/components/link";
@ -163,8 +163,14 @@ const TrustedMail = (props) => {
return (
<MainContainer>
<LearnMoreWrapper>
<Text className="learn-subtitle">{t("TrustedMailHelper")}</Text>
<Text fontSize="13px" fontWeight="400">
{t("TrustedMailSettingDescription")}
</Text>
<Text fontSize="13px" fontWeight="400" className="learn-subtitle">
<Trans t={t} i18nKey="TrustedMailSave" />
</Text>
<Link
className="link-learn-more"
color={currentColorScheme.main.accent}
target="_blank"
isHovered

66
packages/client/src/pages/PortalSettings/categories/security/sub-components/category-wrapper.js
View File

@ -1,66 +0,0 @@
import InfoReactSvgUrl from "PUBLIC_DIR/images/info.react.svg?url";
import React from "react";
import Text from "@docspace/components/text";
import HelpButton from "@docspace/components/help-button";
import Link from "@docspace/components/link";
import { Base } from "@docspace/components/themes";
import { StyledCategoryWrapper, StyledTooltip } from "../StyledSecurity";
import { useTheme } from "styled-components";
const CategoryWrapper = (props) => {
const {
t,
title,
tooltipTitle,
tooltipUrl,
theme,
classNameTooltip,
notTooltip,
} = props;
const { interfaceDirection } = useTheme();
const dirTooltip = interfaceDirection === "rtl" ? "left" : "right";
const tooltip = () => (
<StyledTooltip>
<Text className={tooltipUrl ? "subtitle" : ""} fontSize="12px">
{tooltipTitle}
</Text>
{tooltipUrl && (
<Link
fontSize="13px"
target="_blank"
isBold
isHovered
href={tooltipUrl}
color="#333333"
>
{t("Common:LearnMore")}
</Link>
)}
</StyledTooltip>
);
return (
<StyledCategoryWrapper>
<Text fontSize="16px" fontWeight="700">
{title}
</Text>
{!notTooltip && (
<HelpButton
className={classNameTooltip}
iconName={InfoReactSvgUrl}
displayType="dropdown"
place={dirTooltip}
offsetRight={0}
getContent={tooltip}
tooltipColor={theme.client.settings.security.owner.tooltipColor}
/>
)}
</StyledCategoryWrapper>
);
};
CategoryWrapper.defaultProps = {
theme: Base,
};
export default CategoryWrapper;

60
packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/index.js
View File

@ -35,7 +35,7 @@ import { isSmallTablet } from "@docspace/components/utils/device";
import { SSO_LABEL } from "SRC_DIR/helpers/constants";
import { useTheme } from "styled-components";
const MainProfile = props => {
const MainProfile = (props) => {
const { t } = useTranslation(["Profile", "Common"]);
const {
@ -101,7 +101,8 @@ const MainProfile = props => {
<Link
href={`mailto:${documentationEmail}`}
isHovered={true}
color={theme.profileInfo.tooltipLinkColor}>
color={theme.profileInfo.tooltipLinkColor}
>
{{ supportEmail: documentationEmail }}
</Link>
to take part in the translation and get up to 1 year free of charge."
@ -113,7 +114,8 @@ const MainProfile = props => {
color="#333333"
fontSize="13px"
href={`${helpLink}/guides/become-translator.aspx`}
target="_blank">
target="_blank"
>
{t("Common:LearnMore")}
</Link>
</Box>
@ -125,18 +127,18 @@ const MainProfile = props => {
const { cultureName, currentCulture } = profile;
const language = convertLanguage(cultureName || currentCulture || culture);
const selectedLanguage = cultureNames.find(item => item.key === language) ||
cultureNames.find(item => item.key === culture) || {
const selectedLanguage = cultureNames.find((item) => item.key === language) ||
cultureNames.find((item) => item.key === culture) || {
key: language,
label: "",
};
const onLanguageSelect = language => {
const onLanguageSelect = (language) => {
if (profile.cultureName === language.key) return;
updateProfileCulture(profile.id, language.key)
.then(() => location.reload())
.catch(error => {
.catch((error) => {
toastr.error(error && error.message ? error.message : error);
});
};
@ -170,7 +172,8 @@ const MainProfile = props => {
</StyledAvatarWrapper>
<StyledInfo
withActivationBar={withActivationBar}
currentColorScheme={currentColorScheme}>
currentColorScheme={currentColorScheme}
>
<div className="rows-container">
<div className="profile-block">
<StyledLabel as="div">{t("Common:Name")}</StyledLabel>
@ -181,14 +184,16 @@ const MainProfile = props => {
<StyledLabel
as="div"
marginTopProp={withActivationBar ? "34px" : "16px"}>
marginTopProp={withActivationBar ? "34px" : "16px"}
>
{t("Common:Password")}
</StyledLabel>
<StyledLabel
as="div"
className="profile-language"
marginTopProp="15px">
marginTopProp="15px"
>
{t("Common:Language")}
<HelpButton
size={12}
@ -229,20 +234,21 @@ const MainProfile = props => {
<div className="email-container">
<div className="email-edit-container">
<Text
data-for="emailTooltip"
data-tip={t("EmailNotVerified")}
data-tooltip-id="emailTooltip"
data-tooltip-content={t("EmailNotVerified")}
as="div"
className="email-text-container"
fontWeight={600}>
fontWeight={600}
>
{profile.email}
</Text>
{withActivationBar && (
<Tooltip
float
id="emailTooltip"
getContent={dataTip => (
<Text fontSize="12px">{dataTip}</Text>
getContent={({ content }) => (
<Text fontSize="12px">{content}</Text>
)}
effect="float"
place="bottom"
/>
)}
@ -258,7 +264,8 @@ const MainProfile = props => {
{withActivationBar && (
<div
className="send-again-container"
onClick={sendActivationLinkAction}>
onClick={sendActivationLinkAction}
>
<ReactSVG
className="send-again-icon"
src={SendClockReactSvgUrl}
@ -313,7 +320,8 @@ const MainProfile = props => {
<Text
className="mobile-profile-label-field"
fontWeight={600}
truncate>
truncate
>
{profile.displayName}
</Text>
</div>
@ -332,21 +340,22 @@ const MainProfile = props => {
<div className="email-container">
<div className="email-edit-container">
<Text
data-for="emailTooltip"
data-tip={t("EmailNotVerified")}
data-tooltip-id="emailTooltip"
data-tooltip-content={t("EmailNotVerified")}
as="div"
className="email-text-container"
fontWeight={600}>
fontWeight={600}
>
{profile.email}
</Text>
</div>
{withActivationBar && (
<Tooltip
float
id="emailTooltip"
getContent={dataTip => (
<Text fontSize="12px">{dataTip}</Text>
getContent={({ content }) => (
<Text fontSize="12px">{content}</Text>
)}
effect="float"
place="bottom"
/>
)}
@ -354,7 +363,8 @@ const MainProfile = props => {
{withActivationBar && (
<div
className="send-again-container"
onClick={sendActivationLinkAction}>
onClick={sendActivationLinkAction}
>
<ReactSVG
className="send-again-icon"
src={SendClockReactSvgUrl}

2
packages/common/package.json
View File

@ -32,7 +32,7 @@
"react-player": "^1.15.3",
"react-router": "^6.10.0",
"react-router-dom": "^6.10.0",
"react-tooltip": "^4.5.1",
"react-tooltip": "5.21.1",
"react-viewer": "^3.2.2",
"react-virtualized-auto-sizer": "^1.0.7",
"react-window": "^1.8.8",

16
packages/common/store/SettingsStore.js
View File

@ -263,10 +263,18 @@ class SettingsStore {
return `${this.helpLink}/administration/docspace-settings.aspx#DocSpacelanguage`;
}
get welcomePageSettingsUrl() {
return `${this.helpLink}/administration/docspace-settings.aspx#DocSpacetitle`;
}
get dnsSettingsUrl() {
return `${this.helpLink}/administration/docspace-settings.aspx#alternativeurl`;
}
get renamingSettingsUrl() {
return `${this.helpLink}/administration/docspace-settings.aspx#DocSpacerenaming`;
}
get passwordStrengthSettingsUrl() {
return `${this.helpLink}/administration/docspace-settings.aspx#passwordstrength`;
}
@ -279,6 +287,10 @@ class SettingsStore {
return `${this.helpLink}/administration/docspace-settings.aspx#TrustedDomain`;
}
get ipSettingsUrl() {
return `${this.helpLink}/administration/docspace-settings.aspx#ipsecurity`;
}
get bruteForceProtectionUrl() {
return `${this.helpLink}/administration/configuration.aspx#loginsettings`;
}
@ -287,6 +299,10 @@ class SettingsStore {
return `${this.helpLink}/administration/docspace-settings.aspx#administratormessage`;
}
get lifetimeSettingsUrl() {
return `${this.helpLink}/administration/docspace-settings.aspx#sessionlifetime`;
}
get dataBackupUrl() {
return `${this.helpLink}/administration/docspace-settings.aspx#CreatingBackup_block`;
}

17
packages/components/all/all.stories.js
View File

@ -207,30 +207,29 @@ const Template = (args) => (
</Link>
</div>
<div style={{ padding: "24px 0 8px 0" }}>
<Link data-for="group" data-tip={0}>
<Link data-tooltip-id="group" data-tooltip-content={0}>
Bob
</Link>
<br />
<Link data-for="group" data-tip={1}>
<Link data-tooltip-id="group" data-tooltip-content={1}>
John
</Link>
<br />
<Link data-for="group" data-tip={2}>
<Link data-tooltip-id="group" data-tooltip-content={2}>
Kevin
</Link>
<Tooltip
id="group"
offsetRight={90}
getContent={(dataTip) =>
dataTip ? (
getContent={({ content }) =>
content ? (
<div>
<Text isBold={true} fontSize="16px">
{arrayUsers[dataTip].name}
{arrayUsers[content].name}
</Text>
<Text color="#A3A9AE" fontSize="13px">
{arrayUsers[dataTip].email}
{arrayUsers[content].email}
</Text>
<Text fontSize="13px">{arrayUsers[dataTip].position}</Text>
<Text fontSize="13px">{arrayUsers[content].position}</Text>
</div>
) : null
}

10
packages/components/avatar/index.js
View File

@ -119,19 +119,19 @@ const Avatar = (props) => {
<>
<RoleWrapper
size={size}
data-for={uniqueTooltipId}
data-tip={tooltipContent}
data-tooltip-id={uniqueTooltipId}
data-tooltip-content={tooltipContent}
className="avatar_role-wrapper"
>
{props.roleIcon ? props.roleIcon : roleIcon}
</RoleWrapper>
{withTooltip && (
<Tooltip
float
id={uniqueTooltipId}
getContent={(dataTip) => (
<Text fontSize="12px">{dataTip}</Text>
getContent={({ content }) => (
<Text fontSize="12px">{content}</Text>
)}
effect="float"
place={tooltipPlace}
/>
)}

23
packages/components/email-chips/sub-components/chip.js
View File

@ -43,7 +43,6 @@ const Chip = (props) => {
const [chipWidth, setChipWidth] = useState(0);
const [isChipOverLimit, setIsChipOverLimit] = useState(false);
const tooltipRef = useRef(null);
const warningRef = useRef(null);
const chipRef = useRef(null);
const chipInputRef = useRef(null);
@ -66,7 +65,6 @@ const Chip = (props) => {
}
}, [newValue]);
useClickOutside(warningRef, () => tooltipRef.current.hideTooltip());
useClickOutside(
chipInputRef,
() => {
@ -122,12 +120,10 @@ const Chip = (props) => {
if (value?.email === currentChip?.email) {
return (
<StyledContainer>
{isChipOverLimit && (
<Tooltip getContent={() => {}} id="input" effect="float" />
)}
{isChipOverLimit && <Tooltip id="input" float />}
<StyledChipInput
data-for="input"
data-tip={chipOverLimitText}
data-tooltip-id="input"
data-tooltip-content={chipOverLimitText}
value={newValue}
forwardedRef={chipInputRef}
onChange={onChange}
@ -156,16 +152,11 @@ const Chip = (props) => {
<IconButton
iconName={WarningIconSvgUrl}
size={12}
className="warning_icon_wrap warning_icon "
data-for="group"
data-tip={invalidEmailText}
/>
<Tooltip
getContent={() => {}}
id="group"
reference={tooltipRef}
place={"top"}
className="warning_icon_wrap warning_icon"
data-tooltip-id="group"
data-tooltip-content={invalidEmailText}
/>
<Tooltip id="group" place={"top"} />
</div>
)}
{/*dir="auto" for correct truncate email view (asd@gmai..., ...خالد@الدوح)*/}

99
packages/components/help-button/index.js
View File

@ -2,8 +2,8 @@ import React from "react";
import PropTypes from "prop-types";
import IconButton from "../icon-button";
import Tooltip from "../tooltip";
import { handleAnyClick } from "../utils/event";
import uniqueId from "lodash/uniqueId";
import { classNames } from "../utils/classNames";
import InfoReactSvgUrl from "PUBLIC_DIR/images/info.react.svg?url";
@ -11,52 +11,14 @@ class HelpButton extends React.Component {
constructor(props) {
super(props);
this.state = {
hideTooltip: false,
};
this.ref = React.createRef();
this.refTooltip = React.createRef();
this.id = this.props.id || uniqueId();
}
afterShow = () => {
this.refTooltip.current.updatePosition();
handleAnyClick(true, this.handleClick);
if (this.state.hideTooltip) {
this.refTooltip.current.hideTooltip();
}
};
afterHide = () => {
if (!this.state.hideTooltip) {
handleAnyClick(false, this.handleClick);
}
};
handleClick = (e) => {
if (!this.ref.current.contains(e.target)) {
this.refTooltip.current.hideTooltip();
}
};
componentWillUnmount() {
handleAnyClick(false, this.handleClick);
}
onClick = () => {
this.setState({ hideTooltip: false });
};
render() {
const {
tooltipContent,
tooltipProps,
place,
offsetTop,
offsetBottom,
offsetRight,
offsetLeft,
offset,
iconName,
color,
getContent,
@ -65,53 +27,48 @@ class HelpButton extends React.Component {
tooltipMaxWidth,
style,
size,
afterShow,
afterHide,
} = this.props;
const anchorSelect = `div[id='${this.id}'] svg`;
return (
<div ref={this.ref} style={style}>
<IconButton
theme={this.props.theme}
id={this.id}
className={`${className} help-icon`}
theme={this.props.theme}
className={classNames(className, "help-icon")}
isClickable={true}
iconName={iconName}
size={size}
color={color}
data-for={this.id}
dataTip={dataTip}
onClick={this.onClick}
/>
{getContent ? (
<Tooltip
tooltipProps={tooltipProps}
theme={this.props.theme}
id={this.id}
reference={this.refTooltip}
effect="solid"
clickable
openOnClick
place={place}
offsetTop={offsetTop}
offsetBottom={offsetBottom}
offsetRight={offsetRight}
offsetLeft={offsetLeft}
afterShow={this.afterShow}
afterHide={this.afterHide}
getContent={getContent}
offset={offset}
afterShow={afterShow}
afterHide={afterHide}
maxWidth={tooltipMaxWidth}
{...tooltipProps}
getContent={getContent}
anchorSelect={anchorSelect}
/>
) : (
<Tooltip
theme={this.props.theme}
id={this.id}
reference={this.refTooltip}
effect="solid"
clickable
openOnClick
place={place}
offsetRight={offsetRight}
offsetLeft={offsetLeft}
afterShow={this.afterShow}
afterHide={this.afterHide}
offset={offset}
afterShow={afterShow}
afterHide={afterHide}
maxWidth={tooltipMaxWidth}
{...tooltipProps}
anchorSelect={anchorSelect}
>
{tooltipContent}
</Tooltip>
@ -131,14 +88,6 @@ HelpButton.propTypes = {
tooltipContent: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),
/** Required to set additional properties of the tooltip */
tooltipProps: PropTypes.object,
/** Sets the right offset for all the tooltips on the page */
offsetRight: PropTypes.number,
/** Sets the left offset for all the tooltips on the page */
offsetLeft: PropTypes.number,
/** Sets the top offset for all the tooltips on the page */
offsetTop: PropTypes.number,
/** Sets the bottom offset for all the tooltips on the page */
offsetBottom: PropTypes.number,
/** Sets the maximum width of the tooltip */
tooltipMaxWidth: PropTypes.string,
/** Sets the tooltip id */
@ -166,10 +115,6 @@ HelpButton.propTypes = {
HelpButton.defaultProps = {
iconName: InfoReactSvgUrl,
place: "top",
offsetRight: 60,
offsetLeft: 0,
offsetTop: 0,
offsetBottom: 0,
className: "icon-button",
size: 12,
};

2
packages/components/package.json
View File

@ -40,7 +40,7 @@
"react-svg": "^12.1.0",
"react-text-mask": "^5.5.0",
"react-toastify": "^7.0.4",
"react-tooltip": "^4.5.1",
"react-tooltip": "^5.21.1",
"react-transition-group": "^4.4.5",
"react-virtualized": "^9.22.3",
"react-window": "^1.8.8",

18
packages/components/password-input/index.js
View File

@ -25,7 +25,6 @@ class PasswordInput extends React.Component {
const { inputValue, inputType, clipActionResource, emailInputName } = props;
this.ref = React.createRef();
this.refTooltip = React.createRef();
this.state = {
type: inputType,
@ -40,13 +39,8 @@ class PasswordInput extends React.Component {
};
}
hideTooltip = () => {
this.hideTooltip && this.refTooltip.current.hideTooltip();
};
onBlur = (e) => {
e.persist();
this.hideTooltip();
if (this.props.onBlur) this.props.onBlur(e);
};
@ -56,7 +50,6 @@ class PasswordInput extends React.Component {
};
changeInputType = () => {
this.hideTooltip();
const newType = this.state.type === "text" ? "password" : "text";
this.setState({
@ -395,9 +388,10 @@ class PasswordInput extends React.Component {
></InputBlock>
<Tooltip
id="tooltipContent"
effect="solid"
place="top"
clickable
openOnClick
anchorSelect="div[id='tooltipContent'] input"
offsetLeft={this.props.tooltipOffsetLeft}
offsetTop={this.props.tooltipOffsetTop}
reference={this.refTooltip}
@ -435,11 +429,9 @@ class PasswordInput extends React.Component {
<>
<div className="password-field-wrapper">
<PasswordProgress
inputWidth={inputWidth}
data-for="tooltipContent"
data-tip=""
data-event="click"
id="tooltipContent"
ref={this.ref}
inputWidth={inputWidth}
isDisabled={isDisabled}
>
{this.renderInputGroup()}

163
packages/components/tooltip/index.js
View File

@ -1,82 +1,79 @@
import React, { Component } from "react";
import PropTypes from "prop-types";
import ReactTooltip from "react-tooltip";
import React from "react";
import { Tooltip as ReactTooltip } from "react-tooltip";
import Portal from "../portal";
import StyledTooltip from "./styled-tooltip";
import { flip, shift, offset } from "@floating-ui/dom";
class Tooltip extends Component {
constructor(props) {
super(props);
}
const defaultOffset = 4;
const Tooltip = (props) => {
const {
id,
place,
getContent,
children,
afterShow,
afterHide,
className,
style,
color,
maxWidth,
anchorSelect,
clickable,
openOnClick,
isOpen,
float,
noArrow = true,
} = props;
componentDidUpdate() {
ReactTooltip.rebuild();
}
render() {
const {
effect,
place,
id,
getContent,
offsetTop,
offsetRight,
offsetBottom,
offsetLeft,
children,
afterShow,
afterHide,
reference,
className,
style,
color,
maxWidth,
...rest
} = this.props;
const renderTooltip = () => (
<StyledTooltip
theme={this.props.theme}
className={className}
style={style}
color={color}
maxWidth={maxWidth}
const renderTooltip = () => (
<StyledTooltip
theme={props.theme}
className={className}
style={style}
color={color}
maxWidth={maxWidth}
>
<ReactTooltip
id={id}
float={float}
place={place}
closeOnScroll
closeOnResize
isOpen={isOpen}
noArrow={noArrow}
render={getContent}
clickable={clickable}
afterShow={afterShow}
afterHide={afterHide}
offset={props.offset}
positionStrategy="fixed"
openOnClick={openOnClick}
anchorSelect={anchorSelect}
className="__react_component_tooltip"
middlewares={[
offset(props.offset ?? defaultOffset),
flip({
crossAxis: false,
fallbackAxisSideDirection: place,
}),
shift(),
]}
>
<ReactTooltip
theme={this.props.theme}
id={id}
ref={reference}
getContent={getContent}
effect={effect}
place={place}
offset={{
top: offsetTop,
right: offsetRight,
bottom: offsetBottom,
left: offsetLeft,
}}
wrapper="div"
afterShow={afterShow}
afterHide={afterHide}
isCapture={true}
{...rest}
>
{children}
</ReactTooltip>
</StyledTooltip>
);
{children}
</ReactTooltip>
</StyledTooltip>
);
const tooltip = renderTooltip();
const tooltip = renderTooltip();
return <Portal element={tooltip} />;
}
}
return <Portal element={tooltip} />;
};
Tooltip.propTypes = {
/** Used as HTML id property */
id: PropTypes.string,
/** Tooltip behavior */
effect: PropTypes.oneOf(["float", "solid"]),
/** Global tooltip placement */
place: PropTypes.oneOf(["top", "right", "bottom", "left"]),
/** Sets a callback function that generates the tip content dynamically */
@ -85,20 +82,10 @@ Tooltip.propTypes = {
afterHide: PropTypes.func,
/** A function to be called after the tooltip is shown */
afterShow: PropTypes.func,
/** Sets the top offset for all the tooltips on the page */
offsetTop: PropTypes.number,
/** Sets the right offset for all the tooltips on the page */
offsetRight: PropTypes.number,
/** Sets the bottom offset for all the tooltips on the page */
offsetBottom: PropTypes.number,
/** Sets the left offset for all the tooltips on the page */
offsetLeft: PropTypes.number,
/** Space between the tooltip element and anchor element (arrow not included in calculation) */
offset: PropTypes.number,
/** Child elements */
children: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),
reference: PropTypes.oneOfType([
PropTypes.func,
PropTypes.shape({ current: PropTypes.any }),
]),
/** Accepts class */
className: PropTypes.string,
/** Accepts css style */
@ -107,15 +94,23 @@ Tooltip.propTypes = {
color: PropTypes.string,
/** Maximum width of the tooltip */
maxWidth: PropTypes.string,
/** The tooltip can be controlled or uncontrolled, this attribute cannot be used to handle show and hide tooltip outside tooltip */
isOpen: PropTypes.bool,
/** Allow interaction with elements inside the tooltip */
clickable: PropTypes.bool,
/** Controls whether the tooltip should open when clicking (true) or hovering (false) the anchor element */
openOnClick: PropTypes.bool,
/** Tooltip will follow the mouse position when it moves inside the anchor element */
float: PropTypes.bool,
/** The selector for the anchor elements */
anchorSelect: PropTypes.string,
/** Tooltip arrow will not be shown */
noArrow: PropTypes.bool,
};
Tooltip.defaultProps = {
effect: "float",
place: "top",
offsetTop: 0,
offsetRight: 0,
offsetBottom: 0,
offsetLeft: 0,
noArrow: true,
};
export default Tooltip;

7
packages/components/tooltip/styled-tooltip.js
View File

@ -15,8 +15,13 @@ const StyledTooltip = styled.div`
padding: ${(props) => props.theme.tooltip.padding};
pointer-events: ${(props) => props.theme.tooltip.pointerEvents};
max-width: ${(props) =>
props.maxWidth ? props.maxWidth : props.theme.tooltip.maxWidth};
`min(100vw, ${
props.maxWidth ? props.maxWidth : props.theme.tooltip.maxWidth
})`};
color: ${(props) => props.theme.tooltip.textColor} !important;
z-index: 999;
box-sizing: border-box;
p,
span {

35
packages/components/tooltip/tooltip.mdx
View File

@ -35,20 +35,19 @@ import QuestionReactSvgUrl from 'PUBLIC_DIR/images/question.react.svg?url";
```jsx
<div
style={BodyStyle}
data-for="tooltipContent"
data-tip="You tooltip content"
data-event="click focus"
data-offset="{'top': 100, 'right': 100}"
data-place="top"
data-tooltip-id="tooltipContent"
data-tooltip-content="You tooltip content"
data-tooltip-place="top"
>
<IconButton isClickable={true} size={20} iconName={QuestionReactSvgUrl} />
</div>
<Tooltip
id="tooltipContent"
getContent={dataTip => <Text fontSize='13px'>{dataTip}</Text>}
effect="float"
float
place="top"
offset={100}
maxWidth={320}
id="tooltipContent"
getContent={({content}) => <Text fontSize='13px'>{content}</Text>}
/>
```
@ -90,27 +89,27 @@ const arrayUsers = [
```jsx
<h5 style={{ marginLeft: -5 }}>Hover group</h5>
<Link data-for="group" data-tip={0}>Bob</Link><br />
<Link data-for="group" data-tip={1}>John</Link><br />
<Link data-for="group" data-tip={2}>Kevin</Link><br />
<Link data-for="group" data-tip={3}>Alex</Link><br />
<Link data-for="group" data-tip={4}>Tomas</Link>
<Link data-tooltip-id="group" data-tooltip-content={0}>Bob</Link><br />
<Link data-tooltip-id="group" data-tooltip-content={1}>John</Link><br />
<Link data-tooltip-id="group" data-tooltip-content={2}>Kevin</Link><br />
<Link data-tooltip-id="group" data-tooltip-content={3}>Alex</Link><br />
<Link data-tooltip-id="group" data-tooltip-content={4}>Tomas</Link>
```
```jsx
<Tooltip
id="group"
offsetRight={90}
getContent={(dataTip) =>
dataTip ? (
getContent={({ content }) =>
content ? (
<div>
<Text isBold={true} fontSize="16px">
{arrayUsers[dataTip].name}
{arrayUsers[content].name}
</Text>
<Text color="#A3A9AE" fontSize="13px">
{arrayUsers[dataTip].email}
{arrayUsers[content].email}
</Text>
<Text fontSize="13px">{arrayUsers[dataTip].position}</Text>
<Text fontSize="13px">{arrayUsers[content].position}</Text>
</div>
) : null
}

36
packages/components/tooltip/tooltip.stories.js
View File

@ -24,7 +24,7 @@ const Template = (args) => {
return (
<div style={{ height: "240px" }}>
<div style={BodyStyle}>
<Link data-for="link" data-tip="Bob Johnston">
<Link data-tooltip-id="link" data-tooltip-content="Bob Johnston">
Bob Johnston
</Link>
</div>
@ -32,10 +32,10 @@ const Template = (args) => {
<Tooltip
{...args}
id="link"
getContent={(dataTip) => (
getContent={({ content }) => (
<div>
<Text isBold={true} fontSize="16px">
{dataTip}
{content}
</Text>
<Text color="#A3A9AE" fontSize="13px">
BobJohnston@gmail.com
@ -50,12 +50,8 @@ const Template = (args) => {
export const basic = Template.bind({});
basic.args = {
effect: "float",
float: true,
place: "top",
offsetTop: 0,
offsetRight: 0,
offsetBottom: 0,
offsetLeft: 0,
};
const arrayUsers = [
@ -96,11 +92,11 @@ const AllTemplate = (args) => {
<div>
<div>
<h5 style={{ marginLeft: -5 }}>Hover on me</h5>
<Link data-for="link" data-tip="Bob Johnston">
<Link data-tooltip-id="link" data-tooltip-content="Bob Johnston">
Bob Johnston
</Link>
</div>
<Tooltip id="link" offsetRight={0} effect="solid">
<Tooltip id="link" offset={0}>
<div>
<Text isBold={true} fontSize="16px">
Bob Johnston
@ -114,23 +110,23 @@ const AllTemplate = (args) => {
<div>
<h5 style={{ marginLeft: -5 }}>Hover group</h5>
<Link data-for="group" data-tip={0}>
<Link data-tooltip-id="group" data-tooltip-content={0}>
Bob
</Link>
<br />
<Link data-for="group" data-tip={1}>
<Link data-tooltip-id="group" data-tooltip-content={1}>
John
</Link>
<br />
<Link data-for="group" data-tip={2}>
<Link data-tooltip-id="group" data-tooltip-content={2}>
Kevin
</Link>
<br />
<Link data-for="group" data-tip={3}>
<Link data-tooltip-id="group" data-tooltip-content={3}>
Alex
</Link>
<br />
<Link data-for="group" data-tip={4}>
<Link data-tooltip-id="group" data-tooltip-content={4}>
Tomas
</Link>
</div>
@ -138,16 +134,16 @@ const AllTemplate = (args) => {
<Tooltip
id="group"
offsetRight={0}
getContent={(dataTip) =>
dataTip ? (
getContent={({ content }) =>
content ? (
<div>
<Text isBold={true} fontSize="16px">
{arrayUsers[dataTip].name}
{arrayUsers[content].name}
</Text>
<Text color="#A3A9AE" fontSize="13px">
{arrayUsers[dataTip].email}
{arrayUsers[content].email}
</Text>
<Text fontSize="13px">{arrayUsers[dataTip].position}</Text>
<Text fontSize="13px">{arrayUsers[content].position}</Text>
</div>
) : null
}

2
products/ASC.Files/Core/Core/Dao/Interfaces/IFolderDao.cs
View File

@ -220,6 +220,8 @@ public interface IFolderDao<T>
CommonChunkedUploadSessionHolder sessionHolder);
Task<string> GetBackupExtensionAsync(T folderId);
#region Only for TMFolderDao
/// <summary>

52
products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
View File

@ -1599,57 +1599,9 @@ internal class FolderDao : AbstractDao, IFolderDao<int>
Entries = r.Select(e => new KeyValuePair<string, FileEntryType>(e.EntryId, e.EntryType)).ToHashSet()
}));
private string GetProjectTitle(object folderID)
public async Task<string> GetBackupExtensionAsync(int folderId)
{
return "";
//if (!ApiServer.Available)
//{
// return string.Empty;
//}
//var cacheKey = "documents/folders/" + folderID.ToString();
//var projectTitle = Convert.ToString(cache.Get<string>(cacheKey));
//if (!string.IsNullOrEmpty(projectTitle)) return projectTitle;
//var bunchObjectID = GetBunchObjectID(folderID);
//if (string.IsNullOrEmpty(bunchObjectID))
// throw new Exception("Bunch Object id is null for " + folderID);
//if (!bunchObjectID.StartsWith("projects/project/"))
// return string.Empty;
//var bunchObjectIDParts = bunchObjectID.Split('/');
//if (bunchObjectIDParts.Length < 3)
// throw new Exception("Bunch object id is not supported format");
//var projectID = Convert.ToInt32(bunchObjectIDParts[bunchObjectIDParts.Length - 1]);
//if (HttpContext.Current == null || !SecurityContext.IsAuthenticated)
// return string.Empty;
//var apiServer = new ApiServer();
//var apiUrl = string.Format("{0}project/{1}.json?fields=id,title", SetupInfo.WebApiBaseUrl, projectID);
//var responseApi = JObject.Parse(Encoding.UTF8.GetString(Convert.FromBase64String(apiServer.GetApiResponse(apiUrl, "GET"))))["response"];
//if (responseApi != null && responseApi.HasValues)
//{
// projectTitle = Global.ReplaceInvalidCharsAndTruncate(responseApi["title"].Value<string>());
//}
//else
//{
// return string.Empty;
//}
//if (!string.IsNullOrEmpty(projectTitle))
//{
// cache.Insert(cacheKey, projectTitle, TimeSpan.FromMinutes(15));
//}
//return projectTitle;
return (await _globalStore.GetStoreAsync()).GetBackupExtension();
}
}

1
products/ASC.Files/Core/Core/Entries/ChunkedUploadSession.cs
View File

@ -67,7 +67,6 @@ public class ChunkedUploadSession<T> : CommonChunkedUploadSession
chunkedUploadSession.TransformItems();
return chunkedUploadSession;
}
}

10
products/ASC.Files/Core/Core/FileStorageService.cs
View File

@ -2681,6 +2681,12 @@ public class FileStorageService //: IFileStorageService
Error = FilesCommonResource.ErrorMassage_SecurityException_ReadFile
};
}
var fileStable = file;
if (file.Forcesave != ForcesaveType.None)
{
fileStable = await fileDao.GetFileStableAsync(file.Id, file.Version);
}
var docKey = await _documentServiceHelper.GetDocKeyAsync(fileStable);
var fileReference = new FileReference<T>
{
@ -2691,7 +2697,9 @@ public class FileStorageService //: IFileStorageService
InstanceId = (await _tenantManager.GetCurrentTenantIdAsync()).ToString()
},
Url = await _documentServiceConnector.ReplaceCommunityAdressAsync(await _pathProvider.GetFileStreamUrlAsync(file, lastVersion: true)),
FileType = file.ConvertedExtension.Trim('.')
FileType = file.ConvertedExtension.Trim('.'),
Key = docKey,
Link = _baseCommonLinkUtility.GetFullAbsolutePath(_filesLinkUtility.GetFileWebEditorUrl(file.Id)),
};
fileReference.Token = _documentServiceHelper.GetSignature(fileReference);
return fileReference;

7
products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs vendored
View File

@ -472,6 +472,13 @@ internal class ProviderFolderDao : ProviderDaoBase, IFolderDao<string>
return await folderDao.CreateDataWriteOperatorAsync(folderId, chunkedUploadSession, sessionHolder);
}
public async Task<string> GetBackupExtensionAsync(string folderId)
{
var selector = _selectorFactory.GetSelector(folderId);
var folderDao = selector.GetFolderDao(folderId);
return await folderDao.GetBackupExtensionAsync(folderId);
}
private IAsyncEnumerable<Folder<string>> FilterByProvider(IAsyncEnumerable<Folder<string>> folders, ProviderFilter provider)
{
if (provider != ProviderFilter.kDrive && provider != ProviderFilter.WebDav && provider != ProviderFilter.Yandex)

5
products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs vendored
View File

@ -440,6 +440,11 @@ internal class SharePointFolderDao : SharePointDaoBase, IFolderDao<string>
{
return Task.FromResult<IDataWriteOperator>(null);
}
public Task<string> GetBackupExtensionAsync(string folderId)
{
return Task.FromResult("tar.gz");
}
}
static file class Queries

5
products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs vendored
View File

@ -505,6 +505,11 @@ internal class SharpBoxFolderDao : SharpBoxDaoBase, IFolderDao<string>
{
return Task.FromResult<IDataWriteOperator>(null);
}
public Task<string> GetBackupExtensionAsync(string folderId)
{
return Task.FromResult("tar.gz");
}
}
static file class Queries

5
products/ASC.Files/Core/Core/Thirdparty/ThirdPartyFolderDao.cs vendored
View File

@ -510,6 +510,11 @@ internal class ThirdPartyFolderDao<TFile, TFolder, TItem> : BaseFolderDao, IFold
return Task.FromResult<IDataWriteOperator>(new ChunkZipWriteOperator(_tempStream, chunkedUploadSession, sessionHolder));
}
public Task<string> GetBackupExtensionAsync(string folderId)
{
return Task.FromResult("tar.gz");
}
public Task ReassignFoldersAsync(Guid oldOwnerId, Guid newOwnerId)
{
return Task.CompletedTask;

2
products/ASC.Files/Core/GlobalUsings.cs
View File

@ -84,7 +84,7 @@ global using ASC.Core.Notify.Socket;
global using ASC.Core.Tenants;
global using ASC.Core.Users;
global using ASC.Data.Storage;
global using ASC.Data.Storage.ZipOperators;
global using ASC.Data.Storage.DataOperators;
global using ASC.ElasticSearch;
global using ASC.ElasticSearch.Core;
global using ASC.ElasticSearch.Service;

8
products/ASC.Files/Core/Services/DocumentService/Configuration.cs
View File

@ -677,6 +677,14 @@ public class FileReference<T>
/// <type>System.String, System</type>
public string FileType { get; set; }
/// <summary>Key</summary>
/// <type>System.String, System</type>
public string Key { get; set; }
/// <summary>Link</summary>
/// <type>System.String, System</type>
public string Link { get; set; }
/// <summary>Token</summary>
/// <type>System.String, System</type>
public string Token { get; set; }

6
products/ASC.Files/Core/Utils/FilesChunkedUploadSessionHolder.cs
View File

@ -28,11 +28,13 @@ namespace ASC.Web.Files.Utils;
public class FilesChunkedUploadSessionHolder : CommonChunkedUploadSessionHolder
{
private readonly IDaoFactory _daoFactory;
private readonly IDaoFactory _daoFactory;
public FilesChunkedUploadSessionHolder(IDaoFactory daoFactory, TempPath tempPath, IDataStore dataStore, string domain, long maxChunkUploadSize = 10485760)
: base(tempPath, dataStore, domain, maxChunkUploadSize)
{
_daoFactory = daoFactory;
_daoFactory = daoFactory;
TempDomain = FileConstant.StorageDomainTmp;
}
public override async Task<string> UploadChunkAsync(CommonChunkedUploadSession uploadSession, Stream stream, long length)
{

1
public/scripts/api.js
View File

@ -47,6 +47,7 @@
onAppReady: null,
onAppError: null,
onEditorCloseCallback: null,
onAuthSuccess: null,
},
};

5
web/ASC.Web.Api/Core/CspSettingsHelper.cs
View File

@ -139,6 +139,7 @@ public class CspSettingsHelper
var def = csp.ByDefaultAllow
.FromSelf()
.From("data:")
.From(_filesLinkUtility.DocServiceUrl);
var scriptBuilder = csp.AllowScripts
@ -161,7 +162,9 @@ public class CspSettingsHelper
.AllowUnsafeInline();
var imageBuilder = csp.AllowImages
.FromSelf();
.FromSelf()
.From("data:")
.From("blob:");
var frameBuilder = csp.AllowFraming
.FromSelf();

795
yarn.lock
View File

File diff suppressed because it is too large Load Diff