Merge pull request #9 from aspose-email-cloud/develop

Develop

Author: Marat-Gumerov

Api/EmailApi.cs

@@ -55,7 +55,7 @@ public async Task OneTimeTearDown()
             if (folderExist.Exists == true && folderExist.IsFolder == true)
             {
                 var deleteRequest = new DeleteFolderRequest(folder, StorageName, true);
-                emailApi.DeleteFolder(deleteRequest);
+                await emailApi.DeleteFolderAsync(deleteRequest);
             }
         }
 
@@ -68,6 +68,7 @@ public async Task SyncTest()
         {
             var calendarFile = await CreateCalendar();
             var request = new GetCalendarRequest(calendarFile, folder, StorageName);
+            // ReSharper disable once MethodHasAsyncOverload
             var calendar = emailApi.GetCalendar(request);
             Assert.AreEqual("CALENDAR", calendar.Name);
         }
@@ -285,7 +286,7 @@ await emailApi.UploadFileAsync(new UploadFileRequest($"{folder}/{fileName}", str
                 $"{contactFile.FolderPath}/{contactFile.FileName}", contactFile.Storage)))
             using (var memoryStream = new MemoryStream())
             {
-                contactFileStream.CopyTo(memoryStream);
+                await contactFileStream.CopyToAsync(memoryStream);
                 var contactFileContent = Encoding.UTF8.GetString(memoryStream.ToArray());
                 Assert.True(contactFileContent.Contains("Thomas"));
             }
@@ -326,11 +327,11 @@ public async Task CreateCalendarEmailTest()
             {
                 Attendees = new List<MailAddress>
                 {
-                    new MailAddress("Attendee Name", "attendee@am.ru", "Accepted")
+                    new MailAddress("Attendee Name", "attendee@am.ru", "Accepted", null)
                 },
                 Description = "Some description",
                 Summary = "Some summary",
-                Organizer = new MailAddress("Organizer Name", "cloud.em@yandex.ru", null),
+                Organizer = new MailAddress("Organizer Name", "cloud.em@yandex.ru", null, null),
                 StartDate = DateTime.UtcNow.AddDays(1).AddHours(12),
                 EndDate = DateTime.UtcNow.AddDays(1).AddHours(13),
                 Location = "Some location"
@@ -350,9 +351,9 @@ await emailApi.SaveCalendarModelAsync(
             var email = new EmailDto
             {
                 AlternateViews = new List<AlternateView> {alternate},
-                From = new MailAddress("From address", "cloud.em@yandex.ru", "Accepted"),
+                From = new MailAddress("From address", "cloud.em@yandex.ru", "Accepted", null),
                 To = new List<MailAddress>
-                    {new MailAddress("To address", "cloud.em@yandex.ru", null)},
+                    {new MailAddress("To address", "cloud.em@yandex.ru", null, null)},
                 Subject = "Some subject",
                 Body = "Some body"
             };
@@ -544,6 +545,132 @@ await emailApi.SaveEmailClientMultiAccountAsync(
                 multiAccountFromStorage.SendAccount.Credentials.Discriminator);
         }
 
+        [Test]
+        [Pipeline]
+        public async Task ConvertCalendarTest()
+        {
+            const string location = "Some location";
+            //Create DTO with specified location:
+            var calendarDto = new CalendarDto
+            {
+                Location = location,
+                Summary = "Some summary",
+                Description = "Some description",
+                StartDate = DateTime.Today,
+                EndDate = DateTime.Today.AddHours(1),
+                Organizer = new MailAddress {Address = "organizer@aspose.com"},
+                Attendees = new List<MailAddress>
+                    {new MailAddress {Address = "attendee@aspose.com"}}
+            };
+            //We can convert this DTO to a MAPI or ICS file stream:
+            var mapiStream = await emailApi.ConvertCalendarModelToFileAsync(
+                new ConvertCalendarModelToFileRequest(
+                    "Msg", calendarDto));
+            /*
+            //mapiStream can be saved as a calendar.msg file:
+            using (var file = File.OpenWrite("calendar.msg"))
+            {
+                await mapiStream.CopyToAsync(file);
+            }
+            mapiStream.Seek(0, SeekOrigin.Begin);
+            */
+
+            //Let's convert this stream to an ICS file:
+            var icsStream = await emailApi.ConvertCalendarAsync(new ConvertCalendarRequest(
+                "Ics", mapiStream));
+            /*
+            //icsStream can be saved as a calendar.ics file:
+            using (var file = File.OpenWrite("calendar.ics"))
+            {
+                await icsStream.CopyToAsync(file);
+            }
+            icsStream.Seek(0, SeekOrigin.Begin);
+            */
+
+            //ICS is a text format. We can convert the stream to a string and check that it
+            //contains specified location as a substring:
+            using (var memoryStream = new MemoryStream())
+            {
+                await icsStream.CopyToAsync(memoryStream);
+                var icsString = Encoding.UTF8.GetString(memoryStream.ToArray());
+                Assert.IsTrue(icsString.Contains(location));
+            }
+
+            icsStream.Seek(0, SeekOrigin.Begin);
+            //We can also convert a file stream back to a CalendarDto
+            var dto = await emailApi.GetCalendarFileAsModelAsync(
+                new GetCalendarFileAsModelRequest(icsStream));
+            Assert.AreEqual(location, dto.Location);
+        }
+
+        [Test]
+        [Pipeline]
+        public async Task ConvertContactTest()
+        {
+            const string surname = "Cane";
+            var contactDto = new ContactDto
+            {
+                Gender = "Male",
+                Surname = surname,
+                GivenName = "John",
+                EmailAddresses = new List<EmailAddress>
+                {
+                    new EmailAddress {Address = "address@aspose.com"}
+                },
+                PhoneNumbers = new List<PhoneNumber>
+                {
+                    new PhoneNumber {Number = "+47235345346"}
+                }
+            };
+            var mapiStream = await emailApi.ConvertContactModelToFileAsync(
+                new ConvertContactModelToFileRequest(
+                    "Msg", contactDto));
+            var vcardStream = await emailApi.ConvertContactAsync(new ConvertContactRequest(
+                "VCard", "Msg", mapiStream));
+            using (var memoryStream = new MemoryStream())
+            {
+                await vcardStream.CopyToAsync(memoryStream);
+                var vcardString = Encoding.UTF8.GetString(memoryStream.ToArray());
+                Assert.IsTrue(vcardString.Contains(surname));
+            }
+
+            vcardStream.Seek(0, SeekOrigin.Begin);
+            var dto = await emailApi.GetContactFileAsModelAsync(
+                new GetContactFileAsModelRequest("VCard", vcardStream));
+            Assert.AreEqual(surname, dto.Surname);
+        }
+        
+        [Test]
+        [Pipeline]
+        public async Task ConvertEmailTest()
+        {
+            const string from = "from@aspose.com";
+            var emailDto = new EmailDto
+            {
+                From = new MailAddress{Address = from},
+                To = new List<MailAddress>{new MailAddress{Address = "to@aspose.com"}},
+                Subject = "Some subject",
+                Body = "Some body",
+                Date = DateTime.MinValue.AddDays(1)
+            };
+            var mapiStream = await emailApi.ConvertEmailModelToFileAsync(
+                new ConvertEmailModelToFileRequest(
+                    "Msg", emailDto));
+            var emlStream = await emailApi.ConvertEmailAsync(new ConvertEmailRequest(
+                "Eml", mapiStream));
+            using (var memoryStream = new MemoryStream())
+            {
+                await emlStream.CopyToAsync(memoryStream);
+                var emlString = Encoding.UTF8.GetString(memoryStream.ToArray());
+                Assert.IsTrue(emlString.Contains(from));
+            }
+
+            emlStream.Seek(0, SeekOrigin.Begin);
+            var dto = await emailApi.GetEmailFileAsModelAsync(
+                new GetEmailFileAsModelRequest(emlStream));
+            Assert.AreEqual(from, dto.From.Address);
+        }
+
         private static string FileToBase64(string filePath)
         {
             var bytes = File.ReadAllBytes(filePath);

Aspose.Email-Cloud.Tests/Tests/TestFixture.cs

@@ -4,15 +4,15 @@
     <Title>Aspose.Email Cloud SDK for .NET</Title>
     <TargetFrameworks>net452;netstandard2.0;net20;Xamarin.iOS10;Xamarin.Mac20;MonoAndroid60</TargetFrameworks>
     <Description>Aspose.Email Cloud is a REST API for creating email applications that work with common email file formats. It lets developers manipulate message formats such as Outlook MSG, EML and MHT files.</Description>
-    <Copyright>Copyright (c) 2002-2018 Aspose Pty Ltd</Copyright>
+    <Copyright>Copyright (c) 2002-2020 Aspose Pty Ltd</Copyright>
     <PackageProjectUrl>https://github.com/aspose-email-cloud/aspose-email-cloud-dotnet</PackageProjectUrl>
     <License>MIT</License>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageIcon>aspose_email-for-cloud-icon.png</PackageIcon>
     <RepositoryUrl>https://github.com/aspose-email-cloud/aspose-email-cloud-dotnet</RepositoryUrl>
     <PackageTags>ASPOSE EMAIL CLOUD SDK Outlook MSG EML MHT</PackageTags>
     <RootNamespace>Aspose.Email.Cloud.Sdk</RootNamespace>
-    <Version>20.3.0</Version>
+    <Version>20.5.0.93</Version>
     <AndroidUseIntermediateDesignerFile>False</AndroidUseIntermediateDesignerFile>
   </PropertyGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'Xamarin.iOS10' OR '$(TargetFramework)' == 'Xamarin.Mac20' OR '$(TargetFramework)' == 'MonoAndroid60'">

Aspose.Email-Cloud.csproj

@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright company="Aspose" file="AccountBaseRequest.cs">
-//   Copyright (c) 2016 Aspose.Email for Cloud
+//   Copyright (c) 2016-2020 Aspose.Email for Cloud
 // </copyright>
 // <summary>
 //   Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -38,12 +38,12 @@ namespace Aspose.Email.Cloud.Sdk.Model
     public class AccountBaseRequest 
     {
         /// <summary>
-        /// First account storage file name for receiving emails (or universal one)             
+        /// First account storage file name             
         /// </summary>  
         public string FirstAccount { get; set; }
 
         /// <summary>
-        /// Second account storage file name for sending emails (ignored if first is universal)             
+        /// Additional email account (for example, FirstAccount could be IMAP, and second one could be SMTP)             
         /// </summary>  
         public string SecondAccount { get; set; }
 
@@ -56,8 +56,8 @@ public class AccountBaseRequest
         public AccountBaseRequest() {}
 
         /// <summary>AccountBaseRequest constructor</summary>
-        /// <param name="firstAccount">First account storage file name for receiving emails (or universal one)             </param>
-        /// <param name="secondAccount">Second account storage file name for sending emails (ignored if first is universal)             </param>
+        /// <param name="firstAccount">First account storage file name             </param>
+        /// <param name="secondAccount">Additional email account (for example, FirstAccount could be IMAP, and second one could be SMTP)             </param>
         /// <param name="storageFolder">Storage folder location of account files             </param>
         public AccountBaseRequest(string firstAccount, string secondAccount, StorageFolderLocation storageFolder)
         {

Model/AccountBaseRequest.cs

@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright company="Aspose" file="AddAttachmentRequest.cs">
-//   Copyright (c) 2016 Aspose.Email for Cloud
+//   Copyright (c) 2016-2020 Aspose.Email for Cloud
 // </copyright>
 // <summary>
 //   Permission is hereby granted, free of charge, to any person obtaining a copy

Model/AddAttachmentRequest.cs

@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright company="Aspose" file="AiBcrBase64Image.cs">
-//   Copyright (c) 2016 Aspose.Email for Cloud
+//   Copyright (c) 2016-2020 Aspose.Email for Cloud
 // </copyright>
 // <summary>
 //   Permission is hereby granted, free of charge, to any person obtaining a copy

Model/AiBcrBase64Image.cs

@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright company="Aspose" file="AiBcrBase64Rq.cs">
-//   Copyright (c) 2016 Aspose.Email for Cloud
+//   Copyright (c) 2016-2020 Aspose.Email for Cloud
 // </copyright>
 // <summary>
 //   Permission is hereby granted, free of charge, to any person obtaining a copy

Model/AiBcrBase64Rq.cs

@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright company="Aspose" file="AiBcrImage.cs">
-//   Copyright (c) 2016 Aspose.Email for Cloud
+//   Copyright (c) 2016-2020 Aspose.Email for Cloud
 // </copyright>
 // <summary>
 //   Permission is hereby granted, free of charge, to any person obtaining a copy

Model/AiBcrImage.cs

@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright company="Aspose" file="AiBcrImageStorageFile.cs">
-//   Copyright (c) 2016 Aspose.Email for Cloud
+//   Copyright (c) 2016-2020 Aspose.Email for Cloud
 // </copyright>
 // <summary>
 //   Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -40,15 +40,15 @@ public class AiBcrImageStorageFile : AiBcrImage
         /// <summary>
         /// Image location             
         /// </summary>  
-        public StorageFileLocation File { get; set; }
+        public Object File { get; set; }
 
         /// <summary>AiBcrImageStorageFile constructor</summary>
         public AiBcrImageStorageFile() {}
 
         /// <summary>AiBcrImageStorageFile constructor</summary>
         /// <param name="isSingle">Determines that image contains single VCard or more. Ignored in current version. Multiple cards on image support will be added soon             </param>
         /// <param name="file">Image location             </param>
-        public AiBcrImageStorageFile(bool? isSingle, StorageFileLocation file)
+        public AiBcrImageStorageFile(bool? isSingle, Object file)
         {
             IsSingle = isSingle;
             File = file;

Model/AiBcrImageStorageFile.cs

@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright company="Aspose" file="AiBcrOcrData.cs">
-//   Copyright (c) 2016 Aspose.Email for Cloud
+//   Copyright (c) 2016-2020 Aspose.Email for Cloud
 // </copyright>
 // <summary>
 //   Permission is hereby granted, free of charge, to any person obtaining a copy