Merge pull request #2 from GovTechSG/development

Development

Author: punjabisingh

ApiUtilLib/ApiAuthorization.cs

@@ -220,23 +220,21 @@ public static long NewTimestamp()
             return dto.ToUnixTimeMilliseconds();
         }
 
-        public static long NewNonce()
+        public static string NewNonce()
         {
             long nonce = 0;
+            byte[] data = null;
             using (RNGCryptoServiceProvider rng = new RNGCryptoServiceProvider())
             {
                 // Buffer storage.
-                byte[] data = new byte[8];
+                data = new byte[8];
 
                 // Fill buffer.
                 rng.GetBytes(data);
-
-                // Convert to int 64.
-                nonce = BitConverter.ToInt64(data, 0);
             }
 
             Logger.LogEnterExit(LoggerBase.Args(nonce.ToString()));
-            return nonce;
+            return System.Convert.ToBase64String(data);
         }
 
 		public static String Token(

ApiUtilLib/ApiList.cs

@@ -25,11 +25,22 @@ public string ToString(string delimiter = "&", bool sort = true, bool quote = fa
             if (sort)
             {
                 // sort by key, than by value
-				var sortedList = this.OrderBy(k => k.Key).ThenBy(v => v.Value);
+				var sortedList = this.OrderBy(k => k.Key,StringComparer.Ordinal).ThenBy(v => v.Value,StringComparer.Ordinal); //Fixed issue to sort by capital letter.
+
 
 				foreach (var item in sortedList)
 				{
-					list.Add(string.Format(format, item.Key, item.Value));
+                    format = "{0}={1}";
+                    if (quote) format = "{0}=\"{1}\"";   
+
+                    if (item.Value == null && !quote)
+                    {
+                        list.Add(string.Format("{0}", item.Key, item.Value));
+                    }
+                    else
+                    {
+                        list.Add(string.Format(format, item.Key, item.Value));
+                    }
 				}
 			}
             else

CHANGELOG.md

@@ -3,3 +3,7 @@
 ## Added 
 ### V1.0-SNAPSHOT
 + 2017-10-29 - Initial release.
+### V1.1-SNAPSHOT
++ 2018-09-10 - Bug fixes to return basestring nonce value as basestring64 from integer value.
+### V1.2-SNAPSHOT
++ 2018-09-13 - Bug fixes to sort list by ordinal comparison.