From 084bcdddc1f7fe22f87222a3368172d66b8ef5c0 Mon Sep 17 00:00:00 2001 From: tawsifkamal Date: Thu, 13 Feb 2025 18:38:59 -0800 Subject: [PATCH] convert operationPromise to use async/await syntax --- src/rest/accounts/v1/authTokenPromotion.ts | 26 ++++--- src/rest/accounts/v1/credential/aws.ts | 62 ++++++++++------ src/rest/accounts/v1/credential/publicKey.ts | 62 ++++++++++------ src/rest/accounts/v1/secondaryAuthToken.ts | 26 ++++--- src/rest/api/v2010/account.ts | 58 ++++++++++----- src/rest/api/v2010/account/address.ts | 70 ++++++++++-------- src/rest/api/v2010/account/application.ts | 70 ++++++++++-------- .../api/v2010/account/authorizedConnectApp.ts | 35 +++++---- .../account/availablePhoneNumberCountry.ts | 35 +++++---- src/rest/api/v2010/account/call.ts | 70 ++++++++++-------- .../api/v2010/account/call/notification.ts | 37 ++++++---- src/rest/api/v2010/account/call/payment.ts | 37 ++++++---- src/rest/api/v2010/account/call/recording.ts | 74 +++++++++++-------- src/rest/api/v2010/account/call/siprec.ts | 37 ++++++---- src/rest/api/v2010/account/call/stream.ts | 37 ++++++---- .../api/v2010/account/call/transcription.ts | 37 ++++++---- src/rest/api/v2010/account/conference.ts | 70 ++++++++++-------- .../v2010/account/conference/participant.ts | 74 +++++++++++-------- .../api/v2010/account/conference/recording.ts | 74 +++++++++++-------- src/rest/api/v2010/account/connectApp.ts | 70 ++++++++++-------- .../api/v2010/account/incomingPhoneNumber.ts | 70 ++++++++++-------- .../incomingPhoneNumber/assignedAddOn.ts | 37 ++++++---- .../assignedAddOn/assignedAddOnExtension.ts | 39 +++++----- src/rest/api/v2010/account/key.ts | 70 ++++++++++-------- src/rest/api/v2010/account/message.ts | 70 ++++++++++-------- src/rest/api/v2010/account/message/media.ts | 37 ++++++---- src/rest/api/v2010/account/notification.ts | 35 +++++---- .../api/v2010/account/outgoingCallerId.ts | 70 ++++++++++-------- src/rest/api/v2010/account/queue.ts | 70 ++++++++++-------- src/rest/api/v2010/account/queue/member.ts | 74 +++++++++++-------- src/rest/api/v2010/account/recording.ts | 35 +++++---- .../v2010/account/recording/addOnResult.ts | 37 ++++++---- .../account/recording/addOnResult/payload.ts | 39 +++++----- .../recording/addOnResult/payload/data.ts | 39 +++++----- .../v2010/account/recording/transcription.ts | 37 ++++++---- src/rest/api/v2010/account/shortCode.ts | 70 ++++++++++-------- src/rest/api/v2010/account/signingKey.ts | 70 ++++++++++-------- .../api/v2010/account/sip/credentialList.ts | 70 ++++++++++-------- .../account/sip/credentialList/credential.ts | 74 +++++++++++-------- src/rest/api/v2010/account/sip/domain.ts | 70 ++++++++++-------- .../authCallsCredentialListMapping.ts | 37 ++++++---- .../authCallsIpAccessControlListMapping.ts | 37 ++++++---- .../authRegistrationsCredentialListMapping.ts | 37 ++++++---- .../sip/domain/credentialListMapping.ts | 37 ++++++---- .../sip/domain/ipAccessControlListMapping.ts | 37 ++++++---- .../v2010/account/sip/ipAccessControlList.ts | 70 ++++++++++-------- .../sip/ipAccessControlList/ipAddress.ts | 74 +++++++++++-------- src/rest/api/v2010/account/transcription.ts | 35 +++++---- src/rest/api/v2010/account/usage/trigger.ts | 70 ++++++++++-------- src/rest/assistants/v1/assistant.ts | 62 ++++++++++------ .../v1/assistant/assistantsKnowledge.ts | 35 +++++---- .../assistants/v1/assistant/assistantsTool.ts | 35 +++++---- src/rest/assistants/v1/knowledge.ts | 62 ++++++++++------ .../v1/knowledge/knowledgeStatus.ts | 35 +++++---- src/rest/assistants/v1/session.ts | 31 +++++--- src/rest/assistants/v1/tool.ts | 62 ++++++++++------ src/rest/bulkexports/v1/export.ts | 35 +++++---- src/rest/bulkexports/v1/export/day.ts | 35 +++++---- src/rest/bulkexports/v1/export/job.ts | 31 +++++--- .../bulkexports/v1/exportConfiguration.ts | 70 ++++++++++-------- src/rest/chat/v1/credential.ts | 70 ++++++++++-------- src/rest/chat/v1/service.ts | 58 ++++++++++----- src/rest/chat/v1/service/channel.ts | 70 ++++++++++-------- src/rest/chat/v1/service/channel/invite.ts | 37 ++++++---- src/rest/chat/v1/service/channel/member.ts | 74 +++++++++++-------- src/rest/chat/v1/service/channel/message.ts | 74 +++++++++++-------- src/rest/chat/v1/service/role.ts | 70 ++++++++++-------- src/rest/chat/v1/service/user.ts | 70 ++++++++++-------- src/rest/chat/v2/credential.ts | 70 ++++++++++-------- src/rest/chat/v2/service.ts | 58 ++++++++++----- src/rest/chat/v2/service/binding.ts | 35 +++++---- src/rest/chat/v2/service/channel.ts | 70 ++++++++++-------- src/rest/chat/v2/service/channel/invite.ts | 37 ++++++---- src/rest/chat/v2/service/channel/member.ts | 74 +++++++++++-------- src/rest/chat/v2/service/channel/message.ts | 74 +++++++++++-------- src/rest/chat/v2/service/channel/webhook.ts | 74 +++++++++++-------- src/rest/chat/v2/service/role.ts | 70 ++++++++++-------- src/rest/chat/v2/service/user.ts | 70 ++++++++++-------- src/rest/chat/v2/service/user/userBinding.ts | 37 ++++++---- src/rest/chat/v2/service/user/userChannel.ts | 74 +++++++++++-------- src/rest/chat/v3/channel.ts | 37 ++++++---- src/rest/content/v1/content.ts | 31 +++++--- src/rest/content/v1/content/approvalFetch.ts | 35 +++++---- .../conversations/v1/addressConfiguration.ts | 66 ++++++++++------- src/rest/conversations/v1/configuration.ts | 48 +++++++----- .../conversations/v1/configuration/webhook.ts | 48 +++++++----- src/rest/conversations/v1/conversation.ts | 70 ++++++++++-------- .../conversations/v1/conversation/message.ts | 70 ++++++++++-------- .../conversation/message/deliveryReceipt.ts | 37 ++++++---- .../v1/conversation/participant.ts | 70 ++++++++++-------- .../conversations/v1/conversation/webhook.ts | 70 ++++++++++-------- src/rest/conversations/v1/credential.ts | 70 ++++++++++-------- src/rest/conversations/v1/role.ts | 62 ++++++++++------ src/rest/conversations/v1/service.ts | 29 +++++--- src/rest/conversations/v1/service/binding.ts | 35 +++++---- .../conversations/v1/service/configuration.ts | 70 ++++++++++-------- .../v1/service/configuration/notification.ts | 70 ++++++++++-------- .../v1/service/configuration/webhook.ts | 70 ++++++++++-------- .../conversations/v1/service/conversation.ts | 70 ++++++++++-------- .../v1/service/conversation/message.ts | 74 +++++++++++-------- .../conversation/message/deliveryReceipt.ts | 39 +++++----- .../v1/service/conversation/participant.ts | 74 +++++++++++-------- .../v1/service/conversation/webhook.ts | 74 +++++++++++-------- src/rest/conversations/v1/service/role.ts | 70 ++++++++++-------- src/rest/conversations/v1/service/user.ts | 70 ++++++++++-------- .../v1/service/user/userConversation.ts | 74 +++++++++++-------- src/rest/conversations/v1/user.ts | 62 ++++++++++------ .../conversations/v1/user/userConversation.ts | 70 ++++++++++-------- src/rest/events/v1/eventType.ts | 35 +++++---- src/rest/events/v1/schema.ts | 31 +++++--- src/rest/events/v1/schema/schemaVersion.ts | 35 +++++---- src/rest/events/v1/sink.ts | 58 ++++++++++----- src/rest/events/v1/subscription.ts | 66 ++++++++++------- .../events/v1/subscription/subscribedEvent.ts | 70 ++++++++++-------- src/rest/flexApi/v1/assessments.ts | 33 +++++---- src/rest/flexApi/v1/channel.ts | 29 +++++--- src/rest/flexApi/v1/configuration.ts | 48 +++++++----- src/rest/flexApi/v1/flexFlow.ts | 58 ++++++++++----- src/rest/flexApi/v1/insightsQuestionnaires.ts | 66 ++++++++++------- .../v1/insightsQuestionnairesCategory.ts | 33 +++++---- .../v1/insightsQuestionnairesQuestion.ts | 33 +++++---- src/rest/flexApi/v1/insightsSession.ts | 24 +++--- src/rest/flexApi/v1/insightsUserRoles.ts | 24 +++--- src/rest/flexApi/v1/interaction.ts | 35 +++++---- .../v1/interaction/interactionChannel.ts | 70 ++++++++++-------- .../interactionChannelParticipant.ts | 37 ++++++---- src/rest/flexApi/v1/plugin.ts | 62 ++++++++++------ src/rest/flexApi/v1/plugin/pluginVersions.ts | 35 +++++---- src/rest/flexApi/v1/pluginArchive.ts | 35 +++++---- src/rest/flexApi/v1/pluginConfiguration.ts | 33 +++++---- .../pluginConfiguration/configuredPlugin.ts | 35 +++++---- .../flexApi/v1/pluginConfigurationArchive.ts | 35 +++++---- src/rest/flexApi/v1/pluginRelease.ts | 33 +++++---- src/rest/flexApi/v1/pluginVersionArchive.ts | 37 ++++++---- src/rest/flexApi/v1/provisioningStatus.ts | 26 ++++--- src/rest/flexApi/v1/webChannel.ts | 66 ++++++++++------- src/rest/flexApi/v2/flexUser.ts | 74 +++++++++++-------- src/rest/frontlineApi/v1/user.ts | 62 ++++++++++------ src/rest/iam/v1/apiKey.ts | 62 ++++++++++------ src/rest/insights/v1/call.ts | 31 +++++--- src/rest/insights/v1/call/annotation.ts | 70 ++++++++++-------- src/rest/insights/v1/call/callSummary.ts | 35 +++++---- src/rest/insights/v1/conference.ts | 33 +++++---- .../v1/conference/conferenceParticipant.ts | 35 +++++---- src/rest/insights/v1/room.ts | 29 +++++--- src/rest/insights/v1/room/participant.ts | 35 +++++---- src/rest/insights/v1/setting.ts | 48 +++++++----- src/rest/intelligence/v2/customOperator.ts | 70 ++++++++++-------- src/rest/intelligence/v2/operator.ts | 31 +++++--- .../intelligence/v2/operatorAttachment.ts | 35 +++++---- .../intelligence/v2/operatorAttachments.ts | 35 +++++---- src/rest/intelligence/v2/operatorType.ts | 35 +++++---- src/rest/intelligence/v2/prebuiltOperator.ts | 35 +++++---- src/rest/intelligence/v2/service.ts | 62 ++++++++++------ src/rest/intelligence/v2/transcript.ts | 33 +++++---- src/rest/intelligence/v2/transcript/media.ts | 31 +++++--- .../v2/transcript/operatorResult.ts | 35 +++++---- src/rest/ipMessaging/v1/credential.ts | 70 ++++++++++-------- src/rest/ipMessaging/v1/service.ts | 58 ++++++++++----- src/rest/ipMessaging/v1/service/channel.ts | 70 ++++++++++-------- .../ipMessaging/v1/service/channel/invite.ts | 37 ++++++---- .../ipMessaging/v1/service/channel/member.ts | 74 +++++++++++-------- .../ipMessaging/v1/service/channel/message.ts | 74 +++++++++++-------- src/rest/ipMessaging/v1/service/role.ts | 70 ++++++++++-------- src/rest/ipMessaging/v1/service/user.ts | 70 ++++++++++-------- src/rest/ipMessaging/v2/credential.ts | 70 ++++++++++-------- src/rest/ipMessaging/v2/service.ts | 58 ++++++++++----- src/rest/ipMessaging/v2/service/binding.ts | 35 +++++---- src/rest/ipMessaging/v2/service/channel.ts | 70 ++++++++++-------- .../ipMessaging/v2/service/channel/invite.ts | 37 ++++++---- .../ipMessaging/v2/service/channel/member.ts | 74 +++++++++++-------- .../ipMessaging/v2/service/channel/message.ts | 74 +++++++++++-------- .../ipMessaging/v2/service/channel/webhook.ts | 74 +++++++++++-------- src/rest/ipMessaging/v2/service/role.ts | 70 ++++++++++-------- src/rest/ipMessaging/v2/service/user.ts | 70 ++++++++++-------- .../v2/service/user/userBinding.ts | 37 ++++++---- .../v2/service/user/userChannel.ts | 74 +++++++++++-------- src/rest/lookups/v1/phoneNumber.ts | 35 +++++---- src/rest/lookups/v2/phoneNumber.ts | 35 +++++---- src/rest/marketplace/v1/availableAddOn.ts | 35 +++++---- .../availableAddOn/availableAddOnExtension.ts | 35 +++++---- src/rest/marketplace/v1/installedAddOn.ts | 66 ++++++++++------- .../installedAddOn/installedAddOnExtension.ts | 70 ++++++++++-------- .../marketplace/v1/moduleDataManagement.ts | 70 ++++++++++-------- src/rest/messaging/v1/brandRegistration.ts | 66 ++++++++++------- .../v1/brandRegistration/brandVetting.ts | 35 +++++---- src/rest/messaging/v1/deactivations.ts | 24 +++--- src/rest/messaging/v1/domainCerts.ts | 70 ++++++++++-------- src/rest/messaging/v1/domainConfig.ts | 70 ++++++++++-------- .../v1/domainConfigMessagingService.ts | 33 +++++---- .../v1/linkshorteningMessagingService.ts | 35 +++++---- ...teningMessagingServiceDomainAssociation.ts | 28 ++++--- src/rest/messaging/v1/requestManagedCert.ts | 35 +++++---- src/rest/messaging/v1/service.ts | 58 ++++++++++----- src/rest/messaging/v1/service/alphaSender.ts | 35 +++++---- .../messaging/v1/service/channelSender.ts | 35 +++++---- src/rest/messaging/v1/service/phoneNumber.ts | 35 +++++---- src/rest/messaging/v1/service/shortCode.ts | 35 +++++---- .../messaging/v1/service/usAppToPerson.ts | 70 ++++++++++-------- src/rest/messaging/v1/tollfreeVerification.ts | 66 ++++++++++------- src/rest/microvisor/v1/accountConfig.ts | 70 ++++++++++-------- src/rest/microvisor/v1/accountSecret.ts | 70 ++++++++++-------- src/rest/microvisor/v1/app.ts | 31 +++++--- src/rest/microvisor/v1/app/appManifest.ts | 35 +++++---- src/rest/microvisor/v1/device.ts | 62 ++++++++++------ src/rest/microvisor/v1/device/deviceConfig.ts | 70 ++++++++++-------- src/rest/microvisor/v1/device/deviceSecret.ts | 70 ++++++++++-------- src/rest/monitor/v1/alert.ts | 31 +++++--- src/rest/monitor/v1/event.ts | 31 +++++--- src/rest/notify/v1/credential.ts | 70 ++++++++++-------- src/rest/notify/v1/service.ts | 58 ++++++++++----- src/rest/notify/v1/service/binding.ts | 35 +++++---- src/rest/numbers/v1/bulkEligibility.ts | 35 +++++---- src/rest/numbers/v1/portingPortIn.ts | 33 +++++---- .../numbers/v1/portingPortInPhoneNumber.ts | 35 +++++---- src/rest/numbers/v1/portingPortability.ts | 33 +++++---- src/rest/numbers/v2/authorizationDocument.ts | 33 +++++---- src/rest/numbers/v2/bulkHostedNumberOrder.ts | 33 +++++---- src/rest/numbers/v2/bundleClone.ts | 35 +++++---- src/rest/numbers/v2/hostedNumberOrder.ts | 66 ++++++++++------- .../numbers/v2/regulatoryCompliance/bundle.ts | 58 ++++++++++----- .../regulatoryCompliance/bundle/evaluation.ts | 35 +++++---- .../bundle/itemAssignment.ts | 35 +++++---- .../v2/regulatoryCompliance/endUser.ts | 62 ++++++++++------ .../v2/regulatoryCompliance/endUserType.ts | 35 +++++---- .../v2/regulatoryCompliance/regulation.ts | 35 +++++---- .../supportingDocument.ts | 70 ++++++++++-------- .../supportingDocumentType.ts | 35 +++++---- .../hosted_numbers/authorizationDocument.ts | 66 ++++++++++------- .../hosted_numbers/hostedNumberOrder.ts | 66 ++++++++++------- .../preview/marketplace/availableAddOn.ts | 35 +++++---- .../availableAddOn/availableAddOnExtension.ts | 35 +++++---- .../preview/marketplace/installedAddOn.ts | 66 ++++++++++------- .../installedAddOn/installedAddOnExtension.ts | 70 ++++++++++-------- src/rest/preview/sync/service.ts | 58 ++++++++++----- src/rest/preview/sync/service/document.ts | 70 ++++++++++-------- .../service/document/documentPermission.ts | 74 +++++++++++-------- src/rest/preview/sync/service/syncList.ts | 35 +++++---- .../sync/service/syncList/syncListItem.ts | 74 +++++++++++-------- .../service/syncList/syncListPermission.ts | 74 +++++++++++-------- src/rest/preview/sync/service/syncMap.ts | 35 +++++---- .../sync/service/syncMap/syncMapItem.ts | 74 +++++++++++-------- .../sync/service/syncMap/syncMapPermission.ts | 74 +++++++++++-------- src/rest/preview/wireless/command.ts | 31 +++++--- src/rest/preview/wireless/ratePlan.ts | 58 ++++++++++----- src/rest/preview/wireless/sim.ts | 62 ++++++++++------ src/rest/preview/wireless/sim/usage.ts | 31 +++++--- .../versionless/organization/account.ts | 35 +++++---- .../versionless/organization/user.ts | 70 ++++++++++-------- src/rest/pricing/v1/messaging/country.ts | 35 +++++---- src/rest/pricing/v1/phoneNumber/country.ts | 35 +++++---- src/rest/pricing/v1/voice/country.ts | 35 +++++---- src/rest/pricing/v1/voice/number.ts | 31 +++++--- src/rest/pricing/v2/country.ts | 35 +++++---- src/rest/pricing/v2/number.ts | 35 +++++---- src/rest/pricing/v2/voice/country.ts | 35 +++++---- src/rest/pricing/v2/voice/number.ts | 35 +++++---- src/rest/proxy/v1/service.ts | 62 ++++++++++------ src/rest/proxy/v1/service/phoneNumber.ts | 70 ++++++++++-------- src/rest/proxy/v1/service/session.ts | 70 ++++++++++-------- .../proxy/v1/service/session/interaction.ts | 37 ++++++---- .../proxy/v1/service/session/participant.ts | 37 ++++++---- .../session/participant/messageInteraction.ts | 39 +++++----- src/rest/proxy/v1/service/shortCode.ts | 70 ++++++++++-------- src/rest/routes/v2/phoneNumber.ts | 70 ++++++++++-------- src/rest/routes/v2/sipDomain.ts | 70 ++++++++++-------- src/rest/routes/v2/trunk.ts | 70 ++++++++++-------- src/rest/serverless/v1/service.ts | 62 ++++++++++------ src/rest/serverless/v1/service/asset.ts | 70 ++++++++++-------- .../v1/service/asset/assetVersion.ts | 37 ++++++---- src/rest/serverless/v1/service/build.ts | 35 +++++---- .../v1/service/build/buildStatus.ts | 37 ++++++---- src/rest/serverless/v1/service/environment.ts | 35 +++++---- .../v1/service/environment/deployment.ts | 37 ++++++---- .../serverless/v1/service/environment/log.ts | 37 ++++++---- .../v1/service/environment/variable.ts | 74 +++++++++++-------- src/rest/serverless/v1/service/function.ts | 70 ++++++++++-------- .../v1/service/function/functionVersion.ts | 37 ++++++---- .../functionVersion/functionVersionContent.ts | 37 ++++++---- src/rest/studio/v1/flow.ts | 31 +++++--- src/rest/studio/v1/flow/engagement.ts | 35 +++++---- .../v1/flow/engagement/engagementContext.ts | 37 ++++++---- src/rest/studio/v1/flow/engagement/step.ts | 37 ++++++---- .../v1/flow/engagement/step/stepContext.ts | 39 +++++----- src/rest/studio/v1/flow/execution.ts | 70 ++++++++++-------- .../v1/flow/execution/executionContext.ts | 37 ++++++---- .../studio/v1/flow/execution/executionStep.ts | 37 ++++++---- .../executionStep/executionStepContext.ts | 37 ++++++---- src/rest/studio/v2/flow.ts | 62 ++++++++++------ src/rest/studio/v2/flow/execution.ts | 70 ++++++++++-------- .../v2/flow/execution/executionContext.ts | 37 ++++++---- .../studio/v2/flow/execution/executionStep.ts | 37 ++++++---- .../executionStep/executionStepContext.ts | 37 ++++++---- src/rest/studio/v2/flow/flowRevision.ts | 35 +++++---- src/rest/studio/v2/flow/flowTestUser.ts | 70 ++++++++++-------- src/rest/supersim/v1/esimProfile.ts | 35 +++++---- src/rest/supersim/v1/fleet.ts | 58 ++++++++++----- src/rest/supersim/v1/ipCommand.ts | 31 +++++--- src/rest/supersim/v1/network.ts | 31 +++++--- src/rest/supersim/v1/networkAccessProfile.ts | 66 ++++++++++------- .../networkAccessProfileNetwork.ts | 35 +++++---- src/rest/supersim/v1/sim.ts | 58 ++++++++++----- src/rest/supersim/v1/smsCommand.ts | 35 +++++---- src/rest/sync/v1/service.ts | 58 ++++++++++----- src/rest/sync/v1/service/document.ts | 70 ++++++++++-------- .../v1/service/document/documentPermission.ts | 74 +++++++++++-------- src/rest/sync/v1/service/syncList.ts | 70 ++++++++++-------- .../sync/v1/service/syncList/syncListItem.ts | 74 +++++++++++-------- .../v1/service/syncList/syncListPermission.ts | 74 +++++++++++-------- src/rest/sync/v1/service/syncMap.ts | 70 ++++++++++-------- .../sync/v1/service/syncMap/syncMapItem.ts | 74 +++++++++++-------- .../v1/service/syncMap/syncMapPermission.ts | 74 +++++++++++-------- src/rest/sync/v1/service/syncStream.ts | 70 ++++++++++-------- src/rest/taskrouter/v1/workspace.ts | 58 ++++++++++----- src/rest/taskrouter/v1/workspace/activity.ts | 70 ++++++++++-------- src/rest/taskrouter/v1/workspace/event.ts | 35 +++++---- src/rest/taskrouter/v1/workspace/task.ts | 70 ++++++++++-------- .../v1/workspace/task/reservation.ts | 74 +++++++++++-------- .../taskrouter/v1/workspace/taskChannel.ts | 70 ++++++++++-------- src/rest/taskrouter/v1/workspace/taskQueue.ts | 70 ++++++++++-------- .../taskQueueCumulativeStatistics.ts | 35 +++++---- .../taskQueue/taskQueueRealTimeStatistics.ts | 35 +++++---- .../taskQueue/taskQueueStatistics.ts | 35 +++++---- src/rest/taskrouter/v1/workspace/worker.ts | 70 ++++++++++-------- .../v1/workspace/worker/reservation.ts | 74 +++++++++++-------- .../v1/workspace/worker/workerChannel.ts | 74 +++++++++++-------- .../v1/workspace/worker/workerStatistics.ts | 37 ++++++---- .../worker/workersCumulativeStatistics.ts | 33 +++++---- .../worker/workersRealTimeStatistics.ts | 35 +++++---- .../v1/workspace/worker/workersStatistics.ts | 35 +++++---- src/rest/taskrouter/v1/workspace/workflow.ts | 70 ++++++++++-------- .../workflow/workflowCumulativeStatistics.ts | 35 +++++---- .../workflow/workflowRealTimeStatistics.ts | 35 +++++---- .../workspace/workflow/workflowStatistics.ts | 35 +++++---- .../workspaceCumulativeStatistics.ts | 33 +++++---- .../workspace/workspaceRealTimeStatistics.ts | 33 +++++---- .../v1/workspace/workspaceStatistics.ts | 35 +++++---- src/rest/trunking/v1/trunk.ts | 62 ++++++++++------ src/rest/trunking/v1/trunk/credentialList.ts | 35 +++++---- .../trunking/v1/trunk/ipAccessControlList.ts | 35 +++++---- src/rest/trunking/v1/trunk/originationUrl.ts | 70 ++++++++++-------- src/rest/trunking/v1/trunk/phoneNumber.ts | 35 +++++---- src/rest/trunking/v1/trunk/recording.ts | 70 ++++++++++-------- src/rest/trusthub/v1/complianceInquiries.ts | 33 +++++---- .../v1/complianceRegistrationInquiries.ts | 33 +++++---- src/rest/trusthub/v1/customerProfiles.ts | 66 ++++++++++------- ...stomerProfilesChannelEndpointAssignment.ts | 35 +++++---- .../customerProfilesEntityAssignments.ts | 35 +++++---- .../customerProfilesEvaluations.ts | 35 +++++---- src/rest/trusthub/v1/endUser.ts | 62 ++++++++++------ src/rest/trusthub/v1/endUserType.ts | 35 +++++---- src/rest/trusthub/v1/policies.ts | 31 +++++--- src/rest/trusthub/v1/supportingDocument.ts | 70 ++++++++++-------- .../trusthub/v1/supportingDocumentType.ts | 35 +++++---- src/rest/trusthub/v1/trustProducts.ts | 66 ++++++++++------- .../trustProductsChannelEndpointAssignment.ts | 35 +++++---- .../trustProductsEntityAssignments.ts | 35 +++++---- .../trustProducts/trustProductsEvaluations.ts | 35 +++++---- src/rest/verify/v2/form.ts | 31 +++++--- src/rest/verify/v2/safelist.ts | 35 +++++---- src/rest/verify/v2/service.ts | 58 ++++++++++----- src/rest/verify/v2/service/accessToken.ts | 35 +++++---- src/rest/verify/v2/service/entity.ts | 35 +++++---- .../verify/v2/service/entity/challenge.ts | 74 +++++++++++-------- src/rest/verify/v2/service/entity/factor.ts | 74 +++++++++++-------- .../v2/service/messagingConfiguration.ts | 70 ++++++++++-------- src/rest/verify/v2/service/rateLimit.ts | 70 ++++++++++-------- .../verify/v2/service/rateLimit/bucket.ts | 74 +++++++++++-------- src/rest/verify/v2/service/verification.ts | 70 ++++++++++-------- src/rest/verify/v2/service/webhook.ts | 70 ++++++++++-------- src/rest/verify/v2/verificationAttempt.ts | 33 +++++---- .../verify/v2/verificationAttemptsSummary.ts | 28 ++++--- src/rest/video/v1/composition.ts | 33 +++++---- src/rest/video/v1/compositionHook.ts | 66 ++++++++++------- src/rest/video/v1/compositionSettings.ts | 58 ++++++++++----- src/rest/video/v1/recording.ts | 29 +++++--- src/rest/video/v1/recordingSettings.ts | 48 +++++++----- src/rest/video/v1/room.ts | 58 ++++++++++----- src/rest/video/v1/room/participant.ts | 70 ++++++++++-------- .../video/v1/room/participant/anonymize.ts | 37 ++++++---- .../v1/room/participant/publishedTrack.ts | 37 ++++++---- .../v1/room/participant/subscribedTrack.ts | 37 ++++++---- src/rest/video/v1/room/roomRecording.ts | 35 +++++---- src/rest/voice/v1/byocTrunk.ts | 62 ++++++++++------ src/rest/voice/v1/connectionPolicy.ts | 70 ++++++++++-------- .../connectionPolicyTarget.ts | 70 ++++++++++-------- .../voice/v1/dialingPermissions/country.ts | 33 +++++---- .../voice/v1/dialingPermissions/settings.ts | 48 +++++++----- src/rest/voice/v1/ipRecord.ts | 62 ++++++++++------ src/rest/voice/v1/sourceIpMapping.ts | 70 ++++++++++-------- src/rest/wireless/v1/command.ts | 29 +++++--- src/rest/wireless/v1/ratePlan.ts | 58 ++++++++++----- src/rest/wireless/v1/sim.ts | 62 ++++++++++------ 393 files changed, 11769 insertions(+), 8364 deletions(-) diff --git a/src/rest/accounts/v1/authTokenPromotion.ts b/src/rest/accounts/v1/authTokenPromotion.ts index bf2d1f5e8..5f545668a 100644 --- a/src/rest/accounts/v1/authTokenPromotion.ts +++ b/src/rest/accounts/v1/authTokenPromotion.ts @@ -50,7 +50,7 @@ export class AuthTokenPromotionContextImpl this._uri = `/AuthTokens/Promote`; } - update( + async update( callback?: (error: Error | null, item?: AuthTokenPromotionInstance) => any ): Promise { const headers: any = {}; @@ -64,15 +64,21 @@ export class AuthTokenPromotionContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => new AuthTokenPromotionInstance(operationVersion, payload) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new AuthTokenPromotionInstance(operationVersion, payload); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/accounts/v1/credential/aws.ts b/src/rest/accounts/v1/credential/aws.ts index 4d5e9f73a..56db4f1dc 100644 --- a/src/rest/accounts/v1/credential/aws.ts +++ b/src/rest/accounts/v1/credential/aws.ts @@ -165,7 +165,7 @@ export class AwsContextImpl implements AwsContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: AwsInstance) => any ): Promise { const headers: any = {}; @@ -179,19 +179,28 @@ export class AwsContextImpl implements AwsContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new AwsInstance(operationVersion, payload, instance._solution.sid) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new AwsInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | AwsContextUpdateOptions | ((error: Error | null, item?: AwsInstance) => any), @@ -222,16 +231,25 @@ export class AwsContextImpl implements AwsContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new AwsInstance(operationVersion, payload, instance._solution.sid) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new AwsInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/accounts/v1/credential/publicKey.ts b/src/rest/accounts/v1/credential/publicKey.ts index d58711ae8..8609ad643 100644 --- a/src/rest/accounts/v1/credential/publicKey.ts +++ b/src/rest/accounts/v1/credential/publicKey.ts @@ -165,7 +165,7 @@ export class PublicKeyContextImpl implements PublicKeyContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: PublicKeyInstance) => any ): Promise { const headers: any = {}; @@ -179,19 +179,28 @@ export class PublicKeyContextImpl implements PublicKeyContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new PublicKeyInstance(operationVersion, payload, instance._solution.sid) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new PublicKeyInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | PublicKeyContextUpdateOptions | ((error: Error | null, item?: PublicKeyInstance) => any), @@ -222,16 +231,25 @@ export class PublicKeyContextImpl implements PublicKeyContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new PublicKeyInstance(operationVersion, payload, instance._solution.sid) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new PublicKeyInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/accounts/v1/secondaryAuthToken.ts b/src/rest/accounts/v1/secondaryAuthToken.ts index eb19db278..8a9df85ee 100644 --- a/src/rest/accounts/v1/secondaryAuthToken.ts +++ b/src/rest/accounts/v1/secondaryAuthToken.ts @@ -61,7 +61,7 @@ export class SecondaryAuthTokenContextImpl this._uri = `/AuthTokens/Secondary`; } - create( + async create( callback?: (error: Error | null, item?: SecondaryAuthTokenInstance) => any ): Promise { const headers: any = {}; @@ -75,15 +75,21 @@ export class SecondaryAuthTokenContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => new SecondaryAuthTokenInstance(operationVersion, payload) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new SecondaryAuthTokenInstance(operationVersion, payload); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } remove( diff --git a/src/rest/api/v2010/account.ts b/src/rest/api/v2010/account.ts index a58f8ddc2..6d76877ba 100644 --- a/src/rest/api/v2010/account.ts +++ b/src/rest/api/v2010/account.ts @@ -382,7 +382,7 @@ export class AccountContextImpl implements AccountContext { return this._validationRequests; } - fetch( + async fetch( callback?: (error: Error | null, item?: AccountInstance) => any ): Promise { const headers: any = {}; @@ -396,19 +396,28 @@ export class AccountContextImpl implements AccountContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new AccountInstance(operationVersion, payload, instance._solution.sid) - ); + try { + let payload = await operationPromise; + let operation = new AccountInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | AccountContextUpdateOptions | ((error: Error | null, item?: AccountInstance) => any), @@ -440,16 +449,25 @@ export class AccountContextImpl implements AccountContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new AccountInstance(operationVersion, payload, instance._solution.sid) - ); + try { + let payload = await operationPromise; + let operation = new AccountInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/api/v2010/account/address.ts b/src/rest/api/v2010/account/address.ts index f938b930f..223e192ad 100644 --- a/src/rest/api/v2010/account/address.ts +++ b/src/rest/api/v2010/account/address.ts @@ -234,7 +234,7 @@ export class AddressContextImpl implements AddressContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: AddressInstance) => any ): Promise { const headers: any = {}; @@ -248,24 +248,29 @@ export class AddressContextImpl implements AddressContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new AddressInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new AddressInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | AddressContextUpdateOptions | ((error: Error | null, item?: AddressInstance) => any), @@ -309,21 +314,26 @@ export class AddressContextImpl implements AddressContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new AddressInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new AddressInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/api/v2010/account/application.ts b/src/rest/api/v2010/account/application.ts index 726af2f1f..c2303fd6b 100644 --- a/src/rest/api/v2010/account/application.ts +++ b/src/rest/api/v2010/account/application.ts @@ -232,7 +232,7 @@ export class ApplicationContextImpl implements ApplicationContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: ApplicationInstance) => any ): Promise { const headers: any = {}; @@ -246,24 +246,29 @@ export class ApplicationContextImpl implements ApplicationContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ApplicationInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new ApplicationInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | ApplicationContextUpdateOptions | ((error: Error | null, item?: ApplicationInstance) => any), @@ -326,21 +331,26 @@ export class ApplicationContextImpl implements ApplicationContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ApplicationInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new ApplicationInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/api/v2010/account/authorizedConnectApp.ts b/src/rest/api/v2010/account/authorizedConnectApp.ts index eb43f7453..5c3b677a7 100644 --- a/src/rest/api/v2010/account/authorizedConnectApp.ts +++ b/src/rest/api/v2010/account/authorizedConnectApp.ts @@ -108,7 +108,7 @@ export class AuthorizedConnectAppContextImpl this._uri = `/Accounts/${accountSid}/AuthorizedConnectApps/${connectAppSid}.json`; } - fetch( + async fetch( callback?: (error: Error | null, item?: AuthorizedConnectAppInstance) => any ): Promise { const headers: any = {}; @@ -122,21 +122,26 @@ export class AuthorizedConnectAppContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new AuthorizedConnectAppInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.connectAppSid - ) - ); + try { + let payload = await operationPromise; + let operation = new AuthorizedConnectAppInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.connectAppSid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/api/v2010/account/availablePhoneNumberCountry.ts b/src/rest/api/v2010/account/availablePhoneNumberCountry.ts index 5594adfd7..843e7511f 100644 --- a/src/rest/api/v2010/account/availablePhoneNumberCountry.ts +++ b/src/rest/api/v2010/account/availablePhoneNumberCountry.ts @@ -209,7 +209,7 @@ export class AvailablePhoneNumberCountryContextImpl return this._voip; } - fetch( + async fetch( callback?: ( error: Error | null, item?: AvailablePhoneNumberCountryInstance @@ -226,21 +226,26 @@ export class AvailablePhoneNumberCountryContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new AvailablePhoneNumberCountryInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.countryCode - ) - ); + try { + let payload = await operationPromise; + let operation = new AvailablePhoneNumberCountryInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.countryCode + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/api/v2010/account/call.ts b/src/rest/api/v2010/account/call.ts index 496cd2678..1ac5dc071 100644 --- a/src/rest/api/v2010/account/call.ts +++ b/src/rest/api/v2010/account/call.ts @@ -451,7 +451,7 @@ export class CallContextImpl implements CallContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: CallInstance) => any ): Promise { const headers: any = {}; @@ -465,24 +465,29 @@ export class CallContextImpl implements CallContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new CallInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new CallInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | CallContextUpdateOptions | ((error: Error | null, item?: CallInstance) => any), @@ -526,21 +531,26 @@ export class CallContextImpl implements CallContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new CallInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new CallInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/api/v2010/account/call/notification.ts b/src/rest/api/v2010/account/call/notification.ts index 92aed3be5..909a49b9e 100644 --- a/src/rest/api/v2010/account/call/notification.ts +++ b/src/rest/api/v2010/account/call/notification.ts @@ -131,7 +131,7 @@ export class NotificationContextImpl implements NotificationContext { this._uri = `/Accounts/${accountSid}/Calls/${callSid}/Notifications/${sid}.json`; } - fetch( + async fetch( callback?: (error: Error | null, item?: NotificationInstance) => any ): Promise { const headers: any = {}; @@ -145,22 +145,27 @@ export class NotificationContextImpl implements NotificationContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new NotificationInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.callSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new NotificationInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.callSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/api/v2010/account/call/payment.ts b/src/rest/api/v2010/account/call/payment.ts index 87ff0c935..2734177a9 100644 --- a/src/rest/api/v2010/account/call/payment.ts +++ b/src/rest/api/v2010/account/call/payment.ts @@ -142,7 +142,7 @@ export class PaymentContextImpl implements PaymentContext { this._uri = `/Accounts/${accountSid}/Calls/${callSid}/Payments/${sid}.json`; } - update( + async update( params: PaymentContextUpdateOptions, callback?: (error: Error | null, item?: PaymentInstance) => any ): Promise { @@ -189,22 +189,27 @@ export class PaymentContextImpl implements PaymentContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new PaymentInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.callSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new PaymentInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.callSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/api/v2010/account/call/recording.ts b/src/rest/api/v2010/account/call/recording.ts index a58e2538b..856c00442 100644 --- a/src/rest/api/v2010/account/call/recording.ts +++ b/src/rest/api/v2010/account/call/recording.ts @@ -213,7 +213,7 @@ export class RecordingContextImpl implements RecordingContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: RecordingInstance) => any ): Promise { const headers: any = {}; @@ -227,25 +227,30 @@ export class RecordingContextImpl implements RecordingContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new RecordingInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.callSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new RecordingInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.callSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params: RecordingContextUpdateOptions, callback?: (error: Error | null, item?: RecordingInstance) => any ): Promise { @@ -276,22 +281,27 @@ export class RecordingContextImpl implements RecordingContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new RecordingInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.callSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new RecordingInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.callSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/api/v2010/account/call/siprec.ts b/src/rest/api/v2010/account/call/siprec.ts index 5262bf179..6b9550dd1 100644 --- a/src/rest/api/v2010/account/call/siprec.ts +++ b/src/rest/api/v2010/account/call/siprec.ts @@ -497,7 +497,7 @@ export class SiprecContextImpl implements SiprecContext { this._uri = `/Accounts/${accountSid}/Calls/${callSid}/Siprec/${sid}.json`; } - update( + async update( params: SiprecContextUpdateOptions, callback?: (error: Error | null, item?: SiprecInstance) => any ): Promise { @@ -526,22 +526,27 @@ export class SiprecContextImpl implements SiprecContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new SiprecInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.callSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new SiprecInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.callSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/api/v2010/account/call/stream.ts b/src/rest/api/v2010/account/call/stream.ts index 0c0becec0..0647bf041 100644 --- a/src/rest/api/v2010/account/call/stream.ts +++ b/src/rest/api/v2010/account/call/stream.ts @@ -497,7 +497,7 @@ export class StreamContextImpl implements StreamContext { this._uri = `/Accounts/${accountSid}/Calls/${callSid}/Streams/${sid}.json`; } - update( + async update( params: StreamContextUpdateOptions, callback?: (error: Error | null, item?: StreamInstance) => any ): Promise { @@ -526,22 +526,27 @@ export class StreamContextImpl implements StreamContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new StreamInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.callSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new StreamInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.callSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/api/v2010/account/call/transcription.ts b/src/rest/api/v2010/account/call/transcription.ts index dba55357d..22feeb7d1 100644 --- a/src/rest/api/v2010/account/call/transcription.ts +++ b/src/rest/api/v2010/account/call/transcription.ts @@ -122,7 +122,7 @@ export class TranscriptionContextImpl implements TranscriptionContext { this._uri = `/Accounts/${accountSid}/Calls/${callSid}/Transcriptions/${sid}.json`; } - update( + async update( params: TranscriptionContextUpdateOptions, callback?: (error: Error | null, item?: TranscriptionInstance) => any ): Promise { @@ -151,22 +151,27 @@ export class TranscriptionContextImpl implements TranscriptionContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new TranscriptionInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.callSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new TranscriptionInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.callSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/api/v2010/account/conference.ts b/src/rest/api/v2010/account/conference.ts index 81e8bdeda..7a33bf378 100644 --- a/src/rest/api/v2010/account/conference.ts +++ b/src/rest/api/v2010/account/conference.ts @@ -220,7 +220,7 @@ export class ConferenceContextImpl implements ConferenceContext { return this._recordings; } - fetch( + async fetch( callback?: (error: Error | null, item?: ConferenceInstance) => any ): Promise { const headers: any = {}; @@ -234,24 +234,29 @@ export class ConferenceContextImpl implements ConferenceContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ConferenceInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new ConferenceInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | ConferenceContextUpdateOptions | ((error: Error | null, item?: ConferenceInstance) => any), @@ -285,21 +290,26 @@ export class ConferenceContextImpl implements ConferenceContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ConferenceInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new ConferenceInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/api/v2010/account/conference/participant.ts b/src/rest/api/v2010/account/conference/participant.ts index 5999a5438..697111804 100644 --- a/src/rest/api/v2010/account/conference/participant.ts +++ b/src/rest/api/v2010/account/conference/participant.ts @@ -318,7 +318,7 @@ export class ParticipantContextImpl implements ParticipantContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: ParticipantInstance) => any ): Promise { const headers: any = {}; @@ -332,25 +332,30 @@ export class ParticipantContextImpl implements ParticipantContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ParticipantInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.conferenceSid, - instance._solution.callSid - ) - ); + try { + let payload = await operationPromise; + let operation = new ParticipantInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.conferenceSid, + instance._solution.callSid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | ParticipantContextUpdateOptions | ((error: Error | null, item?: ParticipantInstance) => any), @@ -403,22 +408,27 @@ export class ParticipantContextImpl implements ParticipantContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ParticipantInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.conferenceSid, - instance._solution.callSid - ) - ); + try { + let payload = await operationPromise; + let operation = new ParticipantInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.conferenceSid, + instance._solution.callSid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/api/v2010/account/conference/recording.ts b/src/rest/api/v2010/account/conference/recording.ts index e7c619afd..2c5e5d49d 100644 --- a/src/rest/api/v2010/account/conference/recording.ts +++ b/src/rest/api/v2010/account/conference/recording.ts @@ -195,7 +195,7 @@ export class RecordingContextImpl implements RecordingContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: RecordingInstance) => any ): Promise { const headers: any = {}; @@ -209,25 +209,30 @@ export class RecordingContextImpl implements RecordingContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new RecordingInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.conferenceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new RecordingInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.conferenceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params: RecordingContextUpdateOptions, callback?: (error: Error | null, item?: RecordingInstance) => any ): Promise { @@ -258,22 +263,27 @@ export class RecordingContextImpl implements RecordingContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new RecordingInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.conferenceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new RecordingInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.conferenceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/api/v2010/account/connectApp.ts b/src/rest/api/v2010/account/connectApp.ts index d59fdfab3..37d267338 100644 --- a/src/rest/api/v2010/account/connectApp.ts +++ b/src/rest/api/v2010/account/connectApp.ts @@ -174,7 +174,7 @@ export class ConnectAppContextImpl implements ConnectAppContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: ConnectAppInstance) => any ): Promise { const headers: any = {}; @@ -188,24 +188,29 @@ export class ConnectAppContextImpl implements ConnectAppContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ConnectAppInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new ConnectAppInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | ConnectAppContextUpdateOptions | ((error: Error | null, item?: ConnectAppInstance) => any), @@ -253,21 +258,26 @@ export class ConnectAppContextImpl implements ConnectAppContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ConnectAppInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new ConnectAppInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/api/v2010/account/incomingPhoneNumber.ts b/src/rest/api/v2010/account/incomingPhoneNumber.ts index 0d3ccf881..f947657b2 100644 --- a/src/rest/api/v2010/account/incomingPhoneNumber.ts +++ b/src/rest/api/v2010/account/incomingPhoneNumber.ts @@ -323,7 +323,7 @@ export class IncomingPhoneNumberContextImpl return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: IncomingPhoneNumberInstance) => any ): Promise { const headers: any = {}; @@ -337,24 +337,29 @@ export class IncomingPhoneNumberContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new IncomingPhoneNumberInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new IncomingPhoneNumberInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | IncomingPhoneNumberContextUpdateOptions | ((error: Error | null, item?: IncomingPhoneNumberInstance) => any), @@ -428,21 +433,26 @@ export class IncomingPhoneNumberContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new IncomingPhoneNumberInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new IncomingPhoneNumberInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/api/v2010/account/incomingPhoneNumber/assignedAddOn.ts b/src/rest/api/v2010/account/incomingPhoneNumber/assignedAddOn.ts index 3eb9b3628..c9977186e 100644 --- a/src/rest/api/v2010/account/incomingPhoneNumber/assignedAddOn.ts +++ b/src/rest/api/v2010/account/incomingPhoneNumber/assignedAddOn.ts @@ -162,7 +162,7 @@ export class AssignedAddOnContextImpl implements AssignedAddOnContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: AssignedAddOnInstance) => any ): Promise { const headers: any = {}; @@ -176,22 +176,27 @@ export class AssignedAddOnContextImpl implements AssignedAddOnContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new AssignedAddOnInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.resourceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new AssignedAddOnInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.resourceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/api/v2010/account/incomingPhoneNumber/assignedAddOn/assignedAddOnExtension.ts b/src/rest/api/v2010/account/incomingPhoneNumber/assignedAddOn/assignedAddOnExtension.ts index 933b2da47..47fda63fa 100644 --- a/src/rest/api/v2010/account/incomingPhoneNumber/assignedAddOn/assignedAddOnExtension.ts +++ b/src/rest/api/v2010/account/incomingPhoneNumber/assignedAddOn/assignedAddOnExtension.ts @@ -121,7 +121,7 @@ export class AssignedAddOnExtensionContextImpl this._uri = `/Accounts/${accountSid}/IncomingPhoneNumbers/${resourceSid}/AssignedAddOns/${assignedAddOnSid}/Extensions/${sid}.json`; } - fetch( + async fetch( callback?: ( error: Error | null, item?: AssignedAddOnExtensionInstance @@ -138,23 +138,28 @@ export class AssignedAddOnExtensionContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new AssignedAddOnExtensionInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.resourceSid, - instance._solution.assignedAddOnSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new AssignedAddOnExtensionInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.resourceSid, + instance._solution.assignedAddOnSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/api/v2010/account/key.ts b/src/rest/api/v2010/account/key.ts index 4aa50aba1..e75834360 100644 --- a/src/rest/api/v2010/account/key.ts +++ b/src/rest/api/v2010/account/key.ts @@ -158,7 +158,7 @@ export class KeyContextImpl implements KeyContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: KeyInstance) => any ): Promise { const headers: any = {}; @@ -172,24 +172,29 @@ export class KeyContextImpl implements KeyContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new KeyInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new KeyInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | KeyContextUpdateOptions | ((error: Error | null, item?: KeyInstance) => any), @@ -220,21 +225,26 @@ export class KeyContextImpl implements KeyContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new KeyInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new KeyInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/api/v2010/account/message.ts b/src/rest/api/v2010/account/message.ts index 47e00a429..70c51ee50 100644 --- a/src/rest/api/v2010/account/message.ts +++ b/src/rest/api/v2010/account/message.ts @@ -303,7 +303,7 @@ export class MessageContextImpl implements MessageContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: MessageInstance) => any ): Promise { const headers: any = {}; @@ -317,24 +317,29 @@ export class MessageContextImpl implements MessageContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new MessageInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new MessageInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | MessageContextUpdateOptions | ((error: Error | null, item?: MessageInstance) => any), @@ -365,21 +370,26 @@ export class MessageContextImpl implements MessageContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new MessageInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new MessageInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/api/v2010/account/message/media.ts b/src/rest/api/v2010/account/message/media.ts index c19e1487b..f4f8989ab 100644 --- a/src/rest/api/v2010/account/message/media.ts +++ b/src/rest/api/v2010/account/message/media.ts @@ -156,7 +156,7 @@ export class MediaContextImpl implements MediaContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: MediaInstance) => any ): Promise { const headers: any = {}; @@ -170,22 +170,27 @@ export class MediaContextImpl implements MediaContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new MediaInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.messageSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new MediaInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.messageSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/api/v2010/account/notification.ts b/src/rest/api/v2010/account/notification.ts index 2b3dfe036..48b07e19a 100644 --- a/src/rest/api/v2010/account/notification.ts +++ b/src/rest/api/v2010/account/notification.ts @@ -121,7 +121,7 @@ export class NotificationContextImpl implements NotificationContext { this._uri = `/Accounts/${accountSid}/Notifications/${sid}.json`; } - fetch( + async fetch( callback?: (error: Error | null, item?: NotificationInstance) => any ): Promise { const headers: any = {}; @@ -135,21 +135,26 @@ export class NotificationContextImpl implements NotificationContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new NotificationInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new NotificationInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/api/v2010/account/outgoingCallerId.ts b/src/rest/api/v2010/account/outgoingCallerId.ts index bd53cdd13..3578af7db 100644 --- a/src/rest/api/v2010/account/outgoingCallerId.ts +++ b/src/rest/api/v2010/account/outgoingCallerId.ts @@ -173,7 +173,7 @@ export class OutgoingCallerIdContextImpl implements OutgoingCallerIdContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: OutgoingCallerIdInstance) => any ): Promise { const headers: any = {}; @@ -187,24 +187,29 @@ export class OutgoingCallerIdContextImpl implements OutgoingCallerIdContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new OutgoingCallerIdInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new OutgoingCallerIdInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | OutgoingCallerIdContextUpdateOptions | ((error: Error | null, item?: OutgoingCallerIdInstance) => any), @@ -235,21 +240,26 @@ export class OutgoingCallerIdContextImpl implements OutgoingCallerIdContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new OutgoingCallerIdInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new OutgoingCallerIdInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/api/v2010/account/queue.ts b/src/rest/api/v2010/account/queue.ts index 9b0fb4338..1d85e4516 100644 --- a/src/rest/api/v2010/account/queue.ts +++ b/src/rest/api/v2010/account/queue.ts @@ -186,7 +186,7 @@ export class QueueContextImpl implements QueueContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: QueueInstance) => any ): Promise { const headers: any = {}; @@ -200,24 +200,29 @@ export class QueueContextImpl implements QueueContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new QueueInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new QueueInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | QueueContextUpdateOptions | ((error: Error | null, item?: QueueInstance) => any), @@ -249,21 +254,26 @@ export class QueueContextImpl implements QueueContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new QueueInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new QueueInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/api/v2010/account/queue/member.ts b/src/rest/api/v2010/account/queue/member.ts index 7c5e62659..6bfd55729 100644 --- a/src/rest/api/v2010/account/queue/member.ts +++ b/src/rest/api/v2010/account/queue/member.ts @@ -129,7 +129,7 @@ export class MemberContextImpl implements MemberContext { this._uri = `/Accounts/${accountSid}/Queues/${queueSid}/Members/${callSid}.json`; } - fetch( + async fetch( callback?: (error: Error | null, item?: MemberInstance) => any ): Promise { const headers: any = {}; @@ -143,25 +143,30 @@ export class MemberContextImpl implements MemberContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new MemberInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.queueSid, - instance._solution.callSid - ) - ); + try { + let payload = await operationPromise; + let operation = new MemberInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.queueSid, + instance._solution.callSid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params: MemberContextUpdateOptions, callback?: (error: Error | null, item?: MemberInstance) => any ): Promise { @@ -191,22 +196,27 @@ export class MemberContextImpl implements MemberContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new MemberInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.queueSid, - instance._solution.callSid - ) - ); + try { + let payload = await operationPromise; + let operation = new MemberInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.queueSid, + instance._solution.callSid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/api/v2010/account/recording.ts b/src/rest/api/v2010/account/recording.ts index 21431212c..c2afde9e6 100644 --- a/src/rest/api/v2010/account/recording.ts +++ b/src/rest/api/v2010/account/recording.ts @@ -231,7 +231,7 @@ export class RecordingContextImpl implements RecordingContext { return operationPromise; } - fetch( + async fetch( params?: | RecordingContextFetchOptions | ((error: Error | null, item?: RecordingInstance) => any), @@ -261,21 +261,26 @@ export class RecordingContextImpl implements RecordingContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new RecordingInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new RecordingInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/api/v2010/account/recording/addOnResult.ts b/src/rest/api/v2010/account/recording/addOnResult.ts index 029c286eb..d120e1426 100644 --- a/src/rest/api/v2010/account/recording/addOnResult.ts +++ b/src/rest/api/v2010/account/recording/addOnResult.ts @@ -165,7 +165,7 @@ export class AddOnResultContextImpl implements AddOnResultContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: AddOnResultInstance) => any ): Promise { const headers: any = {}; @@ -179,22 +179,27 @@ export class AddOnResultContextImpl implements AddOnResultContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new AddOnResultInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.referenceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new AddOnResultInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.referenceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/api/v2010/account/recording/addOnResult/payload.ts b/src/rest/api/v2010/account/recording/addOnResult/payload.ts index b74424016..a52256f33 100644 --- a/src/rest/api/v2010/account/recording/addOnResult/payload.ts +++ b/src/rest/api/v2010/account/recording/addOnResult/payload.ts @@ -162,7 +162,7 @@ export class PayloadContextImpl implements PayloadContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: PayloadInstance) => any ): Promise { const headers: any = {}; @@ -176,23 +176,28 @@ export class PayloadContextImpl implements PayloadContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new PayloadInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.referenceSid, - instance._solution.addOnResultSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new PayloadInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.referenceSid, + instance._solution.addOnResultSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/api/v2010/account/recording/addOnResult/payload/data.ts b/src/rest/api/v2010/account/recording/addOnResult/payload/data.ts index cd78203e5..061e39dbc 100644 --- a/src/rest/api/v2010/account/recording/addOnResult/payload/data.ts +++ b/src/rest/api/v2010/account/recording/addOnResult/payload/data.ts @@ -75,7 +75,7 @@ export class DataContextImpl implements DataContext { this._uri = `/Accounts/${accountSid}/Recordings/${referenceSid}/AddOnResults/${addOnResultSid}/Payloads/${payloadSid}/Data.json`; } - fetch( + async fetch( callback?: (error: Error | null, item?: DataInstance) => any ): Promise { const headers: any = {}; @@ -89,23 +89,28 @@ export class DataContextImpl implements DataContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new DataInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.referenceSid, - instance._solution.addOnResultSid, - instance._solution.payloadSid - ) - ); + try { + let payload = await operationPromise; + let operation = new DataInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.referenceSid, + instance._solution.addOnResultSid, + instance._solution.payloadSid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/api/v2010/account/recording/transcription.ts b/src/rest/api/v2010/account/recording/transcription.ts index 784147b58..277e8a334 100644 --- a/src/rest/api/v2010/account/recording/transcription.ts +++ b/src/rest/api/v2010/account/recording/transcription.ts @@ -140,7 +140,7 @@ export class TranscriptionContextImpl implements TranscriptionContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: TranscriptionInstance) => any ): Promise { const headers: any = {}; @@ -154,22 +154,27 @@ export class TranscriptionContextImpl implements TranscriptionContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new TranscriptionInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.recordingSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new TranscriptionInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.recordingSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/api/v2010/account/shortCode.ts b/src/rest/api/v2010/account/shortCode.ts index 55b240f08..fe5ca48bf 100644 --- a/src/rest/api/v2010/account/shortCode.ts +++ b/src/rest/api/v2010/account/shortCode.ts @@ -149,7 +149,7 @@ export class ShortCodeContextImpl implements ShortCodeContext { this._uri = `/Accounts/${accountSid}/SMS/ShortCodes/${sid}.json`; } - fetch( + async fetch( callback?: (error: Error | null, item?: ShortCodeInstance) => any ): Promise { const headers: any = {}; @@ -163,24 +163,29 @@ export class ShortCodeContextImpl implements ShortCodeContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ShortCodeInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new ShortCodeInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | ShortCodeContextUpdateOptions | ((error: Error | null, item?: ShortCodeInstance) => any), @@ -220,21 +225,26 @@ export class ShortCodeContextImpl implements ShortCodeContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ShortCodeInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new ShortCodeInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/api/v2010/account/signingKey.ts b/src/rest/api/v2010/account/signingKey.ts index d56903ed8..cd35054c6 100644 --- a/src/rest/api/v2010/account/signingKey.ts +++ b/src/rest/api/v2010/account/signingKey.ts @@ -158,7 +158,7 @@ export class SigningKeyContextImpl implements SigningKeyContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: SigningKeyInstance) => any ): Promise { const headers: any = {}; @@ -172,24 +172,29 @@ export class SigningKeyContextImpl implements SigningKeyContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new SigningKeyInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new SigningKeyInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | SigningKeyContextUpdateOptions | ((error: Error | null, item?: SigningKeyInstance) => any), @@ -220,21 +225,26 @@ export class SigningKeyContextImpl implements SigningKeyContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new SigningKeyInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new SigningKeyInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/api/v2010/account/sip/credentialList.ts b/src/rest/api/v2010/account/sip/credentialList.ts index cc99d770c..7a60b0f7f 100644 --- a/src/rest/api/v2010/account/sip/credentialList.ts +++ b/src/rest/api/v2010/account/sip/credentialList.ts @@ -175,7 +175,7 @@ export class CredentialListContextImpl implements CredentialListContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: CredentialListInstance) => any ): Promise { const headers: any = {}; @@ -189,24 +189,29 @@ export class CredentialListContextImpl implements CredentialListContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new CredentialListInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new CredentialListInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params: CredentialListContextUpdateOptions, callback?: (error: Error | null, item?: CredentialListInstance) => any ): Promise { @@ -238,21 +243,26 @@ export class CredentialListContextImpl implements CredentialListContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new CredentialListInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new CredentialListInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/api/v2010/account/sip/credentialList/credential.ts b/src/rest/api/v2010/account/sip/credentialList/credential.ts index 00510f846..8fab4f466 100644 --- a/src/rest/api/v2010/account/sip/credentialList/credential.ts +++ b/src/rest/api/v2010/account/sip/credentialList/credential.ts @@ -178,7 +178,7 @@ export class CredentialContextImpl implements CredentialContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: CredentialInstance) => any ): Promise { const headers: any = {}; @@ -192,25 +192,30 @@ export class CredentialContextImpl implements CredentialContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new CredentialInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.credentialListSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new CredentialInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.credentialListSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | CredentialContextUpdateOptions | ((error: Error | null, item?: CredentialInstance) => any), @@ -240,22 +245,27 @@ export class CredentialContextImpl implements CredentialContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new CredentialInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.credentialListSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new CredentialInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.credentialListSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/api/v2010/account/sip/domain.ts b/src/rest/api/v2010/account/sip/domain.ts index 12f87ad74..528f75e34 100644 --- a/src/rest/api/v2010/account/sip/domain.ts +++ b/src/rest/api/v2010/account/sip/domain.ts @@ -258,7 +258,7 @@ export class DomainContextImpl implements DomainContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: DomainInstance) => any ): Promise { const headers: any = {}; @@ -272,24 +272,29 @@ export class DomainContextImpl implements DomainContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new DomainInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new DomainInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | DomainContextUpdateOptions | ((error: Error | null, item?: DomainInstance) => any), @@ -345,21 +350,26 @@ export class DomainContextImpl implements DomainContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new DomainInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new DomainInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/api/v2010/account/sip/domain/authTypes/authTypeCalls/authCallsCredentialListMapping.ts b/src/rest/api/v2010/account/sip/domain/authTypes/authTypeCalls/authCallsCredentialListMapping.ts index 152807557..f30cf8efb 100644 --- a/src/rest/api/v2010/account/sip/domain/authTypes/authTypeCalls/authCallsCredentialListMapping.ts +++ b/src/rest/api/v2010/account/sip/domain/authTypes/authTypeCalls/authCallsCredentialListMapping.ts @@ -153,7 +153,7 @@ export class AuthCallsCredentialListMappingContextImpl return operationPromise; } - fetch( + async fetch( callback?: ( error: Error | null, item?: AuthCallsCredentialListMappingInstance @@ -170,22 +170,27 @@ export class AuthCallsCredentialListMappingContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new AuthCallsCredentialListMappingInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.domainSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new AuthCallsCredentialListMappingInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.domainSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/api/v2010/account/sip/domain/authTypes/authTypeCalls/authCallsIpAccessControlListMapping.ts b/src/rest/api/v2010/account/sip/domain/authTypes/authTypeCalls/authCallsIpAccessControlListMapping.ts index b2fed94d5..672f6ec74 100644 --- a/src/rest/api/v2010/account/sip/domain/authTypes/authTypeCalls/authCallsIpAccessControlListMapping.ts +++ b/src/rest/api/v2010/account/sip/domain/authTypes/authTypeCalls/authCallsIpAccessControlListMapping.ts @@ -153,7 +153,7 @@ export class AuthCallsIpAccessControlListMappingContextImpl return operationPromise; } - fetch( + async fetch( callback?: ( error: Error | null, item?: AuthCallsIpAccessControlListMappingInstance @@ -170,22 +170,27 @@ export class AuthCallsIpAccessControlListMappingContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new AuthCallsIpAccessControlListMappingInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.domainSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new AuthCallsIpAccessControlListMappingInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.domainSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/api/v2010/account/sip/domain/authTypes/authTypeRegistrations/authRegistrationsCredentialListMapping.ts b/src/rest/api/v2010/account/sip/domain/authTypes/authTypeRegistrations/authRegistrationsCredentialListMapping.ts index e6f1ba2f8..8dcae4e40 100644 --- a/src/rest/api/v2010/account/sip/domain/authTypes/authTypeRegistrations/authRegistrationsCredentialListMapping.ts +++ b/src/rest/api/v2010/account/sip/domain/authTypes/authTypeRegistrations/authRegistrationsCredentialListMapping.ts @@ -153,7 +153,7 @@ export class AuthRegistrationsCredentialListMappingContextImpl return operationPromise; } - fetch( + async fetch( callback?: ( error: Error | null, item?: AuthRegistrationsCredentialListMappingInstance @@ -170,22 +170,27 @@ export class AuthRegistrationsCredentialListMappingContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new AuthRegistrationsCredentialListMappingInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.domainSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new AuthRegistrationsCredentialListMappingInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.domainSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/api/v2010/account/sip/domain/credentialListMapping.ts b/src/rest/api/v2010/account/sip/domain/credentialListMapping.ts index 52dfd5e5d..8d722a9dd 100644 --- a/src/rest/api/v2010/account/sip/domain/credentialListMapping.ts +++ b/src/rest/api/v2010/account/sip/domain/credentialListMapping.ts @@ -153,7 +153,7 @@ export class CredentialListMappingContextImpl return operationPromise; } - fetch( + async fetch( callback?: ( error: Error | null, item?: CredentialListMappingInstance @@ -170,22 +170,27 @@ export class CredentialListMappingContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new CredentialListMappingInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.domainSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new CredentialListMappingInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.domainSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/api/v2010/account/sip/domain/ipAccessControlListMapping.ts b/src/rest/api/v2010/account/sip/domain/ipAccessControlListMapping.ts index 1dae94f54..a1cdc1ec7 100644 --- a/src/rest/api/v2010/account/sip/domain/ipAccessControlListMapping.ts +++ b/src/rest/api/v2010/account/sip/domain/ipAccessControlListMapping.ts @@ -153,7 +153,7 @@ export class IpAccessControlListMappingContextImpl return operationPromise; } - fetch( + async fetch( callback?: ( error: Error | null, item?: IpAccessControlListMappingInstance @@ -170,22 +170,27 @@ export class IpAccessControlListMappingContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new IpAccessControlListMappingInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.domainSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new IpAccessControlListMappingInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.domainSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/api/v2010/account/sip/ipAccessControlList.ts b/src/rest/api/v2010/account/sip/ipAccessControlList.ts index 439a8c98d..f803bc9e5 100644 --- a/src/rest/api/v2010/account/sip/ipAccessControlList.ts +++ b/src/rest/api/v2010/account/sip/ipAccessControlList.ts @@ -177,7 +177,7 @@ export class IpAccessControlListContextImpl return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: IpAccessControlListInstance) => any ): Promise { const headers: any = {}; @@ -191,24 +191,29 @@ export class IpAccessControlListContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new IpAccessControlListInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new IpAccessControlListInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params: IpAccessControlListContextUpdateOptions, callback?: (error: Error | null, item?: IpAccessControlListInstance) => any ): Promise { @@ -240,21 +245,26 @@ export class IpAccessControlListContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new IpAccessControlListInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new IpAccessControlListInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/api/v2010/account/sip/ipAccessControlList/ipAddress.ts b/src/rest/api/v2010/account/sip/ipAccessControlList/ipAddress.ts index 44163e92c..d2d2f2c36 100644 --- a/src/rest/api/v2010/account/sip/ipAccessControlList/ipAddress.ts +++ b/src/rest/api/v2010/account/sip/ipAccessControlList/ipAddress.ts @@ -184,7 +184,7 @@ export class IpAddressContextImpl implements IpAddressContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: IpAddressInstance) => any ): Promise { const headers: any = {}; @@ -198,25 +198,30 @@ export class IpAddressContextImpl implements IpAddressContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new IpAddressInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.ipAccessControlListSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new IpAddressInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.ipAccessControlListSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | IpAddressContextUpdateOptions | ((error: Error | null, item?: IpAddressInstance) => any), @@ -251,22 +256,27 @@ export class IpAddressContextImpl implements IpAddressContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new IpAddressInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.ipAccessControlListSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new IpAddressInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.ipAccessControlListSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/api/v2010/account/transcription.ts b/src/rest/api/v2010/account/transcription.ts index 1fe37689f..a14aefc1c 100644 --- a/src/rest/api/v2010/account/transcription.ts +++ b/src/rest/api/v2010/account/transcription.ts @@ -130,7 +130,7 @@ export class TranscriptionContextImpl implements TranscriptionContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: TranscriptionInstance) => any ): Promise { const headers: any = {}; @@ -144,21 +144,26 @@ export class TranscriptionContextImpl implements TranscriptionContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new TranscriptionInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new TranscriptionInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/api/v2010/account/usage/trigger.ts b/src/rest/api/v2010/account/usage/trigger.ts index aebd060ab..bd1c2d568 100644 --- a/src/rest/api/v2010/account/usage/trigger.ts +++ b/src/rest/api/v2010/account/usage/trigger.ts @@ -457,7 +457,7 @@ export class TriggerContextImpl implements TriggerContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: TriggerInstance) => any ): Promise { const headers: any = {}; @@ -471,24 +471,29 @@ export class TriggerContextImpl implements TriggerContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new TriggerInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new TriggerInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | TriggerContextUpdateOptions | ((error: Error | null, item?: TriggerInstance) => any), @@ -523,21 +528,26 @@ export class TriggerContextImpl implements TriggerContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new TriggerInstance( - operationVersion, - payload, - instance._solution.accountSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new TriggerInstance( + operationVersion, + payload, + instance._solution.accountSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/assistants/v1/assistant.ts b/src/rest/assistants/v1/assistant.ts index 25e723aa1..729622606 100644 --- a/src/rest/assistants/v1/assistant.ts +++ b/src/rest/assistants/v1/assistant.ts @@ -357,7 +357,7 @@ export class AssistantContextImpl implements AssistantContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: AssistantInstance) => any ): Promise { const headers: any = {}; @@ -371,19 +371,28 @@ export class AssistantContextImpl implements AssistantContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new AssistantInstance(operationVersion, payload, instance._solution.id) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new AssistantInstance( + operationVersion, + payload, + instance._solution.id + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | AssistantsV1ServiceUpdateAssistantRequest | ((error: Error | null, item?: AssistantInstance) => any), @@ -417,16 +426,25 @@ export class AssistantContextImpl implements AssistantContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new AssistantInstance(operationVersion, payload, instance._solution.id) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new AssistantInstance( + operationVersion, + payload, + instance._solution.id + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/assistants/v1/assistant/assistantsKnowledge.ts b/src/rest/assistants/v1/assistant/assistantsKnowledge.ts index 50dcfb900..e5739213d 100644 --- a/src/rest/assistants/v1/assistant/assistantsKnowledge.ts +++ b/src/rest/assistants/v1/assistant/assistantsKnowledge.ts @@ -113,7 +113,7 @@ export class AssistantsKnowledgeContextImpl this._uri = `/Assistants/${assistantId}/Knowledge/${id}`; } - create( + async create( callback?: (error: Error | null, item?: AssistantsKnowledgeInstance) => any ): Promise { const headers: any = {}; @@ -126,21 +126,26 @@ export class AssistantsKnowledgeContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new AssistantsKnowledgeInstance( - operationVersion, - payload, - instance._solution.assistantId, - instance._solution.id - ) - ); + try { + let payload = await operationPromise; + let operation = new AssistantsKnowledgeInstance( + operationVersion, + payload, + instance._solution.assistantId, + instance._solution.id + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } remove( diff --git a/src/rest/assistants/v1/assistant/assistantsTool.ts b/src/rest/assistants/v1/assistant/assistantsTool.ts index 40b62d8e4..ce35befef 100644 --- a/src/rest/assistants/v1/assistant/assistantsTool.ts +++ b/src/rest/assistants/v1/assistant/assistantsTool.ts @@ -111,7 +111,7 @@ export class AssistantsToolContextImpl implements AssistantsToolContext { this._uri = `/Assistants/${assistantId}/Tools/${id}`; } - create( + async create( callback?: (error: Error | null, item?: AssistantsToolInstance) => any ): Promise { const headers: any = {}; @@ -124,21 +124,26 @@ export class AssistantsToolContextImpl implements AssistantsToolContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new AssistantsToolInstance( - operationVersion, - payload, - instance._solution.assistantId, - instance._solution.id - ) - ); + try { + let payload = await operationPromise; + let operation = new AssistantsToolInstance( + operationVersion, + payload, + instance._solution.assistantId, + instance._solution.id + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } remove( diff --git a/src/rest/assistants/v1/knowledge.ts b/src/rest/assistants/v1/knowledge.ts index 59114493d..327238c1a 100644 --- a/src/rest/assistants/v1/knowledge.ts +++ b/src/rest/assistants/v1/knowledge.ts @@ -262,7 +262,7 @@ export class KnowledgeContextImpl implements KnowledgeContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: KnowledgeInstance) => any ): Promise { const headers: any = {}; @@ -276,19 +276,28 @@ export class KnowledgeContextImpl implements KnowledgeContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new KnowledgeInstance(operationVersion, payload, instance._solution.id) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new KnowledgeInstance( + operationVersion, + payload, + instance._solution.id + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | AssistantsV1ServiceUpdateKnowledgeRequest | ((error: Error | null, item?: KnowledgeInstance) => any), @@ -322,16 +331,25 @@ export class KnowledgeContextImpl implements KnowledgeContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new KnowledgeInstance(operationVersion, payload, instance._solution.id) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new KnowledgeInstance( + operationVersion, + payload, + instance._solution.id + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/assistants/v1/knowledge/knowledgeStatus.ts b/src/rest/assistants/v1/knowledge/knowledgeStatus.ts index 66d8006cf..1b08f5671 100644 --- a/src/rest/assistants/v1/knowledge/knowledgeStatus.ts +++ b/src/rest/assistants/v1/knowledge/knowledgeStatus.ts @@ -54,7 +54,7 @@ export class KnowledgeStatusContextImpl implements KnowledgeStatusContext { this._uri = `/Knowledge/${id}/Status`; } - fetch( + async fetch( callback?: (error: Error | null, item?: KnowledgeStatusInstance) => any ): Promise { const headers: any = {}; @@ -68,20 +68,25 @@ export class KnowledgeStatusContextImpl implements KnowledgeStatusContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new KnowledgeStatusInstance( - operationVersion, - payload, - instance._solution.id - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new KnowledgeStatusInstance( + operationVersion, + payload, + instance._solution.id + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/assistants/v1/session.ts b/src/rest/assistants/v1/session.ts index 3c2cb9741..de94d5ed1 100644 --- a/src/rest/assistants/v1/session.ts +++ b/src/rest/assistants/v1/session.ts @@ -103,7 +103,7 @@ export class SessionContextImpl implements SessionContext { return this._messages; } - fetch( + async fetch( callback?: (error: Error | null, item?: SessionInstance) => any ): Promise { const headers: any = {}; @@ -117,16 +117,25 @@ export class SessionContextImpl implements SessionContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new SessionInstance(operationVersion, payload, instance._solution.id) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new SessionInstance( + operationVersion, + payload, + instance._solution.id + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/assistants/v1/tool.ts b/src/rest/assistants/v1/tool.ts index 24a13cb12..92bedcf98 100644 --- a/src/rest/assistants/v1/tool.ts +++ b/src/rest/assistants/v1/tool.ts @@ -284,7 +284,7 @@ export class ToolContextImpl implements ToolContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: ToolInstance) => any ): Promise { const headers: any = {}; @@ -298,19 +298,28 @@ export class ToolContextImpl implements ToolContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ToolInstance(operationVersion, payload, instance._solution.id) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new ToolInstance( + operationVersion, + payload, + instance._solution.id + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | AssistantsV1ServiceUpdateToolRequest | ((error: Error | null, item?: ToolInstance) => any), @@ -344,16 +353,25 @@ export class ToolContextImpl implements ToolContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ToolInstance(operationVersion, payload, instance._solution.id) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new ToolInstance( + operationVersion, + payload, + instance._solution.id + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/bulkexports/v1/export.ts b/src/rest/bulkexports/v1/export.ts index 7bb684a7d..038405516 100644 --- a/src/rest/bulkexports/v1/export.ts +++ b/src/rest/bulkexports/v1/export.ts @@ -76,7 +76,7 @@ export class ExportContextImpl implements ExportContext { return this._exportCustomJobs; } - fetch( + async fetch( callback?: (error: Error | null, item?: ExportInstance) => any ): Promise { const headers: any = {}; @@ -90,20 +90,25 @@ export class ExportContextImpl implements ExportContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ExportInstance( - operationVersion, - payload, - instance._solution.resourceType - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new ExportInstance( + operationVersion, + payload, + instance._solution.resourceType + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/bulkexports/v1/export/day.ts b/src/rest/bulkexports/v1/export/day.ts index fb5938f05..989bad012 100644 --- a/src/rest/bulkexports/v1/export/day.ts +++ b/src/rest/bulkexports/v1/export/day.ts @@ -97,7 +97,7 @@ export class DayContextImpl implements DayContext { this._uri = `/Exports/${resourceType}/Days/${day}`; } - fetch( + async fetch( callback?: (error: Error | null, item?: DayInstance) => any ): Promise { const headers: any = {}; @@ -111,21 +111,26 @@ export class DayContextImpl implements DayContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new DayInstance( - operationVersion, - payload, - instance._solution.resourceType, - instance._solution.day - ) - ); + try { + let payload = await operationPromise; + let operation = new DayInstance( + operationVersion, + payload, + instance._solution.resourceType, + instance._solution.day + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/bulkexports/v1/export/job.ts b/src/rest/bulkexports/v1/export/job.ts index 599a5558b..2ac5a703d 100644 --- a/src/rest/bulkexports/v1/export/job.ts +++ b/src/rest/bulkexports/v1/export/job.ts @@ -85,7 +85,7 @@ export class JobContextImpl implements JobContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: JobInstance) => any ): Promise { const headers: any = {}; @@ -99,16 +99,25 @@ export class JobContextImpl implements JobContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new JobInstance(operationVersion, payload, instance._solution.jobSid) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new JobInstance( + operationVersion, + payload, + instance._solution.jobSid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/bulkexports/v1/exportConfiguration.ts b/src/rest/bulkexports/v1/exportConfiguration.ts index 4b869b5e8..b51c8aee7 100644 --- a/src/rest/bulkexports/v1/exportConfiguration.ts +++ b/src/rest/bulkexports/v1/exportConfiguration.ts @@ -91,7 +91,7 @@ export class ExportConfigurationContextImpl this._uri = `/Exports/${resourceType}/Configuration`; } - fetch( + async fetch( callback?: (error: Error | null, item?: ExportConfigurationInstance) => any ): Promise { const headers: any = {}; @@ -105,23 +105,28 @@ export class ExportConfigurationContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new ExportConfigurationInstance( - operationVersion, - payload, - instance._solution.resourceType - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new ExportConfigurationInstance( + operationVersion, + payload, + instance._solution.resourceType + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | ExportConfigurationContextUpdateOptions | ((error: Error | null, item?: ExportConfigurationInstance) => any), @@ -156,20 +161,25 @@ export class ExportConfigurationContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new ExportConfigurationInstance( - operationVersion, - payload, - instance._solution.resourceType - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new ExportConfigurationInstance( + operationVersion, + payload, + instance._solution.resourceType + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/chat/v1/credential.ts b/src/rest/chat/v1/credential.ts index 46312768a..79173495e 100644 --- a/src/rest/chat/v1/credential.ts +++ b/src/rest/chat/v1/credential.ts @@ -185,7 +185,7 @@ export class CredentialContextImpl implements CredentialContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: CredentialInstance) => any ): Promise { const headers: any = {}; @@ -199,23 +199,28 @@ export class CredentialContextImpl implements CredentialContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new CredentialInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new CredentialInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | CredentialContextUpdateOptions | ((error: Error | null, item?: CredentialInstance) => any), @@ -254,20 +259,25 @@ export class CredentialContextImpl implements CredentialContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new CredentialInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new CredentialInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/chat/v1/service.ts b/src/rest/chat/v1/service.ts index 023ca0919..09ed451d0 100644 --- a/src/rest/chat/v1/service.ts +++ b/src/rest/chat/v1/service.ts @@ -296,7 +296,7 @@ export class ServiceContextImpl implements ServiceContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: ServiceInstance) => any ): Promise { const headers: any = {}; @@ -310,19 +310,28 @@ export class ServiceContextImpl implements ServiceContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ServiceInstance(operationVersion, payload, instance._solution.sid) - ); + try { + let payload = await operationPromise; + let operation = new ServiceInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | ServiceContextUpdateOptions | ((error: Error | null, item?: ServiceInstance) => any), @@ -504,16 +513,25 @@ export class ServiceContextImpl implements ServiceContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ServiceInstance(operationVersion, payload, instance._solution.sid) - ); + try { + let payload = await operationPromise; + let operation = new ServiceInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/chat/v1/service/channel.ts b/src/rest/chat/v1/service/channel.ts index 004e23b47..d0f902279 100644 --- a/src/rest/chat/v1/service/channel.ts +++ b/src/rest/chat/v1/service/channel.ts @@ -228,7 +228,7 @@ export class ChannelContextImpl implements ChannelContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: ChannelInstance) => any ): Promise { const headers: any = {}; @@ -242,24 +242,29 @@ export class ChannelContextImpl implements ChannelContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ChannelInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new ChannelInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | ChannelContextUpdateOptions | ((error: Error | null, item?: ChannelInstance) => any), @@ -294,21 +299,26 @@ export class ChannelContextImpl implements ChannelContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ChannelInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new ChannelInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/chat/v1/service/channel/invite.ts b/src/rest/chat/v1/service/channel/invite.ts index da419c4c4..7e99cbb4a 100644 --- a/src/rest/chat/v1/service/channel/invite.ts +++ b/src/rest/chat/v1/service/channel/invite.ts @@ -153,7 +153,7 @@ export class InviteContextImpl implements InviteContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: InviteInstance) => any ): Promise { const headers: any = {}; @@ -167,22 +167,27 @@ export class InviteContextImpl implements InviteContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new InviteInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.channelSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new InviteInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.channelSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/chat/v1/service/channel/member.ts b/src/rest/chat/v1/service/channel/member.ts index b517dbd6f..63f0ce149 100644 --- a/src/rest/chat/v1/service/channel/member.ts +++ b/src/rest/chat/v1/service/channel/member.ts @@ -186,7 +186,7 @@ export class MemberContextImpl implements MemberContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: MemberInstance) => any ): Promise { const headers: any = {}; @@ -200,25 +200,30 @@ export class MemberContextImpl implements MemberContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new MemberInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.channelSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new MemberInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.channelSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | MemberContextUpdateOptions | ((error: Error | null, item?: MemberInstance) => any), @@ -250,22 +255,27 @@ export class MemberContextImpl implements MemberContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new MemberInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.channelSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new MemberInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.channelSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/chat/v1/service/channel/message.ts b/src/rest/chat/v1/service/channel/message.ts index 0fbaf6a06..b21456369 100644 --- a/src/rest/chat/v1/service/channel/message.ts +++ b/src/rest/chat/v1/service/channel/message.ts @@ -190,7 +190,7 @@ export class MessageContextImpl implements MessageContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: MessageInstance) => any ): Promise { const headers: any = {}; @@ -204,25 +204,30 @@ export class MessageContextImpl implements MessageContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new MessageInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.channelSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new MessageInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.channelSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | MessageContextUpdateOptions | ((error: Error | null, item?: MessageInstance) => any), @@ -254,22 +259,27 @@ export class MessageContextImpl implements MessageContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new MessageInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.channelSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new MessageInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.channelSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/chat/v1/service/role.ts b/src/rest/chat/v1/service/role.ts index ec72bcfd3..d2512778b 100644 --- a/src/rest/chat/v1/service/role.ts +++ b/src/rest/chat/v1/service/role.ts @@ -162,7 +162,7 @@ export class RoleContextImpl implements RoleContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: RoleInstance) => any ): Promise { const headers: any = {}; @@ -176,24 +176,29 @@ export class RoleContextImpl implements RoleContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new RoleInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new RoleInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params: RoleContextUpdateOptions, callback?: (error: Error | null, item?: RoleInstance) => any ): Promise { @@ -222,21 +227,26 @@ export class RoleContextImpl implements RoleContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new RoleInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new RoleInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/chat/v1/service/user.ts b/src/rest/chat/v1/service/user.ts index c6fcd05c3..1845edc32 100644 --- a/src/rest/chat/v1/service/user.ts +++ b/src/rest/chat/v1/service/user.ts @@ -192,7 +192,7 @@ export class UserContextImpl implements UserContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: UserInstance) => any ): Promise { const headers: any = {}; @@ -206,24 +206,29 @@ export class UserContextImpl implements UserContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new UserInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new UserInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | UserContextUpdateOptions | ((error: Error | null, item?: UserInstance) => any), @@ -257,21 +262,26 @@ export class UserContextImpl implements UserContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new UserInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new UserInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/chat/v2/credential.ts b/src/rest/chat/v2/credential.ts index b5edefbb8..274a105ae 100644 --- a/src/rest/chat/v2/credential.ts +++ b/src/rest/chat/v2/credential.ts @@ -185,7 +185,7 @@ export class CredentialContextImpl implements CredentialContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: CredentialInstance) => any ): Promise { const headers: any = {}; @@ -199,23 +199,28 @@ export class CredentialContextImpl implements CredentialContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new CredentialInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new CredentialInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | CredentialContextUpdateOptions | ((error: Error | null, item?: CredentialInstance) => any), @@ -254,20 +259,25 @@ export class CredentialContextImpl implements CredentialContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new CredentialInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new CredentialInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/chat/v2/service.ts b/src/rest/chat/v2/service.ts index 0fddb09d1..64a809eb9 100644 --- a/src/rest/chat/v2/service.ts +++ b/src/rest/chat/v2/service.ts @@ -259,7 +259,7 @@ export class ServiceContextImpl implements ServiceContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: ServiceInstance) => any ): Promise { const headers: any = {}; @@ -273,19 +273,28 @@ export class ServiceContextImpl implements ServiceContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ServiceInstance(operationVersion, payload, instance._solution.sid) - ); + try { + let payload = await operationPromise; + let operation = new ServiceInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | ServiceContextUpdateOptions | ((error: Error | null, item?: ServiceInstance) => any), @@ -402,16 +411,25 @@ export class ServiceContextImpl implements ServiceContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ServiceInstance(operationVersion, payload, instance._solution.sid) - ); + try { + let payload = await operationPromise; + let operation = new ServiceInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/chat/v2/service/binding.ts b/src/rest/chat/v2/service/binding.ts index a7a5f43d5..795b7139d 100644 --- a/src/rest/chat/v2/service/binding.ts +++ b/src/rest/chat/v2/service/binding.ts @@ -142,7 +142,7 @@ export class BindingContextImpl implements BindingContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: BindingInstance) => any ): Promise { const headers: any = {}; @@ -156,21 +156,26 @@ export class BindingContextImpl implements BindingContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new BindingInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new BindingInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/chat/v2/service/channel.ts b/src/rest/chat/v2/service/channel.ts index 9bdf39462..87f880121 100644 --- a/src/rest/chat/v2/service/channel.ts +++ b/src/rest/chat/v2/service/channel.ts @@ -295,7 +295,7 @@ export class ChannelContextImpl implements ChannelContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: ChannelInstance) => any ): Promise { const headers: any = {}; @@ -309,24 +309,29 @@ export class ChannelContextImpl implements ChannelContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ChannelInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new ChannelInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | ChannelContextUpdateOptions | ((error: Error | null, item?: ChannelInstance) => any), @@ -369,21 +374,26 @@ export class ChannelContextImpl implements ChannelContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ChannelInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new ChannelInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/chat/v2/service/channel/invite.ts b/src/rest/chat/v2/service/channel/invite.ts index 96b8bb7bc..e8ec3f700 100644 --- a/src/rest/chat/v2/service/channel/invite.ts +++ b/src/rest/chat/v2/service/channel/invite.ts @@ -153,7 +153,7 @@ export class InviteContextImpl implements InviteContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: InviteInstance) => any ): Promise { const headers: any = {}; @@ -167,22 +167,27 @@ export class InviteContextImpl implements InviteContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new InviteInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.channelSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new InviteInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.channelSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/chat/v2/service/channel/member.ts b/src/rest/chat/v2/service/channel/member.ts index 40f72947d..269c3f738 100644 --- a/src/rest/chat/v2/service/channel/member.ts +++ b/src/rest/chat/v2/service/channel/member.ts @@ -245,7 +245,7 @@ export class MemberContextImpl implements MemberContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: MemberInstance) => any ): Promise { const headers: any = {}; @@ -259,25 +259,30 @@ export class MemberContextImpl implements MemberContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new MemberInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.channelSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new MemberInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.channelSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | MemberContextUpdateOptions | ((error: Error | null, item?: MemberInstance) => any), @@ -321,22 +326,27 @@ export class MemberContextImpl implements MemberContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new MemberInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.channelSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new MemberInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.channelSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/chat/v2/service/channel/message.ts b/src/rest/chat/v2/service/channel/message.ts index e14658621..12a4d91fb 100644 --- a/src/rest/chat/v2/service/channel/message.ts +++ b/src/rest/chat/v2/service/channel/message.ts @@ -247,7 +247,7 @@ export class MessageContextImpl implements MessageContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: MessageInstance) => any ): Promise { const headers: any = {}; @@ -261,25 +261,30 @@ export class MessageContextImpl implements MessageContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new MessageInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.channelSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new MessageInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.channelSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | MessageContextUpdateOptions | ((error: Error | null, item?: MessageInstance) => any), @@ -320,22 +325,27 @@ export class MessageContextImpl implements MessageContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new MessageInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.channelSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new MessageInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.channelSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/chat/v2/service/channel/webhook.ts b/src/rest/chat/v2/service/channel/webhook.ts index 41c882d05..023019213 100644 --- a/src/rest/chat/v2/service/channel/webhook.ts +++ b/src/rest/chat/v2/service/channel/webhook.ts @@ -202,7 +202,7 @@ export class WebhookContextImpl implements WebhookContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: WebhookInstance) => any ): Promise { const headers: any = {}; @@ -216,25 +216,30 @@ export class WebhookContextImpl implements WebhookContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new WebhookInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.channelSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new WebhookInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.channelSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | WebhookContextUpdateOptions | ((error: Error | null, item?: WebhookInstance) => any), @@ -281,22 +286,27 @@ export class WebhookContextImpl implements WebhookContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new WebhookInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.channelSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new WebhookInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.channelSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/chat/v2/service/role.ts b/src/rest/chat/v2/service/role.ts index cc126ce57..d5eba9dec 100644 --- a/src/rest/chat/v2/service/role.ts +++ b/src/rest/chat/v2/service/role.ts @@ -162,7 +162,7 @@ export class RoleContextImpl implements RoleContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: RoleInstance) => any ): Promise { const headers: any = {}; @@ -176,24 +176,29 @@ export class RoleContextImpl implements RoleContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new RoleInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new RoleInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params: RoleContextUpdateOptions, callback?: (error: Error | null, item?: RoleInstance) => any ): Promise { @@ -222,21 +227,26 @@ export class RoleContextImpl implements RoleContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new RoleInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new RoleInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/chat/v2/service/user.ts b/src/rest/chat/v2/service/user.ts index cd7601502..62e2737ba 100644 --- a/src/rest/chat/v2/service/user.ts +++ b/src/rest/chat/v2/service/user.ts @@ -212,7 +212,7 @@ export class UserContextImpl implements UserContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: UserInstance) => any ): Promise { const headers: any = {}; @@ -226,24 +226,29 @@ export class UserContextImpl implements UserContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new UserInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new UserInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | UserContextUpdateOptions | ((error: Error | null, item?: UserInstance) => any), @@ -279,21 +284,26 @@ export class UserContextImpl implements UserContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new UserInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new UserInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/chat/v2/service/user/userBinding.ts b/src/rest/chat/v2/service/user/userBinding.ts index bfd891711..01ec146ac 100644 --- a/src/rest/chat/v2/service/user/userBinding.ts +++ b/src/rest/chat/v2/service/user/userBinding.ts @@ -146,7 +146,7 @@ export class UserBindingContextImpl implements UserBindingContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: UserBindingInstance) => any ): Promise { const headers: any = {}; @@ -160,22 +160,27 @@ export class UserBindingContextImpl implements UserBindingContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new UserBindingInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.userSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new UserBindingInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.userSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/chat/v2/service/user/userChannel.ts b/src/rest/chat/v2/service/user/userChannel.ts index d80b519be..fdf80d276 100644 --- a/src/rest/chat/v2/service/user/userChannel.ts +++ b/src/rest/chat/v2/service/user/userChannel.ts @@ -216,7 +216,7 @@ export class UserChannelContextImpl implements UserChannelContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: UserChannelInstance) => any ): Promise { const headers: any = {}; @@ -230,25 +230,30 @@ export class UserChannelContextImpl implements UserChannelContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new UserChannelInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.userSid, - instance._solution.channelSid - ) - ); + try { + let payload = await operationPromise; + let operation = new UserChannelInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.userSid, + instance._solution.channelSid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | UserChannelContextUpdateOptions | ((error: Error | null, item?: UserChannelInstance) => any), @@ -285,22 +290,27 @@ export class UserChannelContextImpl implements UserChannelContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new UserChannelInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.userSid, - instance._solution.channelSid - ) - ); + try { + let payload = await operationPromise; + let operation = new UserChannelInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.userSid, + instance._solution.channelSid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/chat/v3/channel.ts b/src/rest/chat/v3/channel.ts index f02494598..8910e0df9 100644 --- a/src/rest/chat/v3/channel.ts +++ b/src/rest/chat/v3/channel.ts @@ -87,7 +87,7 @@ export class ChannelContextImpl implements ChannelContext { this._uri = `/Services/${serviceSid}/Channels/${sid}`; } - update( + async update( params?: | ChannelContextUpdateOptions | ((error: Error | null, item?: ChannelInstance) => any), @@ -121,21 +121,26 @@ export class ChannelContextImpl implements ChannelContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ChannelInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new ChannelInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/content/v1/content.ts b/src/rest/content/v1/content.ts index d1bb85c32..6664603c4 100644 --- a/src/rest/content/v1/content.ts +++ b/src/rest/content/v1/content.ts @@ -401,7 +401,7 @@ export class ContentContextImpl implements ContentContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: ContentInstance) => any ): Promise { const headers: any = {}; @@ -415,16 +415,25 @@ export class ContentContextImpl implements ContentContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ContentInstance(operationVersion, payload, instance._solution.sid) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new ContentInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/content/v1/content/approvalFetch.ts b/src/rest/content/v1/content/approvalFetch.ts index 7f78ec637..a87ad0c96 100644 --- a/src/rest/content/v1/content/approvalFetch.ts +++ b/src/rest/content/v1/content/approvalFetch.ts @@ -54,7 +54,7 @@ export class ApprovalFetchContextImpl implements ApprovalFetchContext { this._uri = `/Content/${sid}/ApprovalRequests`; } - fetch( + async fetch( callback?: (error: Error | null, item?: ApprovalFetchInstance) => any ): Promise { const headers: any = {}; @@ -68,20 +68,25 @@ export class ApprovalFetchContextImpl implements ApprovalFetchContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ApprovalFetchInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new ApprovalFetchInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/conversations/v1/addressConfiguration.ts b/src/rest/conversations/v1/addressConfiguration.ts index bb518b64b..18ccfb0c3 100644 --- a/src/rest/conversations/v1/addressConfiguration.ts +++ b/src/rest/conversations/v1/addressConfiguration.ts @@ -226,7 +226,7 @@ export class AddressConfigurationContextImpl return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: AddressConfigurationInstance) => any ): Promise { const headers: any = {}; @@ -240,23 +240,28 @@ export class AddressConfigurationContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new AddressConfigurationInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new AddressConfigurationInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | AddressConfigurationContextUpdateOptions | ((error: Error | null, item?: AddressConfigurationInstance) => any), @@ -310,20 +315,25 @@ export class AddressConfigurationContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new AddressConfigurationInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new AddressConfigurationInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/conversations/v1/configuration.ts b/src/rest/conversations/v1/configuration.ts index 287715829..fa47a04c3 100644 --- a/src/rest/conversations/v1/configuration.ts +++ b/src/rest/conversations/v1/configuration.ts @@ -86,7 +86,7 @@ export class ConfigurationContextImpl implements ConfigurationContext { this._uri = `/Configuration`; } - fetch( + async fetch( callback?: (error: Error | null, item?: ConfigurationInstance) => any ): Promise { const headers: any = {}; @@ -100,18 +100,24 @@ export class ConfigurationContextImpl implements ConfigurationContext { headers, }); - operationPromise = operationPromise.then( - (payload) => new ConfigurationInstance(operationVersion, payload) - ); + try { + let payload = await operationPromise; + let operation = new ConfigurationInstance(operationVersion, payload); + + if (callback) { + callback(null, operation); + } - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | ConfigurationContextUpdateOptions | ((error: Error | null, item?: ConfigurationInstance) => any), @@ -148,15 +154,21 @@ export class ConfigurationContextImpl implements ConfigurationContext { headers, }); - operationPromise = operationPromise.then( - (payload) => new ConfigurationInstance(operationVersion, payload) - ); + try { + let payload = await operationPromise; + let operation = new ConfigurationInstance(operationVersion, payload); + + if (callback) { + callback(null, operation); + } - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/conversations/v1/configuration/webhook.ts b/src/rest/conversations/v1/configuration/webhook.ts index b3b295e8d..38dee24c4 100644 --- a/src/rest/conversations/v1/configuration/webhook.ts +++ b/src/rest/conversations/v1/configuration/webhook.ts @@ -91,7 +91,7 @@ export class WebhookContextImpl implements WebhookContext { this._uri = `/Configuration/Webhooks`; } - fetch( + async fetch( callback?: (error: Error | null, item?: WebhookInstance) => any ): Promise { const headers: any = {}; @@ -105,18 +105,24 @@ export class WebhookContextImpl implements WebhookContext { headers, }); - operationPromise = operationPromise.then( - (payload) => new WebhookInstance(operationVersion, payload) - ); + try { + let payload = await operationPromise; + let operation = new WebhookInstance(operationVersion, payload); + + if (callback) { + callback(null, operation); + } - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | WebhookContextUpdateOptions | ((error: Error | null, item?: WebhookInstance) => any), @@ -153,15 +159,21 @@ export class WebhookContextImpl implements WebhookContext { headers, }); - operationPromise = operationPromise.then( - (payload) => new WebhookInstance(operationVersion, payload) - ); + try { + let payload = await operationPromise; + let operation = new WebhookInstance(operationVersion, payload); + + if (callback) { + callback(null, operation); + } - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/conversations/v1/conversation.ts b/src/rest/conversations/v1/conversation.ts index 32999d03a..044eaceeb 100644 --- a/src/rest/conversations/v1/conversation.ts +++ b/src/rest/conversations/v1/conversation.ts @@ -292,7 +292,7 @@ export class ConversationContextImpl implements ConversationContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: ConversationInstance) => any ): Promise { const headers: any = {}; @@ -306,23 +306,28 @@ export class ConversationContextImpl implements ConversationContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ConversationInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new ConversationInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | ConversationContextUpdateOptions | ((error: Error | null, item?: ConversationInstance) => any), @@ -374,20 +379,25 @@ export class ConversationContextImpl implements ConversationContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ConversationInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new ConversationInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/conversations/v1/conversation/message.ts b/src/rest/conversations/v1/conversation/message.ts index 43ec2da47..66f1c8e54 100644 --- a/src/rest/conversations/v1/conversation/message.ts +++ b/src/rest/conversations/v1/conversation/message.ts @@ -257,7 +257,7 @@ export class MessageContextImpl implements MessageContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: MessageInstance) => any ): Promise { const headers: any = {}; @@ -271,24 +271,29 @@ export class MessageContextImpl implements MessageContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new MessageInstance( - operationVersion, - payload, - instance._solution.conversationSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new MessageInstance( + operationVersion, + payload, + instance._solution.conversationSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | MessageContextUpdateOptions | ((error: Error | null, item?: MessageInstance) => any), @@ -328,21 +333,26 @@ export class MessageContextImpl implements MessageContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new MessageInstance( - operationVersion, - payload, - instance._solution.conversationSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new MessageInstance( + operationVersion, + payload, + instance._solution.conversationSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/conversations/v1/conversation/message/deliveryReceipt.ts b/src/rest/conversations/v1/conversation/message/deliveryReceipt.ts index 4ebc33e1d..89ac141ef 100644 --- a/src/rest/conversations/v1/conversation/message/deliveryReceipt.ts +++ b/src/rest/conversations/v1/conversation/message/deliveryReceipt.ts @@ -117,7 +117,7 @@ export class DeliveryReceiptContextImpl implements DeliveryReceiptContext { this._uri = `/Conversations/${conversationSid}/Messages/${messageSid}/Receipts/${sid}`; } - fetch( + async fetch( callback?: (error: Error | null, item?: DeliveryReceiptInstance) => any ): Promise { const headers: any = {}; @@ -131,22 +131,27 @@ export class DeliveryReceiptContextImpl implements DeliveryReceiptContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new DeliveryReceiptInstance( - operationVersion, - payload, - instance._solution.conversationSid, - instance._solution.messageSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new DeliveryReceiptInstance( + operationVersion, + payload, + instance._solution.conversationSid, + instance._solution.messageSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/conversations/v1/conversation/participant.ts b/src/rest/conversations/v1/conversation/participant.ts index e647ff65b..104283463 100644 --- a/src/rest/conversations/v1/conversation/participant.ts +++ b/src/rest/conversations/v1/conversation/participant.ts @@ -237,7 +237,7 @@ export class ParticipantContextImpl implements ParticipantContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: ParticipantInstance) => any ): Promise { const headers: any = {}; @@ -251,24 +251,29 @@ export class ParticipantContextImpl implements ParticipantContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ParticipantInstance( - operationVersion, - payload, - instance._solution.conversationSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new ParticipantInstance( + operationVersion, + payload, + instance._solution.conversationSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | ParticipantContextUpdateOptions | ((error: Error | null, item?: ParticipantInstance) => any), @@ -317,21 +322,26 @@ export class ParticipantContextImpl implements ParticipantContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ParticipantInstance( - operationVersion, - payload, - instance._solution.conversationSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new ParticipantInstance( + operationVersion, + payload, + instance._solution.conversationSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/conversations/v1/conversation/webhook.ts b/src/rest/conversations/v1/conversation/webhook.ts index 84135c244..59f0b076e 100644 --- a/src/rest/conversations/v1/conversation/webhook.ts +++ b/src/rest/conversations/v1/conversation/webhook.ts @@ -190,7 +190,7 @@ export class WebhookContextImpl implements WebhookContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: WebhookInstance) => any ): Promise { const headers: any = {}; @@ -204,24 +204,29 @@ export class WebhookContextImpl implements WebhookContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new WebhookInstance( - operationVersion, - payload, - instance._solution.conversationSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new WebhookInstance( + operationVersion, + payload, + instance._solution.conversationSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | WebhookContextUpdateOptions | ((error: Error | null, item?: WebhookInstance) => any), @@ -266,21 +271,26 @@ export class WebhookContextImpl implements WebhookContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new WebhookInstance( - operationVersion, - payload, - instance._solution.conversationSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new WebhookInstance( + operationVersion, + payload, + instance._solution.conversationSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/conversations/v1/credential.ts b/src/rest/conversations/v1/credential.ts index 5f70f0171..85c9bbc13 100644 --- a/src/rest/conversations/v1/credential.ts +++ b/src/rest/conversations/v1/credential.ts @@ -187,7 +187,7 @@ export class CredentialContextImpl implements CredentialContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: CredentialInstance) => any ): Promise { const headers: any = {}; @@ -201,23 +201,28 @@ export class CredentialContextImpl implements CredentialContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new CredentialInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new CredentialInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | CredentialContextUpdateOptions | ((error: Error | null, item?: CredentialInstance) => any), @@ -257,20 +262,25 @@ export class CredentialContextImpl implements CredentialContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new CredentialInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new CredentialInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/conversations/v1/role.ts b/src/rest/conversations/v1/role.ts index d3460e3e7..6f1811591 100644 --- a/src/rest/conversations/v1/role.ts +++ b/src/rest/conversations/v1/role.ts @@ -157,7 +157,7 @@ export class RoleContextImpl implements RoleContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: RoleInstance) => any ): Promise { const headers: any = {}; @@ -171,19 +171,28 @@ export class RoleContextImpl implements RoleContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new RoleInstance(operationVersion, payload, instance._solution.sid) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new RoleInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params: RoleContextUpdateOptions, callback?: (error: Error | null, item?: RoleInstance) => any ): Promise { @@ -212,16 +221,25 @@ export class RoleContextImpl implements RoleContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new RoleInstance(operationVersion, payload, instance._solution.sid) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new RoleInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/conversations/v1/service.ts b/src/rest/conversations/v1/service.ts index 93c80201c..7f26b0717 100644 --- a/src/rest/conversations/v1/service.ts +++ b/src/rest/conversations/v1/service.ts @@ -202,7 +202,7 @@ export class ServiceContextImpl implements ServiceContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: ServiceInstance) => any ): Promise { const headers: any = {}; @@ -216,16 +216,25 @@ export class ServiceContextImpl implements ServiceContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ServiceInstance(operationVersion, payload, instance._solution.sid) - ); + try { + let payload = await operationPromise; + let operation = new ServiceInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/conversations/v1/service/binding.ts b/src/rest/conversations/v1/service/binding.ts index 098c10d28..f0c7a22ba 100644 --- a/src/rest/conversations/v1/service/binding.ts +++ b/src/rest/conversations/v1/service/binding.ts @@ -142,7 +142,7 @@ export class BindingContextImpl implements BindingContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: BindingInstance) => any ): Promise { const headers: any = {}; @@ -156,21 +156,26 @@ export class BindingContextImpl implements BindingContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new BindingInstance( - operationVersion, - payload, - instance._solution.chatServiceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new BindingInstance( + operationVersion, + payload, + instance._solution.chatServiceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/conversations/v1/service/configuration.ts b/src/rest/conversations/v1/service/configuration.ts index c6685dd69..85a9e9f78 100644 --- a/src/rest/conversations/v1/service/configuration.ts +++ b/src/rest/conversations/v1/service/configuration.ts @@ -93,7 +93,7 @@ export class ConfigurationContextImpl implements ConfigurationContext { this._uri = `/Services/${chatServiceSid}/Configuration`; } - fetch( + async fetch( callback?: (error: Error | null, item?: ConfigurationInstance) => any ): Promise { const headers: any = {}; @@ -107,23 +107,28 @@ export class ConfigurationContextImpl implements ConfigurationContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ConfigurationInstance( - operationVersion, - payload, - instance._solution.chatServiceSid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new ConfigurationInstance( + operationVersion, + payload, + instance._solution.chatServiceSid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | ConfigurationContextUpdateOptions | ((error: Error | null, item?: ConfigurationInstance) => any), @@ -163,20 +168,25 @@ export class ConfigurationContextImpl implements ConfigurationContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ConfigurationInstance( - operationVersion, - payload, - instance._solution.chatServiceSid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new ConfigurationInstance( + operationVersion, + payload, + instance._solution.chatServiceSid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/conversations/v1/service/configuration/notification.ts b/src/rest/conversations/v1/service/configuration/notification.ts index e44fd30ba..645a9fade 100644 --- a/src/rest/conversations/v1/service/configuration/notification.ts +++ b/src/rest/conversations/v1/service/configuration/notification.ts @@ -109,7 +109,7 @@ export class NotificationContextImpl implements NotificationContext { this._uri = `/Services/${chatServiceSid}/Configuration/Notifications`; } - fetch( + async fetch( callback?: (error: Error | null, item?: NotificationInstance) => any ): Promise { const headers: any = {}; @@ -123,23 +123,28 @@ export class NotificationContextImpl implements NotificationContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new NotificationInstance( - operationVersion, - payload, - instance._solution.chatServiceSid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new NotificationInstance( + operationVersion, + payload, + instance._solution.chatServiceSid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | NotificationContextUpdateOptions | ((error: Error | null, item?: NotificationInstance) => any), @@ -206,20 +211,25 @@ export class NotificationContextImpl implements NotificationContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new NotificationInstance( - operationVersion, - payload, - instance._solution.chatServiceSid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new NotificationInstance( + operationVersion, + payload, + instance._solution.chatServiceSid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/conversations/v1/service/configuration/webhook.ts b/src/rest/conversations/v1/service/configuration/webhook.ts index cdc3716c1..0303b7010 100644 --- a/src/rest/conversations/v1/service/configuration/webhook.ts +++ b/src/rest/conversations/v1/service/configuration/webhook.ts @@ -93,7 +93,7 @@ export class WebhookContextImpl implements WebhookContext { this._uri = `/Services/${chatServiceSid}/Configuration/Webhooks`; } - fetch( + async fetch( callback?: (error: Error | null, item?: WebhookInstance) => any ): Promise { const headers: any = {}; @@ -107,23 +107,28 @@ export class WebhookContextImpl implements WebhookContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new WebhookInstance( - operationVersion, - payload, - instance._solution.chatServiceSid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new WebhookInstance( + operationVersion, + payload, + instance._solution.chatServiceSid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | WebhookContextUpdateOptions | ((error: Error | null, item?: WebhookInstance) => any), @@ -159,20 +164,25 @@ export class WebhookContextImpl implements WebhookContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new WebhookInstance( - operationVersion, - payload, - instance._solution.chatServiceSid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new WebhookInstance( + operationVersion, + payload, + instance._solution.chatServiceSid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/conversations/v1/service/conversation.ts b/src/rest/conversations/v1/service/conversation.ts index 979d8e8fc..bb9b81f54 100644 --- a/src/rest/conversations/v1/service/conversation.ts +++ b/src/rest/conversations/v1/service/conversation.ts @@ -311,7 +311,7 @@ export class ConversationContextImpl implements ConversationContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: ConversationInstance) => any ): Promise { const headers: any = {}; @@ -325,24 +325,29 @@ export class ConversationContextImpl implements ConversationContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ConversationInstance( - operationVersion, - payload, - instance._solution.chatServiceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new ConversationInstance( + operationVersion, + payload, + instance._solution.chatServiceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | ConversationContextUpdateOptions | ((error: Error | null, item?: ConversationInstance) => any), @@ -394,21 +399,26 @@ export class ConversationContextImpl implements ConversationContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ConversationInstance( - operationVersion, - payload, - instance._solution.chatServiceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new ConversationInstance( + operationVersion, + payload, + instance._solution.chatServiceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/conversations/v1/service/conversation/message.ts b/src/rest/conversations/v1/service/conversation/message.ts index b1915ab7c..8621554ad 100644 --- a/src/rest/conversations/v1/service/conversation/message.ts +++ b/src/rest/conversations/v1/service/conversation/message.ts @@ -268,7 +268,7 @@ export class MessageContextImpl implements MessageContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: MessageInstance) => any ): Promise { const headers: any = {}; @@ -282,25 +282,30 @@ export class MessageContextImpl implements MessageContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new MessageInstance( - operationVersion, - payload, - instance._solution.chatServiceSid, - instance._solution.conversationSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new MessageInstance( + operationVersion, + payload, + instance._solution.chatServiceSid, + instance._solution.conversationSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | MessageContextUpdateOptions | ((error: Error | null, item?: MessageInstance) => any), @@ -340,22 +345,27 @@ export class MessageContextImpl implements MessageContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new MessageInstance( - operationVersion, - payload, - instance._solution.chatServiceSid, - instance._solution.conversationSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new MessageInstance( + operationVersion, + payload, + instance._solution.chatServiceSid, + instance._solution.conversationSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/conversations/v1/service/conversation/message/deliveryReceipt.ts b/src/rest/conversations/v1/service/conversation/message/deliveryReceipt.ts index 5f489187b..00df65ee7 100644 --- a/src/rest/conversations/v1/service/conversation/message/deliveryReceipt.ts +++ b/src/rest/conversations/v1/service/conversation/message/deliveryReceipt.ts @@ -123,7 +123,7 @@ export class DeliveryReceiptContextImpl implements DeliveryReceiptContext { this._uri = `/Services/${chatServiceSid}/Conversations/${conversationSid}/Messages/${messageSid}/Receipts/${sid}`; } - fetch( + async fetch( callback?: (error: Error | null, item?: DeliveryReceiptInstance) => any ): Promise { const headers: any = {}; @@ -137,23 +137,28 @@ export class DeliveryReceiptContextImpl implements DeliveryReceiptContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new DeliveryReceiptInstance( - operationVersion, - payload, - instance._solution.chatServiceSid, - instance._solution.conversationSid, - instance._solution.messageSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new DeliveryReceiptInstance( + operationVersion, + payload, + instance._solution.chatServiceSid, + instance._solution.conversationSid, + instance._solution.messageSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/conversations/v1/service/conversation/participant.ts b/src/rest/conversations/v1/service/conversation/participant.ts index 9b6ec7b90..7e0f8bfc4 100644 --- a/src/rest/conversations/v1/service/conversation/participant.ts +++ b/src/rest/conversations/v1/service/conversation/participant.ts @@ -247,7 +247,7 @@ export class ParticipantContextImpl implements ParticipantContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: ParticipantInstance) => any ): Promise { const headers: any = {}; @@ -261,25 +261,30 @@ export class ParticipantContextImpl implements ParticipantContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ParticipantInstance( - operationVersion, - payload, - instance._solution.chatServiceSid, - instance._solution.conversationSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new ParticipantInstance( + operationVersion, + payload, + instance._solution.chatServiceSid, + instance._solution.conversationSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | ParticipantContextUpdateOptions | ((error: Error | null, item?: ParticipantInstance) => any), @@ -328,22 +333,27 @@ export class ParticipantContextImpl implements ParticipantContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ParticipantInstance( - operationVersion, - payload, - instance._solution.chatServiceSid, - instance._solution.conversationSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new ParticipantInstance( + operationVersion, + payload, + instance._solution.chatServiceSid, + instance._solution.conversationSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/conversations/v1/service/conversation/webhook.ts b/src/rest/conversations/v1/service/conversation/webhook.ts index 4badc8880..a1a943eda 100644 --- a/src/rest/conversations/v1/service/conversation/webhook.ts +++ b/src/rest/conversations/v1/service/conversation/webhook.ts @@ -200,7 +200,7 @@ export class WebhookContextImpl implements WebhookContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: WebhookInstance) => any ): Promise { const headers: any = {}; @@ -214,25 +214,30 @@ export class WebhookContextImpl implements WebhookContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new WebhookInstance( - operationVersion, - payload, - instance._solution.chatServiceSid, - instance._solution.conversationSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new WebhookInstance( + operationVersion, + payload, + instance._solution.chatServiceSid, + instance._solution.conversationSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | WebhookContextUpdateOptions | ((error: Error | null, item?: WebhookInstance) => any), @@ -277,22 +282,27 @@ export class WebhookContextImpl implements WebhookContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new WebhookInstance( - operationVersion, - payload, - instance._solution.chatServiceSid, - instance._solution.conversationSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new WebhookInstance( + operationVersion, + payload, + instance._solution.chatServiceSid, + instance._solution.conversationSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/conversations/v1/service/role.ts b/src/rest/conversations/v1/service/role.ts index 8c939ca1d..85f5ba961 100644 --- a/src/rest/conversations/v1/service/role.ts +++ b/src/rest/conversations/v1/service/role.ts @@ -162,7 +162,7 @@ export class RoleContextImpl implements RoleContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: RoleInstance) => any ): Promise { const headers: any = {}; @@ -176,24 +176,29 @@ export class RoleContextImpl implements RoleContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new RoleInstance( - operationVersion, - payload, - instance._solution.chatServiceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new RoleInstance( + operationVersion, + payload, + instance._solution.chatServiceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params: RoleContextUpdateOptions, callback?: (error: Error | null, item?: RoleInstance) => any ): Promise { @@ -222,21 +227,26 @@ export class RoleContextImpl implements RoleContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new RoleInstance( - operationVersion, - payload, - instance._solution.chatServiceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new RoleInstance( + operationVersion, + payload, + instance._solution.chatServiceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/conversations/v1/service/user.ts b/src/rest/conversations/v1/service/user.ts index cba243441..fdeced0b2 100644 --- a/src/rest/conversations/v1/service/user.ts +++ b/src/rest/conversations/v1/service/user.ts @@ -233,7 +233,7 @@ export class UserContextImpl implements UserContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: UserInstance) => any ): Promise { const headers: any = {}; @@ -247,24 +247,29 @@ export class UserContextImpl implements UserContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new UserInstance( - operationVersion, - payload, - instance._solution.chatServiceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new UserInstance( + operationVersion, + payload, + instance._solution.chatServiceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | UserContextUpdateOptions | ((error: Error | null, item?: UserInstance) => any), @@ -300,21 +305,26 @@ export class UserContextImpl implements UserContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new UserInstance( - operationVersion, - payload, - instance._solution.chatServiceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new UserInstance( + operationVersion, + payload, + instance._solution.chatServiceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/conversations/v1/service/user/userConversation.ts b/src/rest/conversations/v1/service/user/userConversation.ts index 035de7d6b..fe7e2ee33 100644 --- a/src/rest/conversations/v1/service/user/userConversation.ts +++ b/src/rest/conversations/v1/service/user/userConversation.ts @@ -179,7 +179,7 @@ export class UserConversationContextImpl implements UserConversationContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: UserConversationInstance) => any ): Promise { const headers: any = {}; @@ -193,25 +193,30 @@ export class UserConversationContextImpl implements UserConversationContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new UserConversationInstance( - operationVersion, - payload, - instance._solution.chatServiceSid, - instance._solution.userSid, - instance._solution.conversationSid - ) - ); + try { + let payload = await operationPromise; + let operation = new UserConversationInstance( + operationVersion, + payload, + instance._solution.chatServiceSid, + instance._solution.userSid, + instance._solution.conversationSid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | UserConversationContextUpdateOptions | ((error: Error | null, item?: UserConversationInstance) => any), @@ -248,22 +253,27 @@ export class UserConversationContextImpl implements UserConversationContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new UserConversationInstance( - operationVersion, - payload, - instance._solution.chatServiceSid, - instance._solution.userSid, - instance._solution.conversationSid - ) - ); + try { + let payload = await operationPromise; + let operation = new UserConversationInstance( + operationVersion, + payload, + instance._solution.chatServiceSid, + instance._solution.userSid, + instance._solution.conversationSid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/conversations/v1/user.ts b/src/rest/conversations/v1/user.ts index c7a06fdff..28653ab76 100644 --- a/src/rest/conversations/v1/user.ts +++ b/src/rest/conversations/v1/user.ts @@ -224,7 +224,7 @@ export class UserContextImpl implements UserContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: UserInstance) => any ): Promise { const headers: any = {}; @@ -238,19 +238,28 @@ export class UserContextImpl implements UserContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new UserInstance(operationVersion, payload, instance._solution.sid) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new UserInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | UserContextUpdateOptions | ((error: Error | null, item?: UserInstance) => any), @@ -286,16 +295,25 @@ export class UserContextImpl implements UserContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new UserInstance(operationVersion, payload, instance._solution.sid) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new UserInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/conversations/v1/user/userConversation.ts b/src/rest/conversations/v1/user/userConversation.ts index a04cf6bdb..43a86075c 100644 --- a/src/rest/conversations/v1/user/userConversation.ts +++ b/src/rest/conversations/v1/user/userConversation.ts @@ -173,7 +173,7 @@ export class UserConversationContextImpl implements UserConversationContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: UserConversationInstance) => any ): Promise { const headers: any = {}; @@ -187,24 +187,29 @@ export class UserConversationContextImpl implements UserConversationContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new UserConversationInstance( - operationVersion, - payload, - instance._solution.userSid, - instance._solution.conversationSid - ) - ); + try { + let payload = await operationPromise; + let operation = new UserConversationInstance( + operationVersion, + payload, + instance._solution.userSid, + instance._solution.conversationSid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | UserConversationContextUpdateOptions | ((error: Error | null, item?: UserConversationInstance) => any), @@ -241,21 +246,26 @@ export class UserConversationContextImpl implements UserConversationContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new UserConversationInstance( - operationVersion, - payload, - instance._solution.userSid, - instance._solution.conversationSid - ) - ); + try { + let payload = await operationPromise; + let operation = new UserConversationInstance( + operationVersion, + payload, + instance._solution.userSid, + instance._solution.conversationSid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/events/v1/eventType.ts b/src/rest/events/v1/eventType.ts index 47104b702..5c61a2780 100644 --- a/src/rest/events/v1/eventType.ts +++ b/src/rest/events/v1/eventType.ts @@ -98,7 +98,7 @@ export class EventTypeContextImpl implements EventTypeContext { this._uri = `/Types/${type}`; } - fetch( + async fetch( callback?: (error: Error | null, item?: EventTypeInstance) => any ): Promise { const headers: any = {}; @@ -112,20 +112,25 @@ export class EventTypeContextImpl implements EventTypeContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new EventTypeInstance( - operationVersion, - payload, - instance._solution.type - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new EventTypeInstance( + operationVersion, + payload, + instance._solution.type + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/events/v1/schema.ts b/src/rest/events/v1/schema.ts index 76c8ae883..55597484c 100644 --- a/src/rest/events/v1/schema.ts +++ b/src/rest/events/v1/schema.ts @@ -66,7 +66,7 @@ export class SchemaContextImpl implements SchemaContext { return this._versions; } - fetch( + async fetch( callback?: (error: Error | null, item?: SchemaInstance) => any ): Promise { const headers: any = {}; @@ -80,16 +80,25 @@ export class SchemaContextImpl implements SchemaContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new SchemaInstance(operationVersion, payload, instance._solution.id) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new SchemaInstance( + operationVersion, + payload, + instance._solution.id + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/events/v1/schema/schemaVersion.ts b/src/rest/events/v1/schema/schemaVersion.ts index 53ec69077..c417f5add 100644 --- a/src/rest/events/v1/schema/schemaVersion.ts +++ b/src/rest/events/v1/schema/schemaVersion.ts @@ -97,7 +97,7 @@ export class SchemaVersionContextImpl implements SchemaVersionContext { this._uri = `/Schemas/${id}/Versions/${schemaVersion}`; } - fetch( + async fetch( callback?: (error: Error | null, item?: SchemaVersionInstance) => any ): Promise { const headers: any = {}; @@ -111,21 +111,26 @@ export class SchemaVersionContextImpl implements SchemaVersionContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new SchemaVersionInstance( - operationVersion, - payload, - instance._solution.id, - instance._solution.schemaVersion - ) - ); + try { + let payload = await operationPromise; + let operation = new SchemaVersionInstance( + operationVersion, + payload, + instance._solution.id, + instance._solution.schemaVersion + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/events/v1/sink.ts b/src/rest/events/v1/sink.ts index d3fe73f5c..dc4b6ef2c 100644 --- a/src/rest/events/v1/sink.ts +++ b/src/rest/events/v1/sink.ts @@ -192,7 +192,7 @@ export class SinkContextImpl implements SinkContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: SinkInstance) => any ): Promise { const headers: any = {}; @@ -206,19 +206,28 @@ export class SinkContextImpl implements SinkContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new SinkInstance(operationVersion, payload, instance._solution.sid) - ); + try { + let payload = await operationPromise; + let operation = new SinkInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params: SinkContextUpdateOptions, callback?: (error: Error | null, item?: SinkInstance) => any ): Promise { @@ -247,16 +256,25 @@ export class SinkContextImpl implements SinkContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new SinkInstance(operationVersion, payload, instance._solution.sid) - ); + try { + let payload = await operationPromise; + let operation = new SinkInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/events/v1/subscription.ts b/src/rest/events/v1/subscription.ts index 3bc2774a7..44571b612 100644 --- a/src/rest/events/v1/subscription.ts +++ b/src/rest/events/v1/subscription.ts @@ -189,7 +189,7 @@ export class SubscriptionContextImpl implements SubscriptionContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: SubscriptionInstance) => any ): Promise { const headers: any = {}; @@ -203,23 +203,28 @@ export class SubscriptionContextImpl implements SubscriptionContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new SubscriptionInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new SubscriptionInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | SubscriptionContextUpdateOptions | ((error: Error | null, item?: SubscriptionInstance) => any), @@ -255,20 +260,25 @@ export class SubscriptionContextImpl implements SubscriptionContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new SubscriptionInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new SubscriptionInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/events/v1/subscription/subscribedEvent.ts b/src/rest/events/v1/subscription/subscribedEvent.ts index afa4be0f9..5c1eed191 100644 --- a/src/rest/events/v1/subscription/subscribedEvent.ts +++ b/src/rest/events/v1/subscription/subscribedEvent.ts @@ -171,7 +171,7 @@ export class SubscribedEventContextImpl implements SubscribedEventContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: SubscribedEventInstance) => any ): Promise { const headers: any = {}; @@ -185,24 +185,29 @@ export class SubscribedEventContextImpl implements SubscribedEventContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new SubscribedEventInstance( - operationVersion, - payload, - instance._solution.subscriptionSid, - instance._solution.type - ) - ); + try { + let payload = await operationPromise; + let operation = new SubscribedEventInstance( + operationVersion, + payload, + instance._solution.subscriptionSid, + instance._solution.type + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | SubscribedEventContextUpdateOptions | ((error: Error | null, item?: SubscribedEventInstance) => any), @@ -233,21 +238,26 @@ export class SubscribedEventContextImpl implements SubscribedEventContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new SubscribedEventInstance( - operationVersion, - payload, - instance._solution.subscriptionSid, - instance._solution.type - ) - ); + try { + let payload = await operationPromise; + let operation = new SubscribedEventInstance( + operationVersion, + payload, + instance._solution.subscriptionSid, + instance._solution.type + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/flexApi/v1/assessments.ts b/src/rest/flexApi/v1/assessments.ts index 3e0ca71ca..e6ad6df9a 100644 --- a/src/rest/flexApi/v1/assessments.ts +++ b/src/rest/flexApi/v1/assessments.ts @@ -147,7 +147,7 @@ export class AssessmentsContextImpl implements AssessmentsContext { this._uri = `/Insights/QualityManagement/Assessments/${assessmentSid}`; } - update( + async update( params: AssessmentsContextUpdateOptions, callback?: (error: Error | null, item?: AssessmentsInstance) => any ): Promise { @@ -190,20 +190,25 @@ export class AssessmentsContextImpl implements AssessmentsContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new AssessmentsInstance( - operationVersion, - payload, - instance._solution.assessmentSid - ) - ); + try { + let payload = await operationPromise; + let operation = new AssessmentsInstance( + operationVersion, + payload, + instance._solution.assessmentSid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/flexApi/v1/channel.ts b/src/rest/flexApi/v1/channel.ts index f0929d2cc..d0c722d26 100644 --- a/src/rest/flexApi/v1/channel.ts +++ b/src/rest/flexApi/v1/channel.ts @@ -148,7 +148,7 @@ export class ChannelContextImpl implements ChannelContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: ChannelInstance) => any ): Promise { const headers: any = {}; @@ -162,16 +162,25 @@ export class ChannelContextImpl implements ChannelContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ChannelInstance(operationVersion, payload, instance._solution.sid) - ); + try { + let payload = await operationPromise; + let operation = new ChannelInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/flexApi/v1/configuration.ts b/src/rest/flexApi/v1/configuration.ts index 61ff8724c..d0884778e 100644 --- a/src/rest/flexApi/v1/configuration.ts +++ b/src/rest/flexApi/v1/configuration.ts @@ -103,7 +103,7 @@ export class ConfigurationContextImpl implements ConfigurationContext { this._uri = `/Configuration`; } - fetch( + async fetch( params?: | ConfigurationContextFetchOptions | ((error: Error | null, item?: ConfigurationInstance) => any), @@ -133,18 +133,24 @@ export class ConfigurationContextImpl implements ConfigurationContext { headers, }); - operationPromise = operationPromise.then( - (payload) => new ConfigurationInstance(operationVersion, payload) - ); + try { + let payload = await operationPromise; + let operation = new ConfigurationInstance(operationVersion, payload); + + if (callback) { + callback(null, operation); + } - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | object | ((error: Error | null, item?: ConfigurationInstance) => any), @@ -178,15 +184,21 @@ export class ConfigurationContextImpl implements ConfigurationContext { headers, }); - operationPromise = operationPromise.then( - (payload) => new ConfigurationInstance(operationVersion, payload) - ); + try { + let payload = await operationPromise; + let operation = new ConfigurationInstance(operationVersion, payload); + + if (callback) { + callback(null, operation); + } - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/flexApi/v1/flexFlow.ts b/src/rest/flexApi/v1/flexFlow.ts index d6bfdcd5e..790d1ae8f 100644 --- a/src/rest/flexApi/v1/flexFlow.ts +++ b/src/rest/flexApi/v1/flexFlow.ts @@ -241,7 +241,7 @@ export class FlexFlowContextImpl implements FlexFlowContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: FlexFlowInstance) => any ): Promise { const headers: any = {}; @@ -255,19 +255,28 @@ export class FlexFlowContextImpl implements FlexFlowContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new FlexFlowInstance(operationVersion, payload, instance._solution.sid) - ); + try { + let payload = await operationPromise; + let operation = new FlexFlowInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | FlexFlowContextUpdateOptions | ((error: Error | null, item?: FlexFlowInstance) => any), @@ -332,16 +341,25 @@ export class FlexFlowContextImpl implements FlexFlowContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new FlexFlowInstance(operationVersion, payload, instance._solution.sid) - ); + try { + let payload = await operationPromise; + let operation = new FlexFlowInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/flexApi/v1/insightsQuestionnaires.ts b/src/rest/flexApi/v1/insightsQuestionnaires.ts index 20bc5ef07..4dc380c7d 100644 --- a/src/rest/flexApi/v1/insightsQuestionnaires.ts +++ b/src/rest/flexApi/v1/insightsQuestionnaires.ts @@ -248,7 +248,7 @@ export class InsightsQuestionnairesContextImpl return operationPromise; } - fetch( + async fetch( params?: | InsightsQuestionnairesContextFetchOptions | ((error: Error | null, item?: InsightsQuestionnairesInstance) => any), @@ -280,23 +280,28 @@ export class InsightsQuestionnairesContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new InsightsQuestionnairesInstance( - operationVersion, - payload, - instance._solution.questionnaireSid - ) - ); + try { + let payload = await operationPromise; + let operation = new InsightsQuestionnairesInstance( + operationVersion, + payload, + instance._solution.questionnaireSid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params: InsightsQuestionnairesContextUpdateOptions, callback?: ( error: Error | null, @@ -338,20 +343,25 @@ export class InsightsQuestionnairesContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new InsightsQuestionnairesInstance( - operationVersion, - payload, - instance._solution.questionnaireSid - ) - ); + try { + let payload = await operationPromise; + let operation = new InsightsQuestionnairesInstance( + operationVersion, + payload, + instance._solution.questionnaireSid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/flexApi/v1/insightsQuestionnairesCategory.ts b/src/rest/flexApi/v1/insightsQuestionnairesCategory.ts index a533242ba..0ca532315 100644 --- a/src/rest/flexApi/v1/insightsQuestionnairesCategory.ts +++ b/src/rest/flexApi/v1/insightsQuestionnairesCategory.ts @@ -193,7 +193,7 @@ export class InsightsQuestionnairesCategoryContextImpl return operationPromise; } - update( + async update( params: InsightsQuestionnairesCategoryContextUpdateOptions, callback?: ( error: Error | null, @@ -227,20 +227,25 @@ export class InsightsQuestionnairesCategoryContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new InsightsQuestionnairesCategoryInstance( - operationVersion, - payload, - instance._solution.categorySid - ) - ); + try { + let payload = await operationPromise; + let operation = new InsightsQuestionnairesCategoryInstance( + operationVersion, + payload, + instance._solution.categorySid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/flexApi/v1/insightsQuestionnairesQuestion.ts b/src/rest/flexApi/v1/insightsQuestionnairesQuestion.ts index 88bf1c917..4bc452f7e 100644 --- a/src/rest/flexApi/v1/insightsQuestionnairesQuestion.ts +++ b/src/rest/flexApi/v1/insightsQuestionnairesQuestion.ts @@ -215,7 +215,7 @@ export class InsightsQuestionnairesQuestionContextImpl return operationPromise; } - update( + async update( params: InsightsQuestionnairesQuestionContextUpdateOptions, callback?: ( error: Error | null, @@ -256,20 +256,25 @@ export class InsightsQuestionnairesQuestionContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new InsightsQuestionnairesQuestionInstance( - operationVersion, - payload, - instance._solution.questionSid - ) - ); + try { + let payload = await operationPromise; + let operation = new InsightsQuestionnairesQuestionInstance( + operationVersion, + payload, + instance._solution.questionSid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/flexApi/v1/insightsSession.ts b/src/rest/flexApi/v1/insightsSession.ts index 607789761..cfef733b3 100644 --- a/src/rest/flexApi/v1/insightsSession.ts +++ b/src/rest/flexApi/v1/insightsSession.ts @@ -68,7 +68,7 @@ export class InsightsSessionContextImpl implements InsightsSessionContext { this._uri = `/Insights/Session`; } - create( + async create( params?: | InsightsSessionContextCreateOptions | ((error: Error | null, item?: InsightsSessionInstance) => any), @@ -97,15 +97,21 @@ export class InsightsSessionContextImpl implements InsightsSessionContext { headers, }); - operationPromise = operationPromise.then( - (payload) => new InsightsSessionInstance(operationVersion, payload) - ); + try { + let payload = await operationPromise; + let operation = new InsightsSessionInstance(operationVersion, payload); + + if (callback) { + callback(null, operation); + } - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/flexApi/v1/insightsUserRoles.ts b/src/rest/flexApi/v1/insightsUserRoles.ts index a87e85491..23aee9310 100644 --- a/src/rest/flexApi/v1/insightsUserRoles.ts +++ b/src/rest/flexApi/v1/insightsUserRoles.ts @@ -68,7 +68,7 @@ export class InsightsUserRolesContextImpl implements InsightsUserRolesContext { this._uri = `/Insights/UserRoles`; } - fetch( + async fetch( params?: | InsightsUserRolesContextFetchOptions | ((error: Error | null, item?: InsightsUserRolesInstance) => any), @@ -97,15 +97,21 @@ export class InsightsUserRolesContextImpl implements InsightsUserRolesContext { headers, }); - operationPromise = operationPromise.then( - (payload) => new InsightsUserRolesInstance(operationVersion, payload) - ); + try { + let payload = await operationPromise; + let operation = new InsightsUserRolesInstance(operationVersion, payload); + + if (callback) { + callback(null, operation); + } - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/flexApi/v1/interaction.ts b/src/rest/flexApi/v1/interaction.ts index b68bed92b..69b1f851f 100644 --- a/src/rest/flexApi/v1/interaction.ts +++ b/src/rest/flexApi/v1/interaction.ts @@ -78,7 +78,7 @@ export class InteractionContextImpl implements InteractionContext { return this._channels; } - fetch( + async fetch( callback?: (error: Error | null, item?: InteractionInstance) => any ): Promise { const headers: any = {}; @@ -92,20 +92,25 @@ export class InteractionContextImpl implements InteractionContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new InteractionInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new InteractionInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/flexApi/v1/interaction/interactionChannel.ts b/src/rest/flexApi/v1/interaction/interactionChannel.ts index 5f7104c6d..3d0ab3a33 100644 --- a/src/rest/flexApi/v1/interaction/interactionChannel.ts +++ b/src/rest/flexApi/v1/interaction/interactionChannel.ts @@ -173,7 +173,7 @@ export class InteractionChannelContextImpl return this._participants; } - fetch( + async fetch( callback?: (error: Error | null, item?: InteractionChannelInstance) => any ): Promise { const headers: any = {}; @@ -187,24 +187,29 @@ export class InteractionChannelContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new InteractionChannelInstance( - operationVersion, - payload, - instance._solution.interactionSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new InteractionChannelInstance( + operationVersion, + payload, + instance._solution.interactionSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params: InteractionChannelContextUpdateOptions, callback?: (error: Error | null, item?: InteractionChannelInstance) => any ): Promise { @@ -235,21 +240,26 @@ export class InteractionChannelContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new InteractionChannelInstance( - operationVersion, - payload, - instance._solution.interactionSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new InteractionChannelInstance( + operationVersion, + payload, + instance._solution.interactionSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/flexApi/v1/interaction/interactionChannel/interactionChannelParticipant.ts b/src/rest/flexApi/v1/interaction/interactionChannel/interactionChannelParticipant.ts index f81d9c9bc..189b07635 100644 --- a/src/rest/flexApi/v1/interaction/interactionChannel/interactionChannelParticipant.ts +++ b/src/rest/flexApi/v1/interaction/interactionChannel/interactionChannelParticipant.ts @@ -145,7 +145,7 @@ export class InteractionChannelParticipantContextImpl this._uri = `/Interactions/${interactionSid}/Channels/${channelSid}/Participants/${sid}`; } - update( + async update( params: InteractionChannelParticipantContextUpdateOptions, callback?: ( error: Error | null, @@ -177,22 +177,27 @@ export class InteractionChannelParticipantContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new InteractionChannelParticipantInstance( - operationVersion, - payload, - instance._solution.interactionSid, - instance._solution.channelSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new InteractionChannelParticipantInstance( + operationVersion, + payload, + instance._solution.interactionSid, + instance._solution.channelSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/flexApi/v1/plugin.ts b/src/rest/flexApi/v1/plugin.ts index 2808e7421..b55721b74 100644 --- a/src/rest/flexApi/v1/plugin.ts +++ b/src/rest/flexApi/v1/plugin.ts @@ -178,7 +178,7 @@ export class PluginContextImpl implements PluginContext { return this._pluginVersions; } - fetch( + async fetch( params?: | PluginContextFetchOptions | ((error: Error | null, item?: PluginInstance) => any), @@ -207,19 +207,28 @@ export class PluginContextImpl implements PluginContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new PluginInstance(operationVersion, payload, instance._solution.sid) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new PluginInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | PluginContextUpdateOptions | ((error: Error | null, item?: PluginInstance) => any), @@ -254,16 +263,25 @@ export class PluginContextImpl implements PluginContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new PluginInstance(operationVersion, payload, instance._solution.sid) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new PluginInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/flexApi/v1/plugin/pluginVersions.ts b/src/rest/flexApi/v1/plugin/pluginVersions.ts index 60f387984..966200380 100644 --- a/src/rest/flexApi/v1/plugin/pluginVersions.ts +++ b/src/rest/flexApi/v1/plugin/pluginVersions.ts @@ -145,7 +145,7 @@ export class PluginVersionsContextImpl implements PluginVersionsContext { this._uri = `/PluginService/Plugins/${pluginSid}/Versions/${sid}`; } - fetch( + async fetch( params?: | PluginVersionsContextFetchOptions | ((error: Error | null, item?: PluginVersionsInstance) => any), @@ -174,21 +174,26 @@ export class PluginVersionsContextImpl implements PluginVersionsContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new PluginVersionsInstance( - operationVersion, - payload, - instance._solution.pluginSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new PluginVersionsInstance( + operationVersion, + payload, + instance._solution.pluginSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/flexApi/v1/pluginArchive.ts b/src/rest/flexApi/v1/pluginArchive.ts index 23ab925c3..fa1017e51 100644 --- a/src/rest/flexApi/v1/pluginArchive.ts +++ b/src/rest/flexApi/v1/pluginArchive.ts @@ -74,7 +74,7 @@ export class PluginArchiveContextImpl implements PluginArchiveContext { this._uri = `/PluginService/Plugins/${sid}/Archive`; } - update( + async update( params?: | PluginArchiveContextUpdateOptions | ((error: Error | null, item?: PluginArchiveInstance) => any), @@ -103,20 +103,25 @@ export class PluginArchiveContextImpl implements PluginArchiveContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new PluginArchiveInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new PluginArchiveInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/flexApi/v1/pluginConfiguration.ts b/src/rest/flexApi/v1/pluginConfiguration.ts index 31d0b9b68..151d9b292 100644 --- a/src/rest/flexApi/v1/pluginConfiguration.ts +++ b/src/rest/flexApi/v1/pluginConfiguration.ts @@ -148,7 +148,7 @@ export class PluginConfigurationContextImpl return this._plugins; } - fetch( + async fetch( params?: | PluginConfigurationContextFetchOptions | ((error: Error | null, item?: PluginConfigurationInstance) => any), @@ -177,20 +177,25 @@ export class PluginConfigurationContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new PluginConfigurationInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new PluginConfigurationInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/flexApi/v1/pluginConfiguration/configuredPlugin.ts b/src/rest/flexApi/v1/pluginConfiguration/configuredPlugin.ts index d255eb8e8..e3c0ed9dc 100644 --- a/src/rest/flexApi/v1/pluginConfiguration/configuredPlugin.ts +++ b/src/rest/flexApi/v1/pluginConfiguration/configuredPlugin.ts @@ -129,7 +129,7 @@ export class ConfiguredPluginContextImpl implements ConfiguredPluginContext { this._uri = `/PluginService/Configurations/${configurationSid}/Plugins/${pluginSid}`; } - fetch( + async fetch( params?: | ConfiguredPluginContextFetchOptions | ((error: Error | null, item?: ConfiguredPluginInstance) => any), @@ -158,21 +158,26 @@ export class ConfiguredPluginContextImpl implements ConfiguredPluginContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ConfiguredPluginInstance( - operationVersion, - payload, - instance._solution.configurationSid, - instance._solution.pluginSid - ) - ); + try { + let payload = await operationPromise; + let operation = new ConfiguredPluginInstance( + operationVersion, + payload, + instance._solution.configurationSid, + instance._solution.pluginSid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/flexApi/v1/pluginConfigurationArchive.ts b/src/rest/flexApi/v1/pluginConfigurationArchive.ts index 6341e5a66..4e1d12d64 100644 --- a/src/rest/flexApi/v1/pluginConfigurationArchive.ts +++ b/src/rest/flexApi/v1/pluginConfigurationArchive.ts @@ -82,7 +82,7 @@ export class PluginConfigurationArchiveContextImpl this._uri = `/PluginService/Configurations/${sid}/Archive`; } - update( + async update( params?: | PluginConfigurationArchiveContextUpdateOptions | (( @@ -117,20 +117,25 @@ export class PluginConfigurationArchiveContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new PluginConfigurationArchiveInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new PluginConfigurationArchiveInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/flexApi/v1/pluginRelease.ts b/src/rest/flexApi/v1/pluginRelease.ts index 27bb05379..b6ca91d96 100644 --- a/src/rest/flexApi/v1/pluginRelease.ts +++ b/src/rest/flexApi/v1/pluginRelease.ts @@ -127,7 +127,7 @@ export class PluginReleaseContextImpl implements PluginReleaseContext { this._uri = `/PluginService/Releases/${sid}`; } - fetch( + async fetch( params?: | PluginReleaseContextFetchOptions | ((error: Error | null, item?: PluginReleaseInstance) => any), @@ -156,20 +156,25 @@ export class PluginReleaseContextImpl implements PluginReleaseContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new PluginReleaseInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new PluginReleaseInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/flexApi/v1/pluginVersionArchive.ts b/src/rest/flexApi/v1/pluginVersionArchive.ts index 182716c95..7e26c43be 100644 --- a/src/rest/flexApi/v1/pluginVersionArchive.ts +++ b/src/rest/flexApi/v1/pluginVersionArchive.ts @@ -81,7 +81,7 @@ export class PluginVersionArchiveContextImpl this._uri = `/PluginService/Plugins/${pluginSid}/Versions/${sid}/Archive`; } - update( + async update( params?: | PluginVersionArchiveContextUpdateOptions | ((error: Error | null, item?: PluginVersionArchiveInstance) => any), @@ -110,21 +110,26 @@ export class PluginVersionArchiveContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new PluginVersionArchiveInstance( - operationVersion, - payload, - instance._solution.pluginSid, - instance._solution.sid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new PluginVersionArchiveInstance( + operationVersion, + payload, + instance._solution.pluginSid, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/flexApi/v1/provisioningStatus.ts b/src/rest/flexApi/v1/provisioningStatus.ts index 88a1ef4e4..e0c1cc353 100644 --- a/src/rest/flexApi/v1/provisioningStatus.ts +++ b/src/rest/flexApi/v1/provisioningStatus.ts @@ -56,7 +56,7 @@ export class ProvisioningStatusContextImpl this._uri = `/account/provision/status`; } - fetch( + async fetch( callback?: (error: Error | null, item?: ProvisioningStatusInstance) => any ): Promise { const headers: any = {}; @@ -70,15 +70,21 @@ export class ProvisioningStatusContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => new ProvisioningStatusInstance(operationVersion, payload) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new ProvisioningStatusInstance(operationVersion, payload); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/flexApi/v1/webChannel.ts b/src/rest/flexApi/v1/webChannel.ts index 0e011c40b..062977a40 100644 --- a/src/rest/flexApi/v1/webChannel.ts +++ b/src/rest/flexApi/v1/webChannel.ts @@ -175,7 +175,7 @@ export class WebChannelContextImpl implements WebChannelContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: WebChannelInstance) => any ): Promise { const headers: any = {}; @@ -189,23 +189,28 @@ export class WebChannelContextImpl implements WebChannelContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new WebChannelInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new WebChannelInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | WebChannelContextUpdateOptions | ((error: Error | null, item?: WebChannelInstance) => any), @@ -238,20 +243,25 @@ export class WebChannelContextImpl implements WebChannelContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new WebChannelInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new WebChannelInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/flexApi/v2/flexUser.ts b/src/rest/flexApi/v2/flexUser.ts index c9d7dd04e..e11a1a107 100644 --- a/src/rest/flexApi/v2/flexUser.ts +++ b/src/rest/flexApi/v2/flexUser.ts @@ -104,7 +104,7 @@ export class FlexUserContextImpl implements FlexUserContext { this._uri = `/Instances/${instanceSid}/Users/${flexUserSid}`; } - fetch( + async fetch( callback?: (error: Error | null, item?: FlexUserInstance) => any ): Promise { const headers: any = {}; @@ -118,24 +118,29 @@ export class FlexUserContextImpl implements FlexUserContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new FlexUserInstance( - operationVersion, - payload, - instance._solution.instanceSid, - instance._solution.flexUserSid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new FlexUserInstance( + operationVersion, + payload, + instance._solution.instanceSid, + instance._solution.flexUserSid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | FlexUserContextUpdateOptions | ((error: Error | null, item?: FlexUserInstance) => any), @@ -172,21 +177,26 @@ export class FlexUserContextImpl implements FlexUserContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new FlexUserInstance( - operationVersion, - payload, - instance._solution.instanceSid, - instance._solution.flexUserSid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new FlexUserInstance( + operationVersion, + payload, + instance._solution.instanceSid, + instance._solution.flexUserSid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/frontlineApi/v1/user.ts b/src/rest/frontlineApi/v1/user.ts index ca6fc4e11..a8919d4bd 100644 --- a/src/rest/frontlineApi/v1/user.ts +++ b/src/rest/frontlineApi/v1/user.ts @@ -93,7 +93,7 @@ export class UserContextImpl implements UserContext { this._uri = `/Users/${sid}`; } - fetch( + async fetch( callback?: (error: Error | null, item?: UserInstance) => any ): Promise { const headers: any = {}; @@ -107,19 +107,28 @@ export class UserContextImpl implements UserContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new UserInstance(operationVersion, payload, instance._solution.sid) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new UserInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | UserContextUpdateOptions | ((error: Error | null, item?: UserInstance) => any), @@ -154,16 +163,25 @@ export class UserContextImpl implements UserContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new UserInstance(operationVersion, payload, instance._solution.sid) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new UserInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/iam/v1/apiKey.ts b/src/rest/iam/v1/apiKey.ts index ccd2a7567..ff2a56b51 100644 --- a/src/rest/iam/v1/apiKey.ts +++ b/src/rest/iam/v1/apiKey.ts @@ -118,7 +118,7 @@ export class ApiKeyContextImpl implements ApiKeyContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: ApiKeyInstance) => any ): Promise { const headers: any = {}; @@ -132,19 +132,28 @@ export class ApiKeyContextImpl implements ApiKeyContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ApiKeyInstance(operationVersion, payload, instance._solution.sid) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new ApiKeyInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | ApiKeyContextUpdateOptions | ((error: Error | null, item?: ApiKeyInstance) => any), @@ -177,16 +186,25 @@ export class ApiKeyContextImpl implements ApiKeyContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ApiKeyInstance(operationVersion, payload, instance._solution.sid) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new ApiKeyInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/insights/v1/call.ts b/src/rest/insights/v1/call.ts index 574cbbba9..8a59382a6 100644 --- a/src/rest/insights/v1/call.ts +++ b/src/rest/insights/v1/call.ts @@ -94,7 +94,7 @@ export class CallContextImpl implements CallContext { return this._metrics; } - fetch( + async fetch( callback?: (error: Error | null, item?: CallInstance) => any ): Promise { const headers: any = {}; @@ -108,16 +108,25 @@ export class CallContextImpl implements CallContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new CallInstance(operationVersion, payload, instance._solution.sid) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new CallInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/insights/v1/call/annotation.ts b/src/rest/insights/v1/call/annotation.ts index e970ba7e0..5cc371a82 100644 --- a/src/rest/insights/v1/call/annotation.ts +++ b/src/rest/insights/v1/call/annotation.ts @@ -107,7 +107,7 @@ export class AnnotationContextImpl implements AnnotationContext { this._uri = `/Voice/${callSid}/Annotation`; } - fetch( + async fetch( callback?: (error: Error | null, item?: AnnotationInstance) => any ): Promise { const headers: any = {}; @@ -121,23 +121,28 @@ export class AnnotationContextImpl implements AnnotationContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new AnnotationInstance( - operationVersion, - payload, - instance._solution.callSid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new AnnotationInstance( + operationVersion, + payload, + instance._solution.callSid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | AnnotationContextUpdateOptions | ((error: Error | null, item?: AnnotationInstance) => any), @@ -178,20 +183,25 @@ export class AnnotationContextImpl implements AnnotationContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new AnnotationInstance( - operationVersion, - payload, - instance._solution.callSid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new AnnotationInstance( + operationVersion, + payload, + instance._solution.callSid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/insights/v1/call/callSummary.ts b/src/rest/insights/v1/call/callSummary.ts index c567d06ef..10bc866ea 100644 --- a/src/rest/insights/v1/call/callSummary.ts +++ b/src/rest/insights/v1/call/callSummary.ts @@ -102,7 +102,7 @@ export class CallSummaryContextImpl implements CallSummaryContext { this._uri = `/Voice/${callSid}/Summary`; } - fetch( + async fetch( params?: | CallSummaryContextFetchOptions | ((error: Error | null, item?: CallSummaryInstance) => any), @@ -132,20 +132,25 @@ export class CallSummaryContextImpl implements CallSummaryContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new CallSummaryInstance( - operationVersion, - payload, - instance._solution.callSid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new CallSummaryInstance( + operationVersion, + payload, + instance._solution.callSid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/insights/v1/conference.ts b/src/rest/insights/v1/conference.ts index 9d171541f..070c62f09 100644 --- a/src/rest/insights/v1/conference.ts +++ b/src/rest/insights/v1/conference.ts @@ -206,7 +206,7 @@ export class ConferenceContextImpl implements ConferenceContext { return this._conferenceParticipants; } - fetch( + async fetch( callback?: (error: Error | null, item?: ConferenceInstance) => any ): Promise { const headers: any = {}; @@ -220,20 +220,25 @@ export class ConferenceContextImpl implements ConferenceContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ConferenceInstance( - operationVersion, - payload, - instance._solution.conferenceSid - ) - ); + try { + let payload = await operationPromise; + let operation = new ConferenceInstance( + operationVersion, + payload, + instance._solution.conferenceSid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/insights/v1/conference/conferenceParticipant.ts b/src/rest/insights/v1/conference/conferenceParticipant.ts index a3306511a..2084182e4 100644 --- a/src/rest/insights/v1/conference/conferenceParticipant.ts +++ b/src/rest/insights/v1/conference/conferenceParticipant.ts @@ -185,7 +185,7 @@ export class ConferenceParticipantContextImpl this._uri = `/Conferences/${conferenceSid}/Participants/${participantSid}`; } - fetch( + async fetch( params?: | ConferenceParticipantContextFetchOptions | ((error: Error | null, item?: ConferenceParticipantInstance) => any), @@ -218,21 +218,26 @@ export class ConferenceParticipantContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new ConferenceParticipantInstance( - operationVersion, - payload, - instance._solution.conferenceSid, - instance._solution.participantSid - ) - ); + try { + let payload = await operationPromise; + let operation = new ConferenceParticipantInstance( + operationVersion, + payload, + instance._solution.conferenceSid, + instance._solution.participantSid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/insights/v1/room.ts b/src/rest/insights/v1/room.ts index 03de53ada..11496e191 100644 --- a/src/rest/insights/v1/room.ts +++ b/src/rest/insights/v1/room.ts @@ -171,7 +171,7 @@ export class RoomContextImpl implements RoomContext { return this._participants; } - fetch( + async fetch( callback?: (error: Error | null, item?: RoomInstance) => any ): Promise { const headers: any = {}; @@ -185,16 +185,25 @@ export class RoomContextImpl implements RoomContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new RoomInstance(operationVersion, payload, instance._solution.roomSid) - ); + try { + let payload = await operationPromise; + let operation = new RoomInstance( + operationVersion, + payload, + instance._solution.roomSid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/insights/v1/room/participant.ts b/src/rest/insights/v1/room/participant.ts index 814ccdd7e..25930e128 100644 --- a/src/rest/insights/v1/room/participant.ts +++ b/src/rest/insights/v1/room/participant.ts @@ -126,7 +126,7 @@ export class ParticipantContextImpl implements ParticipantContext { this._uri = `/Video/Rooms/${roomSid}/Participants/${participantSid}`; } - fetch( + async fetch( callback?: (error: Error | null, item?: ParticipantInstance) => any ): Promise { const headers: any = {}; @@ -140,21 +140,26 @@ export class ParticipantContextImpl implements ParticipantContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ParticipantInstance( - operationVersion, - payload, - instance._solution.roomSid, - instance._solution.participantSid - ) - ); + try { + let payload = await operationPromise; + let operation = new ParticipantInstance( + operationVersion, + payload, + instance._solution.roomSid, + instance._solution.participantSid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/insights/v1/setting.ts b/src/rest/insights/v1/setting.ts index a83223fe9..d9325b776 100644 --- a/src/rest/insights/v1/setting.ts +++ b/src/rest/insights/v1/setting.ts @@ -103,7 +103,7 @@ export class SettingContextImpl implements SettingContext { this._uri = `/Voice/Settings`; } - fetch( + async fetch( params?: | SettingContextFetchOptions | ((error: Error | null, item?: SettingInstance) => any), @@ -133,18 +133,24 @@ export class SettingContextImpl implements SettingContext { headers, }); - operationPromise = operationPromise.then( - (payload) => new SettingInstance(operationVersion, payload) - ); + try { + let payload = await operationPromise; + let operation = new SettingInstance(operationVersion, payload); + + if (callback) { + callback(null, operation); + } - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | SettingContextUpdateOptions | ((error: Error | null, item?: SettingInstance) => any), @@ -179,15 +185,21 @@ export class SettingContextImpl implements SettingContext { headers, }); - operationPromise = operationPromise.then( - (payload) => new SettingInstance(operationVersion, payload) - ); + try { + let payload = await operationPromise; + let operation = new SettingInstance(operationVersion, payload); + + if (callback) { + callback(null, operation); + } - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/intelligence/v2/customOperator.ts b/src/rest/intelligence/v2/customOperator.ts index eba010380..6c9c6c289 100644 --- a/src/rest/intelligence/v2/customOperator.ts +++ b/src/rest/intelligence/v2/customOperator.ts @@ -180,7 +180,7 @@ export class CustomOperatorContextImpl implements CustomOperatorContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: CustomOperatorInstance) => any ): Promise { const headers: any = {}; @@ -194,23 +194,28 @@ export class CustomOperatorContextImpl implements CustomOperatorContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new CustomOperatorInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new CustomOperatorInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params: CustomOperatorContextUpdateOptions, callback?: (error: Error | null, item?: CustomOperatorInstance) => any ): Promise { @@ -250,20 +255,25 @@ export class CustomOperatorContextImpl implements CustomOperatorContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new CustomOperatorInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new CustomOperatorInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/intelligence/v2/operator.ts b/src/rest/intelligence/v2/operator.ts index 57b251e09..b35779784 100644 --- a/src/rest/intelligence/v2/operator.ts +++ b/src/rest/intelligence/v2/operator.ts @@ -106,7 +106,7 @@ export class OperatorContextImpl implements OperatorContext { this._uri = `/Operators/${sid}`; } - fetch( + async fetch( callback?: (error: Error | null, item?: OperatorInstance) => any ): Promise { const headers: any = {}; @@ -120,16 +120,25 @@ export class OperatorContextImpl implements OperatorContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new OperatorInstance(operationVersion, payload, instance._solution.sid) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new OperatorInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/intelligence/v2/operatorAttachment.ts b/src/rest/intelligence/v2/operatorAttachment.ts index eaacc980c..48ea9fb39 100644 --- a/src/rest/intelligence/v2/operatorAttachment.ts +++ b/src/rest/intelligence/v2/operatorAttachment.ts @@ -72,7 +72,7 @@ export class OperatorAttachmentContextImpl this._uri = `/Services/${serviceSid}/Operators/${operatorSid}`; } - create( + async create( callback?: (error: Error | null, item?: OperatorAttachmentInstance) => any ): Promise { const headers: any = {}; @@ -86,21 +86,26 @@ export class OperatorAttachmentContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new OperatorAttachmentInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.operatorSid - ) - ); + try { + let payload = await operationPromise; + let operation = new OperatorAttachmentInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.operatorSid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } remove( diff --git a/src/rest/intelligence/v2/operatorAttachments.ts b/src/rest/intelligence/v2/operatorAttachments.ts index b38f5328a..2b05e9981 100644 --- a/src/rest/intelligence/v2/operatorAttachments.ts +++ b/src/rest/intelligence/v2/operatorAttachments.ts @@ -56,7 +56,7 @@ export class OperatorAttachmentsContextImpl this._uri = `/Services/${serviceSid}/Operators`; } - fetch( + async fetch( callback?: (error: Error | null, item?: OperatorAttachmentsInstance) => any ): Promise { const headers: any = {}; @@ -70,20 +70,25 @@ export class OperatorAttachmentsContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new OperatorAttachmentsInstance( - operationVersion, - payload, - instance._solution.serviceSid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new OperatorAttachmentsInstance( + operationVersion, + payload, + instance._solution.serviceSid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/intelligence/v2/operatorType.ts b/src/rest/intelligence/v2/operatorType.ts index 627a1ada5..958f0b760 100644 --- a/src/rest/intelligence/v2/operatorType.ts +++ b/src/rest/intelligence/v2/operatorType.ts @@ -107,7 +107,7 @@ export class OperatorTypeContextImpl implements OperatorTypeContext { this._uri = `/OperatorTypes/${sid}`; } - fetch( + async fetch( callback?: (error: Error | null, item?: OperatorTypeInstance) => any ): Promise { const headers: any = {}; @@ -121,20 +121,25 @@ export class OperatorTypeContextImpl implements OperatorTypeContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new OperatorTypeInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new OperatorTypeInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/intelligence/v2/prebuiltOperator.ts b/src/rest/intelligence/v2/prebuiltOperator.ts index da641a297..216340177 100644 --- a/src/rest/intelligence/v2/prebuiltOperator.ts +++ b/src/rest/intelligence/v2/prebuiltOperator.ts @@ -113,7 +113,7 @@ export class PrebuiltOperatorContextImpl implements PrebuiltOperatorContext { this._uri = `/Operators/PreBuilt/${sid}`; } - fetch( + async fetch( callback?: (error: Error | null, item?: PrebuiltOperatorInstance) => any ): Promise { const headers: any = {}; @@ -127,20 +127,25 @@ export class PrebuiltOperatorContextImpl implements PrebuiltOperatorContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new PrebuiltOperatorInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new PrebuiltOperatorInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/intelligence/v2/service.ts b/src/rest/intelligence/v2/service.ts index 0be6f114c..d5c118605 100644 --- a/src/rest/intelligence/v2/service.ts +++ b/src/rest/intelligence/v2/service.ts @@ -195,7 +195,7 @@ export class ServiceContextImpl implements ServiceContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: ServiceInstance) => any ): Promise { const headers: any = {}; @@ -209,19 +209,28 @@ export class ServiceContextImpl implements ServiceContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ServiceInstance(operationVersion, payload, instance._solution.sid) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new ServiceInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | ServiceContextUpdateOptions | ((error: Error | null, item?: ServiceInstance) => any), @@ -268,16 +277,25 @@ export class ServiceContextImpl implements ServiceContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ServiceInstance(operationVersion, payload, instance._solution.sid) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new ServiceInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/intelligence/v2/transcript.ts b/src/rest/intelligence/v2/transcript.ts index 7556a7e83..28644e95b 100644 --- a/src/rest/intelligence/v2/transcript.ts +++ b/src/rest/intelligence/v2/transcript.ts @@ -222,7 +222,7 @@ export class TranscriptContextImpl implements TranscriptContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: TranscriptInstance) => any ): Promise { const headers: any = {}; @@ -236,20 +236,25 @@ export class TranscriptContextImpl implements TranscriptContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new TranscriptInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new TranscriptInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/intelligence/v2/transcript/media.ts b/src/rest/intelligence/v2/transcript/media.ts index a9b46e14c..32104843b 100644 --- a/src/rest/intelligence/v2/transcript/media.ts +++ b/src/rest/intelligence/v2/transcript/media.ts @@ -74,7 +74,7 @@ export class MediaContextImpl implements MediaContext { this._uri = `/Transcripts/${sid}/Media`; } - fetch( + async fetch( params?: | MediaContextFetchOptions | ((error: Error | null, item?: MediaInstance) => any), @@ -104,16 +104,25 @@ export class MediaContextImpl implements MediaContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new MediaInstance(operationVersion, payload, instance._solution.sid) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new MediaInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/intelligence/v2/transcript/operatorResult.ts b/src/rest/intelligence/v2/transcript/operatorResult.ts index 7ceb2b2b5..54f81c300 100644 --- a/src/rest/intelligence/v2/transcript/operatorResult.ts +++ b/src/rest/intelligence/v2/transcript/operatorResult.ts @@ -136,7 +136,7 @@ export class OperatorResultContextImpl implements OperatorResultContext { this._uri = `/Transcripts/${transcriptSid}/OperatorResults/${operatorSid}`; } - fetch( + async fetch( params?: | OperatorResultContextFetchOptions | ((error: Error | null, item?: OperatorResultInstance) => any), @@ -166,21 +166,26 @@ export class OperatorResultContextImpl implements OperatorResultContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new OperatorResultInstance( - operationVersion, - payload, - instance._solution.transcriptSid, - instance._solution.operatorSid - ) - ); + try { + let payload = await operationPromise; + let operation = new OperatorResultInstance( + operationVersion, + payload, + instance._solution.transcriptSid, + instance._solution.operatorSid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/ipMessaging/v1/credential.ts b/src/rest/ipMessaging/v1/credential.ts index 24dcb480f..8ed8b9c67 100644 --- a/src/rest/ipMessaging/v1/credential.ts +++ b/src/rest/ipMessaging/v1/credential.ts @@ -185,7 +185,7 @@ export class CredentialContextImpl implements CredentialContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: CredentialInstance) => any ): Promise { const headers: any = {}; @@ -199,23 +199,28 @@ export class CredentialContextImpl implements CredentialContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new CredentialInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new CredentialInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | CredentialContextUpdateOptions | ((error: Error | null, item?: CredentialInstance) => any), @@ -254,20 +259,25 @@ export class CredentialContextImpl implements CredentialContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new CredentialInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new CredentialInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/ipMessaging/v1/service.ts b/src/rest/ipMessaging/v1/service.ts index 6bd82ebf2..5063eabba 100644 --- a/src/rest/ipMessaging/v1/service.ts +++ b/src/rest/ipMessaging/v1/service.ts @@ -296,7 +296,7 @@ export class ServiceContextImpl implements ServiceContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: ServiceInstance) => any ): Promise { const headers: any = {}; @@ -310,19 +310,28 @@ export class ServiceContextImpl implements ServiceContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ServiceInstance(operationVersion, payload, instance._solution.sid) - ); + try { + let payload = await operationPromise; + let operation = new ServiceInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | ServiceContextUpdateOptions | ((error: Error | null, item?: ServiceInstance) => any), @@ -504,16 +513,25 @@ export class ServiceContextImpl implements ServiceContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ServiceInstance(operationVersion, payload, instance._solution.sid) - ); + try { + let payload = await operationPromise; + let operation = new ServiceInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/ipMessaging/v1/service/channel.ts b/src/rest/ipMessaging/v1/service/channel.ts index bf7a437f8..d056e867b 100644 --- a/src/rest/ipMessaging/v1/service/channel.ts +++ b/src/rest/ipMessaging/v1/service/channel.ts @@ -228,7 +228,7 @@ export class ChannelContextImpl implements ChannelContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: ChannelInstance) => any ): Promise { const headers: any = {}; @@ -242,24 +242,29 @@ export class ChannelContextImpl implements ChannelContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ChannelInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new ChannelInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | ChannelContextUpdateOptions | ((error: Error | null, item?: ChannelInstance) => any), @@ -294,21 +299,26 @@ export class ChannelContextImpl implements ChannelContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ChannelInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new ChannelInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/ipMessaging/v1/service/channel/invite.ts b/src/rest/ipMessaging/v1/service/channel/invite.ts index d1b18782c..4ecae67d4 100644 --- a/src/rest/ipMessaging/v1/service/channel/invite.ts +++ b/src/rest/ipMessaging/v1/service/channel/invite.ts @@ -153,7 +153,7 @@ export class InviteContextImpl implements InviteContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: InviteInstance) => any ): Promise { const headers: any = {}; @@ -167,22 +167,27 @@ export class InviteContextImpl implements InviteContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new InviteInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.channelSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new InviteInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.channelSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/ipMessaging/v1/service/channel/member.ts b/src/rest/ipMessaging/v1/service/channel/member.ts index 7e62fa3c8..ec778cd3e 100644 --- a/src/rest/ipMessaging/v1/service/channel/member.ts +++ b/src/rest/ipMessaging/v1/service/channel/member.ts @@ -186,7 +186,7 @@ export class MemberContextImpl implements MemberContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: MemberInstance) => any ): Promise { const headers: any = {}; @@ -200,25 +200,30 @@ export class MemberContextImpl implements MemberContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new MemberInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.channelSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new MemberInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.channelSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | MemberContextUpdateOptions | ((error: Error | null, item?: MemberInstance) => any), @@ -250,22 +255,27 @@ export class MemberContextImpl implements MemberContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new MemberInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.channelSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new MemberInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.channelSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/ipMessaging/v1/service/channel/message.ts b/src/rest/ipMessaging/v1/service/channel/message.ts index f456a6c51..f25533b64 100644 --- a/src/rest/ipMessaging/v1/service/channel/message.ts +++ b/src/rest/ipMessaging/v1/service/channel/message.ts @@ -190,7 +190,7 @@ export class MessageContextImpl implements MessageContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: MessageInstance) => any ): Promise { const headers: any = {}; @@ -204,25 +204,30 @@ export class MessageContextImpl implements MessageContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new MessageInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.channelSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new MessageInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.channelSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | MessageContextUpdateOptions | ((error: Error | null, item?: MessageInstance) => any), @@ -254,22 +259,27 @@ export class MessageContextImpl implements MessageContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new MessageInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.channelSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new MessageInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.channelSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/ipMessaging/v1/service/role.ts b/src/rest/ipMessaging/v1/service/role.ts index b4b00a11d..29f5eb8b4 100644 --- a/src/rest/ipMessaging/v1/service/role.ts +++ b/src/rest/ipMessaging/v1/service/role.ts @@ -162,7 +162,7 @@ export class RoleContextImpl implements RoleContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: RoleInstance) => any ): Promise { const headers: any = {}; @@ -176,24 +176,29 @@ export class RoleContextImpl implements RoleContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new RoleInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new RoleInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params: RoleContextUpdateOptions, callback?: (error: Error | null, item?: RoleInstance) => any ): Promise { @@ -222,21 +227,26 @@ export class RoleContextImpl implements RoleContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new RoleInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new RoleInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/ipMessaging/v1/service/user.ts b/src/rest/ipMessaging/v1/service/user.ts index ebd6c9eb1..20ebdd4b9 100644 --- a/src/rest/ipMessaging/v1/service/user.ts +++ b/src/rest/ipMessaging/v1/service/user.ts @@ -192,7 +192,7 @@ export class UserContextImpl implements UserContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: UserInstance) => any ): Promise { const headers: any = {}; @@ -206,24 +206,29 @@ export class UserContextImpl implements UserContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new UserInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new UserInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | UserContextUpdateOptions | ((error: Error | null, item?: UserInstance) => any), @@ -257,21 +262,26 @@ export class UserContextImpl implements UserContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new UserInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new UserInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/ipMessaging/v2/credential.ts b/src/rest/ipMessaging/v2/credential.ts index 94fff1379..9430febd2 100644 --- a/src/rest/ipMessaging/v2/credential.ts +++ b/src/rest/ipMessaging/v2/credential.ts @@ -185,7 +185,7 @@ export class CredentialContextImpl implements CredentialContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: CredentialInstance) => any ): Promise { const headers: any = {}; @@ -199,23 +199,28 @@ export class CredentialContextImpl implements CredentialContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new CredentialInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new CredentialInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | CredentialContextUpdateOptions | ((error: Error | null, item?: CredentialInstance) => any), @@ -254,20 +259,25 @@ export class CredentialContextImpl implements CredentialContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new CredentialInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new CredentialInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/ipMessaging/v2/service.ts b/src/rest/ipMessaging/v2/service.ts index 63c428421..40cf513d5 100644 --- a/src/rest/ipMessaging/v2/service.ts +++ b/src/rest/ipMessaging/v2/service.ts @@ -259,7 +259,7 @@ export class ServiceContextImpl implements ServiceContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: ServiceInstance) => any ): Promise { const headers: any = {}; @@ -273,19 +273,28 @@ export class ServiceContextImpl implements ServiceContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ServiceInstance(operationVersion, payload, instance._solution.sid) - ); + try { + let payload = await operationPromise; + let operation = new ServiceInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | ServiceContextUpdateOptions | ((error: Error | null, item?: ServiceInstance) => any), @@ -402,16 +411,25 @@ export class ServiceContextImpl implements ServiceContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ServiceInstance(operationVersion, payload, instance._solution.sid) - ); + try { + let payload = await operationPromise; + let operation = new ServiceInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/ipMessaging/v2/service/binding.ts b/src/rest/ipMessaging/v2/service/binding.ts index fc41b0220..342f58562 100644 --- a/src/rest/ipMessaging/v2/service/binding.ts +++ b/src/rest/ipMessaging/v2/service/binding.ts @@ -142,7 +142,7 @@ export class BindingContextImpl implements BindingContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: BindingInstance) => any ): Promise { const headers: any = {}; @@ -156,21 +156,26 @@ export class BindingContextImpl implements BindingContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new BindingInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new BindingInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/ipMessaging/v2/service/channel.ts b/src/rest/ipMessaging/v2/service/channel.ts index f0e541ccd..43d6a933f 100644 --- a/src/rest/ipMessaging/v2/service/channel.ts +++ b/src/rest/ipMessaging/v2/service/channel.ts @@ -295,7 +295,7 @@ export class ChannelContextImpl implements ChannelContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: ChannelInstance) => any ): Promise { const headers: any = {}; @@ -309,24 +309,29 @@ export class ChannelContextImpl implements ChannelContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ChannelInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new ChannelInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | ChannelContextUpdateOptions | ((error: Error | null, item?: ChannelInstance) => any), @@ -369,21 +374,26 @@ export class ChannelContextImpl implements ChannelContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ChannelInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new ChannelInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/ipMessaging/v2/service/channel/invite.ts b/src/rest/ipMessaging/v2/service/channel/invite.ts index 9c8d929b6..0d167155e 100644 --- a/src/rest/ipMessaging/v2/service/channel/invite.ts +++ b/src/rest/ipMessaging/v2/service/channel/invite.ts @@ -153,7 +153,7 @@ export class InviteContextImpl implements InviteContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: InviteInstance) => any ): Promise { const headers: any = {}; @@ -167,22 +167,27 @@ export class InviteContextImpl implements InviteContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new InviteInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.channelSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new InviteInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.channelSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/ipMessaging/v2/service/channel/member.ts b/src/rest/ipMessaging/v2/service/channel/member.ts index f3fd8cf60..984b65e53 100644 --- a/src/rest/ipMessaging/v2/service/channel/member.ts +++ b/src/rest/ipMessaging/v2/service/channel/member.ts @@ -245,7 +245,7 @@ export class MemberContextImpl implements MemberContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: MemberInstance) => any ): Promise { const headers: any = {}; @@ -259,25 +259,30 @@ export class MemberContextImpl implements MemberContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new MemberInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.channelSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new MemberInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.channelSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | MemberContextUpdateOptions | ((error: Error | null, item?: MemberInstance) => any), @@ -321,22 +326,27 @@ export class MemberContextImpl implements MemberContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new MemberInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.channelSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new MemberInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.channelSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/ipMessaging/v2/service/channel/message.ts b/src/rest/ipMessaging/v2/service/channel/message.ts index c45915677..0bdc4c41d 100644 --- a/src/rest/ipMessaging/v2/service/channel/message.ts +++ b/src/rest/ipMessaging/v2/service/channel/message.ts @@ -247,7 +247,7 @@ export class MessageContextImpl implements MessageContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: MessageInstance) => any ): Promise { const headers: any = {}; @@ -261,25 +261,30 @@ export class MessageContextImpl implements MessageContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new MessageInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.channelSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new MessageInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.channelSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | MessageContextUpdateOptions | ((error: Error | null, item?: MessageInstance) => any), @@ -320,22 +325,27 @@ export class MessageContextImpl implements MessageContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new MessageInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.channelSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new MessageInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.channelSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/ipMessaging/v2/service/channel/webhook.ts b/src/rest/ipMessaging/v2/service/channel/webhook.ts index bbb8b26e1..12d872b36 100644 --- a/src/rest/ipMessaging/v2/service/channel/webhook.ts +++ b/src/rest/ipMessaging/v2/service/channel/webhook.ts @@ -202,7 +202,7 @@ export class WebhookContextImpl implements WebhookContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: WebhookInstance) => any ): Promise { const headers: any = {}; @@ -216,25 +216,30 @@ export class WebhookContextImpl implements WebhookContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new WebhookInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.channelSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new WebhookInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.channelSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | WebhookContextUpdateOptions | ((error: Error | null, item?: WebhookInstance) => any), @@ -281,22 +286,27 @@ export class WebhookContextImpl implements WebhookContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new WebhookInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.channelSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new WebhookInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.channelSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/ipMessaging/v2/service/role.ts b/src/rest/ipMessaging/v2/service/role.ts index 0c280457d..a5b0921b0 100644 --- a/src/rest/ipMessaging/v2/service/role.ts +++ b/src/rest/ipMessaging/v2/service/role.ts @@ -162,7 +162,7 @@ export class RoleContextImpl implements RoleContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: RoleInstance) => any ): Promise { const headers: any = {}; @@ -176,24 +176,29 @@ export class RoleContextImpl implements RoleContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new RoleInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new RoleInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params: RoleContextUpdateOptions, callback?: (error: Error | null, item?: RoleInstance) => any ): Promise { @@ -222,21 +227,26 @@ export class RoleContextImpl implements RoleContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new RoleInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new RoleInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/ipMessaging/v2/service/user.ts b/src/rest/ipMessaging/v2/service/user.ts index 11764675c..b29fe7a13 100644 --- a/src/rest/ipMessaging/v2/service/user.ts +++ b/src/rest/ipMessaging/v2/service/user.ts @@ -212,7 +212,7 @@ export class UserContextImpl implements UserContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: UserInstance) => any ): Promise { const headers: any = {}; @@ -226,24 +226,29 @@ export class UserContextImpl implements UserContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new UserInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new UserInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | UserContextUpdateOptions | ((error: Error | null, item?: UserInstance) => any), @@ -279,21 +284,26 @@ export class UserContextImpl implements UserContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new UserInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new UserInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/ipMessaging/v2/service/user/userBinding.ts b/src/rest/ipMessaging/v2/service/user/userBinding.ts index 625833f64..d42b23797 100644 --- a/src/rest/ipMessaging/v2/service/user/userBinding.ts +++ b/src/rest/ipMessaging/v2/service/user/userBinding.ts @@ -146,7 +146,7 @@ export class UserBindingContextImpl implements UserBindingContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: UserBindingInstance) => any ): Promise { const headers: any = {}; @@ -160,22 +160,27 @@ export class UserBindingContextImpl implements UserBindingContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new UserBindingInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.userSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new UserBindingInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.userSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/ipMessaging/v2/service/user/userChannel.ts b/src/rest/ipMessaging/v2/service/user/userChannel.ts index 81ebe0ace..0b6c70fde 100644 --- a/src/rest/ipMessaging/v2/service/user/userChannel.ts +++ b/src/rest/ipMessaging/v2/service/user/userChannel.ts @@ -179,7 +179,7 @@ export class UserChannelContextImpl implements UserChannelContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: UserChannelInstance) => any ): Promise { const headers: any = {}; @@ -193,25 +193,30 @@ export class UserChannelContextImpl implements UserChannelContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new UserChannelInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.userSid, - instance._solution.channelSid - ) - ); + try { + let payload = await operationPromise; + let operation = new UserChannelInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.userSid, + instance._solution.channelSid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | UserChannelContextUpdateOptions | ((error: Error | null, item?: UserChannelInstance) => any), @@ -248,22 +253,27 @@ export class UserChannelContextImpl implements UserChannelContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new UserChannelInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.userSid, - instance._solution.channelSid - ) - ); + try { + let payload = await operationPromise; + let operation = new UserChannelInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.userSid, + instance._solution.channelSid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/lookups/v1/phoneNumber.ts b/src/rest/lookups/v1/phoneNumber.ts index 6ee860429..19876cbab 100644 --- a/src/rest/lookups/v1/phoneNumber.ts +++ b/src/rest/lookups/v1/phoneNumber.ts @@ -80,7 +80,7 @@ export class PhoneNumberContextImpl implements PhoneNumberContext { this._uri = `/PhoneNumbers/${phoneNumber}`; } - fetch( + async fetch( params?: | PhoneNumberContextFetchOptions | ((error: Error | null, item?: PhoneNumberInstance) => any), @@ -119,20 +119,25 @@ export class PhoneNumberContextImpl implements PhoneNumberContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new PhoneNumberInstance( - operationVersion, - payload, - instance._solution.phoneNumber - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new PhoneNumberInstance( + operationVersion, + payload, + instance._solution.phoneNumber + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/lookups/v2/phoneNumber.ts b/src/rest/lookups/v2/phoneNumber.ts index cd0e83c7e..5fb7a8d92 100644 --- a/src/rest/lookups/v2/phoneNumber.ts +++ b/src/rest/lookups/v2/phoneNumber.ts @@ -110,7 +110,7 @@ export class PhoneNumberContextImpl implements PhoneNumberContext { this._uri = `/PhoneNumbers/${phoneNumber}`; } - fetch( + async fetch( params?: | PhoneNumberContextFetchOptions | ((error: Error | null, item?: PhoneNumberInstance) => any), @@ -164,20 +164,25 @@ export class PhoneNumberContextImpl implements PhoneNumberContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new PhoneNumberInstance( - operationVersion, - payload, - instance._solution.phoneNumber - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new PhoneNumberInstance( + operationVersion, + payload, + instance._solution.phoneNumber + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/marketplace/v1/availableAddOn.ts b/src/rest/marketplace/v1/availableAddOn.ts index f6eebe296..64679c39b 100644 --- a/src/rest/marketplace/v1/availableAddOn.ts +++ b/src/rest/marketplace/v1/availableAddOn.ts @@ -107,7 +107,7 @@ export class AvailableAddOnContextImpl implements AvailableAddOnContext { return this._extensions; } - fetch( + async fetch( callback?: (error: Error | null, item?: AvailableAddOnInstance) => any ): Promise { const headers: any = {}; @@ -121,20 +121,25 @@ export class AvailableAddOnContextImpl implements AvailableAddOnContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new AvailableAddOnInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new AvailableAddOnInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/marketplace/v1/availableAddOn/availableAddOnExtension.ts b/src/rest/marketplace/v1/availableAddOn/availableAddOnExtension.ts index 28f5d9df5..fd3ad191c 100644 --- a/src/rest/marketplace/v1/availableAddOn/availableAddOnExtension.ts +++ b/src/rest/marketplace/v1/availableAddOn/availableAddOnExtension.ts @@ -105,7 +105,7 @@ export class AvailableAddOnExtensionContextImpl this._uri = `/AvailableAddOns/${availableAddOnSid}/Extensions/${sid}`; } - fetch( + async fetch( callback?: ( error: Error | null, item?: AvailableAddOnExtensionInstance @@ -122,21 +122,26 @@ export class AvailableAddOnExtensionContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new AvailableAddOnExtensionInstance( - operationVersion, - payload, - instance._solution.availableAddOnSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new AvailableAddOnExtensionInstance( + operationVersion, + payload, + instance._solution.availableAddOnSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/marketplace/v1/installedAddOn.ts b/src/rest/marketplace/v1/installedAddOn.ts index 63e9738be..4e8e47c34 100644 --- a/src/rest/marketplace/v1/installedAddOn.ts +++ b/src/rest/marketplace/v1/installedAddOn.ts @@ -194,7 +194,7 @@ export class InstalledAddOnContextImpl implements InstalledAddOnContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: InstalledAddOnInstance) => any ): Promise { const headers: any = {}; @@ -208,23 +208,28 @@ export class InstalledAddOnContextImpl implements InstalledAddOnContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new InstalledAddOnInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new InstalledAddOnInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | InstalledAddOnContextUpdateOptions | ((error: Error | null, item?: InstalledAddOnInstance) => any), @@ -257,20 +262,25 @@ export class InstalledAddOnContextImpl implements InstalledAddOnContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new InstalledAddOnInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new InstalledAddOnInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/marketplace/v1/installedAddOn/installedAddOnExtension.ts b/src/rest/marketplace/v1/installedAddOn/installedAddOnExtension.ts index 6f5d4997f..44eafb7de 100644 --- a/src/rest/marketplace/v1/installedAddOn/installedAddOnExtension.ts +++ b/src/rest/marketplace/v1/installedAddOn/installedAddOnExtension.ts @@ -128,7 +128,7 @@ export class InstalledAddOnExtensionContextImpl this._uri = `/InstalledAddOns/${installedAddOnSid}/Extensions/${sid}`; } - fetch( + async fetch( callback?: ( error: Error | null, item?: InstalledAddOnExtensionInstance @@ -145,24 +145,29 @@ export class InstalledAddOnExtensionContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new InstalledAddOnExtensionInstance( - operationVersion, - payload, - instance._solution.installedAddOnSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new InstalledAddOnExtensionInstance( + operationVersion, + payload, + instance._solution.installedAddOnSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params: InstalledAddOnExtensionContextUpdateOptions, callback?: ( error: Error | null, @@ -194,21 +199,26 @@ export class InstalledAddOnExtensionContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new InstalledAddOnExtensionInstance( - operationVersion, - payload, - instance._solution.installedAddOnSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new InstalledAddOnExtensionInstance( + operationVersion, + payload, + instance._solution.installedAddOnSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/marketplace/v1/moduleDataManagement.ts b/src/rest/marketplace/v1/moduleDataManagement.ts index df74c7fb0..524d75ac8 100644 --- a/src/rest/marketplace/v1/moduleDataManagement.ts +++ b/src/rest/marketplace/v1/moduleDataManagement.ts @@ -99,7 +99,7 @@ export class ModuleDataManagementContextImpl this._uri = `/Listing/${sid}`; } - fetch( + async fetch( callback?: (error: Error | null, item?: ModuleDataManagementInstance) => any ): Promise { const headers: any = {}; @@ -113,23 +113,28 @@ export class ModuleDataManagementContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new ModuleDataManagementInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new ModuleDataManagementInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | ModuleDataManagementContextUpdateOptions | ((error: Error | null, item?: ModuleDataManagementInstance) => any), @@ -169,20 +174,25 @@ export class ModuleDataManagementContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new ModuleDataManagementInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new ModuleDataManagementInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/messaging/v1/brandRegistration.ts b/src/rest/messaging/v1/brandRegistration.ts index 93480ac4c..e3a08e720 100644 --- a/src/rest/messaging/v1/brandRegistration.ts +++ b/src/rest/messaging/v1/brandRegistration.ts @@ -163,7 +163,7 @@ export class BrandRegistrationContextImpl implements BrandRegistrationContext { return this._brandVettings; } - fetch( + async fetch( callback?: (error: Error | null, item?: BrandRegistrationInstance) => any ): Promise { const headers: any = {}; @@ -177,23 +177,28 @@ export class BrandRegistrationContextImpl implements BrandRegistrationContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new BrandRegistrationInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new BrandRegistrationInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( callback?: (error: Error | null, item?: BrandRegistrationInstance) => any ): Promise { const headers: any = {}; @@ -207,20 +212,25 @@ export class BrandRegistrationContextImpl implements BrandRegistrationContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new BrandRegistrationInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new BrandRegistrationInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/messaging/v1/brandRegistration/brandVetting.ts b/src/rest/messaging/v1/brandRegistration/brandVetting.ts index aa182afe8..fd130153a 100644 --- a/src/rest/messaging/v1/brandRegistration/brandVetting.ts +++ b/src/rest/messaging/v1/brandRegistration/brandVetting.ts @@ -118,7 +118,7 @@ export class BrandVettingContextImpl implements BrandVettingContext { this._uri = `/a2p/BrandRegistrations/${brandSid}/Vettings/${brandVettingSid}`; } - fetch( + async fetch( callback?: (error: Error | null, item?: BrandVettingInstance) => any ): Promise { const headers: any = {}; @@ -132,21 +132,26 @@ export class BrandVettingContextImpl implements BrandVettingContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new BrandVettingInstance( - operationVersion, - payload, - instance._solution.brandSid, - instance._solution.brandVettingSid - ) - ); + try { + let payload = await operationPromise; + let operation = new BrandVettingInstance( + operationVersion, + payload, + instance._solution.brandSid, + instance._solution.brandVettingSid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/messaging/v1/deactivations.ts b/src/rest/messaging/v1/deactivations.ts index e96e47bac..3b1076605 100644 --- a/src/rest/messaging/v1/deactivations.ts +++ b/src/rest/messaging/v1/deactivations.ts @@ -68,7 +68,7 @@ export class DeactivationsContextImpl implements DeactivationsContext { this._uri = `/Deactivations`; } - fetch( + async fetch( params?: | DeactivationsContextFetchOptions | ((error: Error | null, item?: DeactivationsInstance) => any), @@ -98,15 +98,21 @@ export class DeactivationsContextImpl implements DeactivationsContext { headers, }); - operationPromise = operationPromise.then( - (payload) => new DeactivationsInstance(operationVersion, payload) - ); + try { + let payload = await operationPromise; + let operation = new DeactivationsInstance(operationVersion, payload); + + if (callback) { + callback(null, operation); + } - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/messaging/v1/domainCerts.ts b/src/rest/messaging/v1/domainCerts.ts index fb5382de3..14d9c48c4 100644 --- a/src/rest/messaging/v1/domainCerts.ts +++ b/src/rest/messaging/v1/domainCerts.ts @@ -106,7 +106,7 @@ export class DomainCertsContextImpl implements DomainCertsContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: DomainCertsInstance) => any ): Promise { const headers: any = {}; @@ -120,23 +120,28 @@ export class DomainCertsContextImpl implements DomainCertsContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new DomainCertsInstance( - operationVersion, - payload, - instance._solution.domainSid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new DomainCertsInstance( + operationVersion, + payload, + instance._solution.domainSid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params: DomainCertsContextUpdateOptions, callback?: (error: Error | null, item?: DomainCertsInstance) => any ): Promise { @@ -165,20 +170,25 @@ export class DomainCertsContextImpl implements DomainCertsContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new DomainCertsInstance( - operationVersion, - payload, - instance._solution.domainSid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new DomainCertsInstance( + operationVersion, + payload, + instance._solution.domainSid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/messaging/v1/domainConfig.ts b/src/rest/messaging/v1/domainConfig.ts index 3b23766d1..0e3a8a325 100644 --- a/src/rest/messaging/v1/domainConfig.ts +++ b/src/rest/messaging/v1/domainConfig.ts @@ -91,7 +91,7 @@ export class DomainConfigContextImpl implements DomainConfigContext { this._uri = `/LinkShortening/Domains/${domainSid}/Config`; } - fetch( + async fetch( callback?: (error: Error | null, item?: DomainConfigInstance) => any ): Promise { const headers: any = {}; @@ -105,23 +105,28 @@ export class DomainConfigContextImpl implements DomainConfigContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new DomainConfigInstance( - operationVersion, - payload, - instance._solution.domainSid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new DomainConfigInstance( + operationVersion, + payload, + instance._solution.domainSid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | DomainConfigContextUpdateOptions | ((error: Error | null, item?: DomainConfigInstance) => any), @@ -158,20 +163,25 @@ export class DomainConfigContextImpl implements DomainConfigContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new DomainConfigInstance( - operationVersion, - payload, - instance._solution.domainSid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new DomainConfigInstance( + operationVersion, + payload, + instance._solution.domainSid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/messaging/v1/domainConfigMessagingService.ts b/src/rest/messaging/v1/domainConfigMessagingService.ts index 005a66da2..7eee79cf2 100644 --- a/src/rest/messaging/v1/domainConfigMessagingService.ts +++ b/src/rest/messaging/v1/domainConfigMessagingService.ts @@ -59,7 +59,7 @@ export class DomainConfigMessagingServiceContextImpl this._uri = `/LinkShortening/MessagingService/${messagingServiceSid}/DomainConfig`; } - fetch( + async fetch( callback?: ( error: Error | null, item?: DomainConfigMessagingServiceInstance @@ -76,20 +76,25 @@ export class DomainConfigMessagingServiceContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new DomainConfigMessagingServiceInstance( - operationVersion, - payload, - instance._solution.messagingServiceSid - ) - ); + try { + let payload = await operationPromise; + let operation = new DomainConfigMessagingServiceInstance( + operationVersion, + payload, + instance._solution.messagingServiceSid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/messaging/v1/linkshorteningMessagingService.ts b/src/rest/messaging/v1/linkshorteningMessagingService.ts index 8c98b68b1..e6949557d 100644 --- a/src/rest/messaging/v1/linkshorteningMessagingService.ts +++ b/src/rest/messaging/v1/linkshorteningMessagingService.ts @@ -79,7 +79,7 @@ export class LinkshorteningMessagingServiceContextImpl this._uri = `/LinkShortening/Domains/${domainSid}/MessagingServices/${messagingServiceSid}`; } - create( + async create( callback?: ( error: Error | null, item?: LinkshorteningMessagingServiceInstance @@ -96,21 +96,26 @@ export class LinkshorteningMessagingServiceContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new LinkshorteningMessagingServiceInstance( - operationVersion, - payload, - instance._solution.domainSid, - instance._solution.messagingServiceSid - ) - ); + try { + let payload = await operationPromise; + let operation = new LinkshorteningMessagingServiceInstance( + operationVersion, + payload, + instance._solution.domainSid, + instance._solution.messagingServiceSid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } remove( diff --git a/src/rest/messaging/v1/linkshorteningMessagingServiceDomainAssociation.ts b/src/rest/messaging/v1/linkshorteningMessagingServiceDomainAssociation.ts index 81041fa30..401800333 100644 --- a/src/rest/messaging/v1/linkshorteningMessagingServiceDomainAssociation.ts +++ b/src/rest/messaging/v1/linkshorteningMessagingServiceDomainAssociation.ts @@ -59,7 +59,7 @@ export class LinkshorteningMessagingServiceDomainAssociationContextImpl this._uri = `/LinkShortening/MessagingServices/${messagingServiceSid}/Domain`; } - fetch( + async fetch( callback?: ( error: Error | null, item?: LinkshorteningMessagingServiceDomainAssociationInstance @@ -76,20 +76,26 @@ export class LinkshorteningMessagingServiceDomainAssociationContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => + try { + let payload = await operationPromise; + let operation = new LinkshorteningMessagingServiceDomainAssociationInstance( operationVersion, payload, instance._solution.messagingServiceSid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/messaging/v1/requestManagedCert.ts b/src/rest/messaging/v1/requestManagedCert.ts index 8e75ec305..70b40763e 100644 --- a/src/rest/messaging/v1/requestManagedCert.ts +++ b/src/rest/messaging/v1/requestManagedCert.ts @@ -56,7 +56,7 @@ export class RequestManagedCertContextImpl this._uri = `/LinkShortening/Domains/${domainSid}/RequestManagedCert`; } - update( + async update( callback?: (error: Error | null, item?: RequestManagedCertInstance) => any ): Promise { const headers: any = {}; @@ -70,20 +70,25 @@ export class RequestManagedCertContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new RequestManagedCertInstance( - operationVersion, - payload, - instance._solution.domainSid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new RequestManagedCertInstance( + operationVersion, + payload, + instance._solution.domainSid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/messaging/v1/service.ts b/src/rest/messaging/v1/service.ts index 66c69c34a..2b14f096c 100644 --- a/src/rest/messaging/v1/service.ts +++ b/src/rest/messaging/v1/service.ts @@ -285,7 +285,7 @@ export class ServiceContextImpl implements ServiceContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: ServiceInstance) => any ): Promise { const headers: any = {}; @@ -299,19 +299,28 @@ export class ServiceContextImpl implements ServiceContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ServiceInstance(operationVersion, payload, instance._solution.sid) - ); + try { + let payload = await operationPromise; + let operation = new ServiceInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | ServiceContextUpdateOptions | ((error: Error | null, item?: ServiceInstance) => any), @@ -375,16 +384,25 @@ export class ServiceContextImpl implements ServiceContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ServiceInstance(operationVersion, payload, instance._solution.sid) - ); + try { + let payload = await operationPromise; + let operation = new ServiceInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/messaging/v1/service/alphaSender.ts b/src/rest/messaging/v1/service/alphaSender.ts index e65fcbbea..7b6a590fb 100644 --- a/src/rest/messaging/v1/service/alphaSender.ts +++ b/src/rest/messaging/v1/service/alphaSender.ts @@ -135,7 +135,7 @@ export class AlphaSenderContextImpl implements AlphaSenderContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: AlphaSenderInstance) => any ): Promise { const headers: any = {}; @@ -149,21 +149,26 @@ export class AlphaSenderContextImpl implements AlphaSenderContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new AlphaSenderInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new AlphaSenderInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/messaging/v1/service/channelSender.ts b/src/rest/messaging/v1/service/channelSender.ts index 86cefe299..c21242ac4 100644 --- a/src/rest/messaging/v1/service/channelSender.ts +++ b/src/rest/messaging/v1/service/channelSender.ts @@ -139,7 +139,7 @@ export class ChannelSenderContextImpl implements ChannelSenderContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: ChannelSenderInstance) => any ): Promise { const headers: any = {}; @@ -153,21 +153,26 @@ export class ChannelSenderContextImpl implements ChannelSenderContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ChannelSenderInstance( - operationVersion, - payload, - instance._solution.messagingServiceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new ChannelSenderInstance( + operationVersion, + payload, + instance._solution.messagingServiceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/messaging/v1/service/phoneNumber.ts b/src/rest/messaging/v1/service/phoneNumber.ts index e0d6d6b4b..021504776 100644 --- a/src/rest/messaging/v1/service/phoneNumber.ts +++ b/src/rest/messaging/v1/service/phoneNumber.ts @@ -135,7 +135,7 @@ export class PhoneNumberContextImpl implements PhoneNumberContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: PhoneNumberInstance) => any ): Promise { const headers: any = {}; @@ -149,21 +149,26 @@ export class PhoneNumberContextImpl implements PhoneNumberContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new PhoneNumberInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new PhoneNumberInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/messaging/v1/service/shortCode.ts b/src/rest/messaging/v1/service/shortCode.ts index eb52900c5..563bcd181 100644 --- a/src/rest/messaging/v1/service/shortCode.ts +++ b/src/rest/messaging/v1/service/shortCode.ts @@ -135,7 +135,7 @@ export class ShortCodeContextImpl implements ShortCodeContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: ShortCodeInstance) => any ): Promise { const headers: any = {}; @@ -149,21 +149,26 @@ export class ShortCodeContextImpl implements ShortCodeContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ShortCodeInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new ShortCodeInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/messaging/v1/service/usAppToPerson.ts b/src/rest/messaging/v1/service/usAppToPerson.ts index 470bcd1dd..250c6be56 100644 --- a/src/rest/messaging/v1/service/usAppToPerson.ts +++ b/src/rest/messaging/v1/service/usAppToPerson.ts @@ -202,7 +202,7 @@ export class UsAppToPersonContextImpl implements UsAppToPersonContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: UsAppToPersonInstance) => any ): Promise { const headers: any = {}; @@ -216,24 +216,29 @@ export class UsAppToPersonContextImpl implements UsAppToPersonContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new UsAppToPersonInstance( - operationVersion, - payload, - instance._solution.messagingServiceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new UsAppToPersonInstance( + operationVersion, + payload, + instance._solution.messagingServiceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params: UsAppToPersonContextUpdateOptions, callback?: (error: Error | null, item?: UsAppToPersonInstance) => any ): Promise { @@ -321,21 +326,26 @@ export class UsAppToPersonContextImpl implements UsAppToPersonContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new UsAppToPersonInstance( - operationVersion, - payload, - instance._solution.messagingServiceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new UsAppToPersonInstance( + operationVersion, + payload, + instance._solution.messagingServiceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/messaging/v1/tollfreeVerification.ts b/src/rest/messaging/v1/tollfreeVerification.ts index 65b414273..130893261 100644 --- a/src/rest/messaging/v1/tollfreeVerification.ts +++ b/src/rest/messaging/v1/tollfreeVerification.ts @@ -288,7 +288,7 @@ export class TollfreeVerificationContextImpl return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: TollfreeVerificationInstance) => any ): Promise { const headers: any = {}; @@ -302,23 +302,28 @@ export class TollfreeVerificationContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new TollfreeVerificationInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new TollfreeVerificationInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | TollfreeVerificationContextUpdateOptions | ((error: Error | null, item?: TollfreeVerificationInstance) => any), @@ -396,20 +401,25 @@ export class TollfreeVerificationContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new TollfreeVerificationInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new TollfreeVerificationInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/microvisor/v1/accountConfig.ts b/src/rest/microvisor/v1/accountConfig.ts index e08eaa3b8..f99c62bb8 100644 --- a/src/rest/microvisor/v1/accountConfig.ts +++ b/src/rest/microvisor/v1/accountConfig.ts @@ -153,7 +153,7 @@ export class AccountConfigContextImpl implements AccountConfigContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: AccountConfigInstance) => any ): Promise { const headers: any = {}; @@ -167,23 +167,28 @@ export class AccountConfigContextImpl implements AccountConfigContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new AccountConfigInstance( - operationVersion, - payload, - instance._solution.key - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new AccountConfigInstance( + operationVersion, + payload, + instance._solution.key + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params: AccountConfigContextUpdateOptions, callback?: (error: Error | null, item?: AccountConfigInstance) => any ): Promise { @@ -212,20 +217,25 @@ export class AccountConfigContextImpl implements AccountConfigContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new AccountConfigInstance( - operationVersion, - payload, - instance._solution.key - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new AccountConfigInstance( + operationVersion, + payload, + instance._solution.key + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/microvisor/v1/accountSecret.ts b/src/rest/microvisor/v1/accountSecret.ts index 9ed558d0e..7ceb41d52 100644 --- a/src/rest/microvisor/v1/accountSecret.ts +++ b/src/rest/microvisor/v1/accountSecret.ts @@ -153,7 +153,7 @@ export class AccountSecretContextImpl implements AccountSecretContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: AccountSecretInstance) => any ): Promise { const headers: any = {}; @@ -167,23 +167,28 @@ export class AccountSecretContextImpl implements AccountSecretContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new AccountSecretInstance( - operationVersion, - payload, - instance._solution.key - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new AccountSecretInstance( + operationVersion, + payload, + instance._solution.key + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params: AccountSecretContextUpdateOptions, callback?: (error: Error | null, item?: AccountSecretInstance) => any ): Promise { @@ -212,20 +217,25 @@ export class AccountSecretContextImpl implements AccountSecretContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new AccountSecretInstance( - operationVersion, - payload, - instance._solution.key - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new AccountSecretInstance( + operationVersion, + payload, + instance._solution.key + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/microvisor/v1/app.ts b/src/rest/microvisor/v1/app.ts index b1717cca3..497516c97 100644 --- a/src/rest/microvisor/v1/app.ts +++ b/src/rest/microvisor/v1/app.ts @@ -135,7 +135,7 @@ export class AppContextImpl implements AppContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: AppInstance) => any ): Promise { const headers: any = {}; @@ -149,16 +149,25 @@ export class AppContextImpl implements AppContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new AppInstance(operationVersion, payload, instance._solution.sid) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new AppInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/microvisor/v1/app/appManifest.ts b/src/rest/microvisor/v1/app/appManifest.ts index 48ce270f9..5a5a34890 100644 --- a/src/rest/microvisor/v1/app/appManifest.ts +++ b/src/rest/microvisor/v1/app/appManifest.ts @@ -54,7 +54,7 @@ export class AppManifestContextImpl implements AppManifestContext { this._uri = `/Apps/${appSid}/Manifest`; } - fetch( + async fetch( callback?: (error: Error | null, item?: AppManifestInstance) => any ): Promise { const headers: any = {}; @@ -68,20 +68,25 @@ export class AppManifestContextImpl implements AppManifestContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new AppManifestInstance( - operationVersion, - payload, - instance._solution.appSid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new AppManifestInstance( + operationVersion, + payload, + instance._solution.appSid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/microvisor/v1/device.ts b/src/rest/microvisor/v1/device.ts index b08f880f6..82166b042 100644 --- a/src/rest/microvisor/v1/device.ts +++ b/src/rest/microvisor/v1/device.ts @@ -150,7 +150,7 @@ export class DeviceContextImpl implements DeviceContext { return this._deviceSecrets; } - fetch( + async fetch( callback?: (error: Error | null, item?: DeviceInstance) => any ): Promise { const headers: any = {}; @@ -164,19 +164,28 @@ export class DeviceContextImpl implements DeviceContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new DeviceInstance(operationVersion, payload, instance._solution.sid) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new DeviceInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | DeviceContextUpdateOptions | ((error: Error | null, item?: DeviceInstance) => any), @@ -213,16 +222,25 @@ export class DeviceContextImpl implements DeviceContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new DeviceInstance(operationVersion, payload, instance._solution.sid) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new DeviceInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/microvisor/v1/device/deviceConfig.ts b/src/rest/microvisor/v1/device/deviceConfig.ts index d2ccc54cc..1620d2ad8 100644 --- a/src/rest/microvisor/v1/device/deviceConfig.ts +++ b/src/rest/microvisor/v1/device/deviceConfig.ts @@ -158,7 +158,7 @@ export class DeviceConfigContextImpl implements DeviceConfigContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: DeviceConfigInstance) => any ): Promise { const headers: any = {}; @@ -172,24 +172,29 @@ export class DeviceConfigContextImpl implements DeviceConfigContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new DeviceConfigInstance( - operationVersion, - payload, - instance._solution.deviceSid, - instance._solution.key - ) - ); + try { + let payload = await operationPromise; + let operation = new DeviceConfigInstance( + operationVersion, + payload, + instance._solution.deviceSid, + instance._solution.key + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params: DeviceConfigContextUpdateOptions, callback?: (error: Error | null, item?: DeviceConfigInstance) => any ): Promise { @@ -218,21 +223,26 @@ export class DeviceConfigContextImpl implements DeviceConfigContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new DeviceConfigInstance( - operationVersion, - payload, - instance._solution.deviceSid, - instance._solution.key - ) - ); + try { + let payload = await operationPromise; + let operation = new DeviceConfigInstance( + operationVersion, + payload, + instance._solution.deviceSid, + instance._solution.key + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/microvisor/v1/device/deviceSecret.ts b/src/rest/microvisor/v1/device/deviceSecret.ts index 3ac2ef0a7..7705b1c91 100644 --- a/src/rest/microvisor/v1/device/deviceSecret.ts +++ b/src/rest/microvisor/v1/device/deviceSecret.ts @@ -158,7 +158,7 @@ export class DeviceSecretContextImpl implements DeviceSecretContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: DeviceSecretInstance) => any ): Promise { const headers: any = {}; @@ -172,24 +172,29 @@ export class DeviceSecretContextImpl implements DeviceSecretContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new DeviceSecretInstance( - operationVersion, - payload, - instance._solution.deviceSid, - instance._solution.key - ) - ); + try { + let payload = await operationPromise; + let operation = new DeviceSecretInstance( + operationVersion, + payload, + instance._solution.deviceSid, + instance._solution.key + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params: DeviceSecretContextUpdateOptions, callback?: (error: Error | null, item?: DeviceSecretInstance) => any ): Promise { @@ -218,21 +223,26 @@ export class DeviceSecretContextImpl implements DeviceSecretContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new DeviceSecretInstance( - operationVersion, - payload, - instance._solution.deviceSid, - instance._solution.key - ) - ); + try { + let payload = await operationPromise; + let operation = new DeviceSecretInstance( + operationVersion, + payload, + instance._solution.deviceSid, + instance._solution.key + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/monitor/v1/alert.ts b/src/rest/monitor/v1/alert.ts index fcd38ac01..30bc9d761 100644 --- a/src/rest/monitor/v1/alert.ts +++ b/src/rest/monitor/v1/alert.ts @@ -110,7 +110,7 @@ export class AlertContextImpl implements AlertContext { this._uri = `/Alerts/${sid}`; } - fetch( + async fetch( callback?: (error: Error | null, item?: AlertInstance) => any ): Promise { const headers: any = {}; @@ -124,16 +124,25 @@ export class AlertContextImpl implements AlertContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new AlertInstance(operationVersion, payload, instance._solution.sid) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new AlertInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/monitor/v1/event.ts b/src/rest/monitor/v1/event.ts index 01c7e94b8..e134685a7 100644 --- a/src/rest/monitor/v1/event.ts +++ b/src/rest/monitor/v1/event.ts @@ -128,7 +128,7 @@ export class EventContextImpl implements EventContext { this._uri = `/Events/${sid}`; } - fetch( + async fetch( callback?: (error: Error | null, item?: EventInstance) => any ): Promise { const headers: any = {}; @@ -142,16 +142,25 @@ export class EventContextImpl implements EventContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new EventInstance(operationVersion, payload, instance._solution.sid) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new EventInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/notify/v1/credential.ts b/src/rest/notify/v1/credential.ts index 7cecb2ced..b8384b8b6 100644 --- a/src/rest/notify/v1/credential.ts +++ b/src/rest/notify/v1/credential.ts @@ -185,7 +185,7 @@ export class CredentialContextImpl implements CredentialContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: CredentialInstance) => any ): Promise { const headers: any = {}; @@ -199,23 +199,28 @@ export class CredentialContextImpl implements CredentialContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new CredentialInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new CredentialInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | CredentialContextUpdateOptions | ((error: Error | null, item?: CredentialInstance) => any), @@ -254,20 +259,25 @@ export class CredentialContextImpl implements CredentialContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new CredentialInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new CredentialInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/notify/v1/service.ts b/src/rest/notify/v1/service.ts index 5fbdd0d83..60aa966c9 100644 --- a/src/rest/notify/v1/service.ts +++ b/src/rest/notify/v1/service.ts @@ -240,7 +240,7 @@ export class ServiceContextImpl implements ServiceContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: ServiceInstance) => any ): Promise { const headers: any = {}; @@ -254,19 +254,28 @@ export class ServiceContextImpl implements ServiceContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ServiceInstance(operationVersion, payload, instance._solution.sid) - ); + try { + let payload = await operationPromise; + let operation = new ServiceInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | ServiceContextUpdateOptions | ((error: Error | null, item?: ServiceInstance) => any), @@ -329,16 +338,25 @@ export class ServiceContextImpl implements ServiceContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ServiceInstance(operationVersion, payload, instance._solution.sid) - ); + try { + let payload = await operationPromise; + let operation = new ServiceInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/notify/v1/service/binding.ts b/src/rest/notify/v1/service/binding.ts index 8899484dd..9c740f931 100644 --- a/src/rest/notify/v1/service/binding.ts +++ b/src/rest/notify/v1/service/binding.ts @@ -179,7 +179,7 @@ export class BindingContextImpl implements BindingContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: BindingInstance) => any ): Promise { const headers: any = {}; @@ -193,21 +193,26 @@ export class BindingContextImpl implements BindingContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new BindingInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new BindingInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/numbers/v1/bulkEligibility.ts b/src/rest/numbers/v1/bulkEligibility.ts index 085bc46ac..741725496 100644 --- a/src/rest/numbers/v1/bulkEligibility.ts +++ b/src/rest/numbers/v1/bulkEligibility.ts @@ -62,7 +62,7 @@ export class BulkEligibilityContextImpl implements BulkEligibilityContext { this._uri = `/HostedNumber/Eligibility/Bulk/${requestId}`; } - fetch( + async fetch( callback?: (error: Error | null, item?: BulkEligibilityInstance) => any ): Promise { const headers: any = {}; @@ -76,20 +76,25 @@ export class BulkEligibilityContextImpl implements BulkEligibilityContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new BulkEligibilityInstance( - operationVersion, - payload, - instance._solution.requestId - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new BulkEligibilityInstance( + operationVersion, + payload, + instance._solution.requestId + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/numbers/v1/portingPortIn.ts b/src/rest/numbers/v1/portingPortIn.ts index 6246a1d2b..bea2d5b90 100644 --- a/src/rest/numbers/v1/portingPortIn.ts +++ b/src/rest/numbers/v1/portingPortIn.ts @@ -93,7 +93,7 @@ export class PortingPortInContextImpl implements PortingPortInContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: PortingPortInInstance) => any ): Promise { const headers: any = {}; @@ -107,20 +107,25 @@ export class PortingPortInContextImpl implements PortingPortInContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new PortingPortInInstance( - operationVersion, - payload, - instance._solution.portInRequestSid - ) - ); + try { + let payload = await operationPromise; + let operation = new PortingPortInInstance( + operationVersion, + payload, + instance._solution.portInRequestSid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/numbers/v1/portingPortInPhoneNumber.ts b/src/rest/numbers/v1/portingPortInPhoneNumber.ts index bf21c19f9..c0d30b72d 100644 --- a/src/rest/numbers/v1/portingPortInPhoneNumber.ts +++ b/src/rest/numbers/v1/portingPortInPhoneNumber.ts @@ -99,7 +99,7 @@ export class PortingPortInPhoneNumberContextImpl return operationPromise; } - fetch( + async fetch( callback?: ( error: Error | null, item?: PortingPortInPhoneNumberInstance @@ -116,21 +116,26 @@ export class PortingPortInPhoneNumberContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new PortingPortInPhoneNumberInstance( - operationVersion, - payload, - instance._solution.portInRequestSid, - instance._solution.phoneNumberSid - ) - ); + try { + let payload = await operationPromise; + let operation = new PortingPortInPhoneNumberInstance( + operationVersion, + payload, + instance._solution.portInRequestSid, + instance._solution.phoneNumberSid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/numbers/v1/portingPortability.ts b/src/rest/numbers/v1/portingPortability.ts index e7bf482c7..5f7d89115 100644 --- a/src/rest/numbers/v1/portingPortability.ts +++ b/src/rest/numbers/v1/portingPortability.ts @@ -84,7 +84,7 @@ export class PortingPortabilityContextImpl this._uri = `/Porting/Portability/PhoneNumber/${phoneNumber}`; } - fetch( + async fetch( params?: | PortingPortabilityContextFetchOptions | ((error: Error | null, item?: PortingPortabilityInstance) => any), @@ -116,20 +116,25 @@ export class PortingPortabilityContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new PortingPortabilityInstance( - operationVersion, - payload, - instance._solution.phoneNumber - ) - ); + try { + let payload = await operationPromise; + let operation = new PortingPortabilityInstance( + operationVersion, + payload, + instance._solution.phoneNumber + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/numbers/v2/authorizationDocument.ts b/src/rest/numbers/v2/authorizationDocument.ts index a2d445ffc..b695b8d8b 100644 --- a/src/rest/numbers/v2/authorizationDocument.ts +++ b/src/rest/numbers/v2/authorizationDocument.ts @@ -179,7 +179,7 @@ export class AuthorizationDocumentContextImpl return operationPromise; } - fetch( + async fetch( callback?: ( error: Error | null, item?: AuthorizationDocumentInstance @@ -196,20 +196,25 @@ export class AuthorizationDocumentContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new AuthorizationDocumentInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new AuthorizationDocumentInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/numbers/v2/bulkHostedNumberOrder.ts b/src/rest/numbers/v2/bulkHostedNumberOrder.ts index 77187ef0f..07784c77b 100644 --- a/src/rest/numbers/v2/bulkHostedNumberOrder.ts +++ b/src/rest/numbers/v2/bulkHostedNumberOrder.ts @@ -95,7 +95,7 @@ export class BulkHostedNumberOrderContextImpl this._uri = `/HostedNumber/Orders/Bulk/${bulkHostingSid}`; } - fetch( + async fetch( params?: | BulkHostedNumberOrderContextFetchOptions | ((error: Error | null, item?: BulkHostedNumberOrderInstance) => any), @@ -128,20 +128,25 @@ export class BulkHostedNumberOrderContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new BulkHostedNumberOrderInstance( - operationVersion, - payload, - instance._solution.bulkHostingSid - ) - ); + try { + let payload = await operationPromise; + let operation = new BulkHostedNumberOrderInstance( + operationVersion, + payload, + instance._solution.bulkHostingSid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/numbers/v2/bundleClone.ts b/src/rest/numbers/v2/bundleClone.ts index 93ea94b51..75224d134 100644 --- a/src/rest/numbers/v2/bundleClone.ts +++ b/src/rest/numbers/v2/bundleClone.ts @@ -76,7 +76,7 @@ export class BundleCloneContextImpl implements BundleCloneContext { this._uri = `/RegulatoryCompliance/Bundles/${bundleSid}/Clones`; } - create( + async create( params: BundleCloneContextCreateOptions, callback?: (error: Error | null, item?: BundleCloneInstance) => any ): Promise { @@ -114,20 +114,25 @@ export class BundleCloneContextImpl implements BundleCloneContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new BundleCloneInstance( - operationVersion, - payload, - instance._solution.bundleSid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new BundleCloneInstance( + operationVersion, + payload, + instance._solution.bundleSid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/numbers/v2/hostedNumberOrder.ts b/src/rest/numbers/v2/hostedNumberOrder.ts index cf4ef750c..1a43fbcdd 100644 --- a/src/rest/numbers/v2/hostedNumberOrder.ts +++ b/src/rest/numbers/v2/hostedNumberOrder.ts @@ -231,7 +231,7 @@ export class HostedNumberOrderContextImpl implements HostedNumberOrderContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: HostedNumberOrderInstance) => any ): Promise { const headers: any = {}; @@ -245,23 +245,28 @@ export class HostedNumberOrderContextImpl implements HostedNumberOrderContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new HostedNumberOrderInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new HostedNumberOrderInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params: HostedNumberOrderContextUpdateOptions, callback?: (error: Error | null, item?: HostedNumberOrderInstance) => any ): Promise { @@ -294,20 +299,25 @@ export class HostedNumberOrderContextImpl implements HostedNumberOrderContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new HostedNumberOrderInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new HostedNumberOrderInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/numbers/v2/regulatoryCompliance/bundle.ts b/src/rest/numbers/v2/regulatoryCompliance/bundle.ts index 9c7e8f3e9..0e32c97c9 100644 --- a/src/rest/numbers/v2/regulatoryCompliance/bundle.ts +++ b/src/rest/numbers/v2/regulatoryCompliance/bundle.ts @@ -303,7 +303,7 @@ export class BundleContextImpl implements BundleContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: BundleInstance) => any ): Promise { const headers: any = {}; @@ -317,19 +317,28 @@ export class BundleContextImpl implements BundleContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new BundleInstance(operationVersion, payload, instance._solution.sid) - ); + try { + let payload = await operationPromise; + let operation = new BundleInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | BundleContextUpdateOptions | ((error: Error | null, item?: BundleInstance) => any), @@ -364,16 +373,25 @@ export class BundleContextImpl implements BundleContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new BundleInstance(operationVersion, payload, instance._solution.sid) - ); + try { + let payload = await operationPromise; + let operation = new BundleInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/numbers/v2/regulatoryCompliance/bundle/evaluation.ts b/src/rest/numbers/v2/regulatoryCompliance/bundle/evaluation.ts index eed6d03e2..02ddd9250 100644 --- a/src/rest/numbers/v2/regulatoryCompliance/bundle/evaluation.ts +++ b/src/rest/numbers/v2/regulatoryCompliance/bundle/evaluation.ts @@ -99,7 +99,7 @@ export class EvaluationContextImpl implements EvaluationContext { this._uri = `/RegulatoryCompliance/Bundles/${bundleSid}/Evaluations/${sid}`; } - fetch( + async fetch( callback?: (error: Error | null, item?: EvaluationInstance) => any ): Promise { const headers: any = {}; @@ -113,21 +113,26 @@ export class EvaluationContextImpl implements EvaluationContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new EvaluationInstance( - operationVersion, - payload, - instance._solution.bundleSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new EvaluationInstance( + operationVersion, + payload, + instance._solution.bundleSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/numbers/v2/regulatoryCompliance/bundle/itemAssignment.ts b/src/rest/numbers/v2/regulatoryCompliance/bundle/itemAssignment.ts index 6593d7207..23a0ce49b 100644 --- a/src/rest/numbers/v2/regulatoryCompliance/bundle/itemAssignment.ts +++ b/src/rest/numbers/v2/regulatoryCompliance/bundle/itemAssignment.ts @@ -138,7 +138,7 @@ export class ItemAssignmentContextImpl implements ItemAssignmentContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: ItemAssignmentInstance) => any ): Promise { const headers: any = {}; @@ -152,21 +152,26 @@ export class ItemAssignmentContextImpl implements ItemAssignmentContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ItemAssignmentInstance( - operationVersion, - payload, - instance._solution.bundleSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new ItemAssignmentInstance( + operationVersion, + payload, + instance._solution.bundleSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/numbers/v2/regulatoryCompliance/endUser.ts b/src/rest/numbers/v2/regulatoryCompliance/endUser.ts index 668c344c3..fbf376109 100644 --- a/src/rest/numbers/v2/regulatoryCompliance/endUser.ts +++ b/src/rest/numbers/v2/regulatoryCompliance/endUser.ts @@ -169,7 +169,7 @@ export class EndUserContextImpl implements EndUserContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: EndUserInstance) => any ): Promise { const headers: any = {}; @@ -183,19 +183,28 @@ export class EndUserContextImpl implements EndUserContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new EndUserInstance(operationVersion, payload, instance._solution.sid) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new EndUserInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | EndUserContextUpdateOptions | ((error: Error | null, item?: EndUserInstance) => any), @@ -228,16 +237,25 @@ export class EndUserContextImpl implements EndUserContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new EndUserInstance(operationVersion, payload, instance._solution.sid) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new EndUserInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/numbers/v2/regulatoryCompliance/endUserType.ts b/src/rest/numbers/v2/regulatoryCompliance/endUserType.ts index 036272d23..1650590ca 100644 --- a/src/rest/numbers/v2/regulatoryCompliance/endUserType.ts +++ b/src/rest/numbers/v2/regulatoryCompliance/endUserType.ts @@ -92,7 +92,7 @@ export class EndUserTypeContextImpl implements EndUserTypeContext { this._uri = `/RegulatoryCompliance/EndUserTypes/${sid}`; } - fetch( + async fetch( callback?: (error: Error | null, item?: EndUserTypeInstance) => any ): Promise { const headers: any = {}; @@ -106,20 +106,25 @@ export class EndUserTypeContextImpl implements EndUserTypeContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new EndUserTypeInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new EndUserTypeInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/numbers/v2/regulatoryCompliance/regulation.ts b/src/rest/numbers/v2/regulatoryCompliance/regulation.ts index 0be116318..2532720b5 100644 --- a/src/rest/numbers/v2/regulatoryCompliance/regulation.ts +++ b/src/rest/numbers/v2/regulatoryCompliance/regulation.ts @@ -137,7 +137,7 @@ export class RegulationContextImpl implements RegulationContext { this._uri = `/RegulatoryCompliance/Regulations/${sid}`; } - fetch( + async fetch( params?: | RegulationContextFetchOptions | ((error: Error | null, item?: RegulationInstance) => any), @@ -167,20 +167,25 @@ export class RegulationContextImpl implements RegulationContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new RegulationInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new RegulationInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/numbers/v2/regulatoryCompliance/supportingDocument.ts b/src/rest/numbers/v2/regulatoryCompliance/supportingDocument.ts index e55dc474f..4600a1716 100644 --- a/src/rest/numbers/v2/regulatoryCompliance/supportingDocument.ts +++ b/src/rest/numbers/v2/regulatoryCompliance/supportingDocument.ts @@ -180,7 +180,7 @@ export class SupportingDocumentContextImpl return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: SupportingDocumentInstance) => any ): Promise { const headers: any = {}; @@ -194,23 +194,28 @@ export class SupportingDocumentContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new SupportingDocumentInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new SupportingDocumentInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | SupportingDocumentContextUpdateOptions | ((error: Error | null, item?: SupportingDocumentInstance) => any), @@ -243,20 +248,25 @@ export class SupportingDocumentContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new SupportingDocumentInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new SupportingDocumentInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/numbers/v2/regulatoryCompliance/supportingDocumentType.ts b/src/rest/numbers/v2/regulatoryCompliance/supportingDocumentType.ts index 2f5378066..b0c1f6a21 100644 --- a/src/rest/numbers/v2/regulatoryCompliance/supportingDocumentType.ts +++ b/src/rest/numbers/v2/regulatoryCompliance/supportingDocumentType.ts @@ -100,7 +100,7 @@ export class SupportingDocumentTypeContextImpl this._uri = `/RegulatoryCompliance/SupportingDocumentTypes/${sid}`; } - fetch( + async fetch( callback?: ( error: Error | null, item?: SupportingDocumentTypeInstance @@ -117,20 +117,25 @@ export class SupportingDocumentTypeContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new SupportingDocumentTypeInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new SupportingDocumentTypeInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/preview/hosted_numbers/authorizationDocument.ts b/src/rest/preview/hosted_numbers/authorizationDocument.ts index e791d277b..3eceeddc4 100644 --- a/src/rest/preview/hosted_numbers/authorizationDocument.ts +++ b/src/rest/preview/hosted_numbers/authorizationDocument.ts @@ -197,7 +197,7 @@ export class AuthorizationDocumentContextImpl return this._dependentHostedNumberOrders; } - fetch( + async fetch( callback?: ( error: Error | null, item?: AuthorizationDocumentInstance @@ -214,23 +214,28 @@ export class AuthorizationDocumentContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new AuthorizationDocumentInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new AuthorizationDocumentInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | AuthorizationDocumentContextUpdateOptions | ((error: Error | null, item?: AuthorizationDocumentInstance) => any), @@ -277,20 +282,25 @@ export class AuthorizationDocumentContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new AuthorizationDocumentInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new AuthorizationDocumentInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/preview/hosted_numbers/hostedNumberOrder.ts b/src/rest/preview/hosted_numbers/hostedNumberOrder.ts index f907b4bdc..8acd96d63 100644 --- a/src/rest/preview/hosted_numbers/hostedNumberOrder.ts +++ b/src/rest/preview/hosted_numbers/hostedNumberOrder.ts @@ -258,7 +258,7 @@ export class HostedNumberOrderContextImpl implements HostedNumberOrderContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: HostedNumberOrderInstance) => any ): Promise { const headers: any = {}; @@ -272,23 +272,28 @@ export class HostedNumberOrderContextImpl implements HostedNumberOrderContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new HostedNumberOrderInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new HostedNumberOrderInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | HostedNumberOrderContextUpdateOptions | ((error: Error | null, item?: HostedNumberOrderInstance) => any), @@ -335,20 +340,25 @@ export class HostedNumberOrderContextImpl implements HostedNumberOrderContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new HostedNumberOrderInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new HostedNumberOrderInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/preview/marketplace/availableAddOn.ts b/src/rest/preview/marketplace/availableAddOn.ts index 59a2d3b61..99c96c8bf 100644 --- a/src/rest/preview/marketplace/availableAddOn.ts +++ b/src/rest/preview/marketplace/availableAddOn.ts @@ -107,7 +107,7 @@ export class AvailableAddOnContextImpl implements AvailableAddOnContext { return this._extensions; } - fetch( + async fetch( callback?: (error: Error | null, item?: AvailableAddOnInstance) => any ): Promise { const headers: any = {}; @@ -121,20 +121,25 @@ export class AvailableAddOnContextImpl implements AvailableAddOnContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new AvailableAddOnInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new AvailableAddOnInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/preview/marketplace/availableAddOn/availableAddOnExtension.ts b/src/rest/preview/marketplace/availableAddOn/availableAddOnExtension.ts index da9f60ba2..3a7bfec25 100644 --- a/src/rest/preview/marketplace/availableAddOn/availableAddOnExtension.ts +++ b/src/rest/preview/marketplace/availableAddOn/availableAddOnExtension.ts @@ -109,7 +109,7 @@ export class AvailableAddOnExtensionContextImpl this._uri = `/AvailableAddOns/${availableAddOnSid}/Extensions/${sid}`; } - fetch( + async fetch( callback?: ( error: Error | null, item?: AvailableAddOnExtensionInstance @@ -126,21 +126,26 @@ export class AvailableAddOnExtensionContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new AvailableAddOnExtensionInstance( - operationVersion, - payload, - instance._solution.availableAddOnSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new AvailableAddOnExtensionInstance( + operationVersion, + payload, + instance._solution.availableAddOnSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/preview/marketplace/installedAddOn.ts b/src/rest/preview/marketplace/installedAddOn.ts index 16110d580..cb238a297 100644 --- a/src/rest/preview/marketplace/installedAddOn.ts +++ b/src/rest/preview/marketplace/installedAddOn.ts @@ -184,7 +184,7 @@ export class InstalledAddOnContextImpl implements InstalledAddOnContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: InstalledAddOnInstance) => any ): Promise { const headers: any = {}; @@ -198,23 +198,28 @@ export class InstalledAddOnContextImpl implements InstalledAddOnContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new InstalledAddOnInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new InstalledAddOnInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | InstalledAddOnContextUpdateOptions | ((error: Error | null, item?: InstalledAddOnInstance) => any), @@ -247,20 +252,25 @@ export class InstalledAddOnContextImpl implements InstalledAddOnContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new InstalledAddOnInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new InstalledAddOnInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/preview/marketplace/installedAddOn/installedAddOnExtension.ts b/src/rest/preview/marketplace/installedAddOn/installedAddOnExtension.ts index 448434a3e..a65ab3a85 100644 --- a/src/rest/preview/marketplace/installedAddOn/installedAddOnExtension.ts +++ b/src/rest/preview/marketplace/installedAddOn/installedAddOnExtension.ts @@ -132,7 +132,7 @@ export class InstalledAddOnExtensionContextImpl this._uri = `/InstalledAddOns/${installedAddOnSid}/Extensions/${sid}`; } - fetch( + async fetch( callback?: ( error: Error | null, item?: InstalledAddOnExtensionInstance @@ -149,24 +149,29 @@ export class InstalledAddOnExtensionContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new InstalledAddOnExtensionInstance( - operationVersion, - payload, - instance._solution.installedAddOnSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new InstalledAddOnExtensionInstance( + operationVersion, + payload, + instance._solution.installedAddOnSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params: InstalledAddOnExtensionContextUpdateOptions, callback?: ( error: Error | null, @@ -198,21 +203,26 @@ export class InstalledAddOnExtensionContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new InstalledAddOnExtensionInstance( - operationVersion, - payload, - instance._solution.installedAddOnSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new InstalledAddOnExtensionInstance( + operationVersion, + payload, + instance._solution.installedAddOnSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/preview/sync/service.ts b/src/rest/preview/sync/service.ts index 24aa9a059..e18025b3e 100644 --- a/src/rest/preview/sync/service.ts +++ b/src/rest/preview/sync/service.ts @@ -204,7 +204,7 @@ export class ServiceContextImpl implements ServiceContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: ServiceInstance) => any ): Promise { const headers: any = {}; @@ -218,19 +218,28 @@ export class ServiceContextImpl implements ServiceContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ServiceInstance(operationVersion, payload, instance._solution.sid) - ); + try { + let payload = await operationPromise; + let operation = new ServiceInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | ServiceContextUpdateOptions | ((error: Error | null, item?: ServiceInstance) => any), @@ -269,16 +278,25 @@ export class ServiceContextImpl implements ServiceContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ServiceInstance(operationVersion, payload, instance._solution.sid) - ); + try { + let payload = await operationPromise; + let operation = new ServiceInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/preview/sync/service/document.ts b/src/rest/preview/sync/service/document.ts index 87902b87b..b905584b4 100644 --- a/src/rest/preview/sync/service/document.ts +++ b/src/rest/preview/sync/service/document.ts @@ -176,7 +176,7 @@ export class DocumentContextImpl implements DocumentContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: DocumentInstance) => any ): Promise { const headers: any = {}; @@ -190,24 +190,29 @@ export class DocumentContextImpl implements DocumentContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new DocumentInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new DocumentInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params: DocumentContextUpdateOptions, callback?: (error: Error | null, item?: DocumentInstance) => any ): Promise { @@ -238,21 +243,26 @@ export class DocumentContextImpl implements DocumentContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new DocumentInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new DocumentInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/preview/sync/service/document/documentPermission.ts b/src/rest/preview/sync/service/document/documentPermission.ts index 7b361d0a1..ff9c76e86 100644 --- a/src/rest/preview/sync/service/document/documentPermission.ts +++ b/src/rest/preview/sync/service/document/documentPermission.ts @@ -167,7 +167,7 @@ export class DocumentPermissionContextImpl return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: DocumentPermissionInstance) => any ): Promise { const headers: any = {}; @@ -181,25 +181,30 @@ export class DocumentPermissionContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new DocumentPermissionInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.documentSid, - instance._solution.identity - ) - ); + try { + let payload = await operationPromise; + let operation = new DocumentPermissionInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.documentSid, + instance._solution.identity + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params: DocumentPermissionContextUpdateOptions, callback?: (error: Error | null, item?: DocumentPermissionInstance) => any ): Promise { @@ -240,22 +245,27 @@ export class DocumentPermissionContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new DocumentPermissionInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.documentSid, - instance._solution.identity - ) - ); + try { + let payload = await operationPromise; + let operation = new DocumentPermissionInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.documentSid, + instance._solution.identity + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/preview/sync/service/syncList.ts b/src/rest/preview/sync/service/syncList.ts index e1c95184b..a2fe4d19d 100644 --- a/src/rest/preview/sync/service/syncList.ts +++ b/src/rest/preview/sync/service/syncList.ts @@ -165,7 +165,7 @@ export class SyncListContextImpl implements SyncListContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: SyncListInstance) => any ): Promise { const headers: any = {}; @@ -179,21 +179,26 @@ export class SyncListContextImpl implements SyncListContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new SyncListInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new SyncListInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/preview/sync/service/syncList/syncListItem.ts b/src/rest/preview/sync/service/syncList/syncListItem.ts index d859a8133..6d7dfe886 100644 --- a/src/rest/preview/sync/service/syncList/syncListItem.ts +++ b/src/rest/preview/sync/service/syncList/syncListItem.ts @@ -225,7 +225,7 @@ export class SyncListItemContextImpl implements SyncListItemContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: SyncListItemInstance) => any ): Promise { const headers: any = {}; @@ -239,25 +239,30 @@ export class SyncListItemContextImpl implements SyncListItemContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new SyncListItemInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.listSid, - instance._solution.index - ) - ); + try { + let payload = await operationPromise; + let operation = new SyncListItemInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.listSid, + instance._solution.index + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params: SyncListItemContextUpdateOptions, callback?: (error: Error | null, item?: SyncListItemInstance) => any ): Promise { @@ -288,22 +293,27 @@ export class SyncListItemContextImpl implements SyncListItemContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new SyncListItemInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.listSid, - instance._solution.index - ) - ); + try { + let payload = await operationPromise; + let operation = new SyncListItemInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.listSid, + instance._solution.index + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/preview/sync/service/syncList/syncListPermission.ts b/src/rest/preview/sync/service/syncList/syncListPermission.ts index 0ef4f2460..4158e78b8 100644 --- a/src/rest/preview/sync/service/syncList/syncListPermission.ts +++ b/src/rest/preview/sync/service/syncList/syncListPermission.ts @@ -167,7 +167,7 @@ export class SyncListPermissionContextImpl return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: SyncListPermissionInstance) => any ): Promise { const headers: any = {}; @@ -181,25 +181,30 @@ export class SyncListPermissionContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new SyncListPermissionInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.listSid, - instance._solution.identity - ) - ); + try { + let payload = await operationPromise; + let operation = new SyncListPermissionInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.listSid, + instance._solution.identity + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params: SyncListPermissionContextUpdateOptions, callback?: (error: Error | null, item?: SyncListPermissionInstance) => any ): Promise { @@ -240,22 +245,27 @@ export class SyncListPermissionContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new SyncListPermissionInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.listSid, - instance._solution.identity - ) - ); + try { + let payload = await operationPromise; + let operation = new SyncListPermissionInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.listSid, + instance._solution.identity + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/preview/sync/service/syncMap.ts b/src/rest/preview/sync/service/syncMap.ts index 652b14c75..f64eea35f 100644 --- a/src/rest/preview/sync/service/syncMap.ts +++ b/src/rest/preview/sync/service/syncMap.ts @@ -165,7 +165,7 @@ export class SyncMapContextImpl implements SyncMapContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: SyncMapInstance) => any ): Promise { const headers: any = {}; @@ -179,21 +179,26 @@ export class SyncMapContextImpl implements SyncMapContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new SyncMapInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new SyncMapInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/preview/sync/service/syncMap/syncMapItem.ts b/src/rest/preview/sync/service/syncMap/syncMapItem.ts index 8e0af710e..b149becb0 100644 --- a/src/rest/preview/sync/service/syncMap/syncMapItem.ts +++ b/src/rest/preview/sync/service/syncMap/syncMapItem.ts @@ -227,7 +227,7 @@ export class SyncMapItemContextImpl implements SyncMapItemContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: SyncMapItemInstance) => any ): Promise { const headers: any = {}; @@ -241,25 +241,30 @@ export class SyncMapItemContextImpl implements SyncMapItemContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new SyncMapItemInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.mapSid, - instance._solution.key - ) - ); + try { + let payload = await operationPromise; + let operation = new SyncMapItemInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.mapSid, + instance._solution.key + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params: SyncMapItemContextUpdateOptions, callback?: (error: Error | null, item?: SyncMapItemInstance) => any ): Promise { @@ -290,22 +295,27 @@ export class SyncMapItemContextImpl implements SyncMapItemContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new SyncMapItemInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.mapSid, - instance._solution.key - ) - ); + try { + let payload = await operationPromise; + let operation = new SyncMapItemInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.mapSid, + instance._solution.key + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/preview/sync/service/syncMap/syncMapPermission.ts b/src/rest/preview/sync/service/syncMap/syncMapPermission.ts index f39cfd3c3..8ef94b359 100644 --- a/src/rest/preview/sync/service/syncMap/syncMapPermission.ts +++ b/src/rest/preview/sync/service/syncMap/syncMapPermission.ts @@ -165,7 +165,7 @@ export class SyncMapPermissionContextImpl implements SyncMapPermissionContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: SyncMapPermissionInstance) => any ): Promise { const headers: any = {}; @@ -179,25 +179,30 @@ export class SyncMapPermissionContextImpl implements SyncMapPermissionContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new SyncMapPermissionInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.mapSid, - instance._solution.identity - ) - ); + try { + let payload = await operationPromise; + let operation = new SyncMapPermissionInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.mapSid, + instance._solution.identity + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params: SyncMapPermissionContextUpdateOptions, callback?: (error: Error | null, item?: SyncMapPermissionInstance) => any ): Promise { @@ -238,22 +243,27 @@ export class SyncMapPermissionContextImpl implements SyncMapPermissionContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new SyncMapPermissionInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.mapSid, - instance._solution.identity - ) - ); + try { + let payload = await operationPromise; + let operation = new SyncMapPermissionInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.mapSid, + instance._solution.identity + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/preview/wireless/command.ts b/src/rest/preview/wireless/command.ts index 5f59c2e7f..065eb978f 100644 --- a/src/rest/preview/wireless/command.ts +++ b/src/rest/preview/wireless/command.ts @@ -135,7 +135,7 @@ export class CommandContextImpl implements CommandContext { this._uri = `/Commands/${sid}`; } - fetch( + async fetch( callback?: (error: Error | null, item?: CommandInstance) => any ): Promise { const headers: any = {}; @@ -149,16 +149,25 @@ export class CommandContextImpl implements CommandContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new CommandInstance(operationVersion, payload, instance._solution.sid) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new CommandInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/preview/wireless/ratePlan.ts b/src/rest/preview/wireless/ratePlan.ts index ebf33c1af..76b6fc40b 100644 --- a/src/rest/preview/wireless/ratePlan.ts +++ b/src/rest/preview/wireless/ratePlan.ts @@ -181,7 +181,7 @@ export class RatePlanContextImpl implements RatePlanContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: RatePlanInstance) => any ): Promise { const headers: any = {}; @@ -195,19 +195,28 @@ export class RatePlanContextImpl implements RatePlanContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new RatePlanInstance(operationVersion, payload, instance._solution.sid) - ); + try { + let payload = await operationPromise; + let operation = new RatePlanInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | RatePlanContextUpdateOptions | ((error: Error | null, item?: RatePlanInstance) => any), @@ -240,16 +249,25 @@ export class RatePlanContextImpl implements RatePlanContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new RatePlanInstance(operationVersion, payload, instance._solution.sid) - ); + try { + let payload = await operationPromise; + let operation = new RatePlanInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/preview/wireless/sim.ts b/src/rest/preview/wireless/sim.ts index 5466cefac..68f4d21a6 100644 --- a/src/rest/preview/wireless/sim.ts +++ b/src/rest/preview/wireless/sim.ts @@ -193,7 +193,7 @@ export class SimContextImpl implements SimContext { return this._usage; } - fetch( + async fetch( callback?: (error: Error | null, item?: SimInstance) => any ): Promise { const headers: any = {}; @@ -207,19 +207,28 @@ export class SimContextImpl implements SimContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new SimInstance(operationVersion, payload, instance._solution.sid) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new SimInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | SimContextUpdateOptions | ((error: Error | null, item?: SimInstance) => any), @@ -276,16 +285,25 @@ export class SimContextImpl implements SimContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new SimInstance(operationVersion, payload, instance._solution.sid) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new SimInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/preview/wireless/sim/usage.ts b/src/rest/preview/wireless/sim/usage.ts index e6c6598b2..18341e6d8 100644 --- a/src/rest/preview/wireless/sim/usage.ts +++ b/src/rest/preview/wireless/sim/usage.ts @@ -76,7 +76,7 @@ export class UsageContextImpl implements UsageContext { this._uri = `/Sims/${simSid}/Usage`; } - fetch( + async fetch( params?: | UsageContextFetchOptions | ((error: Error | null, item?: UsageInstance) => any), @@ -106,16 +106,25 @@ export class UsageContextImpl implements UsageContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new UsageInstance(operationVersion, payload, instance._solution.simSid) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new UsageInstance( + operationVersion, + payload, + instance._solution.simSid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/previewIam/versionless/organization/account.ts b/src/rest/previewIam/versionless/organization/account.ts index 50db38f49..d24cf3974 100644 --- a/src/rest/previewIam/versionless/organization/account.ts +++ b/src/rest/previewIam/versionless/organization/account.ts @@ -101,7 +101,7 @@ export class AccountContextImpl implements AccountContext { this._uri = `/${organizationSid}/Accounts/${accountSid}`; } - fetch( + async fetch( callback?: (error: Error | null, item?: AccountInstance) => any ): Promise { const headers: any = {}; @@ -115,21 +115,26 @@ export class AccountContextImpl implements AccountContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new AccountInstance( - operationVersion, - payload, - instance._solution.organizationSid, - instance._solution.accountSid - ) - ); + try { + let payload = await operationPromise; + let operation = new AccountInstance( + operationVersion, + payload, + instance._solution.organizationSid, + instance._solution.accountSid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/previewIam/versionless/organization/user.ts b/src/rest/previewIam/versionless/organization/user.ts index 5d8e3e970..49a5b1dbf 100644 --- a/src/rest/previewIam/versionless/organization/user.ts +++ b/src/rest/previewIam/versionless/organization/user.ts @@ -279,7 +279,7 @@ export class UserContextImpl implements UserContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: UserInstance) => any ): Promise { const headers: any = {}; @@ -293,24 +293,29 @@ export class UserContextImpl implements UserContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new UserInstance( - operationVersion, - payload, - instance._solution.organizationSid, - instance._solution.id - ) - ); + try { + let payload = await operationPromise; + let operation = new UserInstance( + operationVersion, + payload, + instance._solution.organizationSid, + instance._solution.id + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params: ScimUser, headers?: any, callback?: (error: Error | null, item?: UserInstance) => any @@ -339,21 +344,26 @@ export class UserContextImpl implements UserContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new UserInstance( - operationVersion, - payload, - instance._solution.organizationSid, - instance._solution.id - ) - ); + try { + let payload = await operationPromise; + let operation = new UserInstance( + operationVersion, + payload, + instance._solution.organizationSid, + instance._solution.id + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/pricing/v1/messaging/country.ts b/src/rest/pricing/v1/messaging/country.ts index f584a2d0c..6e30fbb38 100644 --- a/src/rest/pricing/v1/messaging/country.ts +++ b/src/rest/pricing/v1/messaging/country.ts @@ -111,7 +111,7 @@ export class CountryContextImpl implements CountryContext { this._uri = `/Messaging/Countries/${isoCountry}`; } - fetch( + async fetch( callback?: (error: Error | null, item?: CountryInstance) => any ): Promise { const headers: any = {}; @@ -125,20 +125,25 @@ export class CountryContextImpl implements CountryContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new CountryInstance( - operationVersion, - payload, - instance._solution.isoCountry - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new CountryInstance( + operationVersion, + payload, + instance._solution.isoCountry + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/pricing/v1/phoneNumber/country.ts b/src/rest/pricing/v1/phoneNumber/country.ts index 7ba7f8146..a4c7fd170 100644 --- a/src/rest/pricing/v1/phoneNumber/country.ts +++ b/src/rest/pricing/v1/phoneNumber/country.ts @@ -98,7 +98,7 @@ export class CountryContextImpl implements CountryContext { this._uri = `/PhoneNumbers/Countries/${isoCountry}`; } - fetch( + async fetch( callback?: (error: Error | null, item?: CountryInstance) => any ): Promise { const headers: any = {}; @@ -112,20 +112,25 @@ export class CountryContextImpl implements CountryContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new CountryInstance( - operationVersion, - payload, - instance._solution.isoCountry - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new CountryInstance( + operationVersion, + payload, + instance._solution.isoCountry + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/pricing/v1/voice/country.ts b/src/rest/pricing/v1/voice/country.ts index 090ba7217..2f5b381b7 100644 --- a/src/rest/pricing/v1/voice/country.ts +++ b/src/rest/pricing/v1/voice/country.ts @@ -105,7 +105,7 @@ export class CountryContextImpl implements CountryContext { this._uri = `/Voice/Countries/${isoCountry}`; } - fetch( + async fetch( callback?: (error: Error | null, item?: CountryInstance) => any ): Promise { const headers: any = {}; @@ -119,20 +119,25 @@ export class CountryContextImpl implements CountryContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new CountryInstance( - operationVersion, - payload, - instance._solution.isoCountry - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new CountryInstance( + operationVersion, + payload, + instance._solution.isoCountry + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/pricing/v1/voice/number.ts b/src/rest/pricing/v1/voice/number.ts index 0f909ab17..70b564ee7 100644 --- a/src/rest/pricing/v1/voice/number.ts +++ b/src/rest/pricing/v1/voice/number.ts @@ -71,7 +71,7 @@ export class NumberContextImpl implements NumberContext { this._uri = `/Voice/Numbers/${number}`; } - fetch( + async fetch( callback?: (error: Error | null, item?: NumberInstance) => any ): Promise { const headers: any = {}; @@ -85,16 +85,25 @@ export class NumberContextImpl implements NumberContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new NumberInstance(operationVersion, payload, instance._solution.number) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new NumberInstance( + operationVersion, + payload, + instance._solution.number + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/pricing/v2/country.ts b/src/rest/pricing/v2/country.ts index 030b87820..5ff19d73d 100644 --- a/src/rest/pricing/v2/country.ts +++ b/src/rest/pricing/v2/country.ts @@ -106,7 +106,7 @@ export class CountryContextImpl implements CountryContext { this._uri = `/Trunking/Countries/${isoCountry}`; } - fetch( + async fetch( callback?: (error: Error | null, item?: CountryInstance) => any ): Promise { const headers: any = {}; @@ -120,20 +120,25 @@ export class CountryContextImpl implements CountryContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new CountryInstance( - operationVersion, - payload, - instance._solution.isoCountry - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new CountryInstance( + operationVersion, + payload, + instance._solution.isoCountry + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/pricing/v2/number.ts b/src/rest/pricing/v2/number.ts index 9cd37bed3..7c7b18151 100644 --- a/src/rest/pricing/v2/number.ts +++ b/src/rest/pricing/v2/number.ts @@ -91,7 +91,7 @@ export class NumberContextImpl implements NumberContext { this._uri = `/Trunking/Numbers/${destinationNumber}`; } - fetch( + async fetch( params?: | NumberContextFetchOptions | ((error: Error | null, item?: NumberInstance) => any), @@ -121,20 +121,25 @@ export class NumberContextImpl implements NumberContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new NumberInstance( - operationVersion, - payload, - instance._solution.destinationNumber - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new NumberInstance( + operationVersion, + payload, + instance._solution.destinationNumber + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/pricing/v2/voice/country.ts b/src/rest/pricing/v2/voice/country.ts index 421c1cadc..48184111e 100644 --- a/src/rest/pricing/v2/voice/country.ts +++ b/src/rest/pricing/v2/voice/country.ts @@ -106,7 +106,7 @@ export class CountryContextImpl implements CountryContext { this._uri = `/Voice/Countries/${isoCountry}`; } - fetch( + async fetch( callback?: (error: Error | null, item?: CountryInstance) => any ): Promise { const headers: any = {}; @@ -120,20 +120,25 @@ export class CountryContextImpl implements CountryContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new CountryInstance( - operationVersion, - payload, - instance._solution.isoCountry - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new CountryInstance( + operationVersion, + payload, + instance._solution.isoCountry + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/pricing/v2/voice/number.ts b/src/rest/pricing/v2/voice/number.ts index 3fa6f4614..bdaa50888 100644 --- a/src/rest/pricing/v2/voice/number.ts +++ b/src/rest/pricing/v2/voice/number.ts @@ -89,7 +89,7 @@ export class NumberContextImpl implements NumberContext { this._uri = `/Voice/Numbers/${destinationNumber}`; } - fetch( + async fetch( params?: | NumberContextFetchOptions | ((error: Error | null, item?: NumberInstance) => any), @@ -119,20 +119,25 @@ export class NumberContextImpl implements NumberContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new NumberInstance( - operationVersion, - payload, - instance._solution.destinationNumber - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new NumberInstance( + operationVersion, + payload, + instance._solution.destinationNumber + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/proxy/v1/service.ts b/src/rest/proxy/v1/service.ts index 48afe5bfd..16209c750 100644 --- a/src/rest/proxy/v1/service.ts +++ b/src/rest/proxy/v1/service.ts @@ -228,7 +228,7 @@ export class ServiceContextImpl implements ServiceContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: ServiceInstance) => any ): Promise { const headers: any = {}; @@ -242,19 +242,28 @@ export class ServiceContextImpl implements ServiceContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ServiceInstance(operationVersion, payload, instance._solution.sid) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new ServiceInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | ServiceContextUpdateOptions | ((error: Error | null, item?: ServiceInstance) => any), @@ -299,16 +308,25 @@ export class ServiceContextImpl implements ServiceContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ServiceInstance(operationVersion, payload, instance._solution.sid) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new ServiceInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/proxy/v1/service/phoneNumber.ts b/src/rest/proxy/v1/service/phoneNumber.ts index ef3d7f6cd..141d1663b 100644 --- a/src/rest/proxy/v1/service/phoneNumber.ts +++ b/src/rest/proxy/v1/service/phoneNumber.ts @@ -171,7 +171,7 @@ export class PhoneNumberContextImpl implements PhoneNumberContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: PhoneNumberInstance) => any ): Promise { const headers: any = {}; @@ -185,24 +185,29 @@ export class PhoneNumberContextImpl implements PhoneNumberContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new PhoneNumberInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new PhoneNumberInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | PhoneNumberContextUpdateOptions | ((error: Error | null, item?: PhoneNumberInstance) => any), @@ -233,21 +238,26 @@ export class PhoneNumberContextImpl implements PhoneNumberContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new PhoneNumberInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new PhoneNumberInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/proxy/v1/service/session.ts b/src/rest/proxy/v1/service/session.ts index 8ee0d085c..d5c7a6e75 100644 --- a/src/rest/proxy/v1/service/session.ts +++ b/src/rest/proxy/v1/service/session.ts @@ -219,7 +219,7 @@ export class SessionContextImpl implements SessionContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: SessionInstance) => any ): Promise { const headers: any = {}; @@ -233,24 +233,29 @@ export class SessionContextImpl implements SessionContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new SessionInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new SessionInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | SessionContextUpdateOptions | ((error: Error | null, item?: SessionInstance) => any), @@ -283,21 +288,26 @@ export class SessionContextImpl implements SessionContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new SessionInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new SessionInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/proxy/v1/service/session/interaction.ts b/src/rest/proxy/v1/service/session/interaction.ts index 14bd3108c..b6b90b143 100644 --- a/src/rest/proxy/v1/service/session/interaction.ts +++ b/src/rest/proxy/v1/service/session/interaction.ts @@ -163,7 +163,7 @@ export class InteractionContextImpl implements InteractionContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: InteractionInstance) => any ): Promise { const headers: any = {}; @@ -177,22 +177,27 @@ export class InteractionContextImpl implements InteractionContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new InteractionInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sessionSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new InteractionInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sessionSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/proxy/v1/service/session/participant.ts b/src/rest/proxy/v1/service/session/participant.ts index 5c1f011b0..a9315928c 100644 --- a/src/rest/proxy/v1/service/session/participant.ts +++ b/src/rest/proxy/v1/service/session/participant.ts @@ -168,7 +168,7 @@ export class ParticipantContextImpl implements ParticipantContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: ParticipantInstance) => any ): Promise { const headers: any = {}; @@ -182,22 +182,27 @@ export class ParticipantContextImpl implements ParticipantContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ParticipantInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sessionSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new ParticipantInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sessionSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/proxy/v1/service/session/participant/messageInteraction.ts b/src/rest/proxy/v1/service/session/participant/messageInteraction.ts index eb5268c58..5d23c439c 100644 --- a/src/rest/proxy/v1/service/session/participant/messageInteraction.ts +++ b/src/rest/proxy/v1/service/session/participant/messageInteraction.ts @@ -152,7 +152,7 @@ export class MessageInteractionContextImpl this._uri = `/Services/${serviceSid}/Sessions/${sessionSid}/Participants/${participantSid}/MessageInteractions/${sid}`; } - fetch( + async fetch( callback?: (error: Error | null, item?: MessageInteractionInstance) => any ): Promise { const headers: any = {}; @@ -166,23 +166,28 @@ export class MessageInteractionContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new MessageInteractionInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sessionSid, - instance._solution.participantSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new MessageInteractionInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sessionSid, + instance._solution.participantSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/proxy/v1/service/shortCode.ts b/src/rest/proxy/v1/service/shortCode.ts index eb3148e46..b6c818bc8 100644 --- a/src/rest/proxy/v1/service/shortCode.ts +++ b/src/rest/proxy/v1/service/shortCode.ts @@ -167,7 +167,7 @@ export class ShortCodeContextImpl implements ShortCodeContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: ShortCodeInstance) => any ): Promise { const headers: any = {}; @@ -181,24 +181,29 @@ export class ShortCodeContextImpl implements ShortCodeContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ShortCodeInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new ShortCodeInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | ShortCodeContextUpdateOptions | ((error: Error | null, item?: ShortCodeInstance) => any), @@ -229,21 +234,26 @@ export class ShortCodeContextImpl implements ShortCodeContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ShortCodeInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new ShortCodeInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/routes/v2/phoneNumber.ts b/src/rest/routes/v2/phoneNumber.ts index 35fdb1f0a..4c8b17b2e 100644 --- a/src/rest/routes/v2/phoneNumber.ts +++ b/src/rest/routes/v2/phoneNumber.ts @@ -87,7 +87,7 @@ export class PhoneNumberContextImpl implements PhoneNumberContext { this._uri = `/PhoneNumbers/${phoneNumber}`; } - fetch( + async fetch( callback?: (error: Error | null, item?: PhoneNumberInstance) => any ): Promise { const headers: any = {}; @@ -101,23 +101,28 @@ export class PhoneNumberContextImpl implements PhoneNumberContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new PhoneNumberInstance( - operationVersion, - payload, - instance._solution.phoneNumber - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new PhoneNumberInstance( + operationVersion, + payload, + instance._solution.phoneNumber + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | PhoneNumberContextUpdateOptions | ((error: Error | null, item?: PhoneNumberInstance) => any), @@ -150,20 +155,25 @@ export class PhoneNumberContextImpl implements PhoneNumberContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new PhoneNumberInstance( - operationVersion, - payload, - instance._solution.phoneNumber - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new PhoneNumberInstance( + operationVersion, + payload, + instance._solution.phoneNumber + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/routes/v2/sipDomain.ts b/src/rest/routes/v2/sipDomain.ts index 295379a1d..a3df5ae00 100644 --- a/src/rest/routes/v2/sipDomain.ts +++ b/src/rest/routes/v2/sipDomain.ts @@ -87,7 +87,7 @@ export class SipDomainContextImpl implements SipDomainContext { this._uri = `/SipDomains/${sipDomain}`; } - fetch( + async fetch( callback?: (error: Error | null, item?: SipDomainInstance) => any ): Promise { const headers: any = {}; @@ -101,23 +101,28 @@ export class SipDomainContextImpl implements SipDomainContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new SipDomainInstance( - operationVersion, - payload, - instance._solution.sipDomain - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new SipDomainInstance( + operationVersion, + payload, + instance._solution.sipDomain + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | SipDomainContextUpdateOptions | ((error: Error | null, item?: SipDomainInstance) => any), @@ -150,20 +155,25 @@ export class SipDomainContextImpl implements SipDomainContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new SipDomainInstance( - operationVersion, - payload, - instance._solution.sipDomain - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new SipDomainInstance( + operationVersion, + payload, + instance._solution.sipDomain + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/routes/v2/trunk.ts b/src/rest/routes/v2/trunk.ts index 77a701414..9ab5dc32c 100644 --- a/src/rest/routes/v2/trunk.ts +++ b/src/rest/routes/v2/trunk.ts @@ -87,7 +87,7 @@ export class TrunkContextImpl implements TrunkContext { this._uri = `/Trunks/${sipTrunkDomain}`; } - fetch( + async fetch( callback?: (error: Error | null, item?: TrunkInstance) => any ): Promise { const headers: any = {}; @@ -101,23 +101,28 @@ export class TrunkContextImpl implements TrunkContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new TrunkInstance( - operationVersion, - payload, - instance._solution.sipTrunkDomain - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new TrunkInstance( + operationVersion, + payload, + instance._solution.sipTrunkDomain + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | TrunkContextUpdateOptions | ((error: Error | null, item?: TrunkInstance) => any), @@ -150,20 +155,25 @@ export class TrunkContextImpl implements TrunkContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new TrunkInstance( - operationVersion, - payload, - instance._solution.sipTrunkDomain - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new TrunkInstance( + operationVersion, + payload, + instance._solution.sipTrunkDomain + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/serverless/v1/service.ts b/src/rest/serverless/v1/service.ts index 6c203d349..2613a1c98 100644 --- a/src/rest/serverless/v1/service.ts +++ b/src/rest/serverless/v1/service.ts @@ -211,7 +211,7 @@ export class ServiceContextImpl implements ServiceContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: ServiceInstance) => any ): Promise { const headers: any = {}; @@ -225,19 +225,28 @@ export class ServiceContextImpl implements ServiceContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ServiceInstance(operationVersion, payload, instance._solution.sid) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new ServiceInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | ServiceContextUpdateOptions | ((error: Error | null, item?: ServiceInstance) => any), @@ -272,16 +281,25 @@ export class ServiceContextImpl implements ServiceContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ServiceInstance(operationVersion, payload, instance._solution.sid) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new ServiceInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/serverless/v1/service/asset.ts b/src/rest/serverless/v1/service/asset.ts index eca9fb5bd..46fe256b0 100644 --- a/src/rest/serverless/v1/service/asset.ts +++ b/src/rest/serverless/v1/service/asset.ts @@ -172,7 +172,7 @@ export class AssetContextImpl implements AssetContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: AssetInstance) => any ): Promise { const headers: any = {}; @@ -186,24 +186,29 @@ export class AssetContextImpl implements AssetContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new AssetInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new AssetInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params: AssetContextUpdateOptions, callback?: (error: Error | null, item?: AssetInstance) => any ): Promise { @@ -235,21 +240,26 @@ export class AssetContextImpl implements AssetContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new AssetInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new AssetInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/serverless/v1/service/asset/assetVersion.ts b/src/rest/serverless/v1/service/asset/assetVersion.ts index 620b32f24..985ea8c0c 100644 --- a/src/rest/serverless/v1/service/asset/assetVersion.ts +++ b/src/rest/serverless/v1/service/asset/assetVersion.ts @@ -109,7 +109,7 @@ export class AssetVersionContextImpl implements AssetVersionContext { this._uri = `/Services/${serviceSid}/Assets/${assetSid}/Versions/${sid}`; } - fetch( + async fetch( callback?: (error: Error | null, item?: AssetVersionInstance) => any ): Promise { const headers: any = {}; @@ -123,22 +123,27 @@ export class AssetVersionContextImpl implements AssetVersionContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new AssetVersionInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.assetSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new AssetVersionInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.assetSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/serverless/v1/service/build.ts b/src/rest/serverless/v1/service/build.ts index 652ada9dc..792f5d137 100644 --- a/src/rest/serverless/v1/service/build.ts +++ b/src/rest/serverless/v1/service/build.ts @@ -167,7 +167,7 @@ export class BuildContextImpl implements BuildContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: BuildInstance) => any ): Promise { const headers: any = {}; @@ -181,21 +181,26 @@ export class BuildContextImpl implements BuildContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new BuildInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new BuildInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/serverless/v1/service/build/buildStatus.ts b/src/rest/serverless/v1/service/build/buildStatus.ts index b7151d9ae..32c419ff8 100644 --- a/src/rest/serverless/v1/service/build/buildStatus.ts +++ b/src/rest/serverless/v1/service/build/buildStatus.ts @@ -61,7 +61,7 @@ export class BuildStatusContextImpl implements BuildStatusContext { this._uri = `/Services/${serviceSid}/Builds/${sid}/Status`; } - fetch( + async fetch( callback?: (error: Error | null, item?: BuildStatusInstance) => any ): Promise { const headers: any = {}; @@ -75,21 +75,26 @@ export class BuildStatusContextImpl implements BuildStatusContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new BuildStatusInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new BuildStatusInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/serverless/v1/service/environment.ts b/src/rest/serverless/v1/service/environment.ts index 39abb9d5a..9e10f74ed 100644 --- a/src/rest/serverless/v1/service/environment.ts +++ b/src/rest/serverless/v1/service/environment.ts @@ -181,7 +181,7 @@ export class EnvironmentContextImpl implements EnvironmentContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: EnvironmentInstance) => any ): Promise { const headers: any = {}; @@ -195,21 +195,26 @@ export class EnvironmentContextImpl implements EnvironmentContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new EnvironmentInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new EnvironmentInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/serverless/v1/service/environment/deployment.ts b/src/rest/serverless/v1/service/environment/deployment.ts index 43138eae8..444e3f79d 100644 --- a/src/rest/serverless/v1/service/environment/deployment.ts +++ b/src/rest/serverless/v1/service/environment/deployment.ts @@ -116,7 +116,7 @@ export class DeploymentContextImpl implements DeploymentContext { this._uri = `/Services/${serviceSid}/Environments/${environmentSid}/Deployments/${sid}`; } - fetch( + async fetch( callback?: (error: Error | null, item?: DeploymentInstance) => any ): Promise { const headers: any = {}; @@ -130,22 +130,27 @@ export class DeploymentContextImpl implements DeploymentContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new DeploymentInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.environmentSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new DeploymentInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.environmentSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/serverless/v1/service/environment/log.ts b/src/rest/serverless/v1/service/environment/log.ts index ab5b295c1..06b838536 100644 --- a/src/rest/serverless/v1/service/environment/log.ts +++ b/src/rest/serverless/v1/service/environment/log.ts @@ -127,7 +127,7 @@ export class LogContextImpl implements LogContext { this._uri = `/Services/${serviceSid}/Environments/${environmentSid}/Logs/${sid}`; } - fetch( + async fetch( callback?: (error: Error | null, item?: LogInstance) => any ): Promise { const headers: any = {}; @@ -141,22 +141,27 @@ export class LogContextImpl implements LogContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new LogInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.environmentSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new LogInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.environmentSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/serverless/v1/service/environment/variable.ts b/src/rest/serverless/v1/service/environment/variable.ts index cb61f0d0b..e3e39cab3 100644 --- a/src/rest/serverless/v1/service/environment/variable.ts +++ b/src/rest/serverless/v1/service/environment/variable.ts @@ -180,7 +180,7 @@ export class VariableContextImpl implements VariableContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: VariableInstance) => any ): Promise { const headers: any = {}; @@ -194,25 +194,30 @@ export class VariableContextImpl implements VariableContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new VariableInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.environmentSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new VariableInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.environmentSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | VariableContextUpdateOptions | ((error: Error | null, item?: VariableInstance) => any), @@ -243,22 +248,27 @@ export class VariableContextImpl implements VariableContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new VariableInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.environmentSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new VariableInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.environmentSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/serverless/v1/service/function.ts b/src/rest/serverless/v1/service/function.ts index e5b8c27e0..56ceef923 100644 --- a/src/rest/serverless/v1/service/function.ts +++ b/src/rest/serverless/v1/service/function.ts @@ -172,7 +172,7 @@ export class FunctionContextImpl implements FunctionContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: FunctionInstance) => any ): Promise { const headers: any = {}; @@ -186,24 +186,29 @@ export class FunctionContextImpl implements FunctionContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new FunctionInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new FunctionInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params: FunctionContextUpdateOptions, callback?: (error: Error | null, item?: FunctionInstance) => any ): Promise { @@ -235,21 +240,26 @@ export class FunctionContextImpl implements FunctionContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new FunctionInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new FunctionInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/serverless/v1/service/function/functionVersion.ts b/src/rest/serverless/v1/service/function/functionVersion.ts index 19adb040a..fecf73d81 100644 --- a/src/rest/serverless/v1/service/function/functionVersion.ts +++ b/src/rest/serverless/v1/service/function/functionVersion.ts @@ -129,7 +129,7 @@ export class FunctionVersionContextImpl implements FunctionVersionContext { return this._functionVersionContent; } - fetch( + async fetch( callback?: (error: Error | null, item?: FunctionVersionInstance) => any ): Promise { const headers: any = {}; @@ -143,22 +143,27 @@ export class FunctionVersionContextImpl implements FunctionVersionContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new FunctionVersionInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.functionSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new FunctionVersionInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.functionSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/serverless/v1/service/function/functionVersion/functionVersionContent.ts b/src/rest/serverless/v1/service/function/functionVersion/functionVersionContent.ts index c80e21f93..f41938317 100644 --- a/src/rest/serverless/v1/service/function/functionVersion/functionVersionContent.ts +++ b/src/rest/serverless/v1/service/function/functionVersion/functionVersionContent.ts @@ -74,7 +74,7 @@ export class FunctionVersionContentContextImpl this._uri = `/Services/${serviceSid}/Functions/${functionSid}/Versions/${sid}/Content`; } - fetch( + async fetch( callback?: ( error: Error | null, item?: FunctionVersionContentInstance @@ -91,22 +91,27 @@ export class FunctionVersionContentContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new FunctionVersionContentInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.functionSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new FunctionVersionContentInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.functionSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/studio/v1/flow.ts b/src/rest/studio/v1/flow.ts index f66328a62..debd82457 100644 --- a/src/rest/studio/v1/flow.ts +++ b/src/rest/studio/v1/flow.ts @@ -147,7 +147,7 @@ export class FlowContextImpl implements FlowContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: FlowInstance) => any ): Promise { const headers: any = {}; @@ -161,16 +161,25 @@ export class FlowContextImpl implements FlowContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new FlowInstance(operationVersion, payload, instance._solution.sid) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new FlowInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/studio/v1/flow/engagement.ts b/src/rest/studio/v1/flow/engagement.ts index 26e1d6cea..6a211eae0 100644 --- a/src/rest/studio/v1/flow/engagement.ts +++ b/src/rest/studio/v1/flow/engagement.ts @@ -171,7 +171,7 @@ export class EngagementContextImpl implements EngagementContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: EngagementInstance) => any ): Promise { const headers: any = {}; @@ -185,21 +185,26 @@ export class EngagementContextImpl implements EngagementContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new EngagementInstance( - operationVersion, - payload, - instance._solution.flowSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new EngagementInstance( + operationVersion, + payload, + instance._solution.flowSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/studio/v1/flow/engagement/engagementContext.ts b/src/rest/studio/v1/flow/engagement/engagementContext.ts index f844eeb14..1c537c4b2 100644 --- a/src/rest/studio/v1/flow/engagement/engagementContext.ts +++ b/src/rest/studio/v1/flow/engagement/engagementContext.ts @@ -59,7 +59,7 @@ export class EngagementContextContextImpl implements EngagementContextContext { this._uri = `/Flows/${flowSid}/Engagements/${engagementSid}/Context`; } - fetch( + async fetch( callback?: (error: Error | null, item?: EngagementContextInstance) => any ): Promise { const headers: any = {}; @@ -73,21 +73,26 @@ export class EngagementContextContextImpl implements EngagementContextContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new EngagementContextInstance( - operationVersion, - payload, - instance._solution.flowSid, - instance._solution.engagementSid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new EngagementContextInstance( + operationVersion, + payload, + instance._solution.flowSid, + instance._solution.engagementSid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/studio/v1/flow/engagement/step.ts b/src/rest/studio/v1/flow/engagement/step.ts index 0c34aaaeb..45930814b 100644 --- a/src/rest/studio/v1/flow/engagement/step.ts +++ b/src/rest/studio/v1/flow/engagement/step.ts @@ -124,7 +124,7 @@ export class StepContextImpl implements StepContext { return this._stepContext; } - fetch( + async fetch( callback?: (error: Error | null, item?: StepInstance) => any ): Promise { const headers: any = {}; @@ -138,22 +138,27 @@ export class StepContextImpl implements StepContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new StepInstance( - operationVersion, - payload, - instance._solution.flowSid, - instance._solution.engagementSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new StepInstance( + operationVersion, + payload, + instance._solution.flowSid, + instance._solution.engagementSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/studio/v1/flow/engagement/step/stepContext.ts b/src/rest/studio/v1/flow/engagement/step/stepContext.ts index eea066121..1df4aeeff 100644 --- a/src/rest/studio/v1/flow/engagement/step/stepContext.ts +++ b/src/rest/studio/v1/flow/engagement/step/stepContext.ts @@ -69,7 +69,7 @@ export class StepContextContextImpl implements StepContextContext { this._uri = `/Flows/${flowSid}/Engagements/${engagementSid}/Steps/${stepSid}/Context`; } - fetch( + async fetch( callback?: (error: Error | null, item?: StepContextInstance) => any ): Promise { const headers: any = {}; @@ -83,22 +83,27 @@ export class StepContextContextImpl implements StepContextContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new StepContextInstance( - operationVersion, - payload, - instance._solution.flowSid, - instance._solution.engagementSid, - instance._solution.stepSid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new StepContextInstance( + operationVersion, + payload, + instance._solution.flowSid, + instance._solution.engagementSid, + instance._solution.stepSid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/studio/v1/flow/execution.ts b/src/rest/studio/v1/flow/execution.ts index cdb9510ac..1272e5a29 100644 --- a/src/rest/studio/v1/flow/execution.ts +++ b/src/rest/studio/v1/flow/execution.ts @@ -204,7 +204,7 @@ export class ExecutionContextImpl implements ExecutionContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: ExecutionInstance) => any ): Promise { const headers: any = {}; @@ -218,24 +218,29 @@ export class ExecutionContextImpl implements ExecutionContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ExecutionInstance( - operationVersion, - payload, - instance._solution.flowSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new ExecutionInstance( + operationVersion, + payload, + instance._solution.flowSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params: ExecutionContextUpdateOptions, callback?: (error: Error | null, item?: ExecutionInstance) => any ): Promise { @@ -264,21 +269,26 @@ export class ExecutionContextImpl implements ExecutionContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ExecutionInstance( - operationVersion, - payload, - instance._solution.flowSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new ExecutionInstance( + operationVersion, + payload, + instance._solution.flowSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/studio/v1/flow/execution/executionContext.ts b/src/rest/studio/v1/flow/execution/executionContext.ts index 4960bc378..cf1ef7424 100644 --- a/src/rest/studio/v1/flow/execution/executionContext.ts +++ b/src/rest/studio/v1/flow/execution/executionContext.ts @@ -59,7 +59,7 @@ export class ExecutionContextContextImpl implements ExecutionContextContext { this._uri = `/Flows/${flowSid}/Executions/${executionSid}/Context`; } - fetch( + async fetch( callback?: (error: Error | null, item?: ExecutionContextInstance) => any ): Promise { const headers: any = {}; @@ -73,21 +73,26 @@ export class ExecutionContextContextImpl implements ExecutionContextContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ExecutionContextInstance( - operationVersion, - payload, - instance._solution.flowSid, - instance._solution.executionSid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new ExecutionContextInstance( + operationVersion, + payload, + instance._solution.flowSid, + instance._solution.executionSid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/studio/v1/flow/execution/executionStep.ts b/src/rest/studio/v1/flow/execution/executionStep.ts index 9e963849b..053900358 100644 --- a/src/rest/studio/v1/flow/execution/executionStep.ts +++ b/src/rest/studio/v1/flow/execution/executionStep.ts @@ -124,7 +124,7 @@ export class ExecutionStepContextImpl implements ExecutionStepContext { return this._stepContext; } - fetch( + async fetch( callback?: (error: Error | null, item?: ExecutionStepInstance) => any ): Promise { const headers: any = {}; @@ -138,22 +138,27 @@ export class ExecutionStepContextImpl implements ExecutionStepContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ExecutionStepInstance( - operationVersion, - payload, - instance._solution.flowSid, - instance._solution.executionSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new ExecutionStepInstance( + operationVersion, + payload, + instance._solution.flowSid, + instance._solution.executionSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/studio/v1/flow/execution/executionStep/executionStepContext.ts b/src/rest/studio/v1/flow/execution/executionStep/executionStepContext.ts index b8f9f4556..bc29c98c0 100644 --- a/src/rest/studio/v1/flow/execution/executionStep/executionStepContext.ts +++ b/src/rest/studio/v1/flow/execution/executionStep/executionStepContext.ts @@ -71,7 +71,7 @@ export class ExecutionStepContextContextImpl this._uri = `/Flows/${flowSid}/Executions/${executionSid}/Steps/${stepSid}/Context`; } - fetch( + async fetch( callback?: (error: Error | null, item?: ExecutionStepContextInstance) => any ): Promise { const headers: any = {}; @@ -85,22 +85,27 @@ export class ExecutionStepContextContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new ExecutionStepContextInstance( - operationVersion, - payload, - instance._solution.flowSid, - instance._solution.executionSid, - instance._solution.stepSid - ) - ); + try { + let payload = await operationPromise; + let operation = new ExecutionStepContextInstance( + operationVersion, + payload, + instance._solution.flowSid, + instance._solution.executionSid, + instance._solution.stepSid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/studio/v2/flow.ts b/src/rest/studio/v2/flow.ts index 427c5a3e8..a7e882de5 100644 --- a/src/rest/studio/v2/flow.ts +++ b/src/rest/studio/v2/flow.ts @@ -197,7 +197,7 @@ export class FlowContextImpl implements FlowContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: FlowInstance) => any ): Promise { const headers: any = {}; @@ -211,19 +211,28 @@ export class FlowContextImpl implements FlowContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new FlowInstance(operationVersion, payload, instance._solution.sid) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new FlowInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params: FlowContextUpdateOptions, callback?: (error: Error | null, item?: FlowInstance) => any ): Promise { @@ -258,16 +267,25 @@ export class FlowContextImpl implements FlowContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new FlowInstance(operationVersion, payload, instance._solution.sid) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new FlowInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/studio/v2/flow/execution.ts b/src/rest/studio/v2/flow/execution.ts index b8f666ef4..944619794 100644 --- a/src/rest/studio/v2/flow/execution.ts +++ b/src/rest/studio/v2/flow/execution.ts @@ -204,7 +204,7 @@ export class ExecutionContextImpl implements ExecutionContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: ExecutionInstance) => any ): Promise { const headers: any = {}; @@ -218,24 +218,29 @@ export class ExecutionContextImpl implements ExecutionContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ExecutionInstance( - operationVersion, - payload, - instance._solution.flowSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new ExecutionInstance( + operationVersion, + payload, + instance._solution.flowSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params: ExecutionContextUpdateOptions, callback?: (error: Error | null, item?: ExecutionInstance) => any ): Promise { @@ -264,21 +269,26 @@ export class ExecutionContextImpl implements ExecutionContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ExecutionInstance( - operationVersion, - payload, - instance._solution.flowSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new ExecutionInstance( + operationVersion, + payload, + instance._solution.flowSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/studio/v2/flow/execution/executionContext.ts b/src/rest/studio/v2/flow/execution/executionContext.ts index 51ff8f3e4..03f5cebc2 100644 --- a/src/rest/studio/v2/flow/execution/executionContext.ts +++ b/src/rest/studio/v2/flow/execution/executionContext.ts @@ -59,7 +59,7 @@ export class ExecutionContextContextImpl implements ExecutionContextContext { this._uri = `/Flows/${flowSid}/Executions/${executionSid}/Context`; } - fetch( + async fetch( callback?: (error: Error | null, item?: ExecutionContextInstance) => any ): Promise { const headers: any = {}; @@ -73,21 +73,26 @@ export class ExecutionContextContextImpl implements ExecutionContextContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ExecutionContextInstance( - operationVersion, - payload, - instance._solution.flowSid, - instance._solution.executionSid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new ExecutionContextInstance( + operationVersion, + payload, + instance._solution.flowSid, + instance._solution.executionSid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/studio/v2/flow/execution/executionStep.ts b/src/rest/studio/v2/flow/execution/executionStep.ts index 6a4f42926..f7526b760 100644 --- a/src/rest/studio/v2/flow/execution/executionStep.ts +++ b/src/rest/studio/v2/flow/execution/executionStep.ts @@ -124,7 +124,7 @@ export class ExecutionStepContextImpl implements ExecutionStepContext { return this._stepContext; } - fetch( + async fetch( callback?: (error: Error | null, item?: ExecutionStepInstance) => any ): Promise { const headers: any = {}; @@ -138,22 +138,27 @@ export class ExecutionStepContextImpl implements ExecutionStepContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ExecutionStepInstance( - operationVersion, - payload, - instance._solution.flowSid, - instance._solution.executionSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new ExecutionStepInstance( + operationVersion, + payload, + instance._solution.flowSid, + instance._solution.executionSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/studio/v2/flow/execution/executionStep/executionStepContext.ts b/src/rest/studio/v2/flow/execution/executionStep/executionStepContext.ts index d6688ea5e..5153b5ae8 100644 --- a/src/rest/studio/v2/flow/execution/executionStep/executionStepContext.ts +++ b/src/rest/studio/v2/flow/execution/executionStep/executionStepContext.ts @@ -71,7 +71,7 @@ export class ExecutionStepContextContextImpl this._uri = `/Flows/${flowSid}/Executions/${executionSid}/Steps/${stepSid}/Context`; } - fetch( + async fetch( callback?: (error: Error | null, item?: ExecutionStepContextInstance) => any ): Promise { const headers: any = {}; @@ -85,22 +85,27 @@ export class ExecutionStepContextContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new ExecutionStepContextInstance( - operationVersion, - payload, - instance._solution.flowSid, - instance._solution.executionSid, - instance._solution.stepSid - ) - ); + try { + let payload = await operationPromise; + let operation = new ExecutionStepContextInstance( + operationVersion, + payload, + instance._solution.flowSid, + instance._solution.executionSid, + instance._solution.stepSid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/studio/v2/flow/flowRevision.ts b/src/rest/studio/v2/flow/flowRevision.ts index c0ab9bc73..38e0137a6 100644 --- a/src/rest/studio/v2/flow/flowRevision.ts +++ b/src/rest/studio/v2/flow/flowRevision.ts @@ -99,7 +99,7 @@ export class FlowRevisionContextImpl implements FlowRevisionContext { this._uri = `/Flows/${sid}/Revisions/${revision}`; } - fetch( + async fetch( callback?: (error: Error | null, item?: FlowRevisionInstance) => any ): Promise { const headers: any = {}; @@ -113,21 +113,26 @@ export class FlowRevisionContextImpl implements FlowRevisionContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new FlowRevisionInstance( - operationVersion, - payload, - instance._solution.sid, - instance._solution.revision - ) - ); + try { + let payload = await operationPromise; + let operation = new FlowRevisionInstance( + operationVersion, + payload, + instance._solution.sid, + instance._solution.revision + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/studio/v2/flow/flowTestUser.ts b/src/rest/studio/v2/flow/flowTestUser.ts index 8157aef10..f957259ec 100644 --- a/src/rest/studio/v2/flow/flowTestUser.ts +++ b/src/rest/studio/v2/flow/flowTestUser.ts @@ -75,7 +75,7 @@ export class FlowTestUserContextImpl implements FlowTestUserContext { this._uri = `/Flows/${sid}/TestUsers`; } - fetch( + async fetch( callback?: (error: Error | null, item?: FlowTestUserInstance) => any ): Promise { const headers: any = {}; @@ -89,23 +89,28 @@ export class FlowTestUserContextImpl implements FlowTestUserContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new FlowTestUserInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new FlowTestUserInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params: FlowTestUserContextUpdateOptions, callback?: (error: Error | null, item?: FlowTestUserInstance) => any ): Promise { @@ -134,20 +139,25 @@ export class FlowTestUserContextImpl implements FlowTestUserContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new FlowTestUserInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new FlowTestUserInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/supersim/v1/esimProfile.ts b/src/rest/supersim/v1/esimProfile.ts index 914cca8b0..c377f7e05 100644 --- a/src/rest/supersim/v1/esimProfile.ts +++ b/src/rest/supersim/v1/esimProfile.ts @@ -131,7 +131,7 @@ export class EsimProfileContextImpl implements EsimProfileContext { this._uri = `/ESimProfiles/${sid}`; } - fetch( + async fetch( callback?: (error: Error | null, item?: EsimProfileInstance) => any ): Promise { const headers: any = {}; @@ -145,20 +145,25 @@ export class EsimProfileContextImpl implements EsimProfileContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new EsimProfileInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new EsimProfileInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/supersim/v1/fleet.ts b/src/rest/supersim/v1/fleet.ts index 10b8ed153..ac574b173 100644 --- a/src/rest/supersim/v1/fleet.ts +++ b/src/rest/supersim/v1/fleet.ts @@ -166,7 +166,7 @@ export class FleetContextImpl implements FleetContext { this._uri = `/Fleets/${sid}`; } - fetch( + async fetch( callback?: (error: Error | null, item?: FleetInstance) => any ): Promise { const headers: any = {}; @@ -180,19 +180,28 @@ export class FleetContextImpl implements FleetContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new FleetInstance(operationVersion, payload, instance._solution.sid) - ); + try { + let payload = await operationPromise; + let operation = new FleetInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | FleetContextUpdateOptions | ((error: Error | null, item?: FleetInstance) => any), @@ -235,16 +244,25 @@ export class FleetContextImpl implements FleetContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new FleetInstance(operationVersion, payload, instance._solution.sid) - ); + try { + let payload = await operationPromise; + let operation = new FleetInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/supersim/v1/ipCommand.ts b/src/rest/supersim/v1/ipCommand.ts index a0ee69309..4aed097b4 100644 --- a/src/rest/supersim/v1/ipCommand.ts +++ b/src/rest/supersim/v1/ipCommand.ts @@ -139,7 +139,7 @@ export class IpCommandContextImpl implements IpCommandContext { this._uri = `/IpCommands/${sid}`; } - fetch( + async fetch( callback?: (error: Error | null, item?: IpCommandInstance) => any ): Promise { const headers: any = {}; @@ -153,16 +153,25 @@ export class IpCommandContextImpl implements IpCommandContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new IpCommandInstance(operationVersion, payload, instance._solution.sid) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new IpCommandInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/supersim/v1/network.ts b/src/rest/supersim/v1/network.ts index 8a051fd0b..d26a24ec7 100644 --- a/src/rest/supersim/v1/network.ts +++ b/src/rest/supersim/v1/network.ts @@ -110,7 +110,7 @@ export class NetworkContextImpl implements NetworkContext { this._uri = `/Networks/${sid}`; } - fetch( + async fetch( callback?: (error: Error | null, item?: NetworkInstance) => any ): Promise { const headers: any = {}; @@ -124,16 +124,25 @@ export class NetworkContextImpl implements NetworkContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new NetworkInstance(operationVersion, payload, instance._solution.sid) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new NetworkInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/supersim/v1/networkAccessProfile.ts b/src/rest/supersim/v1/networkAccessProfile.ts index 560b713f1..8f9c2b7ba 100644 --- a/src/rest/supersim/v1/networkAccessProfile.ts +++ b/src/rest/supersim/v1/networkAccessProfile.ts @@ -152,7 +152,7 @@ export class NetworkAccessProfileContextImpl return this._networks; } - fetch( + async fetch( callback?: (error: Error | null, item?: NetworkAccessProfileInstance) => any ): Promise { const headers: any = {}; @@ -166,23 +166,28 @@ export class NetworkAccessProfileContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new NetworkAccessProfileInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new NetworkAccessProfileInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | NetworkAccessProfileContextUpdateOptions | ((error: Error | null, item?: NetworkAccessProfileInstance) => any), @@ -213,20 +218,25 @@ export class NetworkAccessProfileContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new NetworkAccessProfileInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new NetworkAccessProfileInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/supersim/v1/networkAccessProfile/networkAccessProfileNetwork.ts b/src/rest/supersim/v1/networkAccessProfile/networkAccessProfileNetwork.ts index 96b9e6598..bd86799d8 100644 --- a/src/rest/supersim/v1/networkAccessProfile/networkAccessProfileNetwork.ts +++ b/src/rest/supersim/v1/networkAccessProfile/networkAccessProfileNetwork.ts @@ -147,7 +147,7 @@ export class NetworkAccessProfileNetworkContextImpl return operationPromise; } - fetch( + async fetch( callback?: ( error: Error | null, item?: NetworkAccessProfileNetworkInstance @@ -164,21 +164,26 @@ export class NetworkAccessProfileNetworkContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new NetworkAccessProfileNetworkInstance( - operationVersion, - payload, - instance._solution.networkAccessProfileSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new NetworkAccessProfileNetworkInstance( + operationVersion, + payload, + instance._solution.networkAccessProfileSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/supersim/v1/sim.ts b/src/rest/supersim/v1/sim.ts index 92d2cfc6b..9f592569b 100644 --- a/src/rest/supersim/v1/sim.ts +++ b/src/rest/supersim/v1/sim.ts @@ -186,7 +186,7 @@ export class SimContextImpl implements SimContext { return this._simIpAddresses; } - fetch( + async fetch( callback?: (error: Error | null, item?: SimInstance) => any ): Promise { const headers: any = {}; @@ -200,19 +200,28 @@ export class SimContextImpl implements SimContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new SimInstance(operationVersion, payload, instance._solution.sid) - ); + try { + let payload = await operationPromise; + let operation = new SimInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | SimContextUpdateOptions | ((error: Error | null, item?: SimInstance) => any), @@ -251,16 +260,25 @@ export class SimContextImpl implements SimContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new SimInstance(operationVersion, payload, instance._solution.sid) - ); + try { + let payload = await operationPromise; + let operation = new SimInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/supersim/v1/smsCommand.ts b/src/rest/supersim/v1/smsCommand.ts index 86269f6e5..433a9af2f 100644 --- a/src/rest/supersim/v1/smsCommand.ts +++ b/src/rest/supersim/v1/smsCommand.ts @@ -132,7 +132,7 @@ export class SmsCommandContextImpl implements SmsCommandContext { this._uri = `/SmsCommands/${sid}`; } - fetch( + async fetch( callback?: (error: Error | null, item?: SmsCommandInstance) => any ): Promise { const headers: any = {}; @@ -146,20 +146,25 @@ export class SmsCommandContextImpl implements SmsCommandContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new SmsCommandInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new SmsCommandInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/sync/v1/service.ts b/src/rest/sync/v1/service.ts index ac9cf5a8e..ca5bae695 100644 --- a/src/rest/sync/v1/service.ts +++ b/src/rest/sync/v1/service.ts @@ -226,7 +226,7 @@ export class ServiceContextImpl implements ServiceContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: ServiceInstance) => any ): Promise { const headers: any = {}; @@ -240,19 +240,28 @@ export class ServiceContextImpl implements ServiceContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ServiceInstance(operationVersion, payload, instance._solution.sid) - ); + try { + let payload = await operationPromise; + let operation = new ServiceInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | ServiceContextUpdateOptions | ((error: Error | null, item?: ServiceInstance) => any), @@ -302,16 +311,25 @@ export class ServiceContextImpl implements ServiceContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ServiceInstance(operationVersion, payload, instance._solution.sid) - ); + try { + let payload = await operationPromise; + let operation = new ServiceInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/sync/v1/service/document.ts b/src/rest/sync/v1/service/document.ts index a2dbd94fa..80ecf4edb 100644 --- a/src/rest/sync/v1/service/document.ts +++ b/src/rest/sync/v1/service/document.ts @@ -190,7 +190,7 @@ export class DocumentContextImpl implements DocumentContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: DocumentInstance) => any ): Promise { const headers: any = {}; @@ -204,24 +204,29 @@ export class DocumentContextImpl implements DocumentContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new DocumentInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new DocumentInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | DocumentContextUpdateOptions | ((error: Error | null, item?: DocumentInstance) => any), @@ -255,21 +260,26 @@ export class DocumentContextImpl implements DocumentContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new DocumentInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new DocumentInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/sync/v1/service/document/documentPermission.ts b/src/rest/sync/v1/service/document/documentPermission.ts index c8393f59d..111e0bec7 100644 --- a/src/rest/sync/v1/service/document/documentPermission.ts +++ b/src/rest/sync/v1/service/document/documentPermission.ts @@ -167,7 +167,7 @@ export class DocumentPermissionContextImpl return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: DocumentPermissionInstance) => any ): Promise { const headers: any = {}; @@ -181,25 +181,30 @@ export class DocumentPermissionContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new DocumentPermissionInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.documentSid, - instance._solution.identity - ) - ); + try { + let payload = await operationPromise; + let operation = new DocumentPermissionInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.documentSid, + instance._solution.identity + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params: DocumentPermissionContextUpdateOptions, callback?: (error: Error | null, item?: DocumentPermissionInstance) => any ): Promise { @@ -240,22 +245,27 @@ export class DocumentPermissionContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new DocumentPermissionInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.documentSid, - instance._solution.identity - ) - ); + try { + let payload = await operationPromise; + let operation = new DocumentPermissionInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.documentSid, + instance._solution.identity + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/sync/v1/service/syncList.ts b/src/rest/sync/v1/service/syncList.ts index a0c0f1c0e..1cb473111 100644 --- a/src/rest/sync/v1/service/syncList.ts +++ b/src/rest/sync/v1/service/syncList.ts @@ -202,7 +202,7 @@ export class SyncListContextImpl implements SyncListContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: SyncListInstance) => any ): Promise { const headers: any = {}; @@ -216,24 +216,29 @@ export class SyncListContextImpl implements SyncListContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new SyncListInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new SyncListInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | SyncListContextUpdateOptions | ((error: Error | null, item?: SyncListInstance) => any), @@ -265,21 +270,26 @@ export class SyncListContextImpl implements SyncListContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new SyncListInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new SyncListInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/sync/v1/service/syncList/syncListItem.ts b/src/rest/sync/v1/service/syncList/syncListItem.ts index 9cefc2fbe..c392d214d 100644 --- a/src/rest/sync/v1/service/syncList/syncListItem.ts +++ b/src/rest/sync/v1/service/syncList/syncListItem.ts @@ -247,7 +247,7 @@ export class SyncListItemContextImpl implements SyncListItemContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: SyncListItemInstance) => any ): Promise { const headers: any = {}; @@ -261,25 +261,30 @@ export class SyncListItemContextImpl implements SyncListItemContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new SyncListItemInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.listSid, - instance._solution.index - ) - ); + try { + let payload = await operationPromise; + let operation = new SyncListItemInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.listSid, + instance._solution.index + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | SyncListItemContextUpdateOptions | ((error: Error | null, item?: SyncListItemInstance) => any), @@ -316,22 +321,27 @@ export class SyncListItemContextImpl implements SyncListItemContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new SyncListItemInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.listSid, - instance._solution.index - ) - ); + try { + let payload = await operationPromise; + let operation = new SyncListItemInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.listSid, + instance._solution.index + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/sync/v1/service/syncList/syncListPermission.ts b/src/rest/sync/v1/service/syncList/syncListPermission.ts index 888814651..d86fb4a57 100644 --- a/src/rest/sync/v1/service/syncList/syncListPermission.ts +++ b/src/rest/sync/v1/service/syncList/syncListPermission.ts @@ -167,7 +167,7 @@ export class SyncListPermissionContextImpl return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: SyncListPermissionInstance) => any ): Promise { const headers: any = {}; @@ -181,25 +181,30 @@ export class SyncListPermissionContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new SyncListPermissionInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.listSid, - instance._solution.identity - ) - ); + try { + let payload = await operationPromise; + let operation = new SyncListPermissionInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.listSid, + instance._solution.identity + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params: SyncListPermissionContextUpdateOptions, callback?: (error: Error | null, item?: SyncListPermissionInstance) => any ): Promise { @@ -240,22 +245,27 @@ export class SyncListPermissionContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new SyncListPermissionInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.listSid, - instance._solution.identity - ) - ); + try { + let payload = await operationPromise; + let operation = new SyncListPermissionInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.listSid, + instance._solution.identity + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/sync/v1/service/syncMap.ts b/src/rest/sync/v1/service/syncMap.ts index 90c825c5b..5c4d66c06 100644 --- a/src/rest/sync/v1/service/syncMap.ts +++ b/src/rest/sync/v1/service/syncMap.ts @@ -202,7 +202,7 @@ export class SyncMapContextImpl implements SyncMapContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: SyncMapInstance) => any ): Promise { const headers: any = {}; @@ -216,24 +216,29 @@ export class SyncMapContextImpl implements SyncMapContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new SyncMapInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new SyncMapInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | SyncMapContextUpdateOptions | ((error: Error | null, item?: SyncMapInstance) => any), @@ -265,21 +270,26 @@ export class SyncMapContextImpl implements SyncMapContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new SyncMapInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new SyncMapInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/sync/v1/service/syncMap/syncMapItem.ts b/src/rest/sync/v1/service/syncMap/syncMapItem.ts index 833901319..25209bb10 100644 --- a/src/rest/sync/v1/service/syncMap/syncMapItem.ts +++ b/src/rest/sync/v1/service/syncMap/syncMapItem.ts @@ -249,7 +249,7 @@ export class SyncMapItemContextImpl implements SyncMapItemContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: SyncMapItemInstance) => any ): Promise { const headers: any = {}; @@ -263,25 +263,30 @@ export class SyncMapItemContextImpl implements SyncMapItemContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new SyncMapItemInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.mapSid, - instance._solution.key - ) - ); + try { + let payload = await operationPromise; + let operation = new SyncMapItemInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.mapSid, + instance._solution.key + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | SyncMapItemContextUpdateOptions | ((error: Error | null, item?: SyncMapItemInstance) => any), @@ -318,22 +323,27 @@ export class SyncMapItemContextImpl implements SyncMapItemContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new SyncMapItemInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.mapSid, - instance._solution.key - ) - ); + try { + let payload = await operationPromise; + let operation = new SyncMapItemInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.mapSid, + instance._solution.key + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/sync/v1/service/syncMap/syncMapPermission.ts b/src/rest/sync/v1/service/syncMap/syncMapPermission.ts index 1e6b314cc..6e17cbee2 100644 --- a/src/rest/sync/v1/service/syncMap/syncMapPermission.ts +++ b/src/rest/sync/v1/service/syncMap/syncMapPermission.ts @@ -165,7 +165,7 @@ export class SyncMapPermissionContextImpl implements SyncMapPermissionContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: SyncMapPermissionInstance) => any ): Promise { const headers: any = {}; @@ -179,25 +179,30 @@ export class SyncMapPermissionContextImpl implements SyncMapPermissionContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new SyncMapPermissionInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.mapSid, - instance._solution.identity - ) - ); + try { + let payload = await operationPromise; + let operation = new SyncMapPermissionInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.mapSid, + instance._solution.identity + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params: SyncMapPermissionContextUpdateOptions, callback?: (error: Error | null, item?: SyncMapPermissionInstance) => any ): Promise { @@ -238,22 +243,27 @@ export class SyncMapPermissionContextImpl implements SyncMapPermissionContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new SyncMapPermissionInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.mapSid, - instance._solution.identity - ) - ); + try { + let payload = await operationPromise; + let operation = new SyncMapPermissionInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.mapSid, + instance._solution.identity + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/sync/v1/service/syncStream.ts b/src/rest/sync/v1/service/syncStream.ts index df1db68d5..e8600aeb6 100644 --- a/src/rest/sync/v1/service/syncStream.ts +++ b/src/rest/sync/v1/service/syncStream.ts @@ -184,7 +184,7 @@ export class SyncStreamContextImpl implements SyncStreamContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: SyncStreamInstance) => any ): Promise { const headers: any = {}; @@ -198,24 +198,29 @@ export class SyncStreamContextImpl implements SyncStreamContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new SyncStreamInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new SyncStreamInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | SyncStreamContextUpdateOptions | ((error: Error | null, item?: SyncStreamInstance) => any), @@ -245,21 +250,26 @@ export class SyncStreamContextImpl implements SyncStreamContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new SyncStreamInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new SyncStreamInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/taskrouter/v1/workspace.ts b/src/rest/taskrouter/v1/workspace.ts index 4ededb2d7..16e7f5dc8 100644 --- a/src/rest/taskrouter/v1/workspace.ts +++ b/src/rest/taskrouter/v1/workspace.ts @@ -296,7 +296,7 @@ export class WorkspaceContextImpl implements WorkspaceContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: WorkspaceInstance) => any ): Promise { const headers: any = {}; @@ -310,19 +310,28 @@ export class WorkspaceContextImpl implements WorkspaceContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new WorkspaceInstance(operationVersion, payload, instance._solution.sid) - ); + try { + let payload = await operationPromise; + let operation = new WorkspaceInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | WorkspaceContextUpdateOptions | ((error: Error | null, item?: WorkspaceInstance) => any), @@ -365,16 +374,25 @@ export class WorkspaceContextImpl implements WorkspaceContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new WorkspaceInstance(operationVersion, payload, instance._solution.sid) - ); + try { + let payload = await operationPromise; + let operation = new WorkspaceInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/taskrouter/v1/workspace/activity.ts b/src/rest/taskrouter/v1/workspace/activity.ts index 3899240e4..8632b234e 100644 --- a/src/rest/taskrouter/v1/workspace/activity.ts +++ b/src/rest/taskrouter/v1/workspace/activity.ts @@ -180,7 +180,7 @@ export class ActivityContextImpl implements ActivityContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: ActivityInstance) => any ): Promise { const headers: any = {}; @@ -194,24 +194,29 @@ export class ActivityContextImpl implements ActivityContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ActivityInstance( - operationVersion, - payload, - instance._solution.workspaceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new ActivityInstance( + operationVersion, + payload, + instance._solution.workspaceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | ActivityContextUpdateOptions | ((error: Error | null, item?: ActivityInstance) => any), @@ -242,21 +247,26 @@ export class ActivityContextImpl implements ActivityContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ActivityInstance( - operationVersion, - payload, - instance._solution.workspaceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new ActivityInstance( + operationVersion, + payload, + instance._solution.workspaceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/taskrouter/v1/workspace/event.ts b/src/rest/taskrouter/v1/workspace/event.ts index ff60b2716..db66a9b71 100644 --- a/src/rest/taskrouter/v1/workspace/event.ts +++ b/src/rest/taskrouter/v1/workspace/event.ts @@ -163,7 +163,7 @@ export class EventContextImpl implements EventContext { this._uri = `/Workspaces/${workspaceSid}/Events/${sid}`; } - fetch( + async fetch( callback?: (error: Error | null, item?: EventInstance) => any ): Promise { const headers: any = {}; @@ -177,21 +177,26 @@ export class EventContextImpl implements EventContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new EventInstance( - operationVersion, - payload, - instance._solution.workspaceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new EventInstance( + operationVersion, + payload, + instance._solution.workspaceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/taskrouter/v1/workspace/task.ts b/src/rest/taskrouter/v1/workspace/task.ts index 23df30df6..7515b5c4b 100644 --- a/src/rest/taskrouter/v1/workspace/task.ts +++ b/src/rest/taskrouter/v1/workspace/task.ts @@ -313,7 +313,7 @@ export class TaskContextImpl implements TaskContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: TaskInstance) => any ): Promise { const headers: any = {}; @@ -327,24 +327,29 @@ export class TaskContextImpl implements TaskContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new TaskInstance( - operationVersion, - payload, - instance._solution.workspaceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new TaskInstance( + operationVersion, + payload, + instance._solution.workspaceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | TaskContextUpdateOptions | ((error: Error | null, item?: TaskInstance) => any), @@ -387,21 +392,26 @@ export class TaskContextImpl implements TaskContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new TaskInstance( - operationVersion, - payload, - instance._solution.workspaceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new TaskInstance( + operationVersion, + payload, + instance._solution.workspaceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/taskrouter/v1/workspace/task/reservation.ts b/src/rest/taskrouter/v1/workspace/task/reservation.ts index 44d19f166..8eb2ff449 100644 --- a/src/rest/taskrouter/v1/workspace/task/reservation.ts +++ b/src/rest/taskrouter/v1/workspace/task/reservation.ts @@ -284,7 +284,7 @@ export class ReservationContextImpl implements ReservationContext { this._uri = `/Workspaces/${workspaceSid}/Tasks/${taskSid}/Reservations/${sid}`; } - fetch( + async fetch( callback?: (error: Error | null, item?: ReservationInstance) => any ): Promise { const headers: any = {}; @@ -298,25 +298,30 @@ export class ReservationContextImpl implements ReservationContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ReservationInstance( - operationVersion, - payload, - instance._solution.workspaceSid, - instance._solution.taskSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new ReservationInstance( + operationVersion, + payload, + instance._solution.workspaceSid, + instance._solution.taskSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | ReservationContextUpdateOptions | ((error: Error | null, item?: ReservationInstance) => any), @@ -467,22 +472,27 @@ export class ReservationContextImpl implements ReservationContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ReservationInstance( - operationVersion, - payload, - instance._solution.workspaceSid, - instance._solution.taskSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new ReservationInstance( + operationVersion, + payload, + instance._solution.workspaceSid, + instance._solution.taskSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/taskrouter/v1/workspace/taskChannel.ts b/src/rest/taskrouter/v1/workspace/taskChannel.ts index 865816a9d..996d9d401 100644 --- a/src/rest/taskrouter/v1/workspace/taskChannel.ts +++ b/src/rest/taskrouter/v1/workspace/taskChannel.ts @@ -172,7 +172,7 @@ export class TaskChannelContextImpl implements TaskChannelContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: TaskChannelInstance) => any ): Promise { const headers: any = {}; @@ -186,24 +186,29 @@ export class TaskChannelContextImpl implements TaskChannelContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new TaskChannelInstance( - operationVersion, - payload, - instance._solution.workspaceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new TaskChannelInstance( + operationVersion, + payload, + instance._solution.workspaceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | TaskChannelContextUpdateOptions | ((error: Error | null, item?: TaskChannelInstance) => any), @@ -238,21 +243,26 @@ export class TaskChannelContextImpl implements TaskChannelContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new TaskChannelInstance( - operationVersion, - payload, - instance._solution.workspaceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new TaskChannelInstance( + operationVersion, + payload, + instance._solution.workspaceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/taskrouter/v1/workspace/taskQueue.ts b/src/rest/taskrouter/v1/workspace/taskQueue.ts index fdb9224f4..8389e41df 100644 --- a/src/rest/taskrouter/v1/workspace/taskQueue.ts +++ b/src/rest/taskrouter/v1/workspace/taskQueue.ts @@ -258,7 +258,7 @@ export class TaskQueueContextImpl implements TaskQueueContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: TaskQueueInstance) => any ): Promise { const headers: any = {}; @@ -272,24 +272,29 @@ export class TaskQueueContextImpl implements TaskQueueContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new TaskQueueInstance( - operationVersion, - payload, - instance._solution.workspaceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new TaskQueueInstance( + operationVersion, + payload, + instance._solution.workspaceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | TaskQueueContextUpdateOptions | ((error: Error | null, item?: TaskQueueInstance) => any), @@ -330,21 +335,26 @@ export class TaskQueueContextImpl implements TaskQueueContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new TaskQueueInstance( - operationVersion, - payload, - instance._solution.workspaceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new TaskQueueInstance( + operationVersion, + payload, + instance._solution.workspaceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/taskrouter/v1/workspace/taskQueue/taskQueueCumulativeStatistics.ts b/src/rest/taskrouter/v1/workspace/taskQueue/taskQueueCumulativeStatistics.ts index d40c14638..f69974333 100644 --- a/src/rest/taskrouter/v1/workspace/taskQueue/taskQueueCumulativeStatistics.ts +++ b/src/rest/taskrouter/v1/workspace/taskQueue/taskQueueCumulativeStatistics.ts @@ -99,7 +99,7 @@ export class TaskQueueCumulativeStatisticsContextImpl this._uri = `/Workspaces/${workspaceSid}/TaskQueues/${taskQueueSid}/CumulativeStatistics`; } - fetch( + async fetch( params?: | TaskQueueCumulativeStatisticsContextFetchOptions | (( @@ -142,21 +142,26 @@ export class TaskQueueCumulativeStatisticsContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new TaskQueueCumulativeStatisticsInstance( - operationVersion, - payload, - instance._solution.workspaceSid, - instance._solution.taskQueueSid - ) - ); + try { + let payload = await operationPromise; + let operation = new TaskQueueCumulativeStatisticsInstance( + operationVersion, + payload, + instance._solution.workspaceSid, + instance._solution.taskQueueSid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/taskrouter/v1/workspace/taskQueue/taskQueueRealTimeStatistics.ts b/src/rest/taskrouter/v1/workspace/taskQueue/taskQueueRealTimeStatistics.ts index 83b3514ac..28088d359 100644 --- a/src/rest/taskrouter/v1/workspace/taskQueue/taskQueueRealTimeStatistics.ts +++ b/src/rest/taskrouter/v1/workspace/taskQueue/taskQueueRealTimeStatistics.ts @@ -91,7 +91,7 @@ export class TaskQueueRealTimeStatisticsContextImpl this._uri = `/Workspaces/${workspaceSid}/TaskQueues/${taskQueueSid}/RealTimeStatistics`; } - fetch( + async fetch( params?: | TaskQueueRealTimeStatisticsContextFetchOptions | (( @@ -127,21 +127,26 @@ export class TaskQueueRealTimeStatisticsContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new TaskQueueRealTimeStatisticsInstance( - operationVersion, - payload, - instance._solution.workspaceSid, - instance._solution.taskQueueSid - ) - ); + try { + let payload = await operationPromise; + let operation = new TaskQueueRealTimeStatisticsInstance( + operationVersion, + payload, + instance._solution.workspaceSid, + instance._solution.taskQueueSid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/taskrouter/v1/workspace/taskQueue/taskQueueStatistics.ts b/src/rest/taskrouter/v1/workspace/taskQueue/taskQueueStatistics.ts index aa14236f3..6e73e82de 100644 --- a/src/rest/taskrouter/v1/workspace/taskQueue/taskQueueStatistics.ts +++ b/src/rest/taskrouter/v1/workspace/taskQueue/taskQueueStatistics.ts @@ -93,7 +93,7 @@ export class TaskQueueStatisticsContextImpl this._uri = `/Workspaces/${workspaceSid}/TaskQueues/${taskQueueSid}/Statistics`; } - fetch( + async fetch( params?: | TaskQueueStatisticsContextFetchOptions | ((error: Error | null, item?: TaskQueueStatisticsInstance) => any), @@ -130,21 +130,26 @@ export class TaskQueueStatisticsContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new TaskQueueStatisticsInstance( - operationVersion, - payload, - instance._solution.workspaceSid, - instance._solution.taskQueueSid - ) - ); + try { + let payload = await operationPromise; + let operation = new TaskQueueStatisticsInstance( + operationVersion, + payload, + instance._solution.workspaceSid, + instance._solution.taskQueueSid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/taskrouter/v1/workspace/worker.ts b/src/rest/taskrouter/v1/workspace/worker.ts index b8eb398d5..e46e0073f 100644 --- a/src/rest/taskrouter/v1/workspace/worker.ts +++ b/src/rest/taskrouter/v1/workspace/worker.ts @@ -308,7 +308,7 @@ export class WorkerContextImpl implements WorkerContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: WorkerInstance) => any ): Promise { const headers: any = {}; @@ -322,24 +322,29 @@ export class WorkerContextImpl implements WorkerContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new WorkerInstance( - operationVersion, - payload, - instance._solution.workspaceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new WorkerInstance( + operationVersion, + payload, + instance._solution.workspaceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | WorkerContextUpdateOptions | ((error: Error | null, item?: WorkerInstance) => any), @@ -380,21 +385,26 @@ export class WorkerContextImpl implements WorkerContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new WorkerInstance( - operationVersion, - payload, - instance._solution.workspaceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new WorkerInstance( + operationVersion, + payload, + instance._solution.workspaceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/taskrouter/v1/workspace/worker/reservation.ts b/src/rest/taskrouter/v1/workspace/worker/reservation.ts index 051e7e191..9aa41d371 100644 --- a/src/rest/taskrouter/v1/workspace/worker/reservation.ts +++ b/src/rest/taskrouter/v1/workspace/worker/reservation.ts @@ -272,7 +272,7 @@ export class ReservationContextImpl implements ReservationContext { this._uri = `/Workspaces/${workspaceSid}/Workers/${workerSid}/Reservations/${sid}`; } - fetch( + async fetch( callback?: (error: Error | null, item?: ReservationInstance) => any ): Promise { const headers: any = {}; @@ -286,25 +286,30 @@ export class ReservationContextImpl implements ReservationContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ReservationInstance( - operationVersion, - payload, - instance._solution.workspaceSid, - instance._solution.workerSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new ReservationInstance( + operationVersion, + payload, + instance._solution.workspaceSid, + instance._solution.workerSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | ReservationContextUpdateOptions | ((error: Error | null, item?: ReservationInstance) => any), @@ -451,22 +456,27 @@ export class ReservationContextImpl implements ReservationContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ReservationInstance( - operationVersion, - payload, - instance._solution.workspaceSid, - instance._solution.workerSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new ReservationInstance( + operationVersion, + payload, + instance._solution.workspaceSid, + instance._solution.workerSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/taskrouter/v1/workspace/worker/workerChannel.ts b/src/rest/taskrouter/v1/workspace/worker/workerChannel.ts index 4e91fc0dc..b9aee1864 100644 --- a/src/rest/taskrouter/v1/workspace/worker/workerChannel.ts +++ b/src/rest/taskrouter/v1/workspace/worker/workerChannel.ts @@ -139,7 +139,7 @@ export class WorkerChannelContextImpl implements WorkerChannelContext { this._uri = `/Workspaces/${workspaceSid}/Workers/${workerSid}/Channels/${sid}`; } - fetch( + async fetch( callback?: (error: Error | null, item?: WorkerChannelInstance) => any ): Promise { const headers: any = {}; @@ -153,25 +153,30 @@ export class WorkerChannelContextImpl implements WorkerChannelContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new WorkerChannelInstance( - operationVersion, - payload, - instance._solution.workspaceSid, - instance._solution.workerSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new WorkerChannelInstance( + operationVersion, + payload, + instance._solution.workspaceSid, + instance._solution.workerSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | WorkerChannelContextUpdateOptions | ((error: Error | null, item?: WorkerChannelInstance) => any), @@ -203,22 +208,27 @@ export class WorkerChannelContextImpl implements WorkerChannelContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new WorkerChannelInstance( - operationVersion, - payload, - instance._solution.workspaceSid, - instance._solution.workerSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new WorkerChannelInstance( + operationVersion, + payload, + instance._solution.workspaceSid, + instance._solution.workerSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/taskrouter/v1/workspace/worker/workerStatistics.ts b/src/rest/taskrouter/v1/workspace/worker/workerStatistics.ts index ccfc64fc3..f29e930aa 100644 --- a/src/rest/taskrouter/v1/workspace/worker/workerStatistics.ts +++ b/src/rest/taskrouter/v1/workspace/worker/workerStatistics.ts @@ -85,7 +85,7 @@ export class WorkerStatisticsContextImpl implements WorkerStatisticsContext { this._uri = `/Workspaces/${workspaceSid}/Workers/${workerSid}/Statistics`; } - fetch( + async fetch( params?: | WorkerStatisticsContextFetchOptions | ((error: Error | null, item?: WorkerStatisticsInstance) => any), @@ -120,21 +120,26 @@ export class WorkerStatisticsContextImpl implements WorkerStatisticsContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new WorkerStatisticsInstance( - operationVersion, - payload, - instance._solution.workspaceSid, - instance._solution.workerSid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new WorkerStatisticsInstance( + operationVersion, + payload, + instance._solution.workspaceSid, + instance._solution.workerSid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/taskrouter/v1/workspace/worker/workersCumulativeStatistics.ts b/src/rest/taskrouter/v1/workspace/worker/workersCumulativeStatistics.ts index fcdad66cb..2fc1ed2ee 100644 --- a/src/rest/taskrouter/v1/workspace/worker/workersCumulativeStatistics.ts +++ b/src/rest/taskrouter/v1/workspace/worker/workersCumulativeStatistics.ts @@ -88,7 +88,7 @@ export class WorkersCumulativeStatisticsContextImpl this._uri = `/Workspaces/${workspaceSid}/Workers/CumulativeStatistics`; } - fetch( + async fetch( params?: | WorkersCumulativeStatisticsContextFetchOptions | (( @@ -129,20 +129,25 @@ export class WorkersCumulativeStatisticsContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new WorkersCumulativeStatisticsInstance( - operationVersion, - payload, - instance._solution.workspaceSid - ) - ); + try { + let payload = await operationPromise; + let operation = new WorkersCumulativeStatisticsInstance( + operationVersion, + payload, + instance._solution.workspaceSid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/taskrouter/v1/workspace/worker/workersRealTimeStatistics.ts b/src/rest/taskrouter/v1/workspace/worker/workersRealTimeStatistics.ts index 03cbb4922..32bd4642e 100644 --- a/src/rest/taskrouter/v1/workspace/worker/workersRealTimeStatistics.ts +++ b/src/rest/taskrouter/v1/workspace/worker/workersRealTimeStatistics.ts @@ -82,7 +82,7 @@ export class WorkersRealTimeStatisticsContextImpl this._uri = `/Workspaces/${workspaceSid}/Workers/RealTimeStatistics`; } - fetch( + async fetch( params?: | WorkersRealTimeStatisticsContextFetchOptions | (( @@ -118,20 +118,25 @@ export class WorkersRealTimeStatisticsContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new WorkersRealTimeStatisticsInstance( - operationVersion, - payload, - instance._solution.workspaceSid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new WorkersRealTimeStatisticsInstance( + operationVersion, + payload, + instance._solution.workspaceSid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/taskrouter/v1/workspace/worker/workersStatistics.ts b/src/rest/taskrouter/v1/workspace/worker/workersStatistics.ts index 7408e8326..989ac5ba8 100644 --- a/src/rest/taskrouter/v1/workspace/worker/workersStatistics.ts +++ b/src/rest/taskrouter/v1/workspace/worker/workersStatistics.ts @@ -86,7 +86,7 @@ export class WorkersStatisticsContextImpl implements WorkersStatisticsContext { this._uri = `/Workspaces/${workspaceSid}/Workers/Statistics`; } - fetch( + async fetch( params?: | WorkersStatisticsContextFetchOptions | ((error: Error | null, item?: WorkersStatisticsInstance) => any), @@ -127,20 +127,25 @@ export class WorkersStatisticsContextImpl implements WorkersStatisticsContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new WorkersStatisticsInstance( - operationVersion, - payload, - instance._solution.workspaceSid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new WorkersStatisticsInstance( + operationVersion, + payload, + instance._solution.workspaceSid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/taskrouter/v1/workspace/workflow.ts b/src/rest/taskrouter/v1/workspace/workflow.ts index 52742c7cc..d8119fb48 100644 --- a/src/rest/taskrouter/v1/workspace/workflow.ts +++ b/src/rest/taskrouter/v1/workspace/workflow.ts @@ -234,7 +234,7 @@ export class WorkflowContextImpl implements WorkflowContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: WorkflowInstance) => any ): Promise { const headers: any = {}; @@ -248,24 +248,29 @@ export class WorkflowContextImpl implements WorkflowContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new WorkflowInstance( - operationVersion, - payload, - instance._solution.workspaceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new WorkflowInstance( + operationVersion, + payload, + instance._solution.workspaceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | WorkflowContextUpdateOptions | ((error: Error | null, item?: WorkflowInstance) => any), @@ -307,21 +312,26 @@ export class WorkflowContextImpl implements WorkflowContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new WorkflowInstance( - operationVersion, - payload, - instance._solution.workspaceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new WorkflowInstance( + operationVersion, + payload, + instance._solution.workspaceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/taskrouter/v1/workspace/workflow/workflowCumulativeStatistics.ts b/src/rest/taskrouter/v1/workspace/workflow/workflowCumulativeStatistics.ts index ad02e5915..5d1939cfd 100644 --- a/src/rest/taskrouter/v1/workspace/workflow/workflowCumulativeStatistics.ts +++ b/src/rest/taskrouter/v1/workspace/workflow/workflowCumulativeStatistics.ts @@ -99,7 +99,7 @@ export class WorkflowCumulativeStatisticsContextImpl this._uri = `/Workspaces/${workspaceSid}/Workflows/${workflowSid}/CumulativeStatistics`; } - fetch( + async fetch( params?: | WorkflowCumulativeStatisticsContextFetchOptions | (( @@ -142,21 +142,26 @@ export class WorkflowCumulativeStatisticsContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new WorkflowCumulativeStatisticsInstance( - operationVersion, - payload, - instance._solution.workspaceSid, - instance._solution.workflowSid - ) - ); + try { + let payload = await operationPromise; + let operation = new WorkflowCumulativeStatisticsInstance( + operationVersion, + payload, + instance._solution.workspaceSid, + instance._solution.workflowSid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/taskrouter/v1/workspace/workflow/workflowRealTimeStatistics.ts b/src/rest/taskrouter/v1/workspace/workflow/workflowRealTimeStatistics.ts index 1e22ffcde..e2d1e6eb1 100644 --- a/src/rest/taskrouter/v1/workspace/workflow/workflowRealTimeStatistics.ts +++ b/src/rest/taskrouter/v1/workspace/workflow/workflowRealTimeStatistics.ts @@ -91,7 +91,7 @@ export class WorkflowRealTimeStatisticsContextImpl this._uri = `/Workspaces/${workspaceSid}/Workflows/${workflowSid}/RealTimeStatistics`; } - fetch( + async fetch( params?: | WorkflowRealTimeStatisticsContextFetchOptions | (( @@ -127,21 +127,26 @@ export class WorkflowRealTimeStatisticsContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new WorkflowRealTimeStatisticsInstance( - operationVersion, - payload, - instance._solution.workspaceSid, - instance._solution.workflowSid - ) - ); + try { + let payload = await operationPromise; + let operation = new WorkflowRealTimeStatisticsInstance( + operationVersion, + payload, + instance._solution.workspaceSid, + instance._solution.workflowSid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/taskrouter/v1/workspace/workflow/workflowStatistics.ts b/src/rest/taskrouter/v1/workspace/workflow/workflowStatistics.ts index 85db470ff..be8509463 100644 --- a/src/rest/taskrouter/v1/workspace/workflow/workflowStatistics.ts +++ b/src/rest/taskrouter/v1/workspace/workflow/workflowStatistics.ts @@ -93,7 +93,7 @@ export class WorkflowStatisticsContextImpl this._uri = `/Workspaces/${workspaceSid}/Workflows/${workflowSid}/Statistics`; } - fetch( + async fetch( params?: | WorkflowStatisticsContextFetchOptions | ((error: Error | null, item?: WorkflowStatisticsInstance) => any), @@ -130,21 +130,26 @@ export class WorkflowStatisticsContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new WorkflowStatisticsInstance( - operationVersion, - payload, - instance._solution.workspaceSid, - instance._solution.workflowSid - ) - ); + try { + let payload = await operationPromise; + let operation = new WorkflowStatisticsInstance( + operationVersion, + payload, + instance._solution.workspaceSid, + instance._solution.workflowSid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/taskrouter/v1/workspace/workspaceCumulativeStatistics.ts b/src/rest/taskrouter/v1/workspace/workspaceCumulativeStatistics.ts index 901c47586..cddf339cc 100644 --- a/src/rest/taskrouter/v1/workspace/workspaceCumulativeStatistics.ts +++ b/src/rest/taskrouter/v1/workspace/workspaceCumulativeStatistics.ts @@ -90,7 +90,7 @@ export class WorkspaceCumulativeStatisticsContextImpl this._uri = `/Workspaces/${workspaceSid}/CumulativeStatistics`; } - fetch( + async fetch( params?: | WorkspaceCumulativeStatisticsContextFetchOptions | (( @@ -133,20 +133,25 @@ export class WorkspaceCumulativeStatisticsContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new WorkspaceCumulativeStatisticsInstance( - operationVersion, - payload, - instance._solution.workspaceSid - ) - ); + try { + let payload = await operationPromise; + let operation = new WorkspaceCumulativeStatisticsInstance( + operationVersion, + payload, + instance._solution.workspaceSid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/taskrouter/v1/workspace/workspaceRealTimeStatistics.ts b/src/rest/taskrouter/v1/workspace/workspaceRealTimeStatistics.ts index 5d0147ebd..d68e3a869 100644 --- a/src/rest/taskrouter/v1/workspace/workspaceRealTimeStatistics.ts +++ b/src/rest/taskrouter/v1/workspace/workspaceRealTimeStatistics.ts @@ -82,7 +82,7 @@ export class WorkspaceRealTimeStatisticsContextImpl this._uri = `/Workspaces/${workspaceSid}/RealTimeStatistics`; } - fetch( + async fetch( params?: | WorkspaceRealTimeStatisticsContextFetchOptions | (( @@ -118,20 +118,25 @@ export class WorkspaceRealTimeStatisticsContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new WorkspaceRealTimeStatisticsInstance( - operationVersion, - payload, - instance._solution.workspaceSid - ) - ); + try { + let payload = await operationPromise; + let operation = new WorkspaceRealTimeStatisticsInstance( + operationVersion, + payload, + instance._solution.workspaceSid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/taskrouter/v1/workspace/workspaceStatistics.ts b/src/rest/taskrouter/v1/workspace/workspaceStatistics.ts index 61cf3db2f..430d8ff1f 100644 --- a/src/rest/taskrouter/v1/workspace/workspaceStatistics.ts +++ b/src/rest/taskrouter/v1/workspace/workspaceStatistics.ts @@ -84,7 +84,7 @@ export class WorkspaceStatisticsContextImpl this._uri = `/Workspaces/${workspaceSid}/Statistics`; } - fetch( + async fetch( params?: | WorkspaceStatisticsContextFetchOptions | ((error: Error | null, item?: WorkspaceStatisticsInstance) => any), @@ -121,20 +121,25 @@ export class WorkspaceStatisticsContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new WorkspaceStatisticsInstance( - operationVersion, - payload, - instance._solution.workspaceSid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new WorkspaceStatisticsInstance( + operationVersion, + payload, + instance._solution.workspaceSid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/trunking/v1/trunk.ts b/src/rest/trunking/v1/trunk.ts index 782c9ffe1..94f93e871 100644 --- a/src/rest/trunking/v1/trunk.ts +++ b/src/rest/trunking/v1/trunk.ts @@ -245,7 +245,7 @@ export class TrunkContextImpl implements TrunkContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: TrunkInstance) => any ): Promise { const headers: any = {}; @@ -259,19 +259,28 @@ export class TrunkContextImpl implements TrunkContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new TrunkInstance(operationVersion, payload, instance._solution.sid) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new TrunkInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | TrunkContextUpdateOptions | ((error: Error | null, item?: TrunkInstance) => any), @@ -316,16 +325,25 @@ export class TrunkContextImpl implements TrunkContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new TrunkInstance(operationVersion, payload, instance._solution.sid) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new TrunkInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/trunking/v1/trunk/credentialList.ts b/src/rest/trunking/v1/trunk/credentialList.ts index 00b775df3..77418b04e 100644 --- a/src/rest/trunking/v1/trunk/credentialList.ts +++ b/src/rest/trunking/v1/trunk/credentialList.ts @@ -138,7 +138,7 @@ export class CredentialListContextImpl implements CredentialListContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: CredentialListInstance) => any ): Promise { const headers: any = {}; @@ -152,21 +152,26 @@ export class CredentialListContextImpl implements CredentialListContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new CredentialListInstance( - operationVersion, - payload, - instance._solution.trunkSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new CredentialListInstance( + operationVersion, + payload, + instance._solution.trunkSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/trunking/v1/trunk/ipAccessControlList.ts b/src/rest/trunking/v1/trunk/ipAccessControlList.ts index 9fa0bd8c5..1f6af5fe1 100644 --- a/src/rest/trunking/v1/trunk/ipAccessControlList.ts +++ b/src/rest/trunking/v1/trunk/ipAccessControlList.ts @@ -140,7 +140,7 @@ export class IpAccessControlListContextImpl return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: IpAccessControlListInstance) => any ): Promise { const headers: any = {}; @@ -154,21 +154,26 @@ export class IpAccessControlListContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new IpAccessControlListInstance( - operationVersion, - payload, - instance._solution.trunkSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new IpAccessControlListInstance( + operationVersion, + payload, + instance._solution.trunkSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/trunking/v1/trunk/originationUrl.ts b/src/rest/trunking/v1/trunk/originationUrl.ts index 328b1c86a..d0ca27731 100644 --- a/src/rest/trunking/v1/trunk/originationUrl.ts +++ b/src/rest/trunking/v1/trunk/originationUrl.ts @@ -185,7 +185,7 @@ export class OriginationUrlContextImpl implements OriginationUrlContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: OriginationUrlInstance) => any ): Promise { const headers: any = {}; @@ -199,24 +199,29 @@ export class OriginationUrlContextImpl implements OriginationUrlContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new OriginationUrlInstance( - operationVersion, - payload, - instance._solution.trunkSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new OriginationUrlInstance( + operationVersion, + payload, + instance._solution.trunkSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | OriginationUrlContextUpdateOptions | ((error: Error | null, item?: OriginationUrlInstance) => any), @@ -252,21 +257,26 @@ export class OriginationUrlContextImpl implements OriginationUrlContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new OriginationUrlInstance( - operationVersion, - payload, - instance._solution.trunkSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new OriginationUrlInstance( + operationVersion, + payload, + instance._solution.trunkSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/trunking/v1/trunk/phoneNumber.ts b/src/rest/trunking/v1/trunk/phoneNumber.ts index a97f22154..2fc6aa2f3 100644 --- a/src/rest/trunking/v1/trunk/phoneNumber.ts +++ b/src/rest/trunking/v1/trunk/phoneNumber.ts @@ -141,7 +141,7 @@ export class PhoneNumberContextImpl implements PhoneNumberContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: PhoneNumberInstance) => any ): Promise { const headers: any = {}; @@ -155,21 +155,26 @@ export class PhoneNumberContextImpl implements PhoneNumberContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new PhoneNumberInstance( - operationVersion, - payload, - instance._solution.trunkSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new PhoneNumberInstance( + operationVersion, + payload, + instance._solution.trunkSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/trunking/v1/trunk/recording.ts b/src/rest/trunking/v1/trunk/recording.ts index dae79865b..a0ddaf190 100644 --- a/src/rest/trunking/v1/trunk/recording.ts +++ b/src/rest/trunking/v1/trunk/recording.ts @@ -96,7 +96,7 @@ export class RecordingContextImpl implements RecordingContext { this._uri = `/Trunks/${trunkSid}/Recording`; } - fetch( + async fetch( callback?: (error: Error | null, item?: RecordingInstance) => any ): Promise { const headers: any = {}; @@ -110,23 +110,28 @@ export class RecordingContextImpl implements RecordingContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new RecordingInstance( - operationVersion, - payload, - instance._solution.trunkSid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new RecordingInstance( + operationVersion, + payload, + instance._solution.trunkSid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | RecordingContextUpdateOptions | ((error: Error | null, item?: RecordingInstance) => any), @@ -157,20 +162,25 @@ export class RecordingContextImpl implements RecordingContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new RecordingInstance( - operationVersion, - payload, - instance._solution.trunkSid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new RecordingInstance( + operationVersion, + payload, + instance._solution.trunkSid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/trusthub/v1/complianceInquiries.ts b/src/rest/trusthub/v1/complianceInquiries.ts index bccb0c818..19b4a5b13 100644 --- a/src/rest/trusthub/v1/complianceInquiries.ts +++ b/src/rest/trusthub/v1/complianceInquiries.ts @@ -80,7 +80,7 @@ export class ComplianceInquiriesContextImpl this._uri = `/ComplianceInquiries/Customers/${customerId}/Initialize`; } - update( + async update( params: ComplianceInquiriesContextUpdateOptions, callback?: (error: Error | null, item?: ComplianceInquiriesInstance) => any ): Promise { @@ -116,20 +116,25 @@ export class ComplianceInquiriesContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new ComplianceInquiriesInstance( - operationVersion, - payload, - instance._solution.customerId - ) - ); + try { + let payload = await operationPromise; + let operation = new ComplianceInquiriesInstance( + operationVersion, + payload, + instance._solution.customerId + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/trusthub/v1/complianceRegistrationInquiries.ts b/src/rest/trusthub/v1/complianceRegistrationInquiries.ts index c71c5739f..b7b967945 100644 --- a/src/rest/trusthub/v1/complianceRegistrationInquiries.ts +++ b/src/rest/trusthub/v1/complianceRegistrationInquiries.ts @@ -190,7 +190,7 @@ export class ComplianceRegistrationInquiriesContextImpl this._uri = `/ComplianceInquiries/Registration/${registrationId}/RegulatoryCompliance/GB/Initialize`; } - update( + async update( params?: | ComplianceRegistrationInquiriesContextUpdateOptions | (( @@ -229,20 +229,25 @@ export class ComplianceRegistrationInquiriesContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new ComplianceRegistrationInquiriesInstance( - operationVersion, - payload, - instance._solution.registrationId - ) - ); + try { + let payload = await operationPromise; + let operation = new ComplianceRegistrationInquiriesInstance( + operationVersion, + payload, + instance._solution.registrationId + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/trusthub/v1/customerProfiles.ts b/src/rest/trusthub/v1/customerProfiles.ts index 3ee5e3e00..fff75cae9 100644 --- a/src/rest/trusthub/v1/customerProfiles.ts +++ b/src/rest/trusthub/v1/customerProfiles.ts @@ -242,7 +242,7 @@ export class CustomerProfilesContextImpl implements CustomerProfilesContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: CustomerProfilesInstance) => any ): Promise { const headers: any = {}; @@ -256,23 +256,28 @@ export class CustomerProfilesContextImpl implements CustomerProfilesContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new CustomerProfilesInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new CustomerProfilesInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | CustomerProfilesContextUpdateOptions | ((error: Error | null, item?: CustomerProfilesInstance) => any), @@ -307,20 +312,25 @@ export class CustomerProfilesContextImpl implements CustomerProfilesContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new CustomerProfilesInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new CustomerProfilesInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/trusthub/v1/customerProfiles/customerProfilesChannelEndpointAssignment.ts b/src/rest/trusthub/v1/customerProfiles/customerProfilesChannelEndpointAssignment.ts index ab848abda..afc938f07 100644 --- a/src/rest/trusthub/v1/customerProfiles/customerProfilesChannelEndpointAssignment.ts +++ b/src/rest/trusthub/v1/customerProfiles/customerProfilesChannelEndpointAssignment.ts @@ -157,7 +157,7 @@ export class CustomerProfilesChannelEndpointAssignmentContextImpl return operationPromise; } - fetch( + async fetch( callback?: ( error: Error | null, item?: CustomerProfilesChannelEndpointAssignmentInstance @@ -174,21 +174,26 @@ export class CustomerProfilesChannelEndpointAssignmentContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new CustomerProfilesChannelEndpointAssignmentInstance( - operationVersion, - payload, - instance._solution.customerProfileSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new CustomerProfilesChannelEndpointAssignmentInstance( + operationVersion, + payload, + instance._solution.customerProfileSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/trusthub/v1/customerProfiles/customerProfilesEntityAssignments.ts b/src/rest/trusthub/v1/customerProfiles/customerProfilesEntityAssignments.ts index 284f08410..fe78f2579 100644 --- a/src/rest/trusthub/v1/customerProfiles/customerProfilesEntityAssignments.ts +++ b/src/rest/trusthub/v1/customerProfiles/customerProfilesEntityAssignments.ts @@ -149,7 +149,7 @@ export class CustomerProfilesEntityAssignmentsContextImpl return operationPromise; } - fetch( + async fetch( callback?: ( error: Error | null, item?: CustomerProfilesEntityAssignmentsInstance @@ -166,21 +166,26 @@ export class CustomerProfilesEntityAssignmentsContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new CustomerProfilesEntityAssignmentsInstance( - operationVersion, - payload, - instance._solution.customerProfileSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new CustomerProfilesEntityAssignmentsInstance( + operationVersion, + payload, + instance._solution.customerProfileSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/trusthub/v1/customerProfiles/customerProfilesEvaluations.ts b/src/rest/trusthub/v1/customerProfiles/customerProfilesEvaluations.ts index 1c95ebd2a..854d92a26 100644 --- a/src/rest/trusthub/v1/customerProfiles/customerProfilesEvaluations.ts +++ b/src/rest/trusthub/v1/customerProfiles/customerProfilesEvaluations.ts @@ -114,7 +114,7 @@ export class CustomerProfilesEvaluationsContextImpl this._uri = `/CustomerProfiles/${customerProfileSid}/Evaluations/${sid}`; } - fetch( + async fetch( callback?: ( error: Error | null, item?: CustomerProfilesEvaluationsInstance @@ -131,21 +131,26 @@ export class CustomerProfilesEvaluationsContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new CustomerProfilesEvaluationsInstance( - operationVersion, - payload, - instance._solution.customerProfileSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new CustomerProfilesEvaluationsInstance( + operationVersion, + payload, + instance._solution.customerProfileSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/trusthub/v1/endUser.ts b/src/rest/trusthub/v1/endUser.ts index b4d63a581..54ede18d9 100644 --- a/src/rest/trusthub/v1/endUser.ts +++ b/src/rest/trusthub/v1/endUser.ts @@ -167,7 +167,7 @@ export class EndUserContextImpl implements EndUserContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: EndUserInstance) => any ): Promise { const headers: any = {}; @@ -181,19 +181,28 @@ export class EndUserContextImpl implements EndUserContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new EndUserInstance(operationVersion, payload, instance._solution.sid) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new EndUserInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | EndUserContextUpdateOptions | ((error: Error | null, item?: EndUserInstance) => any), @@ -226,16 +235,25 @@ export class EndUserContextImpl implements EndUserContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new EndUserInstance(operationVersion, payload, instance._solution.sid) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new EndUserInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/trusthub/v1/endUserType.ts b/src/rest/trusthub/v1/endUserType.ts index 0632ea85a..1ea960b87 100644 --- a/src/rest/trusthub/v1/endUserType.ts +++ b/src/rest/trusthub/v1/endUserType.ts @@ -92,7 +92,7 @@ export class EndUserTypeContextImpl implements EndUserTypeContext { this._uri = `/EndUserTypes/${sid}`; } - fetch( + async fetch( callback?: (error: Error | null, item?: EndUserTypeInstance) => any ): Promise { const headers: any = {}; @@ -106,20 +106,25 @@ export class EndUserTypeContextImpl implements EndUserTypeContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new EndUserTypeInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new EndUserTypeInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/trusthub/v1/policies.ts b/src/rest/trusthub/v1/policies.ts index 43a75fb51..f244e9cd8 100644 --- a/src/rest/trusthub/v1/policies.ts +++ b/src/rest/trusthub/v1/policies.ts @@ -92,7 +92,7 @@ export class PoliciesContextImpl implements PoliciesContext { this._uri = `/Policies/${sid}`; } - fetch( + async fetch( callback?: (error: Error | null, item?: PoliciesInstance) => any ): Promise { const headers: any = {}; @@ -106,16 +106,25 @@ export class PoliciesContextImpl implements PoliciesContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new PoliciesInstance(operationVersion, payload, instance._solution.sid) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new PoliciesInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/trusthub/v1/supportingDocument.ts b/src/rest/trusthub/v1/supportingDocument.ts index 4a7756b0b..6d70b0658 100644 --- a/src/rest/trusthub/v1/supportingDocument.ts +++ b/src/rest/trusthub/v1/supportingDocument.ts @@ -180,7 +180,7 @@ export class SupportingDocumentContextImpl return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: SupportingDocumentInstance) => any ): Promise { const headers: any = {}; @@ -194,23 +194,28 @@ export class SupportingDocumentContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new SupportingDocumentInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new SupportingDocumentInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | SupportingDocumentContextUpdateOptions | ((error: Error | null, item?: SupportingDocumentInstance) => any), @@ -243,20 +248,25 @@ export class SupportingDocumentContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new SupportingDocumentInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new SupportingDocumentInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/trusthub/v1/supportingDocumentType.ts b/src/rest/trusthub/v1/supportingDocumentType.ts index 2c0936acd..7ab427a81 100644 --- a/src/rest/trusthub/v1/supportingDocumentType.ts +++ b/src/rest/trusthub/v1/supportingDocumentType.ts @@ -100,7 +100,7 @@ export class SupportingDocumentTypeContextImpl this._uri = `/SupportingDocumentTypes/${sid}`; } - fetch( + async fetch( callback?: ( error: Error | null, item?: SupportingDocumentTypeInstance @@ -117,20 +117,25 @@ export class SupportingDocumentTypeContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new SupportingDocumentTypeInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new SupportingDocumentTypeInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/trusthub/v1/trustProducts.ts b/src/rest/trusthub/v1/trustProducts.ts index 22ed8803a..4cba8966d 100644 --- a/src/rest/trusthub/v1/trustProducts.ts +++ b/src/rest/trusthub/v1/trustProducts.ts @@ -236,7 +236,7 @@ export class TrustProductsContextImpl implements TrustProductsContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: TrustProductsInstance) => any ): Promise { const headers: any = {}; @@ -250,23 +250,28 @@ export class TrustProductsContextImpl implements TrustProductsContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new TrustProductsInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new TrustProductsInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | TrustProductsContextUpdateOptions | ((error: Error | null, item?: TrustProductsInstance) => any), @@ -301,20 +306,25 @@ export class TrustProductsContextImpl implements TrustProductsContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new TrustProductsInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new TrustProductsInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/trusthub/v1/trustProducts/trustProductsChannelEndpointAssignment.ts b/src/rest/trusthub/v1/trustProducts/trustProductsChannelEndpointAssignment.ts index 659e00e52..895e56339 100644 --- a/src/rest/trusthub/v1/trustProducts/trustProductsChannelEndpointAssignment.ts +++ b/src/rest/trusthub/v1/trustProducts/trustProductsChannelEndpointAssignment.ts @@ -157,7 +157,7 @@ export class TrustProductsChannelEndpointAssignmentContextImpl return operationPromise; } - fetch( + async fetch( callback?: ( error: Error | null, item?: TrustProductsChannelEndpointAssignmentInstance @@ -174,21 +174,26 @@ export class TrustProductsChannelEndpointAssignmentContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new TrustProductsChannelEndpointAssignmentInstance( - operationVersion, - payload, - instance._solution.trustProductSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new TrustProductsChannelEndpointAssignmentInstance( + operationVersion, + payload, + instance._solution.trustProductSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/trusthub/v1/trustProducts/trustProductsEntityAssignments.ts b/src/rest/trusthub/v1/trustProducts/trustProductsEntityAssignments.ts index 7ae9f7645..1655d522f 100644 --- a/src/rest/trusthub/v1/trustProducts/trustProductsEntityAssignments.ts +++ b/src/rest/trusthub/v1/trustProducts/trustProductsEntityAssignments.ts @@ -149,7 +149,7 @@ export class TrustProductsEntityAssignmentsContextImpl return operationPromise; } - fetch( + async fetch( callback?: ( error: Error | null, item?: TrustProductsEntityAssignmentsInstance @@ -166,21 +166,26 @@ export class TrustProductsEntityAssignmentsContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new TrustProductsEntityAssignmentsInstance( - operationVersion, - payload, - instance._solution.trustProductSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new TrustProductsEntityAssignmentsInstance( + operationVersion, + payload, + instance._solution.trustProductSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/trusthub/v1/trustProducts/trustProductsEvaluations.ts b/src/rest/trusthub/v1/trustProducts/trustProductsEvaluations.ts index 6c9dd24c0..e80db7a72 100644 --- a/src/rest/trusthub/v1/trustProducts/trustProductsEvaluations.ts +++ b/src/rest/trusthub/v1/trustProducts/trustProductsEvaluations.ts @@ -114,7 +114,7 @@ export class TrustProductsEvaluationsContextImpl this._uri = `/TrustProducts/${trustProductSid}/Evaluations/${sid}`; } - fetch( + async fetch( callback?: ( error: Error | null, item?: TrustProductsEvaluationsInstance @@ -131,21 +131,26 @@ export class TrustProductsEvaluationsContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new TrustProductsEvaluationsInstance( - operationVersion, - payload, - instance._solution.trustProductSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new TrustProductsEvaluationsInstance( + operationVersion, + payload, + instance._solution.trustProductSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/verify/v2/form.ts b/src/rest/verify/v2/form.ts index ab7017c3c..7067befe1 100644 --- a/src/rest/verify/v2/form.ts +++ b/src/rest/verify/v2/form.ts @@ -56,7 +56,7 @@ export class FormContextImpl implements FormContext { this._uri = `/Forms/${formType}`; } - fetch( + async fetch( callback?: (error: Error | null, item?: FormInstance) => any ): Promise { const headers: any = {}; @@ -70,16 +70,25 @@ export class FormContextImpl implements FormContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new FormInstance(operationVersion, payload, instance._solution.formType) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new FormInstance( + operationVersion, + payload, + instance._solution.formType + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/verify/v2/safelist.ts b/src/rest/verify/v2/safelist.ts index 47a394dc5..22a177f82 100644 --- a/src/rest/verify/v2/safelist.ts +++ b/src/rest/verify/v2/safelist.ts @@ -93,7 +93,7 @@ export class SafelistContextImpl implements SafelistContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: SafelistInstance) => any ): Promise { const headers: any = {}; @@ -107,20 +107,25 @@ export class SafelistContextImpl implements SafelistContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new SafelistInstance( - operationVersion, - payload, - instance._solution.phoneNumber - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new SafelistInstance( + operationVersion, + payload, + instance._solution.phoneNumber + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/verify/v2/service.ts b/src/rest/verify/v2/service.ts index c39ad9798..b184e4b0d 100644 --- a/src/rest/verify/v2/service.ts +++ b/src/rest/verify/v2/service.ts @@ -307,7 +307,7 @@ export class ServiceContextImpl implements ServiceContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: ServiceInstance) => any ): Promise { const headers: any = {}; @@ -321,19 +321,28 @@ export class ServiceContextImpl implements ServiceContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ServiceInstance(operationVersion, payload, instance._solution.sid) - ); + try { + let payload = await operationPromise; + let operation = new ServiceInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | ServiceContextUpdateOptions | ((error: Error | null, item?: ServiceInstance) => any), @@ -405,16 +414,25 @@ export class ServiceContextImpl implements ServiceContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ServiceInstance(operationVersion, payload, instance._solution.sid) - ); + try { + let payload = await operationPromise; + let operation = new ServiceInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/verify/v2/service/accessToken.ts b/src/rest/verify/v2/service/accessToken.ts index 45f7100cc..710e18f3d 100644 --- a/src/rest/verify/v2/service/accessToken.ts +++ b/src/rest/verify/v2/service/accessToken.ts @@ -75,7 +75,7 @@ export class AccessTokenContextImpl implements AccessTokenContext { this._uri = `/Services/${serviceSid}/AccessTokens/${sid}`; } - fetch( + async fetch( callback?: (error: Error | null, item?: AccessTokenInstance) => any ): Promise { const headers: any = {}; @@ -89,21 +89,26 @@ export class AccessTokenContextImpl implements AccessTokenContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new AccessTokenInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new AccessTokenInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/verify/v2/service/entity.ts b/src/rest/verify/v2/service/entity.ts index 518a733fa..d08c2431c 100644 --- a/src/rest/verify/v2/service/entity.ts +++ b/src/rest/verify/v2/service/entity.ts @@ -179,7 +179,7 @@ export class EntityContextImpl implements EntityContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: EntityInstance) => any ): Promise { const headers: any = {}; @@ -193,21 +193,26 @@ export class EntityContextImpl implements EntityContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new EntityInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.identity - ) - ); + try { + let payload = await operationPromise; + let operation = new EntityInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.identity + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/verify/v2/service/entity/challenge.ts b/src/rest/verify/v2/service/entity/challenge.ts index 839ea750a..a89a2f055 100644 --- a/src/rest/verify/v2/service/entity/challenge.ts +++ b/src/rest/verify/v2/service/entity/challenge.ts @@ -204,7 +204,7 @@ export class ChallengeContextImpl implements ChallengeContext { return this._notifications; } - fetch( + async fetch( callback?: (error: Error | null, item?: ChallengeInstance) => any ): Promise { const headers: any = {}; @@ -218,25 +218,30 @@ export class ChallengeContextImpl implements ChallengeContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ChallengeInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.identity, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new ChallengeInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.identity, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | ChallengeContextUpdateOptions | ((error: Error | null, item?: ChallengeInstance) => any), @@ -269,22 +274,27 @@ export class ChallengeContextImpl implements ChallengeContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ChallengeInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.identity, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new ChallengeInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.identity, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/verify/v2/service/entity/factor.ts b/src/rest/verify/v2/service/entity/factor.ts index 22400009e..7e2506649 100644 --- a/src/rest/verify/v2/service/entity/factor.ts +++ b/src/rest/verify/v2/service/entity/factor.ts @@ -190,7 +190,7 @@ export class FactorContextImpl implements FactorContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: FactorInstance) => any ): Promise { const headers: any = {}; @@ -204,25 +204,30 @@ export class FactorContextImpl implements FactorContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new FactorInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.identity, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new FactorInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.identity, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | FactorContextUpdateOptions | ((error: Error | null, item?: FactorInstance) => any), @@ -270,22 +275,27 @@ export class FactorContextImpl implements FactorContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new FactorInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.identity, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new FactorInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.identity, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/verify/v2/service/messagingConfiguration.ts b/src/rest/verify/v2/service/messagingConfiguration.ts index 433897c69..3bb0a86c0 100644 --- a/src/rest/verify/v2/service/messagingConfiguration.ts +++ b/src/rest/verify/v2/service/messagingConfiguration.ts @@ -169,7 +169,7 @@ export class MessagingConfigurationContextImpl return operationPromise; } - fetch( + async fetch( callback?: ( error: Error | null, item?: MessagingConfigurationInstance @@ -186,24 +186,29 @@ export class MessagingConfigurationContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new MessagingConfigurationInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.country - ) - ); + try { + let payload = await operationPromise; + let operation = new MessagingConfigurationInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.country + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params: MessagingConfigurationContextUpdateOptions, callback?: ( error: Error | null, @@ -240,21 +245,26 @@ export class MessagingConfigurationContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new MessagingConfigurationInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.country - ) - ); + try { + let payload = await operationPromise; + let operation = new MessagingConfigurationInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.country + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/verify/v2/service/rateLimit.ts b/src/rest/verify/v2/service/rateLimit.ts index 5acdd7f1e..d27ad6a66 100644 --- a/src/rest/verify/v2/service/rateLimit.ts +++ b/src/rest/verify/v2/service/rateLimit.ts @@ -184,7 +184,7 @@ export class RateLimitContextImpl implements RateLimitContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: RateLimitInstance) => any ): Promise { const headers: any = {}; @@ -198,24 +198,29 @@ export class RateLimitContextImpl implements RateLimitContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new RateLimitInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new RateLimitInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | RateLimitContextUpdateOptions | ((error: Error | null, item?: RateLimitInstance) => any), @@ -246,21 +251,26 @@ export class RateLimitContextImpl implements RateLimitContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new RateLimitInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new RateLimitInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/verify/v2/service/rateLimit/bucket.ts b/src/rest/verify/v2/service/rateLimit/bucket.ts index ff8310b27..5f876ac45 100644 --- a/src/rest/verify/v2/service/rateLimit/bucket.ts +++ b/src/rest/verify/v2/service/rateLimit/bucket.ts @@ -180,7 +180,7 @@ export class BucketContextImpl implements BucketContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: BucketInstance) => any ): Promise { const headers: any = {}; @@ -194,25 +194,30 @@ export class BucketContextImpl implements BucketContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new BucketInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.rateLimitSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new BucketInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.rateLimitSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | BucketContextUpdateOptions | ((error: Error | null, item?: BucketInstance) => any), @@ -243,22 +248,27 @@ export class BucketContextImpl implements BucketContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new BucketInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.rateLimitSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new BucketInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.rateLimitSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/verify/v2/service/verification.ts b/src/rest/verify/v2/service/verification.ts index dece77203..b13c9d581 100644 --- a/src/rest/verify/v2/service/verification.ts +++ b/src/rest/verify/v2/service/verification.ts @@ -128,7 +128,7 @@ export class VerificationContextImpl implements VerificationContext { this._uri = `/Services/${serviceSid}/Verifications/${sid}`; } - fetch( + async fetch( callback?: (error: Error | null, item?: VerificationInstance) => any ): Promise { const headers: any = {}; @@ -142,24 +142,29 @@ export class VerificationContextImpl implements VerificationContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new VerificationInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new VerificationInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params: VerificationContextUpdateOptions, callback?: (error: Error | null, item?: VerificationInstance) => any ): Promise { @@ -188,21 +193,26 @@ export class VerificationContextImpl implements VerificationContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new VerificationInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new VerificationInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/verify/v2/service/webhook.ts b/src/rest/verify/v2/service/webhook.ts index ea78fa833..657cd135d 100644 --- a/src/rest/verify/v2/service/webhook.ts +++ b/src/rest/verify/v2/service/webhook.ts @@ -188,7 +188,7 @@ export class WebhookContextImpl implements WebhookContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: WebhookInstance) => any ): Promise { const headers: any = {}; @@ -202,24 +202,29 @@ export class WebhookContextImpl implements WebhookContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new WebhookInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new WebhookInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | WebhookContextUpdateOptions | ((error: Error | null, item?: WebhookInstance) => any), @@ -259,21 +264,26 @@ export class WebhookContextImpl implements WebhookContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new WebhookInstance( - operationVersion, - payload, - instance._solution.serviceSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new WebhookInstance( + operationVersion, + payload, + instance._solution.serviceSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/verify/v2/verificationAttempt.ts b/src/rest/verify/v2/verificationAttempt.ts index 61f52a981..7653d1e5e 100644 --- a/src/rest/verify/v2/verificationAttempt.ts +++ b/src/rest/verify/v2/verificationAttempt.ts @@ -149,7 +149,7 @@ export class VerificationAttemptContextImpl this._uri = `/Attempts/${sid}`; } - fetch( + async fetch( callback?: (error: Error | null, item?: VerificationAttemptInstance) => any ): Promise { const headers: any = {}; @@ -163,20 +163,25 @@ export class VerificationAttemptContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new VerificationAttemptInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new VerificationAttemptInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/verify/v2/verificationAttemptsSummary.ts b/src/rest/verify/v2/verificationAttemptsSummary.ts index 1ae01b3c5..869f5e471 100644 --- a/src/rest/verify/v2/verificationAttemptsSummary.ts +++ b/src/rest/verify/v2/verificationAttemptsSummary.ts @@ -92,7 +92,7 @@ export class VerificationAttemptsSummaryContextImpl this._uri = `/Attempts/Summary`; } - fetch( + async fetch( params?: | VerificationAttemptsSummaryContextFetchOptions | (( @@ -140,16 +140,24 @@ export class VerificationAttemptsSummaryContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new VerificationAttemptsSummaryInstance(operationVersion, payload) - ); + try { + let payload = await operationPromise; + let operation = new VerificationAttemptsSummaryInstance( + operationVersion, + payload + ); + + if (callback) { + callback(null, operation); + } - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/video/v1/composition.ts b/src/rest/video/v1/composition.ts index f04cede9e..1b4fa9cc1 100644 --- a/src/rest/video/v1/composition.ts +++ b/src/rest/video/v1/composition.ts @@ -179,7 +179,7 @@ export class CompositionContextImpl implements CompositionContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: CompositionInstance) => any ): Promise { const headers: any = {}; @@ -193,20 +193,25 @@ export class CompositionContextImpl implements CompositionContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new CompositionInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new CompositionInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/video/v1/compositionHook.ts b/src/rest/video/v1/compositionHook.ts index fd307332f..999e1d495 100644 --- a/src/rest/video/v1/compositionHook.ts +++ b/src/rest/video/v1/compositionHook.ts @@ -216,7 +216,7 @@ export class CompositionHookContextImpl implements CompositionHookContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: CompositionHookInstance) => any ): Promise { const headers: any = {}; @@ -230,23 +230,28 @@ export class CompositionHookContextImpl implements CompositionHookContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new CompositionHookInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new CompositionHookInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params: CompositionHookContextUpdateOptions, callback?: (error: Error | null, item?: CompositionHookInstance) => any ): Promise { @@ -301,20 +306,25 @@ export class CompositionHookContextImpl implements CompositionHookContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new CompositionHookInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new CompositionHookInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/video/v1/compositionSettings.ts b/src/rest/video/v1/compositionSettings.ts index f92bc639e..5420d6085 100644 --- a/src/rest/video/v1/compositionSettings.ts +++ b/src/rest/video/v1/compositionSettings.ts @@ -81,7 +81,7 @@ export class CompositionSettingsContextImpl this._uri = `/CompositionSettings/Default`; } - create( + async create( params: CompositionSettingsContextCreateOptions, callback?: (error: Error | null, item?: CompositionSettingsInstance) => any ): Promise { @@ -122,18 +122,27 @@ export class CompositionSettingsContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => new CompositionSettingsInstance(operationVersion, payload) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new CompositionSettingsInstance( + operationVersion, + payload + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - fetch( + async fetch( callback?: (error: Error | null, item?: CompositionSettingsInstance) => any ): Promise { const headers: any = {}; @@ -147,15 +156,24 @@ export class CompositionSettingsContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => new CompositionSettingsInstance(operationVersion, payload) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new CompositionSettingsInstance( + operationVersion, + payload + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/video/v1/recording.ts b/src/rest/video/v1/recording.ts index b88aa5dce..1609cee82 100644 --- a/src/rest/video/v1/recording.ts +++ b/src/rest/video/v1/recording.ts @@ -167,7 +167,7 @@ export class RecordingContextImpl implements RecordingContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: RecordingInstance) => any ): Promise { const headers: any = {}; @@ -181,16 +181,25 @@ export class RecordingContextImpl implements RecordingContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new RecordingInstance(operationVersion, payload, instance._solution.sid) - ); + try { + let payload = await operationPromise; + let operation = new RecordingInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/video/v1/recordingSettings.ts b/src/rest/video/v1/recordingSettings.ts index 7adfa3c8a..88b48e1a6 100644 --- a/src/rest/video/v1/recordingSettings.ts +++ b/src/rest/video/v1/recordingSettings.ts @@ -79,7 +79,7 @@ export class RecordingSettingsContextImpl implements RecordingSettingsContext { this._uri = `/RecordingSettings/Default`; } - create( + async create( params: RecordingSettingsContextCreateOptions, callback?: (error: Error | null, item?: RecordingSettingsInstance) => any ): Promise { @@ -120,18 +120,24 @@ export class RecordingSettingsContextImpl implements RecordingSettingsContext { headers, }); - operationPromise = operationPromise.then( - (payload) => new RecordingSettingsInstance(operationVersion, payload) - ); + try { + let payload = await operationPromise; + let operation = new RecordingSettingsInstance(operationVersion, payload); + + if (callback) { + callback(null, operation); + } - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - fetch( + async fetch( callback?: (error: Error | null, item?: RecordingSettingsInstance) => any ): Promise { const headers: any = {}; @@ -145,15 +151,21 @@ export class RecordingSettingsContextImpl implements RecordingSettingsContext { headers, }); - operationPromise = operationPromise.then( - (payload) => new RecordingSettingsInstance(operationVersion, payload) - ); + try { + let payload = await operationPromise; + let operation = new RecordingSettingsInstance(operationVersion, payload); + + if (callback) { + callback(null, operation); + } - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/video/v1/room.ts b/src/rest/video/v1/room.ts index 0fd136d42..8d6691aae 100644 --- a/src/rest/video/v1/room.ts +++ b/src/rest/video/v1/room.ts @@ -210,7 +210,7 @@ export class RoomContextImpl implements RoomContext { return this._recordings; } - fetch( + async fetch( callback?: (error: Error | null, item?: RoomInstance) => any ): Promise { const headers: any = {}; @@ -224,19 +224,28 @@ export class RoomContextImpl implements RoomContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new RoomInstance(operationVersion, payload, instance._solution.sid) - ); + try { + let payload = await operationPromise; + let operation = new RoomInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params: RoomContextUpdateOptions, callback?: (error: Error | null, item?: RoomInstance) => any ): Promise { @@ -265,16 +274,25 @@ export class RoomContextImpl implements RoomContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new RoomInstance(operationVersion, payload, instance._solution.sid) - ); + try { + let payload = await operationPromise; + let operation = new RoomInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/video/v1/room/participant.ts b/src/rest/video/v1/room/participant.ts index 443a374e4..4bbe68c20 100644 --- a/src/rest/video/v1/room/participant.ts +++ b/src/rest/video/v1/room/participant.ts @@ -211,7 +211,7 @@ export class ParticipantContextImpl implements ParticipantContext { return this._subscribedTracks; } - fetch( + async fetch( callback?: (error: Error | null, item?: ParticipantInstance) => any ): Promise { const headers: any = {}; @@ -225,24 +225,29 @@ export class ParticipantContextImpl implements ParticipantContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ParticipantInstance( - operationVersion, - payload, - instance._solution.roomSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new ParticipantInstance( + operationVersion, + payload, + instance._solution.roomSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | ParticipantContextUpdateOptions | ((error: Error | null, item?: ParticipantInstance) => any), @@ -272,21 +277,26 @@ export class ParticipantContextImpl implements ParticipantContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ParticipantInstance( - operationVersion, - payload, - instance._solution.roomSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new ParticipantInstance( + operationVersion, + payload, + instance._solution.roomSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/video/v1/room/participant/anonymize.ts b/src/rest/video/v1/room/participant/anonymize.ts index d4ee3d641..a52989538 100644 --- a/src/rest/video/v1/room/participant/anonymize.ts +++ b/src/rest/video/v1/room/participant/anonymize.ts @@ -61,7 +61,7 @@ export class AnonymizeContextImpl implements AnonymizeContext { this._uri = `/Rooms/${roomSid}/Participants/${sid}/Anonymize`; } - update( + async update( callback?: (error: Error | null, item?: AnonymizeInstance) => any ): Promise { const headers: any = {}; @@ -75,21 +75,26 @@ export class AnonymizeContextImpl implements AnonymizeContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new AnonymizeInstance( - operationVersion, - payload, - instance._solution.roomSid, - instance._solution.sid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new AnonymizeInstance( + operationVersion, + payload, + instance._solution.roomSid, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/video/v1/room/participant/publishedTrack.ts b/src/rest/video/v1/room/participant/publishedTrack.ts index e56ee98c3..82307b156 100644 --- a/src/rest/video/v1/room/participant/publishedTrack.ts +++ b/src/rest/video/v1/room/participant/publishedTrack.ts @@ -112,7 +112,7 @@ export class PublishedTrackContextImpl implements PublishedTrackContext { this._uri = `/Rooms/${roomSid}/Participants/${participantSid}/PublishedTracks/${sid}`; } - fetch( + async fetch( callback?: (error: Error | null, item?: PublishedTrackInstance) => any ): Promise { const headers: any = {}; @@ -126,22 +126,27 @@ export class PublishedTrackContextImpl implements PublishedTrackContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new PublishedTrackInstance( - operationVersion, - payload, - instance._solution.roomSid, - instance._solution.participantSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new PublishedTrackInstance( + operationVersion, + payload, + instance._solution.roomSid, + instance._solution.participantSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/video/v1/room/participant/subscribedTrack.ts b/src/rest/video/v1/room/participant/subscribedTrack.ts index ed4c1ffb4..68e95c9ca 100644 --- a/src/rest/video/v1/room/participant/subscribedTrack.ts +++ b/src/rest/video/v1/room/participant/subscribedTrack.ts @@ -112,7 +112,7 @@ export class SubscribedTrackContextImpl implements SubscribedTrackContext { this._uri = `/Rooms/${roomSid}/Participants/${participantSid}/SubscribedTracks/${sid}`; } - fetch( + async fetch( callback?: (error: Error | null, item?: SubscribedTrackInstance) => any ): Promise { const headers: any = {}; @@ -126,22 +126,27 @@ export class SubscribedTrackContextImpl implements SubscribedTrackContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new SubscribedTrackInstance( - operationVersion, - payload, - instance._solution.roomSid, - instance._solution.participantSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new SubscribedTrackInstance( + operationVersion, + payload, + instance._solution.roomSid, + instance._solution.participantSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/video/v1/room/roomRecording.ts b/src/rest/video/v1/room/roomRecording.ts index 2e516da30..12685b685 100644 --- a/src/rest/video/v1/room/roomRecording.ts +++ b/src/rest/video/v1/room/roomRecording.ts @@ -164,7 +164,7 @@ export class RoomRecordingContextImpl implements RoomRecordingContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: RoomRecordingInstance) => any ): Promise { const headers: any = {}; @@ -178,21 +178,26 @@ export class RoomRecordingContextImpl implements RoomRecordingContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new RoomRecordingInstance( - operationVersion, - payload, - instance._solution.roomSid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new RoomRecordingInstance( + operationVersion, + payload, + instance._solution.roomSid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/voice/v1/byocTrunk.ts b/src/rest/voice/v1/byocTrunk.ts index a2834bbb3..99536662b 100644 --- a/src/rest/voice/v1/byocTrunk.ts +++ b/src/rest/voice/v1/byocTrunk.ts @@ -197,7 +197,7 @@ export class ByocTrunkContextImpl implements ByocTrunkContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: ByocTrunkInstance) => any ): Promise { const headers: any = {}; @@ -211,19 +211,28 @@ export class ByocTrunkContextImpl implements ByocTrunkContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ByocTrunkInstance(operationVersion, payload, instance._solution.sid) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new ByocTrunkInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | ByocTrunkContextUpdateOptions | ((error: Error | null, item?: ByocTrunkInstance) => any), @@ -271,16 +280,25 @@ export class ByocTrunkContextImpl implements ByocTrunkContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ByocTrunkInstance(operationVersion, payload, instance._solution.sid) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new ByocTrunkInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/voice/v1/connectionPolicy.ts b/src/rest/voice/v1/connectionPolicy.ts index f4e77b6b5..bf2fafd5b 100644 --- a/src/rest/voice/v1/connectionPolicy.ts +++ b/src/rest/voice/v1/connectionPolicy.ts @@ -176,7 +176,7 @@ export class ConnectionPolicyContextImpl implements ConnectionPolicyContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: ConnectionPolicyInstance) => any ): Promise { const headers: any = {}; @@ -190,23 +190,28 @@ export class ConnectionPolicyContextImpl implements ConnectionPolicyContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ConnectionPolicyInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new ConnectionPolicyInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | ConnectionPolicyContextUpdateOptions | ((error: Error | null, item?: ConnectionPolicyInstance) => any), @@ -237,20 +242,25 @@ export class ConnectionPolicyContextImpl implements ConnectionPolicyContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new ConnectionPolicyInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new ConnectionPolicyInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/voice/v1/connectionPolicy/connectionPolicyTarget.ts b/src/rest/voice/v1/connectionPolicy/connectionPolicyTarget.ts index a3b25faa7..09adbdf0d 100644 --- a/src/rest/voice/v1/connectionPolicy/connectionPolicyTarget.ts +++ b/src/rest/voice/v1/connectionPolicy/connectionPolicyTarget.ts @@ -200,7 +200,7 @@ export class ConnectionPolicyTargetContextImpl return operationPromise; } - fetch( + async fetch( callback?: ( error: Error | null, item?: ConnectionPolicyTargetInstance @@ -217,24 +217,29 @@ export class ConnectionPolicyTargetContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new ConnectionPolicyTargetInstance( - operationVersion, - payload, - instance._solution.connectionPolicySid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new ConnectionPolicyTargetInstance( + operationVersion, + payload, + instance._solution.connectionPolicySid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | ConnectionPolicyTargetContextUpdateOptions | ((error: Error | null, item?: ConnectionPolicyTargetInstance) => any), @@ -273,21 +278,26 @@ export class ConnectionPolicyTargetContextImpl headers, }); - operationPromise = operationPromise.then( - (payload) => - new ConnectionPolicyTargetInstance( - operationVersion, - payload, - instance._solution.connectionPolicySid, - instance._solution.sid - ) - ); + try { + let payload = await operationPromise; + let operation = new ConnectionPolicyTargetInstance( + operationVersion, + payload, + instance._solution.connectionPolicySid, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/voice/v1/dialingPermissions/country.ts b/src/rest/voice/v1/dialingPermissions/country.ts index 2b917f7ba..aa1e81215 100644 --- a/src/rest/voice/v1/dialingPermissions/country.ts +++ b/src/rest/voice/v1/dialingPermissions/country.ts @@ -140,7 +140,7 @@ export class CountryContextImpl implements CountryContext { return this._highriskSpecialPrefixes; } - fetch( + async fetch( callback?: (error: Error | null, item?: CountryInstance) => any ): Promise { const headers: any = {}; @@ -154,20 +154,25 @@ export class CountryContextImpl implements CountryContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new CountryInstance( - operationVersion, - payload, - instance._solution.isoCode - ) - ); + try { + let payload = await operationPromise; + let operation = new CountryInstance( + operationVersion, + payload, + instance._solution.isoCode + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/voice/v1/dialingPermissions/settings.ts b/src/rest/voice/v1/dialingPermissions/settings.ts index 1c2ba350b..8136ad74a 100644 --- a/src/rest/voice/v1/dialingPermissions/settings.ts +++ b/src/rest/voice/v1/dialingPermissions/settings.ts @@ -79,7 +79,7 @@ export class SettingsContextImpl implements SettingsContext { this._uri = `/Settings`; } - fetch( + async fetch( callback?: (error: Error | null, item?: SettingsInstance) => any ): Promise { const headers: any = {}; @@ -93,18 +93,24 @@ export class SettingsContextImpl implements SettingsContext { headers, }); - operationPromise = operationPromise.then( - (payload) => new SettingsInstance(operationVersion, payload) - ); + try { + let payload = await operationPromise; + let operation = new SettingsInstance(operationVersion, payload); + + if (callback) { + callback(null, operation); + } - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | SettingsContextUpdateOptions | ((error: Error | null, item?: SettingsInstance) => any), @@ -137,15 +143,21 @@ export class SettingsContextImpl implements SettingsContext { headers, }); - operationPromise = operationPromise.then( - (payload) => new SettingsInstance(operationVersion, payload) - ); + try { + let payload = await operationPromise; + let operation = new SettingsInstance(operationVersion, payload); + + if (callback) { + callback(null, operation); + } - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/voice/v1/ipRecord.ts b/src/rest/voice/v1/ipRecord.ts index 6a8488d1e..6c7716d8c 100644 --- a/src/rest/voice/v1/ipRecord.ts +++ b/src/rest/voice/v1/ipRecord.ts @@ -165,7 +165,7 @@ export class IpRecordContextImpl implements IpRecordContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: IpRecordInstance) => any ): Promise { const headers: any = {}; @@ -179,19 +179,28 @@ export class IpRecordContextImpl implements IpRecordContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new IpRecordInstance(operationVersion, payload, instance._solution.sid) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new IpRecordInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | IpRecordContextUpdateOptions | ((error: Error | null, item?: IpRecordInstance) => any), @@ -222,16 +231,25 @@ export class IpRecordContextImpl implements IpRecordContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new IpRecordInstance(operationVersion, payload, instance._solution.sid) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new IpRecordInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/voice/v1/sourceIpMapping.ts b/src/rest/voice/v1/sourceIpMapping.ts index c72a761e4..72cabfef0 100644 --- a/src/rest/voice/v1/sourceIpMapping.ts +++ b/src/rest/voice/v1/sourceIpMapping.ts @@ -156,7 +156,7 @@ export class SourceIpMappingContextImpl implements SourceIpMappingContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: SourceIpMappingInstance) => any ): Promise { const headers: any = {}; @@ -170,23 +170,28 @@ export class SourceIpMappingContextImpl implements SourceIpMappingContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new SourceIpMappingInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new SourceIpMappingInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params: SourceIpMappingContextUpdateOptions, callback?: (error: Error | null, item?: SourceIpMappingInstance) => any ): Promise { @@ -218,20 +223,25 @@ export class SourceIpMappingContextImpl implements SourceIpMappingContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new SourceIpMappingInstance( - operationVersion, - payload, - instance._solution.sid - ) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new SourceIpMappingInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/wireless/v1/command.ts b/src/rest/wireless/v1/command.ts index 5df6b8675..533d60d0e 100644 --- a/src/rest/wireless/v1/command.ts +++ b/src/rest/wireless/v1/command.ts @@ -179,7 +179,7 @@ export class CommandContextImpl implements CommandContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: CommandInstance) => any ): Promise { const headers: any = {}; @@ -193,16 +193,25 @@ export class CommandContextImpl implements CommandContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new CommandInstance(operationVersion, payload, instance._solution.sid) - ); + try { + let payload = await operationPromise; + let operation = new CommandInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/wireless/v1/ratePlan.ts b/src/rest/wireless/v1/ratePlan.ts index 106f21c91..89d6fa99e 100644 --- a/src/rest/wireless/v1/ratePlan.ts +++ b/src/rest/wireless/v1/ratePlan.ts @@ -183,7 +183,7 @@ export class RatePlanContextImpl implements RatePlanContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: RatePlanInstance) => any ): Promise { const headers: any = {}; @@ -197,19 +197,28 @@ export class RatePlanContextImpl implements RatePlanContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new RatePlanInstance(operationVersion, payload, instance._solution.sid) - ); + try { + let payload = await operationPromise; + let operation = new RatePlanInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | RatePlanContextUpdateOptions | ((error: Error | null, item?: RatePlanInstance) => any), @@ -242,16 +251,25 @@ export class RatePlanContextImpl implements RatePlanContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new RatePlanInstance(operationVersion, payload, instance._solution.sid) - ); + try { + let payload = await operationPromise; + let operation = new RatePlanInstance( + operationVersion, + payload, + instance._solution.sid + ); - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /** diff --git a/src/rest/wireless/v1/sim.ts b/src/rest/wireless/v1/sim.ts index 9f28a84d0..e4bd0b7ca 100644 --- a/src/rest/wireless/v1/sim.ts +++ b/src/rest/wireless/v1/sim.ts @@ -251,7 +251,7 @@ export class SimContextImpl implements SimContext { return operationPromise; } - fetch( + async fetch( callback?: (error: Error | null, item?: SimInstance) => any ): Promise { const headers: any = {}; @@ -265,19 +265,28 @@ export class SimContextImpl implements SimContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new SimInstance(operationVersion, payload, instance._solution.sid) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new SimInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } - update( + async update( params?: | SimContextUpdateOptions | ((error: Error | null, item?: SimInstance) => any), @@ -338,16 +347,25 @@ export class SimContextImpl implements SimContext { headers, }); - operationPromise = operationPromise.then( - (payload) => - new SimInstance(operationVersion, payload, instance._solution.sid) - ); - - operationPromise = instance._version.setPromiseCallback( - operationPromise, - callback - ); - return operationPromise; + try { + let payload = await operationPromise; + let operation = new SimInstance( + operationVersion, + payload, + instance._solution.sid + ); + + if (callback) { + callback(null, operation); + } + + return operation; + } catch (err: any) { + if (callback) { + callback(err); + } + throw err; + } } /**