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

fix

Browse Source
This commit is contained in:
pavelbannov 2022-06-17 20:51:01 +03:00
parent 8ea04bcc81
commit 72b0a81f51
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/ASC.Core.Common/Context/Impl/UserManager.cs
View File

@ -373,7 +373,7 @@ public class UserManager
var collection = _cardDavAddressbook.GetCollection(requestUrlBook, userAuthorization, myUri.ToString()).Result;
if (collection.Completed && collection.StatusCode != 404)
{
_cardDavAddressbook.Delete(myUri, newUser.Id, newUser.Email, tenant.Id);
_cardDavAddressbook.Delete(myUri, newUser.Id, newUser.Email, tenant.Id).Wait();//TODO
}
foreach (var email in allUserEmails)
{
@ -403,7 +403,7 @@ public class UserManager
try
{
_cardDavAddressbook.UpdateItemForAllAddBooks(allUserEmails, myUri, cardDavUser, _tenantManager.GetCurrentTenant().Id, oldUserData != null && oldUserData.Email != newUser.Email ? oldUserData.Email : null);
_cardDavAddressbook.UpdateItemForAllAddBooks(allUserEmails, myUri, cardDavUser, _tenantManager.GetCurrentTenant().Id, oldUserData != null && oldUserData.Email != newUser.Email ? oldUserData.Email : null).Wait(); // todo
}
catch (Exception ex)
{
@ -617,7 +617,7 @@ public class UserManager
var myUri = (_accessor?.HttpContext != null) ? _accessor.HttpContext.Request.GetUrlRewriter().ToString() :
(_cache.Get<string>("REWRITE_URL" + tenant.Id) != null) ?
new Uri(_cache.Get<string>("REWRITE_URL" + tenant.Id)).ToString() : tenant.GetTenantDomain(_coreSettings);
_cardDavAddressbook.Delete(myUri, user.Id, user.Email, tenant.Id);
_cardDavAddressbook.Delete(myUri, user.Id, user.Email, tenant.Id).Wait(); //todo
}
}

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

@ -704,6 +704,10 @@ public class CustomizationConfig<T>
{
Customer.SetConfiguration(_configuration);
}
else
{
Customer = null;
}
Logo.SetConfiguration(_configuration);
}