v3.0.7

SendSafely-GitHub · SendSafely-GitHub · commit 00fefdb49827 · 2020-11-12T11:49:01.000-05:00
- Pagining enhancements to multiple methods - Add recipient notification to FinalizePackage - Addresses #7
diff --git a/SendsafelyAPI/ClientAPI.cs b/SendsafelyAPI/ClientAPI.cs
diff --git a/SendsafelyAPI/Objects/Connection.cs b/SendsafelyAPI/Objects/Connection.cs
@@ -253,7 +253,7 @@ private String generateUserAgent()
 
         private String CreateSignature(String privateKey, String apiKey, String uri, String dateStr, String requestData)
         {
-            String content = apiKey + uri + dateStr + requestData;
+            String content = apiKey + uri.Split('?')[0] + dateStr + requestData;
             Logger.Log("-" + content + "-");
             CryptUtility cu = new CryptUtility();
             return cu.createSignature(privateKey, content);
diff --git a/SendsafelyAPI/Objects/ConnectionStrings.cs b/SendsafelyAPI/Objects/ConnectionStrings.cs
@@ -15,6 +15,7 @@ internal class ConnectionStrings
             {"receivedPackages", new Endpoint("/api/v2.0/package/received/", HTTPMethod.GET, "application/json")},
             {"archivedPackages", new Endpoint("/api/v2.0/package/archived/", HTTPMethod.GET, "application/json")},
             {"organizationPackages", new Endpoint("/api/v2.0/package/organization/", HTTPMethod.POST, "application/json")},
+            {"organizationPackagesSearch", new Endpoint("/api/v2.0/package/organization/search", HTTPMethod.POST, "application/json") },
             {"addRecipient", new Endpoint("/api/v2.0/package/{packageId}/recipient/", HTTPMethod.PUT, "application/json")},
             {"addRecipientPhonenumber", new Endpoint("/api/v2.0/package/{packageId}/recipient/{recipientId}/", HTTPMethod.POST, "application/json")},
             {"createFileId", new Endpoint("/api/v2.0/package/{packageId}/file/", HTTPMethod.PUT, "application/json")},
@@ -73,6 +74,7 @@ internal class ConnectionStrings
             {"addContactGroupsToPackage", new Endpoint("/api/v2.0/package/{packageId}/group/{groupId}/", HTTPMethod.PUT, "application/json")},
             {"removeContactGroupsToPackage", new Endpoint("/api/v2.0/package/{packageId}/group/{groupId}/", HTTPMethod.DELETE, "application/json")},
             {"removeRecipient", new Endpoint("/api/v2.0/package/{packageId}/recipient/{recipientId}/", HTTPMethod.DELETE, "application/json")},
+            {"notifyRecipients", new Endpoint("/api/v2.0/package/{packageId}/notify", HTTPMethod.POST, "application/json") },
         };
     }
 }
diff --git a/SendsafelyAPI/Objects/DirectoryResponse.cs b/SendsafelyAPI/Objects/DirectoryResponse.cs
@@ -15,25 +15,25 @@ public class DirectoryResponse
         private ICollection<DirectoryResponse> subDirectories = new Collection<DirectoryResponse>();
 
         [JsonProperty(PropertyName = "directoryId")]
-        internal String DirectoryId
+        public String DirectoryId
         {
             get { return directoryId; }
             set { directoryId = value; }
         }
         [JsonProperty(PropertyName = "name")]
-        internal String Name
+        public String Name
         {
             get { return name; }
             set { name = value; }
         }
         [JsonProperty(PropertyName = "created")]
-        internal DateTime Created
+        public DateTime Created
         {
             get { return created; }
             set { created = value; }
         }
         [JsonProperty(PropertyName = "subDirectories")]
-        internal ICollection<DirectoryResponse> SubDirectories
+        public ICollection<DirectoryResponse> SubDirectories
         {
             get { return subDirectories; }
             set { subDirectories = value; }
diff --git a/SendsafelyAPI/Objects/GetOrganizationPakagesResponse.cs b/SendsafelyAPI/Objects/GetOrganizationPakagesResponse.cs
@@ -5,7 +5,7 @@
 
 namespace SendSafely.Objects
 {
-    class GetOrganizationPakagesResponse : StandardResponse
+    class GetOrganizationPakagesResponse : PaginationResponse
     {
 
         List<PackageDTO> packages;
@@ -18,13 +18,12 @@ public List<PackageDTO> Packages
             set { packages = value; }
         }
 
+        [Obsolete("capped is deprecated, please use Pagination property instead)",false)]
         [JsonProperty(PropertyName = "capped")]
         public bool Capped
         {
             get { return capped; }
             set { capped = value; }
         }
-
-
     }
 }
diff --git a/SendsafelyAPI/Objects/GetPackagesResponse.cs b/SendsafelyAPI/Objects/GetPackagesResponse.cs
@@ -6,18 +6,11 @@
 namespace SendSafely.Objects
 {
     [JsonObject(MemberSerialization.OptIn)]
-    class GetPackagesResponse
+    class GetPackagesResponse : PaginationResponse
     {
-        private APIResponse _response;
+
         private List<PackageDTO> _packages;
 
-        [JsonProperty(PropertyName = "response")]
-        internal APIResponse Response
-        {
-            get { return _response; }
-            set { _response = value; }
-        }
-
         [JsonProperty(PropertyName = "packages")]
         public List<PackageDTO> Packages
         {
diff --git a/SendsafelyAPI/Objects/Keypair.cs b/SendsafelyAPI/Objects/Keypair.cs
@@ -4,7 +4,7 @@
 
 namespace SendSafely.Objects
 {
-    class Keypair
+    public class Keypair
     {
         public String PrivateKey { get; set; }
         public String PublicKey { get; set; }
diff --git a/SendsafelyAPI/Objects/NotifyPackageRecipientsRequest.cs b/SendsafelyAPI/Objects/NotifyPackageRecipientsRequest.cs
@@ -0,0 +1,16 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Text;
+using Newtonsoft.Json;
+
+namespace SendSafely.Objects
+{
+    [JsonObject(MemberSerialization.OptIn)]
+    class NotifyPackageRecipientsRequest
+    {
+        private String _keycode;
+
+        [JsonProperty(PropertyName = "keycode")]
+        public String Keycode { get; set; }      
+    }
+}
diff --git a/SendsafelyAPI/Objects/PaginationResponse.cs b/SendsafelyAPI/Objects/PaginationResponse.cs
@@ -0,0 +1,20 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Text;
+using Newtonsoft.Json;
+
+namespace SendSafely.Objects
+{
+    class PaginationResponse : StandardResponse
+    {
+
+        private Dictionary<String, String> _pagination;
+
+        [JsonProperty(PropertyName = "pagination")]
+        internal Dictionary<String, String> Pagination
+        {
+            get { return _pagination; }
+            set { _pagination = value; }
+        }
+    }
+}
diff --git a/SendsafelyAPI/Objects/ProgressStream.cs b/SendsafelyAPI/Objects/ProgressStream.cs
@@ -25,7 +25,7 @@ public ProgressStream(Stream inner, ISendSafelyProgress progress, String prefix,
             this._inner = inner;
             this._progress = progress;
             this._prefix = prefix;
-            this._fileSize = size;
+            this._fileSize = size < 1024 ? size * 1024 : size; // multiple file size by 1024 if fileSize is less than 1024 bytes.
             this._readSoFar = 0;
             this._offset = offset;
             _lastProgressCallback = DateTime.Now.Ticks - UPDATE_FREQUENCY; // Make sure we trigger it the first time.
diff --git a/SendsafelyAPI/PaginatedList.cs b/SendsafelyAPI/PaginatedList.cs
@@ -0,0 +1,46 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Text;
+using Newtonsoft.Json;
+
+namespace SendSafely
+{
+    [JsonObject(MemberSerialization.OptIn)]
+    public class PaginatedList<T> : List<T>
+    {
+        private int _rowIndex = 0;
+        private int _rowsReturned;
+        private int _nextRowIndex;
+        private bool _rowsCapped;
+
+        [JsonProperty(PropertyName = "rowIndex")]
+        public int RowIndex
+        {
+            get { return _rowIndex; }
+            set { _rowIndex = value; }
+        }
+
+        [JsonProperty(PropertyName = "rowsReturned")]
+        public int RowsReturned
+        {
+            get { return _rowsReturned; }
+            set { _rowsReturned = value; }
+        }
+
+        [JsonProperty(PropertyName = "nextRowIndex")]
+        public int NextRowIndex
+        {
+            get { return _nextRowIndex; }
+            set { _nextRowIndex = value; }
+        }
+
+        [JsonProperty(PropertyName = "rowsCapped")]
+        public bool RowsCapped
+        {
+            get { return _rowsCapped; }
+            set { _rowsCapped = value; }
+        }
+    }
+
+    
+}
diff --git a/SendsafelyAPI/Properties/AssemblyInfo.cs b/SendsafelyAPI/Properties/AssemblyInfo.cs
@@ -32,7 +32,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.6")]
-[assembly: AssemblyFileVersion("3.0.6")]
+[assembly: AssemblyVersion("3.0.7")]
+[assembly: AssemblyFileVersion("3.0.7")]
 
 [assembly: System.Runtime.CompilerServices.InternalsVisibleTo("APITests")]
diff --git a/SendsafelyAPI/SendsafelyAPI.csproj b/SendsafelyAPI/SendsafelyAPI.csproj
diff --git a/SendsafelyAPI/Utilities/CryptUtility.cs b/SendsafelyAPI/Utilities/CryptUtility.cs
diff --git a/SendsafelyAPI/Utilities/PackageUtility.cs b/SendsafelyAPI/Utilities/PackageUtility.cs
diff --git a/SendsafelyAPI/Utilities/ParseLinksUtility.cs b/SendsafelyAPI/Utilities/ParseLinksUtility.cs

Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,7 @@ private String generateUserAgent()`
`253`	`253`
`254`	`254`	`private String CreateSignature(String privateKey, String apiKey, String uri, String dateStr, String requestData)`
`255`	`255`	`{`
`256`		`- String content = apiKey + uri + dateStr + requestData;`
	`256`	`+ String content = apiKey + uri.Split('?')[0] + dateStr + requestData;`
`257`	`257`	`Logger.Log("-" + content + "-");`
`258`	`258`	`CryptUtility cu = new CryptUtility();`
`259`	`259`	`return cu.createSignature(privateKey, content);`
Original file line number	Diff line number	Diff line change
`@@ -15,25 +15,25 @@ public class DirectoryResponse`
`15`	`15`	`private ICollection<DirectoryResponse> subDirectories = new Collection<DirectoryResponse>();`
`16`	`16`
`17`	`17`	`[JsonProperty(PropertyName = "directoryId")]`
`18`		`- internal String DirectoryId`
	`18`	`+ public String DirectoryId`
`19`	`19`	`{`
`20`	`20`	`get { return directoryId; }`
`21`	`21`	`set { directoryId = value; }`
`22`	`22`	`}`
`23`	`23`	`[JsonProperty(PropertyName = "name")]`
`24`		`- internal String Name`
	`24`	`+ public String Name`
`25`	`25`	`{`
`26`	`26`	`get { return name; }`
`27`	`27`	`set { name = value; }`
`28`	`28`	`}`
`29`	`29`	`[JsonProperty(PropertyName = "created")]`
`30`		`- internal DateTime Created`
	`30`	`+ public DateTime Created`
`31`	`31`	`{`
`32`	`32`	`get { return created; }`
`33`	`33`	`set { created = value; }`
`34`	`34`	`}`
`35`	`35`	`[JsonProperty(PropertyName = "subDirectories")]`
`36`		`- internal ICollection<DirectoryResponse> SubDirectories`
	`36`	`+ public ICollection<DirectoryResponse> SubDirectories`
`37`	`37`	`{`
`38`	`38`	`get { return subDirectories; }`
`39`	`39`	`set { subDirectories = value; }`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`namespace SendSafely.Objects`
`7`	`7`	`{`
`8`		`- class GetOrganizationPakagesResponse : StandardResponse`
	`8`	`+ class GetOrganizationPakagesResponse : PaginationResponse`
`9`	`9`	`{`
`10`	`10`
`11`	`11`	`List<PackageDTO> packages;`
`@@ -18,13 +18,12 @@ public List<PackageDTO> Packages`
`18`	`18`	`set { packages = value; }`
`19`	`19`	`}`
`20`	`20`
	`21`	`+ [Obsolete("capped is deprecated, please use Pagination property instead)",false)]`
`21`	`22`	`[JsonProperty(PropertyName = "capped")]`
`22`	`23`	`public bool Capped`
`23`	`24`	`{`
`24`	`25`	`get { return capped; }`
`25`	`26`	`set { capped = value; }`
`26`	`27`	`}`
`27`		`-`
`28`		`-`
`29`	`28`	`}`
`30`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace SendSafely.Objects`
`6`	`6`	`{`
`7`		`- class Keypair`
	`7`	`+ public class Keypair`
`8`	`8`	`{`
`9`	`9`	`public String PrivateKey { get; set; }`
`10`	`10`	`public String PublicKey { get; set; }`