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

Radicale: check radicale available

Browse Source
This commit is contained in:
Nikolay Rechkin 2023-07-15 12:03:59 +03:00
parent 5e5d0c99ef
commit 615df7a72c
2 changed files with 66 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -435,6 +435,9 @@ public class UserManager
new Uri(_cache.Get<string>("REWRITE_URL" + tenant.Id)).ToString() : tenant.GetTenantDomain(_coreSettings);
var rootAuthorization = _cardDavAddressbook.GetSystemAuthorization();
if (rootAuthorization != null)
{
var allUserEmails = GetDavUserEmails().ToList();
if (oldUserData != null && oldUserData.Status != newUser.Status && newUser.Status == EmployeeStatus.Terminated)
@ -485,6 +488,7 @@ public class UserManager
}
}
}
}
public IEnumerable<string> GetDavUserEmails()
{
@ -524,9 +528,10 @@ public class UserManager
new Uri(_cache.Get<string>("REWRITE_URL" + tenant.Id)).ToString() : tenant.GetTenantDomain(_coreSettings);
var davUsersEmails = GetDavUserEmails();
var requestUrlBook = _cardDavAddressbook.GetRadicaleUrl(myUri, delUser.Email.ToLower(), true, true);
if(rootAuthorization != null)
{
var addBookCollection = await _cardDavAddressbook.GetCollection(requestUrlBook, userAuthorization, myUri.ToString());
if (addBookCollection.Completed && addBookCollection.StatusCode != 404)
{
var davbookRequest = new DavRequest()
@ -557,6 +562,8 @@ public class UserManager
}
}
}
}
catch (Exception ex)
{
_log.ErrorWithException(ex);

4
common/ASC.Core.Common/Radicale/RadicaleEntity.cs
View File

@ -69,6 +69,10 @@ public abstract class RadicaleEntity
public string GetSystemAuthorization()
{
if(_configuration["radicale:admin"] == null || _configuration["radicale:admin"] == "")
{
return null;
}
return _configuration["radicale:admin"] + ":" + _instanceCrypto.Encrypt(_configuration["radicale:admin"]);
}