@azure/keyvault-certificates 4.9.1-alpha.20250113.1 → 4.9.1-alpha.20250120.1

package/dist/browser/index.js

@@ -1,6 +1,5 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-import { __asyncGenerator, __asyncValues, __await } from "tslib";
 import { logger } from "./log.js";
 import { WellKnownIssuerNames, DefaultCertificatePolicy, LATEST_API_VERSION, KnownCertificateKeyCurveNames, KnownCertificateKeyTypes, KnownKeyUsageTypes, } from "./certificatesModels.js";
 import { KnownDeletionRecoveryLevel as KnownDeletionRecoveryLevels, } from "./generated/models/index.js";
@@ -12,8 +11,10 @@ import { DeleteCertificatePoller } from "./lro/delete/poller.js";
 import { RecoverDeletedCertificatePoller } from "./lro/recover/poller.js";
 import { parseCertificateBytes } from "./utils.js";
 import { parseKeyVaultCertificateIdentifier } from "./identifier.js";
-import { coreContactsToCertificateContacts, getCertificateFromCertificateBundle, getCertificateOperationFromCoreOperation, getCertificateWithPolicyFromCertificateBundle, getDeletedCertificateFromDeletedCertificateBundle, getDeletedCertificateFromItem, getPropertiesFromCertificateBundle, toCoreAttributes, toCorePolicy, toPublicIssuer, toPublicPolicy, } from "./transformations.js";
+import { coreContactsToCertificateContacts, getCertificateFromCertificateBundle, getCertificateOperationFromCoreOperation, getCertificateWithPolicyFromCertificateBundle, getDeletedCertificateFromDeletedCertificateBundle, getDeletedCertificateFromItem, getPropertiesFromCertificateBundle, mapPagedAsyncIterable, toCoreAttributes, toCorePolicy, toPublicIssuer, toPublicPolicy, } from "./transformations.js";
 import { tracingClient } from "./tracing.js";
+import { bearerTokenAuthenticationPolicyName } from "@azure/core-rest-pipeline";
+import { SDK_VERSION } from "./constants.js";
 export { parseKeyVaultCertificateIdentifier, DefaultCertificatePolicy, WellKnownIssuerNames as WellKnownIssuer, logger, KnownCertificateKeyCurveNames, KnownDeletionRecoveryLevels, KnownCertificateKeyTypes, KnownKeyUsageTypes, };
 /**
  * The client to interact with the KeyVault certificates functionality
@@ -27,8 +28,11 @@ export class CertificateClient {
      *                          Omit this parameter to use the default pipeline configuration.
      */
     constructor(vaultUrl, credential, clientOptions = {}) {
+        var _a;
         this.vaultUrl = vaultUrl;
-        const internalClientPipelineOptions = Object.assign(Object.assign({}, clientOptions), { loggingOptions: {
+        const internalClientPipelineOptions = Object.assign(Object.assign({}, clientOptions), { apiVersion: clientOptions.serviceVersion || LATEST_API_VERSION, userAgentOptions: {
+                userAgentPrefix: `${(_a = clientOptions.userAgentOptions) === null || _a === void 0 ? void 0 : _a.userAgentPrefix} azsdk-js-keyvault-certificates/${SDK_VERSION}`,
+            }, loggingOptions: {
                 logger: logger.info,
                 additionalAllowedHeaderNames: [
                     "x-ms-keyvault-region",
@@ -36,56 +40,20 @@ export class CertificateClient {
                     "x-ms-keyvault-service-version",
                 ],
             } });
-        this.client = new KeyVaultClient(clientOptions.serviceVersion || LATEST_API_VERSION, internalClientPipelineOptions);
-        // The authentication policy must come after the deserialization policy since the deserialization policy
-        // converts 401 responses to an Error, and we don't want to deal with that.
-        this.client.pipeline.addPolicy(keyVaultAuthenticationPolicy(credential, clientOptions), {
-            afterPolicies: ["deserializationPolicy"],
-        });
-    }
-    listPropertiesOfCertificatesPage(continuationState_1) {
-        return __asyncGenerator(this, arguments, function* listPropertiesOfCertificatesPage_1(continuationState, options = {}) {
-            if (continuationState.continuationToken == null) {
-                const optionsComplete = Object.assign({ maxresults: continuationState.maxPageSize, includePending: options.includePending }, options);
-                const currentSetResponse = yield __await(tracingClient.withSpan("CertificateClient.listPropertiesOfCertificatesPage", optionsComplete, (updatedOptions) => this.client.getCertificates(this.vaultUrl, updatedOptions)));
-                continuationState.continuationToken = currentSetResponse.nextLink;
-                if (currentSetResponse.value) {
-                    yield yield __await(currentSetResponse.value.map(getPropertiesFromCertificateBundle, this));
-                }
-            }
-            while (continuationState.continuationToken) {
-                const currentSetResponse = yield __await(tracingClient.withSpan("CertificateClient.listPropertiesOfCertificatesPage", options, (updatedOptions) => this.client.getCertificatesNext(this.vaultUrl, continuationState.continuationToken, updatedOptions)));
-                continuationState.continuationToken = currentSetResponse.nextLink;
-                if (currentSetResponse.value) {
-                    yield yield __await(currentSetResponse.value.map(getPropertiesFromCertificateBundle, this));
-                }
-                else {
-                    break;
-                }
-            }
-        });
-    }
-    listPropertiesOfCertificatesAll() {
-        return __asyncGenerator(this, arguments, function* listPropertiesOfCertificatesAll_1(options = {}) {
-            var _a, e_1, _b, _c;
-            const f = {};
-            try {
-                for (var _d = true, _e = __asyncValues(this.listPropertiesOfCertificatesPage(f, options)), _f; _f = yield __await(_e.next()), _a = _f.done, !_a; _d = true) {
-                    _c = _f.value;
-                    _d = false;
-                    const page = _c;
-                    for (const certificate of page) {
-                        yield yield __await(certificate);
-                    }
+        this.client = new KeyVaultClient(this.vaultUrl, credential, internalClientPipelineOptions);
+        this.client.pipeline.removePolicy({ name: bearerTokenAuthenticationPolicyName });
+        this.client.pipeline.addPolicy(keyVaultAuthenticationPolicy(credential, clientOptions));
+        // Workaround for: https://github.com/Azure/azure-sdk-for-js/issues/31843
+        this.client.pipeline.addPolicy({
+            name: "ContentTypePolicy",
+            sendRequest(request, next) {
+                var _a;
+                const contentType = (_a = request.headers.get("Content-Type")) !== null && _a !== void 0 ? _a : "";
+                if (contentType.startsWith("application/json")) {
+                    request.headers.set("Content-Type", "application/json");
                 }
-            }
-            catch (e_1_1) { e_1 = { error: e_1_1 }; }
-            finally {
-                try {
-                    if (!_d && !_a && (_b = _e.return)) yield __await(_b.call(_e));
-                }
-                finally { if (e_1) throw e_1.error; }
-            }
+                return next(request);
+            },
         });
     }
     /**
@@ -110,62 +78,7 @@ export class CertificateClient {
      * @param options - The optional parameters
      */
     listPropertiesOfCertificates(options = {}) {
-        const iter = this.listPropertiesOfCertificatesAll(options);
-        const result = {
-            next() {
-                return iter.next();
-            },
-            [Symbol.asyncIterator]() {
-                return this;
-            },
-            byPage: (settings = {}) => this.listPropertiesOfCertificatesPage(settings, options),
-        };
-        return result;
-    }
-    listPropertiesOfCertificateVersionsPage(certificateName_1, continuationState_1) {
-        return __asyncGenerator(this, arguments, function* listPropertiesOfCertificateVersionsPage_1(certificateName, continuationState, options = {}) {
-            if (continuationState.continuationToken == null) {
-                const optionsComplete = Object.assign({ maxresults: continuationState.maxPageSize }, options);
-                const currentSetResponse = yield __await(tracingClient.withSpan("CertificateClient.listPropertiesOfCertificateVersionsPage", optionsComplete, (updatedOptions) => this.client.getCertificateVersions(this.vaultUrl, certificateName, updatedOptions)));
-                continuationState.continuationToken = currentSetResponse.nextLink;
-                if (currentSetResponse.value) {
-                    yield yield __await(currentSetResponse.value.map(getPropertiesFromCertificateBundle, this));
-                }
-            }
-            while (continuationState.continuationToken) {
-                const currentSetResponse = yield __await(tracingClient.withSpan("CertificateClient.listPropertiesOfCertificateVersionsPage", options, (updatedOptions) => this.client.getCertificateVersions(continuationState.continuationToken, certificateName, updatedOptions)));
-                continuationState.continuationToken = currentSetResponse.nextLink;
-                if (currentSetResponse.value) {
-                    yield yield __await(currentSetResponse.value.map(getPropertiesFromCertificateBundle, this));
-                }
-                else {
-                    break;
-                }
-            }
-        });
-    }
-    listPropertiesOfCertificateVersionsAll(certificateName_1) {
-        return __asyncGenerator(this, arguments, function* listPropertiesOfCertificateVersionsAll_1(certificateName, options = {}) {
-            var _a, e_2, _b, _c;
-            const f = {};
-            try {
-                for (var _d = true, _e = __asyncValues(this.listPropertiesOfCertificateVersionsPage(certificateName, f, options)), _f; _f = yield __await(_e.next()), _a = _f.done, !_a; _d = true) {
-                    _c = _f.value;
-                    _d = false;
-                    const page = _c;
-                    for (const item of page) {
-                        yield yield __await(item);
-                    }
-                }
-            }
-            catch (e_2_1) { e_2 = { error: e_2_1 }; }
-            finally {
-                try {
-                    if (!_d && !_a && (_b = _e.return)) yield __await(_b.call(_e));
-                }
-                finally { if (e_2) throw e_2.error; }
-            }
-        });
+        return mapPagedAsyncIterable(this.client.getCertificates(options), getPropertiesFromCertificateBundle);
     }
     /**
      * Returns the versions of a certificate in the specified key
@@ -183,17 +96,7 @@ export class CertificateClient {
      * @param options - The optional parameters
      */
     listPropertiesOfCertificateVersions(certificateName, options = {}) {
-        const iter = this.listPropertiesOfCertificateVersionsAll(certificateName, options);
-        const result = {
-            next() {
-                return iter.next();
-            },
-            [Symbol.asyncIterator]() {
-                return this;
-            },
-            byPage: (settings = {}) => this.listPropertiesOfCertificateVersionsPage(certificateName, settings, options),
-        };
-        return result;
+        return mapPagedAsyncIterable(this.client.getCertificateVersions(certificateName, options), getPropertiesFromCertificateBundle);
     }
     /**
      * The DELETE operation applies to any certificate stored in Azure Key Vault. DELETE cannot be applied
@@ -252,7 +155,7 @@ export class CertificateClient {
     deleteContacts(options = {}) {
         let parsedBody;
         return tracingClient.withSpan("CertificateClient.deleteContacts", options, async (updatedOptions) => {
-            await this.client.deleteCertificateContacts(this.vaultUrl, Object.assign(Object.assign({}, updatedOptions), { onResponse: (response) => {
+            await this.client.deleteCertificateContacts(Object.assign(Object.assign({}, updatedOptions), { onResponse: (response) => {
                     parsedBody = response.parsedBody;
                 } }));
             return coreContactsToCertificateContacts(parsedBody);
@@ -280,12 +183,9 @@ export class CertificateClient {
             name: x ? x.name : undefined,
             phone: x ? x.phone : undefined,
         }));
-        let parsedBody;
         return tracingClient.withSpan("CertificateClient.setContacts", options, async (updatedOptions) => {
-            await this.client.setCertificateContacts(this.vaultUrl, { contactList: coreContacts }, Object.assign(Object.assign({}, updatedOptions), { onResponse: (response) => {
-                    parsedBody = response.parsedBody;
-                } }));
-            return coreContactsToCertificateContacts(parsedBody);
+            const response = await this.client.setCertificateContacts({ contactList: coreContacts }, updatedOptions);
+            return coreContactsToCertificateContacts(response);
         });
     }
     /**
@@ -307,55 +207,10 @@ export class CertificateClient {
      */
     getContacts(options = {}) {
         return tracingClient.withSpan("CertificateClient.getContacts", options, async (updatedOptions) => {
-            const result = await this.client.getCertificateContacts(this.vaultUrl, updatedOptions);
+            const result = await this.client.getCertificateContacts(updatedOptions);
             return coreContactsToCertificateContacts(result);
         });
     }
-    listPropertiesOfIssuersPage(continuationState_1) {
-        return __asyncGenerator(this, arguments, function* listPropertiesOfIssuersPage_1(continuationState, options = {}) {
-            if (continuationState.continuationToken == null) {
-                const requestOptionsComplete = Object.assign({ maxresults: continuationState.maxPageSize }, options);
-                const currentSetResponse = yield __await(tracingClient.withSpan("CertificateClient.listPropertiesOfIssuersPage", requestOptionsComplete, (updatedOptions) => this.client.getCertificateIssuers(this.vaultUrl, updatedOptions)));
-                continuationState.continuationToken = currentSetResponse.nextLink;
-                if (currentSetResponse.value) {
-                    yield yield __await(currentSetResponse.value);
-                }
-            }
-            while (continuationState.continuationToken) {
-                const currentSetResponse = yield __await(tracingClient.withSpan("CertificateClient.listPropertiesOfIssuersPage", options, (updatedOptions) => this.client.getCertificateIssuers(continuationState.continuationToken, updatedOptions)));
-                continuationState.continuationToken = currentSetResponse.nextLink;
-                if (currentSetResponse.value) {
-                    yield yield __await(currentSetResponse.value);
-                }
-                else {
-                    break;
-                }
-            }
-        });
-    }
-    listPropertiesOfIssuersAll() {
-        return __asyncGenerator(this, arguments, function* listPropertiesOfIssuersAll_1(options = {}) {
-            var _a, e_3, _b, _c;
-            const f = {};
-            try {
-                for (var _d = true, _e = __asyncValues(this.listPropertiesOfIssuersPage(f, options)), _f; _f = yield __await(_e.next()), _a = _f.done, !_a; _d = true) {
-                    _c = _f.value;
-                    _d = false;
-                    const page = _c;
-                    for (const item of page) {
-                        yield yield __await(item);
-                    }
-                }
-            }
-            catch (e_3_1) { e_3 = { error: e_3_1 }; }
-            finally {
-                try {
-                    if (!_d && !_a && (_b = _e.return)) yield __await(_b.call(_e));
-                }
-                finally { if (e_3) throw e_3.error; }
-            }
-        });
-    }
     /**
      * Returns the set of certificate issuer resources in the specified key vault. This operation requires the certificates/manageissuers/getissuers permission.
      *
@@ -378,17 +233,7 @@ export class CertificateClient {
      * @param options - The optional parameters
      */
     listPropertiesOfIssuers(options = {}) {
-        const iter = this.listPropertiesOfIssuersAll(options);
-        const result = {
-            next() {
-                return iter.next();
-            },
-            [Symbol.asyncIterator]() {
-                return this;
-            },
-            byPage: (settings = {}) => this.listPropertiesOfIssuersPage(settings, options),
-        };
-        return result;
+        return this.client.getCertificateIssuers(options);
     }
     /**
      * The createIssuer operation adds or updates the specified certificate issuer. This
@@ -407,13 +252,16 @@ export class CertificateClient {
     createIssuer(issuerName, provider, options = {}) {
         return tracingClient.withSpan("CertificateClient.createIssuer", options, async (updatedOptions) => {
             const { accountId, password } = updatedOptions;
-            const generatedOptions = Object.assign(Object.assign({}, updatedOptions), { credentials: {
+            const parameters = {
+                credentials: {
                     accountId,
                     password,
-                } });
+                },
+                provider,
+            };
             if (updatedOptions.organizationId ||
                 (updatedOptions.administratorContacts && updatedOptions.administratorContacts.length)) {
-                generatedOptions.organizationDetails = {
+                parameters.organizationDetails = {
                     id: updatedOptions.organizationId,
                     adminDetails: updatedOptions.administratorContacts
                         ? updatedOptions.administratorContacts.map((x) => ({
@@ -426,15 +274,12 @@ export class CertificateClient {
                 };
             }
             if (updatedOptions.enabled !== undefined) {
-                generatedOptions.attributes = {
+                parameters.attributes = {
                     enabled: updatedOptions.enabled,
                 };
             }
-            let parsedBody;
-            await this.client.setCertificateIssuer(this.vaultUrl, issuerName, provider, Object.assign(Object.assign({}, generatedOptions), { onResponse: (response) => {
-                    parsedBody = response.parsedBody;
-                } }));
-            return toPublicIssuer(parsedBody);
+            const response = await this.client.setCertificateIssuer(issuerName, parameters, updatedOptions);
+            return toPublicIssuer(response);
         });
     }
     /**
@@ -456,13 +301,18 @@ export class CertificateClient {
     async updateIssuer(issuerName, options = {}) {
         return tracingClient.withSpan("CertificateClient.updateIssuer", options, async (updatedOptions) => {
             const { accountId, password } = options;
-            const generatedOptions = Object.assign(Object.assign({}, updatedOptions), { credentials: {
+            const parameters = {
+                credentials: {
                     accountId,
                     password,
-                } });
+                },
+            };
+            if (updatedOptions.provider) {
+                parameters.provider = updatedOptions.provider;
+            }
             if (updatedOptions.organizationId ||
                 (updatedOptions.administratorContacts && updatedOptions.administratorContacts.length)) {
-                generatedOptions.organizationDetails = {
+                parameters.organizationDetails = {
                     id: updatedOptions.organizationId,
                     adminDetails: updatedOptions.administratorContacts
                         ? updatedOptions.administratorContacts.map((x) => ({
@@ -475,15 +325,12 @@ export class CertificateClient {
                 };
             }
             if (updatedOptions.enabled) {
-                generatedOptions.attributes = {
+                parameters.attributes = {
                     enabled: updatedOptions.enabled,
                 };
             }
-            let parsedBody;
-            await this.client.updateCertificateIssuer(this.vaultUrl, issuerName, Object.assign(Object.assign({}, generatedOptions), { onResponse: (response) => {
-                    parsedBody = response.parsedBody;
-                } }));
-            return toPublicIssuer(parsedBody);
+            const response = await this.client.updateCertificateIssuer(issuerName, parameters, updatedOptions);
+            return toPublicIssuer(response);
         });
     }
     /**
@@ -503,12 +350,9 @@ export class CertificateClient {
      * @param options - The optional parameters
      */
     getIssuer(issuerName, options = {}) {
-        let parsedBody;
         return tracingClient.withSpan("CertificateClient.getIssuer", options, async (updatedOptions) => {
-            await this.client.getCertificateIssuer(this.vaultUrl, issuerName, Object.assign(Object.assign({}, updatedOptions), { onResponse: (response) => {
-                    parsedBody = response.parsedBody;
-                } }));
-            return toPublicIssuer(parsedBody);
+            const response = await this.client.getCertificateIssuer(issuerName, Object.assign({}, updatedOptions));
+            return toPublicIssuer(response);
         });
     }
     /**
@@ -526,12 +370,9 @@ export class CertificateClient {
      * @param options - The optional parameters
      */
     deleteIssuer(issuerName, options = {}) {
-        let parsedBody;
         return tracingClient.withSpan("CertificateClient.deleteIssuer", options, async (updatedOptions) => {
-            await this.client.deleteCertificateIssuer(this.vaultUrl, issuerName, Object.assign(Object.assign({}, updatedOptions), { onResponse: (response) => {
-                    parsedBody = response.parsedBody;
-                } }));
-            return toPublicIssuer(parsedBody);
+            const response = await this.client.deleteCertificateIssuer(issuerName, updatedOptions);
+            return toPublicIssuer(response);
         });
     }
     /**
@@ -604,7 +445,7 @@ export class CertificateClient {
      */
     getCertificate(certificateName, options = {}) {
         return tracingClient.withSpan("CertificateClient.getCertificate", options, async (updatedOptions) => {
-            const result = await this.client.getCertificate(this.vaultUrl, certificateName, "", updatedOptions);
+            const result = await this.client.getCertificate(certificateName, "", updatedOptions);
             return getCertificateWithPolicyFromCertificateBundle(result);
         });
     }
@@ -633,7 +474,7 @@ export class CertificateClient {
             if (!version) {
                 throw new Error("The 'version' cannot be empty.");
             }
-            const result = await this.client.getCertificate(this.vaultUrl, certificateName, version, updatedOptions);
+            const result = await this.client.getCertificate(certificateName, version, updatedOptions);
             return getCertificateFromCertificateBundle(result);
         });
     }
@@ -666,7 +507,7 @@ export class CertificateClient {
         return tracingClient.withSpan("CertificateClient.importCertificate", options, async (updatedOptions) => {
             var _a;
             const base64EncodedCertificate = parseCertificateBytes(certificateBytes, (_a = updatedOptions.policy) === null || _a === void 0 ? void 0 : _a.contentType);
-            const result = await this.client.importCertificate(this.vaultUrl, certificateName, base64EncodedCertificate, updatedOptions);
+            const result = await this.client.importCertificate(certificateName, Object.assign({ base64EncodedCertificate }, updatedOptions), updatedOptions);
             return getCertificateWithPolicyFromCertificateBundle(result);
         });
     }
@@ -688,12 +529,9 @@ export class CertificateClient {
      * @param options - The optional parameters
      */
     getCertificatePolicy(certificateName, options = {}) {
-        let parsedBody;
         return tracingClient.withSpan("CertificateClient.getCertificatePolicy", options, async (updatedOptions) => {
-            await this.client.getCertificatePolicy(this.vaultUrl, certificateName, Object.assign(Object.assign({}, updatedOptions), { onResponse: (res) => {
-                    parsedBody = res.parsedBody;
-                } }));
-            return toPublicPolicy(parsedBody);
+            const response = await this.client.getCertificatePolicy(certificateName, updatedOptions);
+            return toPublicPolicy(response);
         });
     }
     /**
@@ -707,9 +545,7 @@ export class CertificateClient {
         let parsedBody;
         return tracingClient.withSpan("CertificateClient.updateCertificatePolicy", options, async (updatedOptions) => {
             const corePolicy = toCorePolicy(undefined, policy);
-            await this.client.updateCertificatePolicy(this.vaultUrl, certificateName, corePolicy, Object.assign(Object.assign({}, updatedOptions), { onResponse: (response) => {
-                    parsedBody = response.parsedBody;
-                } }));
+            await this.client.updateCertificatePolicy(certificateName, corePolicy, updatedOptions);
             return toPublicPolicy(parsedBody);
         });
     }
@@ -739,12 +575,12 @@ export class CertificateClient {
      * @param options - The options, including what to update
      */
     updateCertificateProperties(certificateName, version, options = {}) {
-        let parsedBody;
         return tracingClient.withSpan("CertificateClient.updateCertificateProperties", options, async (updatedOptions) => {
-            await this.client.updateCertificate(this.vaultUrl, certificateName, version, Object.assign(Object.assign({}, updatedOptions), { certificateAttributes: toCoreAttributes(options), onResponse: (response) => {
-                    parsedBody = response.parsedBody;
-                } }));
-            return getCertificateFromCertificateBundle(parsedBody);
+            const response = await this.client.updateCertificate(certificateName, version, {
+                certificateAttributes: toCoreAttributes(options),
+                tags: options.tags,
+            }, updatedOptions);
+            return getCertificateFromCertificateBundle(response);
         });
     }
     /**
@@ -802,11 +638,8 @@ export class CertificateClient {
      */
     deleteCertificateOperation(certificateName, options = {}) {
         return tracingClient.withSpan("CertificateClient.deleteCertificateOperation", options, async (updatedOptions) => {
-            let parsedBody;
-            await this.client.deleteCertificateOperation(this.vaultUrl, certificateName, Object.assign(Object.assign({}, updatedOptions), { onResponse: (response) => {
-                    parsedBody = response.parsedBody;
-                } }));
-            return getCertificateOperationFromCoreOperation(certificateName, this.vaultUrl, parsedBody);
+            const operation = await this.client.deleteCertificateOperation(certificateName, updatedOptions);
+            return getCertificateOperationFromCoreOperation(certificateName, operation);
         });
     }
     /**
@@ -844,12 +677,9 @@ export class CertificateClient {
      * @param options - The optional parameters
      */
     mergeCertificate(certificateName, x509Certificates, options = {}) {
-        let parsedBody;
         return tracingClient.withSpan("CertificateClient.mergeCertificate", options, async (updatedOptions) => {
-            await this.client.mergeCertificate(this.vaultUrl, certificateName, x509Certificates, Object.assign(Object.assign({}, updatedOptions), { onResponse: (response) => {
-                    parsedBody = response.parsedBody;
-                } }));
-            return getCertificateWithPolicyFromCertificateBundle(parsedBody);
+            const response = await this.client.mergeCertificate(certificateName, { x509Certificates }, updatedOptions);
+            return getCertificateWithPolicyFromCertificateBundle(response);
         });
     }
     /**
@@ -870,12 +700,9 @@ export class CertificateClient {
      * @param options - The optional parameters
      */
     backupCertificate(certificateName, options = {}) {
-        let parsedBody;
         return tracingClient.withSpan("CertificateClient.backupCertificate", options, async (updatedOptions) => {
-            await this.client.backupCertificate(this.vaultUrl, certificateName, Object.assign(Object.assign({}, updatedOptions), { onResponse: (response) => {
-                    parsedBody = response.parsedBody;
-                } }));
-            return parsedBody.value;
+            const response = await this.client.backupCertificate(certificateName, updatedOptions);
+            return response.value;
         });
     }
     /**
@@ -899,57 +726,9 @@ export class CertificateClient {
      * @param options - The optional parameters
      */
     restoreCertificateBackup(backup, options = {}) {
-        let parsedBody;
         return tracingClient.withSpan("CertificateClient.restoreCertificateBackup", options, async (updatedOptions) => {
-            await this.client.restoreCertificate(this.vaultUrl, backup, Object.assign(Object.assign({}, updatedOptions), { onResponse: (response) => {
-                    parsedBody = response.parsedBody;
-                } }));
-            return getCertificateWithPolicyFromCertificateBundle(parsedBody);
-        });
-    }
-    listDeletedCertificatesPage(continuationState_1) {
-        return __asyncGenerator(this, arguments, function* listDeletedCertificatesPage_1(continuationState, options = {}) {
-            if (continuationState.continuationToken == null) {
-                const requestOptionsComplete = Object.assign({ maxresults: continuationState.maxPageSize, includePending: options.includePending }, options);
-                const currentSetResponse = yield __await(tracingClient.withSpan("CertificateClient.listDeletedCertificatesPage", requestOptionsComplete, (updatedOptions) => this.client.getDeletedCertificates(this.vaultUrl, updatedOptions)));
-                continuationState.continuationToken = currentSetResponse.nextLink;
-                if (currentSetResponse.value) {
-                    yield yield __await(currentSetResponse.value.map(getDeletedCertificateFromItem, this));
-                }
-            }
-            while (continuationState.continuationToken) {
-                const currentSetResponse = yield __await(tracingClient.withSpan("CertificateClient.listDeletedCertificatesPage", options, (updatedOptions) => this.client.getDeletedCertificatesNext(this.vaultUrl, continuationState.continuationToken, updatedOptions)));
-                continuationState.continuationToken = currentSetResponse.nextLink;
-                if (currentSetResponse.value) {
-                    yield yield __await(currentSetResponse.value.map(getDeletedCertificateFromItem, this));
-                }
-                else {
-                    break;
-                }
-            }
-        });
-    }
-    listDeletedCertificatesAll() {
-        return __asyncGenerator(this, arguments, function* listDeletedCertificatesAll_1(options = {}) {
-            var _a, e_4, _b, _c;
-            const f = {};
-            try {
-                for (var _d = true, _e = __asyncValues(this.listDeletedCertificatesPage(f, options)), _f; _f = yield __await(_e.next()), _a = _f.done, !_a; _d = true) {
-                    _c = _f.value;
-                    _d = false;
-                    const page = _c;
-                    for (const item of page) {
-                        yield yield __await(item);
-                    }
-                }
-            }
-            catch (e_4_1) { e_4 = { error: e_4_1 }; }
-            finally {
-                try {
-                    if (!_d && !_a && (_b = _e.return)) yield __await(_b.call(_e));
-                }
-                finally { if (e_4) throw e_4.error; }
-            }
+            const response = await this.client.restoreCertificate({ certificateBundleBackup: backup }, updatedOptions);
+            return getCertificateWithPolicyFromCertificateBundle(response);
         });
     }
     /**
@@ -972,17 +751,7 @@ export class CertificateClient {
      * @param options - The optional parameters
      */
     listDeletedCertificates(options = {}) {
-        const iter = this.listDeletedCertificatesAll(options);
-        const result = {
-            next() {
-                return iter.next();
-            },
-            [Symbol.asyncIterator]() {
-                return this;
-            },
-            byPage: (settings = {}) => this.listDeletedCertificatesPage(settings, options),
-        };
-        return result;
+        return mapPagedAsyncIterable(this.client.getDeletedCertificates(options), getDeletedCertificateFromItem);
     }
     /**
      * retrieves the deleted certificate information plus its attributes, such as retention interval, scheduled permanent deletion and the
@@ -1000,11 +769,8 @@ export class CertificateClient {
      */
     getDeletedCertificate(certificateName, options = {}) {
         return tracingClient.withSpan("CertificateClient.getDeletedCertificate", options, async (updatedOptions) => {
-            let parsedBody;
-            await this.client.getDeletedCertificate(this.vaultUrl, certificateName, Object.assign(Object.assign({}, updatedOptions), { onResponse: (response) => {
-                    parsedBody = response.parsedBody;
-                } }));
-            return getDeletedCertificateFromDeletedCertificateBundle(parsedBody);
+            const response = await this.client.getDeletedCertificate(certificateName, updatedOptions);
+            return getDeletedCertificateFromDeletedCertificateBundle(response);
         });
     }
     /**
@@ -1025,7 +791,7 @@ export class CertificateClient {
      */
     async purgeDeletedCertificate(certificateName, options = {}) {
         return tracingClient.withSpan("CertificateClient.purgeDeletedCertificate", options, async (updatedOptions) => {
-            await this.client.purgeDeletedCertificate(this.vaultUrl, certificateName, updatedOptions);
+            await this.client.purgeDeletedCertificate(certificateName, updatedOptions);
             return null;
         });
     }