Synchronous Request Endpoint Updates (#100)

* version 3.1.0 Signed-off-by: elvis ayiemba <[email protected]> * Documentation urls modified Signed-off-by: elvis ayiemba <[email protected]> * Update reversal.md * Update accountbalance.md * Update b2b.md * Update b2c.md * Update callbacks.md * Update callbacks.md * Update callbacks.md * Update and rename commonpitfalls.md to tips.md * Update tips.md * Update tips.md * Update toc.yml * Update index.md * Update README.md * Update README.md * Update README.md * Updated Documentation, resolved broken links Signed-off-by: elvis ayiemba <[email protected]> * updated documentation Signed-off-by: elvis ayiemba <[email protected]> * edited csproj Signed-off-by: elvis ayiemba <[email protected]> * Documentation * Documentation * Refactoring MpesaClient * Adding test project * version 3.1.3 * adding test project * Update MpesaClient * minor cleanup * updates * Improved Error Handling and Improved Asyn -> Sync conversion * Adding Cancellation Tokens * Update IMpesaClient.cs
ayiemba · Mar 17, 2019 · e5cc98c · e5cc98c
1 parent 3ea761a
commit e5cc98c
Show file tree

Hide file tree

Showing 8 changed files with 211 additions and 147 deletions.
diff --git a/MpesaLibrary.sln b/MpesaLibrary.sln
@@ -14,7 +14,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{9372EA7C-3B1
 		__JSONSchema = 
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MpesaLib.Tests", "MpesaLib.Tests\MpesaLib.Tests.csproj", "{C9FBF83B-0C56-4071-B4F1-B835AE86A026}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MpesaLib.Tests", "src\MpesaLib.Tests\MpesaLib.Tests.csproj", "{D2EFFCF9-1F0B-4A14-AD20-ADDE06A2C885}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -26,17 +26,17 @@ Global
 		{C780CBA5-DDED-4311-B829-16FDF97F163E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C780CBA5-DDED-4311-B829-16FDF97F163E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C780CBA5-DDED-4311-B829-16FDF97F163E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C9FBF83B-0C56-4071-B4F1-B835AE86A026}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C9FBF83B-0C56-4071-B4F1-B835AE86A026}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C9FBF83B-0C56-4071-B4F1-B835AE86A026}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C9FBF83B-0C56-4071-B4F1-B835AE86A026}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D2EFFCF9-1F0B-4A14-AD20-ADDE06A2C885}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D2EFFCF9-1F0B-4A14-AD20-ADDE06A2C885}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D2EFFCF9-1F0B-4A14-AD20-ADDE06A2C885}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D2EFFCF9-1F0B-4A14-AD20-ADDE06A2C885}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{C780CBA5-DDED-4311-B829-16FDF97F163E} = {9372EA7C-3B1B-4E16-A108-6E1F0B7C23BD}
-		{C9FBF83B-0C56-4071-B4F1-B835AE86A026} = {9372EA7C-3B1B-4E16-A108-6E1F0B7C23BD}
+		{D2EFFCF9-1F0B-4A14-AD20-ADDE06A2C885} = {9372EA7C-3B1B-4E16-A108-6E1F0B7C23BD}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {AF2D71E1-E089-4701-96B8-A55DE41A7751}

diff --git a/MpesaLib.Tests/LipaNaMpesaOnlineTest.cs → src/MpesaLib.Tests/LipaNaMpesaOnlineTest.cs b/MpesaLib.Tests/LipaNaMpesaOnlineTest.cs → src/MpesaLib.Tests/LipaNaMpesaOnlineTest.cs
diff --git a/MpesaLib.Tests/MpesaLib.Tests.csproj → src/MpesaLib.Tests/MpesaLib.Tests.csproj b/MpesaLib.Tests/MpesaLib.Tests.csproj → src/MpesaLib.Tests/MpesaLib.Tests.csproj
@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\src\MpesaLib\MpesaLib.csproj" />
+    <ProjectReference Include="..\MpesaLib\MpesaLib.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/MpesaLib.Tests/TestData.cs → src/MpesaLib.Tests/TestData.cs b/MpesaLib.Tests/TestData.cs → src/MpesaLib.Tests/TestData.cs
diff --git a/src/MpesaLib/Helpers/Exceptions/MpesaApiException.cs b/src/MpesaLib/Helpers/Exceptions/MpesaApiException.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace MpesaLib.Helpers.Exceptions
+{
+    /// <summary>
+    /// Mpesa Api Exceptions Helper class
+    /// </summary>
+    public class MpesaApiException : Exception
+    {
+        /// <summary>
+        /// Http Status code
+        /// </summary>
+        public int StatusCode { get; set; }
+
+        /// <summary>
+        /// Content from  response body
+        /// </summary>
+        public string Content { get; set; }
+    }
+}
diff --git a/src/MpesaLib/IMpesaClient.cs b/src/MpesaLib/IMpesaClient.cs
diff --git a/src/MpesaLib/MpesaClient.cs b/src/MpesaLib/MpesaClient.cs
diff --git a/src/MpesaLib/TokenDto.cs → src/MpesaLib/Responses/TokenResponse.cs b/src/MpesaLib/TokenDto.cs → src/MpesaLib/Responses/TokenResponse.cs
@@ -4,23 +4,23 @@
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace MpesaLib
+namespace MpesaLib.Responses
 {
     /// <summary>
     /// Accesstoken data transfer object
     /// </summary>
-    public class TokenDto
+    public class TokenResponse
     {
         /// <summary>
         /// Access token to access other APIs
         /// </summary>
         [JsonProperty("access_token")]
-        public string access_token { get; set; }
+        public string AccessToken { get; set; }
 
         /// <summary>
         /// time token expires
         /// </summary>
         [JsonProperty("expires_in")]
-        public string expires_in { get; set; }
+        public string ExpiresIn { get; set; }
     }
 }