v13.0.12190-Beta

Author: ITHitBuild

CS/CalDAVServer.FileSystemStorage.AspNetCore/Acl/AclFactory.cs

@@ -18,7 +18,7 @@ internal static class AclFactory
         /// <param name="path">Relative path requested.</param>
         /// <param name="context">Instance of <see cref="DavContext"/> class.</param>
         /// <returns>Object implemening ACL principal or folder</returns>
-        internal static async Task<IHierarchyItemAsync> GetAclItemAsync(DavContext context, string path)
+        internal static async Task<IHierarchyItem> GetAclItemAsync(DavContext context, string path)
         {
             // If this is [DAVLocation]/acl - return folder which contains users and groups.
             if (path.Equals(AclFolder.AclFolderPath.Trim('/'), System.StringComparison.InvariantCultureIgnoreCase))

CS/CalDAVServer.FileSystemStorage.AspNetCore/Acl/User.cs

@@ -7,6 +7,7 @@
 
 using ITHit.WebDAV.Server;
 using ITHit.WebDAV.Server.Acl;
+using IPrincipal = ITHit.WebDAV.Server.Acl.IPrincipal;
 using ITHit.WebDAV.Server.CalDav;
 using CalDAVServer.FileSystemStorage.AspNetCore.CalDav;
 
@@ -16,7 +17,7 @@ namespace CalDAVServer.FileSystemStorage.AspNetCore.Acl
     /// This class represents user principal in WebDAV hierarchy. 
     /// Instances of this class correspond to the following path: [DAVLocation]/acl/users/[UserID].
     /// </summary>
-    public class User : Discovery, ICalendarPrincipalAsync
+    public class User : Discovery, ICalendarPrincipal
     {
         private readonly string email;
 
@@ -88,7 +89,7 @@ public User(DavContext context, string userId, string name, string email, DateTi
         /// <param name="destName">New user name.</param>
         /// <param name="deep">Whether to copy children - is not user.</param>
         /// <param name="multistatus">Is not used as there's no children.</param>
-        public async Task CopyToAsync(IItemCollectionAsync destFolder, string destName, bool deep, MultistatusException multistatus)
+        public async Task CopyToAsync(IItemCollection destFolder, string destName, bool deep, MultistatusException multistatus)
         {
             throw new DavException("Not implemented.", DavStatus.NOT_IMPLEMENTED);
         }
@@ -99,7 +100,7 @@ public async Task CopyToAsync(IItemCollectionAsync destFolder, string destName,
         /// <param name="destFolder">We don't use it as moving groups to different folder is not supported.</param>
         /// <param name="destName">New name.</param>
         /// <param name="multistatus">We don't use it as there're no child objects.</param>
-        public async Task MoveToAsync(IItemCollectionAsync destFolder, string destName, MultistatusException multistatus)
+        public async Task MoveToAsync(IItemCollection destFolder, string destName, MultistatusException multistatus)
         {
             throw new DavException("Not implemented.", DavStatus.NOT_IMPLEMENTED);
         }
@@ -150,7 +151,7 @@ public async Task UpdatePropertiesAsync(IList<PropertyValue> setProps, IList<Pro
         /// between users and groups.
         /// </summary>
         /// <param name="members">Members of the group.</param>
-        public async Task SetGroupMembersAsync(IList<IPrincipalAsync> members)
+        public async Task SetGroupMembersAsync(IList<IPrincipal> members)
         {
             throw new DavException("User objects can not contain other users.", DavStatus.CONFLICT);
         }
@@ -159,18 +160,18 @@ public async Task SetGroupMembersAsync(IList<IPrincipalAsync> members)
         /// Retrieves principal members. Users have no members, so return empty list.
         /// </summary>
         /// <returns>Principal members.</returns>
-        public async Task<IEnumerable<IPrincipalAsync>> GetGroupMembersAsync()
+        public async Task<IEnumerable<IPrincipal>> GetGroupMembersAsync()
         {
-            return new IPrincipalAsync[0];
+            return new IPrincipal[0];
         }
 
         /// <summary>
         /// Gets groups to which this principal belongs.
         /// </summary>
         /// <returns>Enumerable with groups.</returns>
-        public async Task<IEnumerable<IPrincipalAsync>> GetGroupMembershipAsync()
+        public async Task<IEnumerable<IPrincipal>> GetGroupMembershipAsync()
         {
-            return new IPrincipalAsync[0];
+            return new IPrincipal[0];
         }
 
         /// <summary>

CS/CalDAVServer.FileSystemStorage.AspNetCore/Acl/UsersFolder.cs

@@ -4,6 +4,7 @@
 
 using ITHit.WebDAV.Server;
 using ITHit.WebDAV.Server.Acl;
+using IPrincipal = ITHit.WebDAV.Server.Acl.IPrincipal;
 using ITHit.WebDAV.Server.Paging;
 
 namespace CalDAVServer.FileSystemStorage.AspNetCore.Acl
@@ -12,7 +13,7 @@ namespace CalDAVServer.FileSystemStorage.AspNetCore.Acl
     /// Logical folder which contains users.
     /// Instances of this class correspond to the following path: [DAVLocation]/acl/users/.
     /// </summary>
-    public class UsersFolder : LogicalFolder, IPrincipalFolderAsync
+    public class UsersFolder : LogicalFolder, IPrincipalFolder
     {
         /// <summary>
         /// This folder name.
@@ -45,7 +46,7 @@ public override async Task<PageResults> GetChildrenAsync(IList<PropertyName> pro
             /// In this implementation we list users from OWIN Identity or from membership provider, 
             /// you can replace it with your own users source.
 
-            IList<IHierarchyItemAsync> children = new List<IHierarchyItemAsync>();
+            IList<IHierarchyItem> children = new List<IHierarchyItem>();
 
             children.Add(new User(Context, Context.Identity.Name, Context.Identity.Name, null, new DateTime(2000, 1, 1), new DateTime(2000, 1, 1)));
 
@@ -55,7 +56,7 @@ public override async Task<PageResults> GetChildrenAsync(IList<PropertyName> pro
         /// <summary>
         /// We don't support creating folders inside this folder.
         /// </summary>        
-        public async Task<IPrincipalFolderAsync> CreateFolderAsync(string name)
+        public async Task<IPrincipalFolder> CreateFolderAsync(string name)
         {
             throw new DavException("Not implemented.", DavStatus.NOT_IMPLEMENTED);
         }
@@ -65,7 +66,7 @@ public async Task<IPrincipalFolderAsync> CreateFolderAsync(string name)
         /// </summary>
         /// <param name="name">User name.</param>
         /// <returns>Newly created user.</returns>
-        public async Task<IPrincipalAsync> CreatePrincipalAsync(string name)
+        public async Task<IPrincipal> CreatePrincipalAsync(string name)
         {
             throw new DavException("Not implemented.", DavStatus.NOT_IMPLEMENTED);
         }
@@ -76,7 +77,7 @@ public async Task<IPrincipalAsync> CreatePrincipalAsync(string name)
         /// <param name="propValues">Properties and values to look for.</param>
         /// <param name="props">Properties that will be requested by the engine from the returned users.</param>
         /// <returns>Enumerable with users whose properties match.</returns>
-        public async Task<IEnumerable<IPrincipalAsync>> FindPrincipalsByPropertyValuesAsync(
+        public async Task<IEnumerable<IPrincipal>> FindPrincipalsByPropertyValuesAsync(
             IList<PropertyValue> propValues,
             IList<PropertyName> props)
         {
@@ -93,11 +94,11 @@ public async Task<IEnumerable<PropertyDescription>> GetPrincipalSearcheablePrope
         }
 
         /// <summary>
-        /// Returns <see cref="IPrincipalAsync"/> for the current user.
+        /// Returns <see cref="IPrincipal"/> for the current user.
         /// </summary>
         /// <param name="props">Properties that will be asked later from the user returned.</param>
         /// <returns>Enumerable with users.</returns>
-        public async Task<IEnumerable<IPrincipalAsync>> GetMatchingPrincipalsAsync(IList<PropertyName> props)
+        public async Task<IEnumerable<IPrincipal>> GetMatchingPrincipalsAsync(IList<PropertyName> props)
         {
             throw new DavException("Not implemented.", DavStatus.NOT_IMPLEMENTED);
         }

CS/CalDAVServer.FileSystemStorage.AspNetCore/CalDAVServer.FileSystemStorage.AspNetCore.csproj

@@ -1,32 +1,28 @@
 
 <Project Sdk="Microsoft.NET.Sdk.Web">
-  <PropertyGroup>
-    <VersionPrefix>12.1.11824</VersionPrefix>
-    <AssemblyName>CalDAVServer.FileSystemStorage.AspNetCore</AssemblyName>
-    <TargetFramework>net6.0</TargetFramework>
-    <LangVersion>8.0</LangVersion>
-    <NullableContextOptions>enable</NullableContextOptions>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <NoWarn>1701;1702;1705;1998</NoWarn>
-  </PropertyGroup>
-  <ItemGroup>
-    <None Remove="MyCustomHandlerPage.html" />
-	<None Remove="App_Data\WebDav\Storage\qtest_*\**" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="MyCustomHandlerPage.html">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="ITHit.Server" Version="12.1.11824" />
-    <PackageReference Include="ITHit.Server.Core" Version="12.1.11824" />
-    <PackageReference Include="ITHit.WebDAV.Server" Version="12.1.11824" />
-    <PackageReference Include="ITHit.GSuite.Server" Version="12.1.11824" />
-    <PackageReference Include="System.Data.OleDb" Version="6.0.0" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="ITHit.Collab" Version="1.0.0.759" />
-  </ItemGroup>
+	<PropertyGroup>
+		<VersionPrefix>13.0.12190-Beta</VersionPrefix>
+		<AssemblyName>CalDAVServer.FileSystemStorage.AspNetCore</AssemblyName>
+		<TargetFramework>net6.0</TargetFramework>
+		<LangVersion>8.0</LangVersion>
+		<NullableContextOptions>enable</NullableContextOptions>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+		<NoWarn>1701;1702;1705;1998</NoWarn>
+	</PropertyGroup>
+	<ItemGroup>
+		<Content Include="MyCustomHandlerPage.html">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+	</ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="ITHit.Server" Version="13.0.12190-Beta" />
+		<PackageReference Include="ITHit.Server.Core" Version="13.0.12190-Beta" />
+		<PackageReference Include="ITHit.WebDAV.Server" Version="13.0.12190-Beta" />
+		<PackageReference Include="ITHit.GSuite.Server" Version="13.0.12190-Beta" />
+		<PackageReference Include="System.Data.OleDb" Version="6.0.0" />
+	</ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="ITHit.Collab" Version="1.0.0.759" />
+	</ItemGroup>
 </Project>

CS/CalDAVServer.FileSystemStorage.AspNetCore/CalDav/CalDavFactory.cs

@@ -14,9 +14,9 @@ public static class CalDavFactory
         /// <param name="path">Relative path requested.</param>
         /// <param name="context">Instance of <see cref="DavContext"/> class.</param>
         /// <returns>Object implementing various CalDAV items or null if no object corresponding to path is found.</returns>
-        internal static IHierarchyItemAsync GetCalDavItem(DavContext context, string path)
+        internal static IHierarchyItem GetCalDavItem(DavContext context, string path)
         {
-            IHierarchyItemAsync item = null;
+            IHierarchyItem item = null;
 
             item = CalendarsRootFolder.GetCalendarsRootFolder(context, path);
             if (item != null)

CS/CalDAVServer.FileSystemStorage.AspNetCore/CalDav/CalendarFile.cs

@@ -31,7 +31,7 @@ namespace CalDAVServer.FileSystemStorage.AspNetCore.CalDav
     ///                |-- ...
     ///                |-- [File X.ics]  -- this class
     /// </example>
-    public class CalendarFile : DavFile, ICalendarFileAsync
+    public class CalendarFile : DavFile, ICalendarFile
     {
         /// <summary>
         /// Returns calendar file that corresponds to path or null if no calendar file is found.

CS/CalDAVServer.FileSystemStorage.AspNetCore/CalDav/CalendarFolder.cs

@@ -8,6 +8,7 @@
 using ITHit.WebDAV.Server;
 using ITHit.WebDAV.Server.CalDav;
 using ITHit.WebDAV.Server.Acl;
+using IPrincipal = ITHit.WebDAV.Server.Acl.IPrincipal;
 
 using CalDAVServer.FileSystemStorage.AspNetCore.Acl;
 
@@ -17,7 +18,7 @@ namespace CalDAVServer.FileSystemStorage.AspNetCore.CalDav
     /// Represents CalDAV calendar (calendar folder).
     /// Instances of this class correspond to the following path: [DAVLocation]/calendars/[user_name]/[calendar_name]/
     /// </summary>
-    /// <remarks>Mozilla Thunderbird Lightning requires ICurrentUserPrincipalAsync on calendar folder, it does not support discovery.</remarks>
+    /// <remarks>Mozilla Thunderbird Lightning requires ICurrentUserPrincipal on calendar folder, it does not support discovery.</remarks>
     /// <example>
     /// [DAVLocation]
     ///  |-- ...
@@ -29,9 +30,9 @@ namespace CalDAVServer.FileSystemStorage.AspNetCore.CalDav
     ///           |-- [Calendar X]  -- this class
     /// </example>
     /// <remarks>
-    /// IAclHierarchyItemAsync is required by OS X Calendar.
+    /// IAclHierarchyItem is required by OS X Calendar.
     /// </remarks>
-    public class CalendarFolder : DavFolder, ICalendarFolderAsync, IAppleCalendarAsync, ICurrentUserPrincipalAsync, IAclHierarchyItemAsync
+    public class CalendarFolder : DavFolder, ICalendarFolder, IAppleCalendar, ICurrentUserPrincipal, IAclHierarchyItem
     {
         /// <summary>
         /// Returns calendar folder that corresponds to path.
@@ -83,15 +84,15 @@ private CalendarFolder(DirectoryInfo directoryInfo, DavContext context, string p
         /// the Engine for each item that are returned from this method.
         /// </param>
         /// <returns>List of calendar files. Returns <b>null</b> for any item that is not found.</returns>
-        public async Task<IEnumerable<ICalendarFileAsync>> MultiGetAsync(IEnumerable<string> pathList, IEnumerable<PropertyName> propNames)
+        public async Task<IEnumerable<ICalendarFile>> MultiGetAsync(IEnumerable<string> pathList, IEnumerable<PropertyName> propNames)
         {
             // Here you can load all items from pathList in one request to your storage, instead of 
             // getting items one-by-one using GetHierarchyItem call.
 
-            IList<ICalendarFileAsync> calendarFileList = new List<ICalendarFileAsync>();
+            IList<ICalendarFile> calendarFileList = new List<ICalendarFile>();
             foreach (string path in pathList)
             {
-                ICalendarFileAsync calendarFile = await context.GetHierarchyItemAsync(path) as ICalendarFileAsync;
+                ICalendarFile calendarFile = await context.GetHierarchyItemAsync(path) as ICalendarFile;
                 calendarFileList.Add(calendarFile);
             }
             return calendarFileList;
@@ -113,11 +114,11 @@ public async Task<IEnumerable<ICalendarFileAsync>> MultiGetAsync(IEnumerable<str
         /// the Engine for each item that are returned from this method.
         /// </param>
         /// <returns>List of calendar files. Returns <b>null</b> for any item that is not found.</returns>
-        public async Task<IEnumerable<ICalendarFileAsync>> QueryAsync(string rawQuery, IEnumerable<PropertyName> propNames)
+        public async Task<IEnumerable<ICalendarFile>> QueryAsync(string rawQuery, IEnumerable<PropertyName> propNames)
         {
             // For the sake of simplicity we just call GetChildren returning all items. 
             // Typically you will return only items that match the query.
-            return (await GetChildrenAsync(propNames.ToList(), null, null, null)).Page.Cast<ICalendarFileAsync>();
+            return (await GetChildrenAsync(propNames.ToList(), null, null, null)).Page.Cast<ICalendarFile>();
         }
 
         /// <summary>
@@ -301,8 +302,8 @@ public async Task<CalendarSharedBy> GetSharedByAsync()
                 return CalendarSharedBy.NotShared;
             }
                 
-            IPrincipalAsync principal = await this.GetCurrentUserPrincipalAsync();
-            IPrincipalAsync owner = await this.GetOwnerAsync();
+            IPrincipal principal = await this.GetCurrentUserPrincipalAsync();
+            IPrincipal owner = await this.GetOwnerAsync();
             if(owner.Name.Equals(principal.Name))
             {
                 return CalendarSharedBy.SharedByOwner;                
@@ -314,7 +315,7 @@ public async Task<CalendarSharedBy> GetSharedByAsync()
             */
         }
 
-        public Task SetOwnerAsync(IPrincipalAsync value)
+        public Task SetOwnerAsync(IPrincipal value)
         {
             throw new NotImplementedException();
         }
@@ -324,9 +325,9 @@ public Task SetOwnerAsync(IPrincipalAsync value)
         /// </summary>
         /// <remarks>Required by OS X.</remarks>
         /// <returns>
-        /// Item that represents owner of this item and implements <see cref="IPrincipalAsync"/>.
+        /// Item that represents owner of this item and implements <see cref="IPrincipal"/>.
         /// </returns>
-        public async Task<IPrincipalAsync> GetOwnerAsync()
+        public async Task<IPrincipal> GetOwnerAsync()
         {
             // In this sample the address book is owned by the user that owns the folder in which address book is 
             // located. Extract user name from parent folder name: [DAVLocation]/addressbooks/[user_name]/[addressbook_name]/
@@ -336,12 +337,12 @@ public async Task<IPrincipalAsync> GetOwnerAsync()
             return await User.GetUserAsync(context, userId);
         }
 
-        public Task SetGroupAsync(IPrincipalAsync value)
+        public Task SetGroupAsync(IPrincipal value)
         {
             throw new NotImplementedException();
         }
 
-        public Task<IPrincipalAsync> GetGroupAsync()
+        public Task<IPrincipal> GetGroupAsync()
         {
             throw new NotImplementedException();
         }
@@ -379,22 +380,22 @@ public Task<AclRestriction> GetAclRestrictionsAsync()
             throw new NotImplementedException();
         }
 
-        public Task<IEnumerable<IHierarchyItemAsync>> GetInheritedAclSetAsync()
+        public Task<IEnumerable<IHierarchyItem>> GetInheritedAclSetAsync()
         {
             throw new NotImplementedException();
         }
 
-        public Task<IEnumerable<IPrincipalFolderAsync>> GetPrincipalCollectionSetAsync()
+        public Task<IEnumerable<IPrincipalFolder>> GetPrincipalCollectionSetAsync()
         {
             throw new NotImplementedException();
         }
 
-        public Task<IPrincipalAsync> ResolveWellKnownPrincipalAsync(WellKnownPrincipal wellKnownPrincipal)
+        public Task<IPrincipal> ResolveWellKnownPrincipalAsync(WellKnownPrincipal wellKnownPrincipal)
         {
             throw new NotImplementedException();
         }
 
-        public Task<IEnumerable<IAclHierarchyItemAsync>> GetItemsByPropertyAsync(MatchBy matchBy, IList<PropertyName> props)
+        public Task<IEnumerable<IAclHierarchyItem>> GetItemsByPropertyAsync(MatchBy matchBy, IList<PropertyName> props)
         {
             throw new NotImplementedException();
         }

CS/CalDAVServer.FileSystemStorage.AspNetCore/CalDav/CalendarsRootFolder.cs

@@ -60,7 +60,7 @@ private CalendarsRootFolder(DirectoryInfo directory, DavContext context, string
         /// <summary>
         /// Prohibit creating files in this folder.
         /// </summary>
-        override public async Task<IFileAsync> CreateFileAsync(string name)
+        override public async Task<IFile> CreateFileAsync(string name, Stream content, string contentType, long totalFileSize)
         {
             throw new DavException("Creating files in this folder is not implemented.", DavStatus.NOT_IMPLEMENTED);
         }
@@ -88,7 +88,7 @@ override public async Task CopyToAsync(IItemCollection destFolder, string destNa
         /// <summary>
         /// Prohibit moving or renaming this folder
         /// </summary>        
-        override public async Task MoveToAsync(IItemCollectionAsync destFolder, string destName, MultistatusException multistatus)
+        override public async Task MoveToAsync(IItemCollection destFolder, string destName, MultistatusException multistatus)
         {
             throw new DavException("Moving or renaming this folder is not allowed.", DavStatus.NOT_ALLOWED);
         }