Update flow

Author: NanSigmaBohdanMoroz

DocuSign.Workspaces/DocuSign.Workspaces/ClientApp/src/assets/scss/components/_forms.scss

@@ -215,6 +215,20 @@ input[type='radio'] {
 }
 .warning-text_margin {
   margin-left: 24px;
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+}
+.warning-text-line {
+  display: inline-flex;
+  gap: 6px;
+  flex-wrap: wrap;
+}
+.warning-text-detail {
+  font-family: 'Inter', sans-serif;
+  font-size: 14px;
+  font-weight: 400;
+  color: #13131b;
 }
 .shield-icon {
   width: 32px;

DocuSign.Workspaces/DocuSign.Workspaces/ClientApp/src/components/SomethingWentWrong.js

@@ -1,7 +1,7 @@
 import { useTranslation } from 'react-i18next';
 import { ReactComponent as ShieldIcon } from '../assets/icons/shield-cross.svg';
 
-export const SomethingWentWrong = ({ tryAgain }) => {
+export const SomethingWentWrong = ({ tryAgain, message }) => {
   const { t } = useTranslation();
 
   return (
@@ -10,13 +10,16 @@ export const SomethingWentWrong = ({ tryAgain }) => {
         <div className="warning-text">
           <ShieldIcon className="shield-icon" />
           <span className="warning-text_margin">
-            {t('SomethingWent')}
-            <span
-              style={{ color: 'inherit', textDecoration: 'underline', cursor: 'pointer' }}
-              onClick={tryAgain}
-            >
-              {t('TryAgain')}
+            <span className="warning-text-line">
+              {t('SomethingWent')}
+              <span
+                style={{ color: 'inherit', textDecoration: 'underline', cursor: 'pointer' }}
+                onClick={tryAgain}
+              >
+                {t('TryAgain')}
+              </span>
             </span>
+            {message ? <span className="warning-text-detail">{message}</span> : null}
           </span>
         </div>
       </div>

DocuSign.Workspaces/DocuSign.Workspaces/ClientApp/src/pages/UseCaseTwo/index.js

@@ -112,13 +112,14 @@ export const UseCaseTwoPage = () => {
         body: JSON.stringify(payload),
       });
       if (!res.ok) {
-        throw new Error(`${t('Common.ServerError')}${res.status}`);
+        const message = await res.text();
+        throw new Error(message || `${t('Common.ServerError')}${res.status}`);
       }
 
       const data = await res.json();
       setListFiles(data);
     } catch (error) {
-      setErrorOnboarding(t('Common.Error'));
+      setErrorOnboarding(error.message || t('Common.Error'));
     } finally {
       setRequesting(false);
     }
@@ -177,6 +178,7 @@ export const UseCaseTwoPage = () => {
         {currentStep === 1 &&
           (errorOnboarding ? (
             <SomethingWentWrong
+              message={errorOnboarding}
               tryAgain={() => {
                 setCurrentStep(0);
                 scrollToTop();

DocuSign.Workspaces/DocuSign.Workspaces/Controllers/Admin/AdminController.cs

@@ -48,8 +48,8 @@ public IActionResult ObtainConsent([FromBody] RequestAccountAuthorizeModel model
 
             return model.ConsentType switch
             {
-                ConsentType.Admin => Ok(new ResponseAccountAuthorizeModel(_authenticationService.CreateAdminConsentUrl(model.BasePath, $"api/consentcallback"))),
-                ConsentType.Individual => Ok(new ResponseAccountAuthorizeModel(_authenticationService.CreateUserConsentUrl(model.BasePath, $"api/consentcallback"))),
+                ConsentType.Admin => Ok(new ResponseAccountAuthorizeModel(_authenticationService.CreateAdminConsentUrl(model.BasePath, "api/consentcallback"))),
+                ConsentType.Individual => Ok(new ResponseAccountAuthorizeModel(_authenticationService.CreateUserConsentUrl(model.BasePath, "api/consentcallback"))),
                 _ => BadRequest("Unknown consent type")
             };
         }
@@ -71,17 +71,19 @@ public IActionResult ConsentCallback(string code)
             var settings = _settingsRepository.Get();
             settings.IsConsentGranted = true;
             settings.UserId = _authenticationService.PrePopulateUserId(settings.BasePath, code);
+            settings.AuthCode = code;
             _settingsRepository.Save(settings);
             return LocalRedirect("/");
         }
 
         [HttpGet]
         [Route("/api/accounts")]
-        public IActionResult GetAccounts(string basePath, string userId)
+        public async Task<IActionResult> GetAccounts(string basePath, string userId)
         {
             try
             {
-                var result = _authenticationService.GetAccounts(basePath, userId);
+                var result = await _authenticationService.GetAccountsAsync(
+                    basePath, userId);
                 return Ok(result);
             }
             catch (ApplicationApiException ex)
@@ -97,8 +99,7 @@ public async Task<IActionResult> Connect([FromBody] RequestAccountConnectModel m
             var connectionSettings = CreateConnectionSettings(model);
             try
             {
-                var principal =
-                    _authenticationService.AuthenticateFromJwt(connectionSettings);
+                var principal = await _authenticationService.AuthenticateFromJwtAsync(connectionSettings);
 
                 await HttpContext.SignInAsync(
                     CookieAuthenticationDefaults.AuthenticationScheme,
@@ -110,7 +111,6 @@ await HttpContext.SignInAsync(
                 settings.UserId = model.UserId;
                 settings.AccountId = model.AccountId;
                 settings.BaseUri = model.BaseUri;
-                settings.TemplatesDataSource = GetTemplatesDataSource(connectionSettings.AccountId);
                 settings.Template = TemplateNames.DefaultTemplateId;
                 settings.SignatureTypesDataSource = GetSignatureTypesDataSource(connectionSettings.AccountId);
                 settings.SignatureType = SignatureInfo.DefaultProviderName;
@@ -258,20 +258,5 @@ private IEnumerable<DataSourceItem> GetSignatureTypesDataSource(string accountId
             result.AddRange(signatureProviders.SignatureProviders.Select(p => new DataSourceItem(p.SignatureProviderName, p.SignatureProviderDisplayName)));
             return result;
         }
-
-        private IEnumerable<DataSourceItem> GetTemplatesDataSource(string accountId)
-        {
-            var userTemplates = _docuSignApiProvider.TemplatesApi.ListTemplates(accountId);
-            var result = new List<DataSourceItem>
-            {
-                new()
-                {
-                    Key = TemplateNames.DefaultTemplateId,
-                    Value = TemplateNames.DefaultTemplateName
-                }
-            };
-            result.AddRange(userTemplates.EnvelopeTemplates.Select(t => new DataSourceItem(t.TemplateId, t.Name)));
-            return result;
-        }
     }
 }

DocuSign.Workspaces/DocuSign.Workspaces/Controllers/CarePlans/CarePlansController.cs

@@ -1,8 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using DocuSign.eSign.Client;
 using DocuSign.Workspaces.Domain.CarePlans;
 using DocuSign.Workspaces.Domain.CarePlans.Model;
+using DocuSign.Workspaces.Infrastructure.Exceptions;
 using Microsoft.AspNetCore.Mvc;
 
 namespace DocuSign.Workspaces.Controllers.CarePlans;
@@ -19,9 +21,28 @@ public async Task<List<PhysicianModel>> GetPhysicians()
 
     [HttpPost]
     [Route("/api/care-plans/submit-physician")]
-    public async Task<List<CareDocumentsModel>> SubmitToPhysician([FromBody] SubmitToPhysiciansModel model)
+    public async Task<IActionResult> SubmitToPhysician([FromBody] SubmitToPhysiciansModel model)
     {
-        var documents = await carePlansService.SubmitToPhysician(model);
-        return documents;
+        try
+        {
+            var documents = await carePlansService.SubmitToPhysician(model);
+            return Ok(documents);
+        }
+        catch (ApplicationApiException ex)
+        {
+            var message = ex.Details?.ErrorDescription ?? ex.Details?.Error ?? ex.Message;
+            return BadRequest(message);
+        }
+        catch (Docusign.IAM.SDK.Models.Errors.APIException ex)
+        {
+            return StatusCode(500, ex.StatusCode == 429 ?
+                "The request limit for adding users to a workspace (4 per day) has been reached." :
+                ex.Message);
+        }
+        catch (Exception ex)
+        {
+            var tp = ex.GetType().ToString();
+            return StatusCode(500, ex.Message);
+        }
     }
 }

DocuSign.Workspaces/DocuSign.Workspaces/Domain/Admin/Models/Settings.cs

@@ -16,6 +16,7 @@ public Settings()
 
         public AuthenticationType AuthenticationType { get; set; }
         public string BasePath { get; set; }
+        public string AuthCode { get; set; }
         public string BaseUri { get; set; }
         public string AccountId { get; set; }
         public string UserId { get; set; }

DocuSign.Workspaces/DocuSign.Workspaces/Domain/Admin/Services/Interfaces/IAuthenticationService.cs

@@ -1,17 +1,23 @@
 using System.Collections.Generic;
 using System.Security.Claims;
+using System.Threading.Tasks;
 using DocuSign.Workspaces.Controllers.Admin.Models;
 using DocuSign.Workspaces.Domain.Admin.Models;
 
 namespace DocuSign.Workspaces.Domain.Admin.Services.Interfaces
 {
     public interface IAuthenticationService
     {
-        ClaimsPrincipal AuthenticateFromJwt(AccountConnectionSettings connectionSettings);
+        Task<ClaimsPrincipal> AuthenticateFromJwtAsync(AccountConnectionSettings accountConnectionSettings);
+
         string CreateAdminConsentUrl(string baseUrl, string redirectUrl);
+
         string CreateUserConsentUrl(string baseUrl, string redirectUrl);
+
         void AuthenticateForProfileManagement(string login, string password);
+
         string PrePopulateUserId(string basePath, string code);
-        List<ResponseGetAccountsModel> GetAccounts(string basePath, string userId);
+
+        Task<List<ResponseGetAccountsModel>> GetAccountsAsync(string basePath, string userId);
     }
-}
+}

DocuSign.Workspaces/DocuSign.Workspaces/Domain/CarePlans/CarePlansService.cs

@@ -78,7 +78,15 @@ public async Task<List<CareDocumentsModel>> SubmitToPhysician(SubmitToPhysicians
             FirstName = model.Physician.Name,
             LastName = ""
         };
-        await docuSignApiProvider.WorkspaceUsers.AddWorkspaceUserAsync(accountRepository.AccountId, model.Physician.WorkspaceId, userForCreate);
+        try
+        {
+            await docuSignApiProvider.WorkspaceUsers.AddWorkspaceUserAsync(accountRepository.AccountId, model.Physician.WorkspaceId, userForCreate);
+        }
+        catch (Exception e)
+        {
+            Console.WriteLine(e);
+            throw;
+        }
 
         foreach (var document in model.Documents)
         {