rebasing with master

plivo · Jan 11, 2024 · e886f1f · e886f1f
1 parent 2daa85c
commit e886f1f
Show file tree

Hide file tree

Showing 17 changed files with 32 additions and 29 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## [5.42.0](https://github.com/plivo/plivo-dotnet/tree/v5.42.0) (2024-01-11)
+**Feature - Fixes for api-messaging list API meta data**
+- Fixed Meta data response for powerpack, media, all numbers, shortcode and tollfree list
+
 ## [5.42.1](https://github.com/plivo/plivo-dotnet/tree/v5.42.1) (2023-12-19)
 **Feature - added param in speak api**
 - Added new field `type` for POST Speak APIs

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,7 +2,7 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <PackageReference Include="Nerdbank.GitVersioning">
-      <Version>2.2.33</Version>
+      <Version>3.4.244</Version>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>

diff --git a/Plivo.sln b/Plivo.sln
@@ -4,8 +4,6 @@ VisualStudioVersion = 15.0.28307.106
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Plivo", "src\Plivo\Plivo.csproj", "{EF3352B6-54D2-4731-95B5-D07D01982713}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Plivo.NetCore.Test", "tests_netcore\Plivo.NetCore.Test\Plivo.NetCore.Test.csproj", "{72465D60-EA64-47A8-8F6E-E44E2C99BD60}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

diff --git a/src/Plivo/Client/SystemHttpClient.cs b/src/Plivo/Client/SystemHttpClient.cs
@@ -112,28 +112,28 @@ public SystemHttpClient(BasicAuth basicAuth, Dictionary<string, string> proxySer
                 );
             _client.DefaultRequestHeaders.Authorization = authHeader;
             _client.DefaultRequestHeaders.Add("User-Agent", "plivo-dotnet/" + ThisAssembly.AssemblyFileVersion);
-            var baseServerUri = string.IsNullOrEmpty(baseUri) ? "https://api.plivo.com/" + Version.ApiVersion  : baseUri;
+            var baseServerUri = string.IsNullOrEmpty(baseUri) ? "https://apidev.sms.plivodev.com/" + Version.ApiVersion  : baseUri;
             _client.BaseAddress = new Uri(baseServerUri + "/");
 
             _voiceBaseUriClient = new System.Net.Http.HttpClient(httpClientHandler);
             _voiceBaseUriClient.Timeout = TimeSpan.FromSeconds(5);
             _voiceBaseUriClient.DefaultRequestHeaders.Authorization = authHeader;
             _voiceBaseUriClient.DefaultRequestHeaders.Add("User-Agent", "plivo-dotnet/" + ThisAssembly.AssemblyFileVersion);
-            var voiceBaseServerUri = string.IsNullOrEmpty(baseUri) ? "https://api.plivo.com/" + Version.ApiVersion  : baseUri;
+            var voiceBaseServerUri = string.IsNullOrEmpty(baseUri) ? "https://apidev.sms.plivodev.com/" + Version.ApiVersion  : baseUri;
             _voiceBaseUriClient.BaseAddress = new Uri(voiceBaseServerUri + "/");
 
             _voiceFallback1Client = new System.Net.Http.HttpClient(httpClientHandler);
             _voiceFallback1Client.Timeout = TimeSpan.FromSeconds(5);
             _voiceFallback1Client.DefaultRequestHeaders.Authorization = authHeader;
             _voiceFallback1Client.DefaultRequestHeaders.Add("User-Agent", "plivo-dotnet/" + ThisAssembly.AssemblyFileVersion);
-            var voiceFallback1Uri = string.IsNullOrEmpty(baseUri) ? "https://api.plivo.com/" + Version.ApiVersion  : baseUri;
+            var voiceFallback1Uri = string.IsNullOrEmpty(baseUri) ? "https://apidev.sms.plivodev.com/" + Version.ApiVersion  : baseUri;
             _voiceFallback1Client.BaseAddress = new Uri(voiceFallback1Uri + "/");
 
             _voiceFallback2Client = new System.Net.Http.HttpClient(httpClientHandler);
             _voiceFallback2Client.Timeout = TimeSpan.FromSeconds(5);
             _voiceFallback2Client.DefaultRequestHeaders.Authorization = authHeader;
             _voiceFallback2Client.DefaultRequestHeaders.Add("User-Agent", "plivo-dotnet/" + ThisAssembly.AssemblyFileVersion);
-            var voiceFallback2Uri = string.IsNullOrEmpty(baseUri) ? "https://api.plivo.com/" + Version.ApiVersion  : baseUri;
+            var voiceFallback2Uri = string.IsNullOrEmpty(baseUri) ? "https://apidev.sms.plivodev.com/" + Version.ApiVersion  : baseUri;
             _voiceFallback2Client.BaseAddress = new Uri(voiceFallback2Uri + "/");
 
             _callInsightsclient = new System.Net.Http.HttpClient(httpClientHandler);

diff --git a/src/Plivo/Plivo.nuspec b/src/Plivo/Plivo.nuspec
@@ -12,6 +12,7 @@
     <projectUrl>http://github.com/plivo/plivo-dotnet</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <releaseNotes>
+      * 5.43.0 Fixes for api-messaging list API meta data
       * 5.42.0 Added Params `vertical`, `campaign_alias` for GET and LIST Campaigns.
       * 5.41.1 Support Params `from_number` and `to_number` for LIST Message.
       * 5.41.0 Added New Params `error_code`, `error_reason` for GET and LIST Campaign.

diff --git a/tests/Plivo.Test/Mocks/addressGetResponse.json b/tests/Plivo.Test/Mocks/addressGetResponse.json
@@ -23,7 +23,7 @@
   "region": "PARIS",
   "salutation": "Mr",
   "subaccount": null,
-  "url": "https://api.plivo.com/v1/Account/MAXXXXXXXXXXXXXXXXXX/Verification/Address/20220771838737/",
+  "url": "https://apidev.sms.plivodev.com/v1/Account/MAXXXXXXXXXXXXXXXXXX/Verification/Address/20220771838737/",
   "validation_status": "accepted",
   "verification_status": "pending"
 }
diff --git a/tests/Plivo.Test/Mocks/addressListResponse.json b/tests/Plivo.Test/Mocks/addressListResponse.json
@@ -2,7 +2,7 @@
   "api_id": "af8b199a-0b58-11e8-b939-06755d68f0ca",
   "meta": {
     "limit": 1,
-    "next": "https://api.plivo.com/v1/Account/MAXXXXXXXXXXXXXXXXXX/Verification/Address/?limit=1&offset=1",
+    "next": "https://apidev.sms.plivodev.com/v1/Account/MAXXXXXXXXXXXXXXXXXX/Verification/Address/?limit=1&offset=1",
     "offset": 0,
     "previous": null,
     "total_count": 22
@@ -32,7 +32,7 @@
       "region": "PARIS",
       "salutation": "Mr",
       "subaccount": null,
-      "url": "https://api.plivo.com/v1/Account/MAXXXXXXXXXXXXXXXXXX/Verification/Address/20220771838737/",
+      "url": "https://apidev.sms.plivodev.com/v1/Account/MAXXXXXXXXXXXXXXXXXX/Verification/Address/20220771838737/",
       "validation_status": "accepted",
       "verification_status": "pending"
     }

diff --git a/tests/Plivo.Test/Mocks/identityGetResponse.json b/tests/Plivo.Test/Mocks/identityGetResponse.json
@@ -19,7 +19,7 @@
   "nationality": "FR",
   "salutation": "Mr",
   "subaccount": null,
-  "url": "https://api.plivo.com/v1/Account/MAXXXXXXXXXXXXXXXXXX/Verification/Identity/24856289978366/",
+  "url": "https://apidev.sms.plivodev.com/v1/Account/MAXXXXXXXXXXXXXXXXXX/Verification/Identity/24856289978366/",
   "validation_status": "pending",
   "verification_status": "pending"
 }
diff --git a/tests/Plivo.Test/Mocks/identityListResponse.json b/tests/Plivo.Test/Mocks/identityListResponse.json
@@ -2,7 +2,7 @@
   "api_id": "3c294e0c-0b5a-11e8-9ad8-064c8d7b2d26",
   "meta": {
     "limit": 1,
-    "next": "https://api.plivo.com/v1/Account/MAXXXXXXXXXXXXXXXXXX/Verification/Identity/?limit=1&offset=1",
+    "next": "https://apidev.sms.plivodev.com/v1/Account/MAXXXXXXXXXXXXXXXXXX/Verification/Identity/?limit=1&offset=1",
     "offset": 0,
     "previous": null,
     "total_count": 6
@@ -28,7 +28,7 @@
       "nationality": "FR",
       "salutation": "Mr",
       "subaccount": null,
-      "url": "https://api.plivo.com/v1/Account/MAXXXXXXXXXXXXXXXXXX/Verification/Identity/24856289978366/",
+      "url": "https://apidev.sms.plivodev.com/v1/Account/MAXXXXXXXXXXXXXXXXXX/Verification/Identity/24856289978366/",
       "validation_status": "pending",
       "verification_status": "pending"
     }

diff --git a/tests_netcore/Plivo.NetCore.Test/Mocks/addressGetResponse.json b/tests_netcore/Plivo.NetCore.Test/Mocks/addressGetResponse.json
@@ -23,7 +23,7 @@
   "region": "PARIS",
   "salutation": "Mr",
   "subaccount": null,
-  "url": "https://api.plivo.com/v1/Account/MAXXXXXXXXXXXXXXXXXX/Verification/Address/20220771838737/",
+  "url": "https://apidev.sms.plivodev.com/v1/Account/MAXXXXXXXXXXXXXXXXXX/Verification/Address/20220771838737/",
   "validation_status": "accepted",
   "verification_status": "pending"
 }
diff --git a/tests_netcore/Plivo.NetCore.Test/Mocks/addressGetResponseNew.json b/tests_netcore/Plivo.NetCore.Test/Mocks/addressGetResponseNew.json
@@ -23,7 +23,7 @@
   "region": "PARIS",
   "salutation": "Mr",
   "subaccount": "",
-  "url": "https://api.plivo.com/v1/Account/MAXXXXXXXXXXXXXXXXXX/Verification/Identity/20220771838737/",
+  "url": "https://apidev.sms.plivodev.com/v1/Account/MAXXXXXXXXXXXXXXXXXX/Verification/Identity/20220771838737/",
   "validation_status": "accepted",
   "verification_status": "pending"
 }
diff --git a/tests_netcore/Plivo.NetCore.Test/Mocks/addressListResponse.json b/tests_netcore/Plivo.NetCore.Test/Mocks/addressListResponse.json
@@ -2,7 +2,7 @@
   "api_id": "af8b199a-0b58-11e8-b939-06755d68f0ca",
   "meta": {
     "limit": 1,
-    "next": "https://api.plivo.com/v1/Account/MAXXXXXXXXXXXXXXXXXX/Verification/Address/?limit=1&offset=1",
+    "next": "https://apidev.sms.plivodev.com/v1/Account/MAXXXXXXXXXXXXXXXXXX/Verification/Address/?limit=1&offset=1",
     "offset": 0,
     "previous": null,
     "total_count": 22
@@ -32,7 +32,7 @@
       "region": "PARIS",
       "salutation": "Mr",
       "subaccount": null,
-      "url": "https://api.plivo.com/v1/Account/MAXXXXXXXXXXXXXXXXXX/Verification/Address/20220771838737/",
+      "url": "https://apidev.sms.plivodev.com/v1/Account/MAXXXXXXXXXXXXXXXXXX/Verification/Address/20220771838737/",
       "validation_status": "accepted",
       "verification_status": "pending"
     }

diff --git a/tests_netcore/Plivo.NetCore.Test/Mocks/addressListResponseNew.json b/tests_netcore/Plivo.NetCore.Test/Mocks/addressListResponseNew.json
@@ -2,7 +2,7 @@
   "meta": {
     "previous": null,
     "total_count": 4,
-    "next": "https://api.plivo.com/v1/Account/MAZJM2NGUZMDI1OGRLZW/Verification/Address/?offset=3",
+    "next": "https://apidev.sms.plivodev.com/v1/Account/MAZJM2NGUZMDI1OGRLZW/Verification/Address/?offset=3",
     "limit": 3,
     "offset": 0
   },
@@ -15,7 +15,7 @@
       "id": "33394390956933",
       "account": "MAZJM2NGUZMDI1OGRLZW",
       "subaccount": null,
-      "url": "https://api.plivo.com/v1/Account/MAZJM2NGUZMDI1OGRLZW/Verification/Download/Document/33394390956933/",
+      "url": "https://apidev.sms.plivodev.com/v1/Account/MAZJM2NGUZMDI1OGRLZW/Verification/Download/Document/33394390956933/",
       "address_proof_type": "address",
       "alias": null,
       "country_iso": "US",
@@ -45,7 +45,7 @@
       "account": "MAZJM2NGUZMDI1OGRLZW",
       "address_line1": "128",
       "subaccount": null,
-      "url": "https://api.plivo.com/v1/Account/MAZJM2NGUZMDI1OGRLZW/Verification/Download/Document/19246032249004/",
+      "url": "https://apidev.sms.plivodev.com/v1/Account/MAZJM2NGUZMDI1OGRLZW/Verification/Download/Document/19246032249004/",
       "region": "GRAD ZAGREB",
       "address_proof_type": "address",
       "alias": "testone",
@@ -60,7 +60,7 @@
       "id": "26421064527697",
       "account": "MAZJM2NGUZMDI1OGRLZW",
       "subaccount": null,
-      "url": "https://api.plivo.com/v1/Account/MAZJM2NGUZMDI1OGRLZW/Verification/Download/Document/26421064527697/",
+      "url": "https://apidev.sms.plivodev.com/v1/Account/MAZJM2NGUZMDI1OGRLZW/Verification/Download/Document/26421064527697/",
       "address_proof_type": "address",
       "alias": null,
       "country_iso": "TR",

diff --git a/tests_netcore/Plivo.NetCore.Test/Mocks/identityGetResponse.json b/tests_netcore/Plivo.NetCore.Test/Mocks/identityGetResponse.json
@@ -19,7 +19,7 @@
   "nationality": "FR",
   "salutation": "Mr",
   "subaccount": null,
-  "url": "https://api.plivo.com/v1/Account/MAXXXXXXXXXXXXXXXXXX/Verification/Identity/24856289978366/",
+  "url": "https://apidev.sms.plivodev.com/v1/Account/MAXXXXXXXXXXXXXXXXXX/Verification/Identity/24856289978366/",
   "validation_status": "pending",
   "verification_status": "pending"
 }
diff --git a/tests_netcore/Plivo.NetCore.Test/Mocks/identityGetResponseNew.json b/tests_netcore/Plivo.NetCore.Test/Mocks/identityGetResponseNew.json
@@ -23,7 +23,7 @@
   "region": "PARIS",
   "salutation": "Mr",
   "subaccount": "",
-  "url": "https://api.plivo.com/v1/Account/MAXXXXXXXXXXXXXXXXXX/Verification/Identity/20220771838737/",
+  "url": "https://apidev.sms.plivodev.com/v1/Account/MAXXXXXXXXXXXXXXXXXX/Verification/Identity/20220771838737/",
   "validation_status": "accepted",
   "verification_status": "pending"
 }
diff --git a/tests_netcore/Plivo.NetCore.Test/Mocks/identityListResponse.json b/tests_netcore/Plivo.NetCore.Test/Mocks/identityListResponse.json
@@ -2,7 +2,7 @@
   "api_id": "3c294e0c-0b5a-11e8-9ad8-064c8d7b2d26",
   "meta": {
     "limit": 1,
-    "next": "https://api.plivo.com/v1/Account/MAXXXXXXXXXXXXXXXXXX/Verification/Identity/?limit=1&offset=1",
+    "next": "https://apidev.sms.plivodev.com/v1/Account/MAXXXXXXXXXXXXXXXXXX/Verification/Identity/?limit=1&offset=1",
     "offset": 0,
     "previous": null,
     "total_count": 6
@@ -28,7 +28,7 @@
       "nationality": "FR",
       "salutation": "Mr",
       "subaccount": null,
-      "url": "https://api.plivo.com/v1/Account/MAXXXXXXXXXXXXXXXXXX/Verification/Identity/24856289978366/",
+      "url": "https://apidev.sms.plivodev.com/v1/Account/MAXXXXXXXXXXXXXXXXXX/Verification/Identity/24856289978366/",
       "validation_status": "pending",
       "verification_status": "pending"
     }

diff --git a/tests_netcore/Plivo.NetCore.Test/Mocks/identityListResponseNew.json b/tests_netcore/Plivo.NetCore.Test/Mocks/identityListResponseNew.json
@@ -2,7 +2,7 @@
   "meta": {
     "previous": null,
     "total_count": 4,
-    "next": "https://api.plivo.com/v1/Account/MAZJM2NGUZMDI1OGRLZW/Verification/Address/?offset=3",
+    "next": "https://apidev.sms.plivodev.com/v1/Account/MAZJM2NGUZMDI1OGRLZW/Verification/Address/?offset=3",
     "limit": 3,
     "offset": 0
   },
@@ -15,7 +15,7 @@
       "id": "33394390956933",
       "account": "MAZJM2NGUZMDI1OGRLZW",
       "subaccount": null,
-      "url": "https://api.plivo.com/v1/Account/MAZJM2NGUZMDI1OGRLZW/Verification/Download/Document/33394390956933/",
+      "url": "https://apidev.sms.plivodev.com/v1/Account/MAZJM2NGUZMDI1OGRLZW/Verification/Download/Document/33394390956933/",
       "address_proof_type": "address",
       "alias": null,
       "country_iso": "US",
@@ -45,7 +45,7 @@
       "account": "MAZJM2NGUZMDI1OGRLZW",
       "address_line1": "128",
       "subaccount": null,
-      "url": "https://api.plivo.com/v1/Account/MAZJM2NGUZMDI1OGRLZW/Verification/Download/Document/19246032249004/",
+      "url": "https://apidev.sms.plivodev.com/v1/Account/MAZJM2NGUZMDI1OGRLZW/Verification/Download/Document/19246032249004/",
       "region": "GRAD ZAGREB",
       "address_proof_type": "identity",
       "alias": "testone",
@@ -60,7 +60,7 @@
       "id": "26421064527697",
       "account": "MAZJM2NGUZMDI1OGRLZW",
       "subaccount": null,
-      "url": "https://api.plivo.com/v1/Account/MAZJM2NGUZMDI1OGRLZW/Verification/Download/Document/26421064527697/",
+      "url": "https://apidev.sms.plivodev.com/v1/Account/MAZJM2NGUZMDI1OGRLZW/Verification/Download/Document/26421064527697/",
       "address_proof_type": "identity",
       "alias": null,
       "country_iso": "TR",