Merge pull request #136 from docusign/feature/replace-apiclient-with-docusignclient

InbarGazit · web-flow · commit fb0f2631c880 · 2023-08-17T09:52:11.000-07:00
Replace ApiClient with DocuSignClient
diff --git a/launcher-csharp.Tests/TestConfig/ITestConfig.cs b/launcher-csharp.Tests/TestConfig/ITestConfig.cs
@@ -8,7 +8,7 @@ public interface ITestConfig
 
         public string Host { get; set; }
 
-        public ApiClient ApiClient { get; set; }
+        public DocuSignClient ApiClient { get; set; }
 
         public string AccountId { get; set; }
 
diff --git a/launcher-csharp/Admin/Controllers/CreateCLMESignUser.cs b/launcher-csharp/Admin/Controllers/CreateCLMESignUser.cs
@@ -41,7 +41,7 @@ protected override void InitializeInternal()
             var accountId = this.RequestItemsService.Session.AccountId;
 
             //ds-snippet-start:Admin2Step2
-            var apiClient = new ApiClient(basePath);
+            var apiClient = new DocuSignClient(basePath);
             apiClient.Configuration.DefaultHeader.Add("Authorization", "Bearer " + accessToken);
             //ds-snippet-end:Admin2Step2
 
diff --git a/launcher-csharp/Admin/Examples/AuditUsers.cs b/launcher-csharp/Admin/Examples/AuditUsers.cs
@@ -21,7 +21,7 @@ public class AuditUsers
         public static IEnumerable<UserDrilldownResponse> GetRecentlyModifiedUsersData(string basePath, string accessToken, Guid? accountId, Guid? orgId)
         {
             //ds-snippet-start:Admin5Step2
-            var apiClient = new ApiClient(basePath);
+            var apiClient = new DocuSignClient(basePath);
             apiClient.Configuration.DefaultHeader.Add("Authorization", "Bearer " + accessToken);
             //ds-snippet-end:Admin5Step2
 
diff --git a/launcher-csharp/Admin/Examples/BulkExportUserData.cs b/launcher-csharp/Admin/Examples/BulkExportUserData.cs
@@ -29,7 +29,7 @@ public static OrganizationExportResponse CreateBulkExportRequest(
             string filePath)
         {
             //ds-snippet-start:Admin3Step2
-            var apiClient = new ApiClient(basePath);
+            var apiClient = new DocuSignClient(basePath);
             apiClient.Configuration.DefaultHeader.Add("Authorization", "Bearer " + accessToken);
             //ds-snippet-end:Admin3Step2
 
diff --git a/launcher-csharp/Admin/Examples/CreateCLMESignUser.cs b/launcher-csharp/Admin/Examples/CreateCLMESignUser.cs
@@ -31,7 +31,7 @@ public class CreateCLMESignUser
         /// <returns>The AddUserResponse object coming back from the API</returns>
         public static AddUserResponse Create(string userName, string firstName, string lastName, string email, string clmPermissionProfileId, string eSignPermissionProfileId, Guid? dsGroupId, Guid? clmProductId, Guid? eSignProductId, string basePath, string accessToken, Guid? accountId, Guid? orgId)
         {
-            var apiClient = new ApiClient(basePath);
+            var apiClient = new DocuSignClient(basePath);
             apiClient.Configuration.DefaultHeader.Add("Authorization", "Bearer " + accessToken);
             UsersApi usersApi = new UsersApi(apiClient);
             //ds-snippet-start:Admin2Step5
diff --git a/launcher-csharp/Admin/Examples/CreateUser.cs b/launcher-csharp/Admin/Examples/CreateUser.cs
@@ -42,7 +42,7 @@ public static NewUserResponse CreateNewUser(
         {
             // Construct your API headers
             //ds-snippet-start:Admin1Step2
-            var apiClient = new DocuSign.Admin.Client.ApiClient(basePath);
+            var apiClient = new DocuSign.Admin.Client.DocuSignClient(basePath);
             apiClient.Configuration.DefaultHeader.Add("Authorization", "Bearer " + accessToken);
             //ds-snippet-end:Admin1Step2
 
diff --git a/launcher-csharp/Admin/Examples/DeleteUserProductPermissionProfileById.cs b/launcher-csharp/Admin/Examples/DeleteUserProductPermissionProfileById.cs
@@ -31,7 +31,7 @@ public static RemoveUserProductsResponse DeleteUserProductPermissionProfile(
             Guid? productId)
         {
             //ds-snippet-start:Admin9Step2
-            var apiClient = new ApiClient(basePath);
+            var apiClient = new DocuSignClient(basePath);
             apiClient.Configuration.DefaultHeader.Add("Authorization", "Bearer " + accessToken);
             //ds-snippet-end:Admin9Step2
 
@@ -68,7 +68,7 @@ public static UserProductPermissionProfilesResponse GetPermissionProfilesByEmail
             Guid accountId,
             string emailAddress)
         {
-            var apiClient = new ApiClient(basePath);
+            var apiClient = new DocuSignClient(basePath);
             apiClient.Configuration.DefaultHeader.Add("Authorization", "Bearer " + accessToken);
 
             //ds-snippet-start:Admin9Step3
diff --git a/launcher-csharp/Admin/Examples/ImportUser.cs b/launcher-csharp/Admin/Examples/ImportUser.cs
@@ -24,7 +24,7 @@ public class ImportUser
         public static OrganizationImportResponse CreateBulkImportRequest(string accessToken, string basePath, string accountId, Guid? organizationId, string csvFilePath)
         {
             //ds-snippet-start:Admin4Step2
-            var apiClient = new ApiClient(basePath);
+            var apiClient = new DocuSignClient(basePath);
             apiClient.Configuration.DefaultHeader.Add("Authorization", "Bearer " + accessToken);
             //ds-snippet-end:Admin4Step2
 
@@ -51,7 +51,7 @@ public static OrganizationImportResponse CreateBulkImportRequest(string accessTo
         public static OrganizationImportResponse CheckkStatus(string accessToken, string basePath, Guid? organizationId, Guid? importId)
         {
             //ds-snippet-start:Admin4Step4
-            var apiClient = new ApiClient(basePath);
+            var apiClient = new DocuSignClient(basePath);
             apiClient.Configuration.DefaultHeader.Add("Authorization", "Bearer " + accessToken);
             var bulkImportsApi = new BulkImportsApi(apiClient);
             return bulkImportsApi.GetBulkUserImportRequest(organizationId, importId);
diff --git a/launcher-csharp/Admin/Examples/RetrieveDocuSignProfileByEmailAddress.cs b/launcher-csharp/Admin/Examples/RetrieveDocuSignProfileByEmailAddress.cs
@@ -26,7 +26,7 @@ public static UsersDrilldownResponse GetDocuSignProfileByEmailAdress(
             string email)
         {
             //ds-snippet-start:Admin6Step2
-            var apiClient = new ApiClient(basePath);
+            var apiClient = new DocuSignClient(basePath);
             apiClient.Configuration.DefaultHeader.Add("Authorization", "Bearer " + accessToken);
             //ds-snippet-end:Admin6Step2
 
diff --git a/launcher-csharp/Admin/Examples/RetrieveDocuSignProfileByUserId.cs b/launcher-csharp/Admin/Examples/RetrieveDocuSignProfileByUserId.cs
@@ -26,7 +26,7 @@ public static UsersDrilldownResponse GetDocuSignProfileByUserId(
             Guid userId)
         {
             //ds-snippet-start:Admin7Step2
-            var apiClient = new ApiClient(basePath);
+            var apiClient = new DocuSignClient(basePath);
             apiClient.Configuration.DefaultHeader.Add("Authorization", "Bearer " + accessToken);
             //ds-snippet-end:Admin7Step2
 
diff --git a/launcher-csharp/Admin/Examples/UpdateUserProductPermissionProfileByEmail.cs b/launcher-csharp/Admin/Examples/UpdateUserProductPermissionProfileByEmail.cs
@@ -33,7 +33,7 @@ public static UserProductPermissionProfilesResponse UpdateUserProductPermissionP
             string permissionProfileId)
         {
             //ds-snippet-start:Admin8Step2
-            var apiClient = new ApiClient(basePath);
+            var apiClient = new DocuSignClient(basePath);
             apiClient.Configuration.DefaultHeader.Add("Authorization", "Bearer " + accessToken);
             //ds-snippet-end:Admin8Step2
             var productPermissionProfilesApi = new ProductPermissionProfilesApi(apiClient);
@@ -75,7 +75,7 @@ public static ProductPermissionProfilesResponse GetPermissionProfiles(
             Guid? orgId,
             Guid accountId)
         {
-            var apiClient = new ApiClient(basePath);
+            var apiClient = new DocuSignClient(basePath);
             apiClient.Configuration.DefaultHeader.Add("Authorization", "Bearer " + accessToken);
 
             var productPermissionProfileApi = new ProductPermissionProfilesApi(apiClient);
diff --git a/launcher-csharp/Common/RequestItemsService.cs b/launcher-csharp/Common/RequestItemsService.cs
@@ -80,7 +80,7 @@ public Guid? OrganizationId
             {
                 if (organizationId == null)
                 {
-                    var apiClient = new DocuSign.Admin.Client.ApiClient(this.Session.AdminApiBasePath);
+                    var apiClient = new DocuSign.Admin.Client.DocuSignClient(this.Session.AdminApiBasePath);
                     apiClient.Configuration.DefaultHeader.Add("Authorization", "Bearer " + this.User.AccessToken);
                     var accountApi = new DocuSign.Admin.Api.AccountsApi(apiClient);
                     var org = accountApi.GetOrganizations().Organizations.FirstOrDefault();
diff --git a/launcher-csharp/Monitor/Examples/GetMonitoringDataFunc.cs b/launcher-csharp/Monitor/Examples/GetMonitoringDataFunc.cs
@@ -22,11 +22,11 @@ public virtual IEnumerable<object> Invoke(string accessToken, string requestPath
         {
             try
             {
-                ApiClient apiClient = new ApiClient(ApiClient.Demo_REST_BasePath);
+                DocuSignClient apiClient = new DocuSignClient(DocuSignClient.Demo_REST_BasePath);
 
                 // Construct API headers
                 //ds-snippet-start:Monitor1Step2
-                apiClient.SetBasePath(ApiClient.Demo_REST_BasePath);
+                apiClient.SetBasePath(DocuSignClient.Demo_REST_BasePath);
                 apiClient.Configuration.DefaultHeader.Add("Authorization", string.Format("Bearer {0}", accessToken));
                 apiClient.Configuration.DefaultHeader.Add("Content-Type", "application/json");
                 //ds-snippet-end:Monitor1Step2
diff --git a/launcher-csharp/Rooms/Controllers/AssignFormToFormGroups.cs b/launcher-csharp/Rooms/Controllers/AssignFormToFormGroups.cs
@@ -89,9 +89,8 @@ public ActionResult AssignFormToFormGroup(FormFormGroupModel formFormGroupModel)
                 this.ViewBag.h1 = this.CodeExampleText.ExampleName;
                 this.ViewBag.message = string.Format(
                     this.CodeExampleText.ResultsPageText,
-                    formGroupFormToAssign.FormId,
+                    formFormGroupModel.FormId.ToString(),
                     formFormGroupModel.FormGroupId.ToString());
-                this.ViewBag.Locals.Json = JsonConvert.SerializeObject(formGroupFormToAssign, Formatting.Indented);
 
                 return this.View("example_done");
             }
diff --git a/launcher-csharp/Rooms/Examples/AddingFormToRoom.cs b/launcher-csharp/Rooms/Examples/AddingFormToRoom.cs
@@ -27,7 +27,7 @@ public static (FormSummaryList forms, RoomSummaryList rooms) GetFormsAndRooms(
         {
             // Construct your API headers
             //ds-snippet-start:Rooms4Step2
-            var apiClient = new ApiClient(basePath);
+            var apiClient = new DocuSignClient(basePath);
             apiClient.Configuration.DefaultHeader.Add("Authorization", $"Bearer {accessToken}");
             var roomsApi = new RoomsApi(apiClient);
             var formLibrariesApi = new FormLibrariesApi(apiClient);
@@ -71,7 +71,7 @@ public static RoomDocument AddForm(
             Guid formId)
         {
             // Construct your API headers
-            var apiClient = new ApiClient(basePath);
+            var apiClient = new DocuSignClient(basePath);
             apiClient.Configuration.DefaultHeader.Add("Authorization", $"Bearer {accessToken}");
             var roomsApi = new RoomsApi(apiClient);
 
diff --git a/launcher-csharp/Rooms/Examples/AssignFormToFormGroups.cs b/launcher-csharp/Rooms/Examples/AssignFormToFormGroups.cs
@@ -26,7 +26,7 @@ public static (FormSummaryList forms, FormGroupSummaryList formGroups) GetFormsA
         {
             // Construct your API headers
             //ds-snippet-start:Rooms9Step2
-            var apiClient = new ApiClient(basePath);
+            var apiClient = new DocuSignClient(basePath);
             apiClient.Configuration.DefaultHeader.Add("Authorization", $"Bearer {accessToken}");
             var formGroupsApi = new FormGroupsApi(apiClient);
             var formLibrariesApi = new FormLibrariesApi(apiClient);
@@ -68,7 +68,7 @@ public static FormGroupFormToAssign AssignForm(
             FormGroupFormToAssign formToAssign)
         {
             // Construct your API headers
-            var apiClient = new ApiClient(basePath);
+            var apiClient = new DocuSignClient(basePath);
             apiClient.Configuration.DefaultHeader.Add("Authorization", $"Bearer {accessToken}");
             var formGroupsApi = new FormGroupsApi(apiClient);
 
diff --git a/launcher-csharp/Rooms/Examples/CreateExternalFormFillSession.cs b/launcher-csharp/Rooms/Examples/CreateExternalFormFillSession.cs
@@ -26,7 +26,7 @@ public static RoomDocumentList GetDocuments(
         {
             // Construct your API headers
             //ds-snippet-start:Rooms6Step2
-            var apiClient = new ApiClient(basePath);
+            var apiClient = new DocuSignClient(basePath);
             apiClient.Configuration.DefaultHeader.Add("Authorization", $"Bearer {accessToken}");
             var roomsApi = new RoomsApi(apiClient);
             //ds-snippet-end:Rooms6Step2 
@@ -48,7 +48,7 @@ public static RoomSummaryList GetRooms(
             string accountId)
         {
             // Construct your API headers
-            var apiClient = new ApiClient(basePath);
+            var apiClient = new DocuSignClient(basePath);
             apiClient.Configuration.DefaultHeader.Add("Authorization", $"Bearer {accessToken}");
             var roomsApi = new RoomsApi(apiClient);
 
@@ -74,7 +74,7 @@ public static ExternalFormFillSession CreateSession(
         //ds-snippet-end:Rooms6Step3
         {
             // Construct your API headers
-            var apiClient = new ApiClient(basePath);
+            var apiClient = new DocuSignClient(basePath);
             apiClient.Configuration.DefaultHeader.Add("Authorization", $"Bearer {accessToken}");
             var externalFormFillSessionsApi = new ExternalFormFillSessionsApi(apiClient);
 
diff --git a/launcher-csharp/Rooms/Examples/CreateFormGroups.cs b/launcher-csharp/Rooms/Examples/CreateFormGroups.cs
@@ -26,7 +26,7 @@ public static FormGroup CreateGroup(
         {
             // Construct your API headers
             //ds-snippet-start:Rooms7Step2
-            var apiClient = new ApiClient(basePath);
+            var apiClient = new DocuSignClient(basePath);
             apiClient.Configuration.DefaultHeader.Add("Authorization", $"Bearer {accessToken}");
             var formGroupsApi = new FormGroupsApi(apiClient);
             //ds-snippet-end:Rooms7Step2
diff --git a/launcher-csharp/Rooms/Examples/CreateRoomFromTemplate.cs b/launcher-csharp/Rooms/Examples/CreateRoomFromTemplate.cs
@@ -26,7 +26,7 @@ public static RoomTemplatesSummaryList GetTemplates(
         {
             // Construct your API headers
             //ds-snippet-start:Rooms2Step3
-            var apiClient = new ApiClient(basePath);
+            var apiClient = new DocuSignClient(basePath);
             apiClient.Configuration.DefaultHeader.Add("Authorization", $"Bearer {accessToken}");
             var roomTemplatesApi = new RoomTemplatesApi(apiClient);
 
@@ -53,7 +53,7 @@ public static Room CreateRoom(
         {
             // Construct your API headers
             //ds-snippet-start:Rooms2Step2
-            var apiClient = new ApiClient(basePath);
+            var apiClient = new DocuSignClient(basePath);
             apiClient.Configuration.DefaultHeader.Add("Authorization", $"Bearer {accessToken}");
             var roomsApi = new RoomsApi(apiClient);
             var rolesApi = new RolesApi(apiClient);
diff --git a/launcher-csharp/Rooms/Examples/CreateRoomWithData.cs b/launcher-csharp/Rooms/Examples/CreateRoomWithData.cs
@@ -28,7 +28,7 @@ public static Room CreateRoom(
         {
             // Construct your API headers
             //ds-snippet-start:Rooms1Step2
-            var apiClient = new ApiClient(basePath);
+            var apiClient = new DocuSignClient(basePath);
             apiClient.Configuration.DefaultHeader.Add("Authorization", $"Bearer {accessToken}");
             var roomsApi = new RoomsApi(apiClient);
             var rolesApi = new RolesApi(apiClient);
diff --git a/launcher-csharp/Rooms/Examples/ExportDataFromRoom.cs b/launcher-csharp/Rooms/Examples/ExportDataFromRoom.cs
@@ -23,7 +23,7 @@ public static RoomSummaryList GetRooms(
             string accountId)
         {
             // Construct your API headers
-            var apiClient = new ApiClient(basePath);
+            var apiClient = new DocuSignClient(basePath);
             apiClient.Configuration.DefaultHeader.Add("Authorization", $"Bearer {accessToken}");
             var roomsApi = new RoomsApi(apiClient);
 
@@ -47,7 +47,7 @@ public static FieldData Export(
         {
             // Construct your API headers
             //ds-snippet-start:Rooms3Step2
-            var apiClient = new ApiClient(basePath);
+            var apiClient = new DocuSignClient(basePath);
             apiClient.Configuration.DefaultHeader.Add("Authorization", $"Bearer {accessToken}");
             var roomsApi = new RoomsApi(apiClient);
             //ds-snippet-end:Rooms3Step2
diff --git a/launcher-csharp/Rooms/Examples/GetRoomsWithFilters.cs b/launcher-csharp/Rooms/Examples/GetRoomsWithFilters.cs
@@ -28,7 +28,7 @@ public static RoomSummaryList GetRooms(
         {
             // Construct your API headers
             //ds-snippet-start:Rooms5Step2
-            var apiClient = new ApiClient(basePath);
+            var apiClient = new DocuSignClient(basePath);
             apiClient.Configuration.DefaultHeader.Add("Authorization", $"Bearer {accessToken}");
             var roomsApi = new RoomsApi(apiClient);
             //ds-snippet-end:Rooms5Step2
diff --git a/launcher-csharp/Rooms/Examples/GrantOfficeAccessToFormGroup.cs b/launcher-csharp/Rooms/Examples/GrantOfficeAccessToFormGroup.cs
@@ -24,7 +24,7 @@ public static (OfficeSummaryList offices, FormGroupSummaryList formGroups) GetOf
             string accountId)
         {
             // Construct your API headers
-            var apiClient = new ApiClient(basePath);
+            var apiClient = new DocuSignClient(basePath);
             apiClient.Configuration.DefaultHeader.Add("Authorization", $"Bearer {accessToken}");
             var officesApi = new OfficesApi(apiClient);
             var formGroupsApi = new FormGroupsApi(apiClient);
@@ -60,7 +60,7 @@ public static void GrantAccess(
         {
             // Construct your API headers
             //ds-snippet-start:Rooms8Step2
-            var apiClient = new ApiClient(basePath);
+            var apiClient = new DocuSignClient(basePath);
             apiClient.Configuration.DefaultHeader.Add("Authorization", $"Bearer {accessToken}");
             var formGroupsApi = new FormGroupsApi(apiClient);
             //ds-snippet-end:Rooms8Step2
diff --git a/launcher-csharp/launcher-csharp.csproj b/launcher-csharp/launcher-csharp.csproj
@@ -39,7 +39,7 @@
     <PackageReference Include="DocuSign.Admin" Version="1.3.0" />
     <PackageReference Include="DocuSign.Click" Version="1.2.2" />
     <PackageReference Include="DocuSign.eSign.dll" Version="6.4.1" />
-    <PackageReference Include="DocuSign.Monitor" Version="1.1.0" />
+    <PackageReference Include="DocuSign.Monitor" Version="1.1.1" />
     <PackageReference Include="DocuSign.Rooms" Version="1.3.0" />
     <PackageReference Include="Microsoft.AspNetCore.Session" Version="2.2.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.0-preview1.19506.2" />

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public class AuditUsers`
`21`	`21`	`public static IEnumerable<UserDrilldownResponse> GetRecentlyModifiedUsersData(string basePath, string accessToken, Guid? accountId, Guid? orgId)`
`22`	`22`	`{`
`23`	`23`	`//ds-snippet-start:Admin5Step2`
`24`		`- var apiClient = new ApiClient(basePath);`
	`24`	`+ var apiClient = new DocuSignClient(basePath);`
`25`	`25`	`apiClient.Configuration.DefaultHeader.Add("Authorization", "Bearer " + accessToken);`
`26`	`26`	`//ds-snippet-end:Admin5Step2`
`27`	`27`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public static OrganizationExportResponse CreateBulkExportRequest(`
`29`	`29`	`string filePath)`
`30`	`30`	`{`
`31`	`31`	`//ds-snippet-start:Admin3Step2`
`32`		`- var apiClient = new ApiClient(basePath);`
	`32`	`+ var apiClient = new DocuSignClient(basePath);`
`33`	`33`	`apiClient.Configuration.DefaultHeader.Add("Authorization", "Bearer " + accessToken);`
`34`	`34`	`//ds-snippet-end:Admin3Step2`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public class CreateCLMESignUser`
`31`	`31`	`/// <returns>The AddUserResponse object coming back from the API</returns>`
`32`	`32`	`public static AddUserResponse Create(string userName, string firstName, string lastName, string email, string clmPermissionProfileId, string eSignPermissionProfileId, Guid? dsGroupId, Guid? clmProductId, Guid? eSignProductId, string basePath, string accessToken, Guid? accountId, Guid? orgId)`
`33`	`33`	`{`
`34`		`- var apiClient = new ApiClient(basePath);`
	`34`	`+ var apiClient = new DocuSignClient(basePath);`
`35`	`35`	`apiClient.Configuration.DefaultHeader.Add("Authorization", "Bearer " + accessToken);`
`36`	`36`	`UsersApi usersApi = new UsersApi(apiClient);`
`37`	`37`	`//ds-snippet-start:Admin2Step5`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public static NewUserResponse CreateNewUser(`
`42`	`42`	`{`
`43`	`43`	`// Construct your API headers`
`44`	`44`	`//ds-snippet-start:Admin1Step2`
`45`		`- var apiClient = new DocuSign.Admin.Client.ApiClient(basePath);`
	`45`	`+ var apiClient = new DocuSign.Admin.Client.DocuSignClient(basePath);`
`46`	`46`	`apiClient.Configuration.DefaultHeader.Add("Authorization", "Bearer " + accessToken);`
`47`	`47`	`//ds-snippet-end:Admin1Step2`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public static UsersDrilldownResponse GetDocuSignProfileByEmailAdress(`
`26`	`26`	`string email)`
`27`	`27`	`{`
`28`	`28`	`//ds-snippet-start:Admin6Step2`
`29`		`- var apiClient = new ApiClient(basePath);`
	`29`	`+ var apiClient = new DocuSignClient(basePath);`
`30`	`30`	`apiClient.Configuration.DefaultHeader.Add("Authorization", "Bearer " + accessToken);`
`31`	`31`	`//ds-snippet-end:Admin6Step2`
`32`	`32`