@azure/arm-cognitiveservices 7.3.0 → 7.3.1-alpha.20221128.1

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Release History
     
+## 7.3.1 (2022-11-21)
+
+**Features**
+
+ -  Exposes `getContinuationToken` helper function to extract continuation token
+
+**Bugs Fixed**
+
+  - A series of small bug fixs relevant to authentication and apiVersion policy
+
 ## 7.3.0 (2022-10-31)
     
 **Features**

package/dist/index.js

@@ -28,6 +28,38 @@ function _interopNamespace(e) {
 var coreClient__namespace = /*#__PURE__*/_interopNamespace(coreClient);
 var coreRestPipeline__namespace = /*#__PURE__*/_interopNamespace(coreRestPipeline);
 
+/*
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is regenerated.
+ */
+const pageMap = new WeakMap();
+/**
+ * Given a result page from a pageable operation, returns a
+ * continuation token that can be used to begin paging from
+ * that point later.
+ * @param page A result object from calling .byPage() on a paged operation.
+ * @returns The continuation token that can be passed into byPage().
+ */
+function getContinuationToken(page) {
+    var _a;
+    if (typeof page !== "object" || page === null) {
+        return undefined;
+    }
+    return (_a = pageMap.get(page)) === null || _a === void 0 ? void 0 : _a.continuationToken;
+}
+function setContinuationToken(page, continuationToken) {
+    var _a;
+    if (typeof page !== "object" || page === null || !continuationToken) {
+        return;
+    }
+    const pageInfo = (_a = pageMap.get(page)) !== null && _a !== void 0 ? _a : {};
+    pageInfo.continuationToken = continuationToken;
+    pageMap.set(page, pageInfo);
+}
+
 /*
  * Copyright (c) Microsoft Corporation.
  * Licensed under the MIT License.
@@ -2811,20 +2843,31 @@ class AccountsImpl {
             [Symbol.asyncIterator]() {
                 return this;
             },
-            byPage: () => {
-                return this.listByResourceGroupPagingPage(resourceGroupName, options);
+            byPage: (settings) => {
+                if (settings === null || settings === void 0 ? void 0 : settings.maxPageSize) {
+                    throw new Error("maxPageSize is not supported by this operation.");
+                }
+                return this.listByResourceGroupPagingPage(resourceGroupName, options, settings);
             }
         };
     }
-    listByResourceGroupPagingPage(resourceGroupName, options) {
+    listByResourceGroupPagingPage(resourceGroupName, options, settings) {
         return tslib.__asyncGenerator(this, arguments, function* listByResourceGroupPagingPage_1() {
-            let result = yield tslib.__await(this._listByResourceGroup(resourceGroupName, options));
-            yield yield tslib.__await(result.value || []);
-            let continuationToken = result.nextLink;
+            let result;
+            let continuationToken = settings === null || settings === void 0 ? void 0 : settings.continuationToken;
+            if (!continuationToken) {
+                result = yield tslib.__await(this._listByResourceGroup(resourceGroupName, options));
+                let page = result.value || [];
+                continuationToken = result.nextLink;
+                setContinuationToken(page, continuationToken);
+                yield yield tslib.__await(page);
+            }
             while (continuationToken) {
                 result = yield tslib.__await(this._listByResourceGroupNext(resourceGroupName, continuationToken, options));
                 continuationToken = result.nextLink;
-                yield yield tslib.__await(result.value || []);
+                let page = result.value || [];
+                setContinuationToken(page, continuationToken);
+                yield yield tslib.__await(page);
             }
         });
     }
@@ -2859,20 +2902,31 @@ class AccountsImpl {
             [Symbol.asyncIterator]() {
                 return this;
             },
-            byPage: () => {
-                return this.listPagingPage(options);
+            byPage: (settings) => {
+                if (settings === null || settings === void 0 ? void 0 : settings.maxPageSize) {
+                    throw new Error("maxPageSize is not supported by this operation.");
+                }
+                return this.listPagingPage(options, settings);
             }
         };
     }
-    listPagingPage(options) {
+    listPagingPage(options, settings) {
         return tslib.__asyncGenerator(this, arguments, function* listPagingPage_1() {
-            let result = yield tslib.__await(this._list(options));
-            yield yield tslib.__await(result.value || []);
-            let continuationToken = result.nextLink;
+            let result;
+            let continuationToken = settings === null || settings === void 0 ? void 0 : settings.continuationToken;
+            if (!continuationToken) {
+                result = yield tslib.__await(this._list(options));
+                let page = result.value || [];
+                continuationToken = result.nextLink;
+                setContinuationToken(page, continuationToken);
+                yield yield tslib.__await(page);
+            }
             while (continuationToken) {
                 result = yield tslib.__await(this._listNext(continuationToken, options));
                 continuationToken = result.nextLink;
-                yield yield tslib.__await(result.value || []);
+                let page = result.value || [];
+                setContinuationToken(page, continuationToken);
+                yield yield tslib.__await(page);
             }
         });
     }
@@ -2909,20 +2963,31 @@ class AccountsImpl {
             [Symbol.asyncIterator]() {
                 return this;
             },
-            byPage: () => {
-                return this.listModelsPagingPage(resourceGroupName, accountName, options);
+            byPage: (settings) => {
+                if (settings === null || settings === void 0 ? void 0 : settings.maxPageSize) {
+                    throw new Error("maxPageSize is not supported by this operation.");
+                }
+                return this.listModelsPagingPage(resourceGroupName, accountName, options, settings);
             }
         };
     }
-    listModelsPagingPage(resourceGroupName, accountName, options) {
+    listModelsPagingPage(resourceGroupName, accountName, options, settings) {
         return tslib.__asyncGenerator(this, arguments, function* listModelsPagingPage_1() {
-            let result = yield tslib.__await(this._listModels(resourceGroupName, accountName, options));
-            yield yield tslib.__await(result.value || []);
-            let continuationToken = result.nextLink;
+            let result;
+            let continuationToken = settings === null || settings === void 0 ? void 0 : settings.continuationToken;
+            if (!continuationToken) {
+                result = yield tslib.__await(this._listModels(resourceGroupName, accountName, options));
+                let page = result.value || [];
+                continuationToken = result.nextLink;
+                setContinuationToken(page, continuationToken);
+                yield yield tslib.__await(page);
+            }
             while (continuationToken) {
                 result = yield tslib.__await(this._listModelsNext(resourceGroupName, accountName, continuationToken, options));
                 continuationToken = result.nextLink;
-                yield yield tslib.__await(result.value || []);
+                let page = result.value || [];
+                setContinuationToken(page, continuationToken);
+                yield yield tslib.__await(page);
             }
         });
     }
@@ -3550,20 +3615,31 @@ class DeletedAccountsImpl {
             [Symbol.asyncIterator]() {
                 return this;
             },
-            byPage: () => {
-                return this.listPagingPage(options);
+            byPage: (settings) => {
+                if (settings === null || settings === void 0 ? void 0 : settings.maxPageSize) {
+                    throw new Error("maxPageSize is not supported by this operation.");
+                }
+                return this.listPagingPage(options, settings);
             }
         };
     }
-    listPagingPage(options) {
+    listPagingPage(options, settings) {
         return tslib.__asyncGenerator(this, arguments, function* listPagingPage_1() {
-            let result = yield tslib.__await(this._list(options));
-            yield yield tslib.__await(result.value || []);
-            let continuationToken = result.nextLink;
+            let result;
+            let continuationToken = settings === null || settings === void 0 ? void 0 : settings.continuationToken;
+            if (!continuationToken) {
+                result = yield tslib.__await(this._list(options));
+                let page = result.value || [];
+                continuationToken = result.nextLink;
+                setContinuationToken(page, continuationToken);
+                yield yield tslib.__await(page);
+            }
             while (continuationToken) {
                 result = yield tslib.__await(this._listNext(continuationToken, options));
                 continuationToken = result.nextLink;
-                yield yield tslib.__await(result.value || []);
+                let page = result.value || [];
+                setContinuationToken(page, continuationToken);
+                yield yield tslib.__await(page);
             }
         });
     }
@@ -3778,20 +3854,31 @@ class ResourceSkusImpl {
             [Symbol.asyncIterator]() {
                 return this;
             },
-            byPage: () => {
-                return this.listPagingPage(options);
+            byPage: (settings) => {
+                if (settings === null || settings === void 0 ? void 0 : settings.maxPageSize) {
+                    throw new Error("maxPageSize is not supported by this operation.");
+                }
+                return this.listPagingPage(options, settings);
             }
         };
     }
-    listPagingPage(options) {
+    listPagingPage(options, settings) {
         return tslib.__asyncGenerator(this, arguments, function* listPagingPage_1() {
-            let result = yield tslib.__await(this._list(options));
-            yield yield tslib.__await(result.value || []);
-            let continuationToken = result.nextLink;
+            let result;
+            let continuationToken = settings === null || settings === void 0 ? void 0 : settings.continuationToken;
+            if (!continuationToken) {
+                result = yield tslib.__await(this._list(options));
+                let page = result.value || [];
+                continuationToken = result.nextLink;
+                setContinuationToken(page, continuationToken);
+                yield yield tslib.__await(page);
+            }
             while (continuationToken) {
                 result = yield tslib.__await(this._listNext(continuationToken, options));
                 continuationToken = result.nextLink;
-                yield yield tslib.__await(result.value || []);
+                let page = result.value || [];
+                setContinuationToken(page, continuationToken);
+                yield yield tslib.__await(page);
             }
         });
     }
@@ -3898,20 +3985,31 @@ class OperationsImpl {
             [Symbol.asyncIterator]() {
                 return this;
             },
-            byPage: () => {
-                return this.listPagingPage(options);
+            byPage: (settings) => {
+                if (settings === null || settings === void 0 ? void 0 : settings.maxPageSize) {
+                    throw new Error("maxPageSize is not supported by this operation.");
+                }
+                return this.listPagingPage(options, settings);
             }
         };
     }
-    listPagingPage(options) {
+    listPagingPage(options, settings) {
         return tslib.__asyncGenerator(this, arguments, function* listPagingPage_1() {
-            let result = yield tslib.__await(this._list(options));
-            yield yield tslib.__await(result.value || []);
-            let continuationToken = result.nextLink;
+            let result;
+            let continuationToken = settings === null || settings === void 0 ? void 0 : settings.continuationToken;
+            if (!continuationToken) {
+                result = yield tslib.__await(this._list(options));
+                let page = result.value || [];
+                continuationToken = result.nextLink;
+                setContinuationToken(page, continuationToken);
+                yield yield tslib.__await(page);
+            }
             while (continuationToken) {
                 result = yield tslib.__await(this._listNext(continuationToken, options));
                 continuationToken = result.nextLink;
-                yield yield tslib.__await(result.value || []);
+                let page = result.value || [];
+                setContinuationToken(page, continuationToken);
+                yield yield tslib.__await(page);
             }
         });
     }
@@ -4015,20 +4113,31 @@ class CommitmentTiersImpl {
             [Symbol.asyncIterator]() {
                 return this;
             },
-            byPage: () => {
-                return this.listPagingPage(location, options);
+            byPage: (settings) => {
+                if (settings === null || settings === void 0 ? void 0 : settings.maxPageSize) {
+                    throw new Error("maxPageSize is not supported by this operation.");
+                }
+                return this.listPagingPage(location, options, settings);
             }
         };
     }
-    listPagingPage(location, options) {
+    listPagingPage(location, options, settings) {
         return tslib.__asyncGenerator(this, arguments, function* listPagingPage_1() {
-            let result = yield tslib.__await(this._list(location, options));
-            yield yield tslib.__await(result.value || []);
-            let continuationToken = result.nextLink;
+            let result;
+            let continuationToken = settings === null || settings === void 0 ? void 0 : settings.continuationToken;
+            if (!continuationToken) {
+                result = yield tslib.__await(this._list(location, options));
+                let page = result.value || [];
+                continuationToken = result.nextLink;
+                setContinuationToken(page, continuationToken);
+                yield yield tslib.__await(page);
+            }
             while (continuationToken) {
                 result = yield tslib.__await(this._listNext(location, continuationToken, options));
                 continuationToken = result.nextLink;
-                yield yield tslib.__await(result.value || []);
+                let page = result.value || [];
+                setContinuationToken(page, continuationToken);
+                yield yield tslib.__await(page);
             }
         });
     }
@@ -4463,20 +4572,31 @@ class DeploymentsImpl {
             [Symbol.asyncIterator]() {
                 return this;
             },
-            byPage: () => {
-                return this.listPagingPage(resourceGroupName, accountName, options);
+            byPage: (settings) => {
+                if (settings === null || settings === void 0 ? void 0 : settings.maxPageSize) {
+                    throw new Error("maxPageSize is not supported by this operation.");
+                }
+                return this.listPagingPage(resourceGroupName, accountName, options, settings);
             }
         };
     }
-    listPagingPage(resourceGroupName, accountName, options) {
+    listPagingPage(resourceGroupName, accountName, options, settings) {
         return tslib.__asyncGenerator(this, arguments, function* listPagingPage_1() {
-            let result = yield tslib.__await(this._list(resourceGroupName, accountName, options));
-            yield yield tslib.__await(result.value || []);
-            let continuationToken = result.nextLink;
+            let result;
+            let continuationToken = settings === null || settings === void 0 ? void 0 : settings.continuationToken;
+            if (!continuationToken) {
+                result = yield tslib.__await(this._list(resourceGroupName, accountName, options));
+                let page = result.value || [];
+                continuationToken = result.nextLink;
+                setContinuationToken(page, continuationToken);
+                yield yield tslib.__await(page);
+            }
             while (continuationToken) {
                 result = yield tslib.__await(this._listNext(resourceGroupName, accountName, continuationToken, options));
                 continuationToken = result.nextLink;
-                yield yield tslib.__await(result.value || []);
+                let page = result.value || [];
+                setContinuationToken(page, continuationToken);
+                yield yield tslib.__await(page);
             }
         });
     }
@@ -4792,20 +4912,31 @@ class CommitmentPlansImpl {
             [Symbol.asyncIterator]() {
                 return this;
             },
-            byPage: () => {
-                return this.listPagingPage(resourceGroupName, accountName, options);
+            byPage: (settings) => {
+                if (settings === null || settings === void 0 ? void 0 : settings.maxPageSize) {
+                    throw new Error("maxPageSize is not supported by this operation.");
+                }
+                return this.listPagingPage(resourceGroupName, accountName, options, settings);
             }
         };
     }
-    listPagingPage(resourceGroupName, accountName, options) {
+    listPagingPage(resourceGroupName, accountName, options, settings) {
         return tslib.__asyncGenerator(this, arguments, function* listPagingPage_1() {
-            let result = yield tslib.__await(this._list(resourceGroupName, accountName, options));
-            yield yield tslib.__await(result.value || []);
-            let continuationToken = result.nextLink;
+            let result;
+            let continuationToken = settings === null || settings === void 0 ? void 0 : settings.continuationToken;
+            if (!continuationToken) {
+                result = yield tslib.__await(this._list(resourceGroupName, accountName, options));
+                let page = result.value || [];
+                continuationToken = result.nextLink;
+                setContinuationToken(page, continuationToken);
+                yield yield tslib.__await(page);
+            }
             while (continuationToken) {
                 result = yield tslib.__await(this._listNext(resourceGroupName, accountName, continuationToken, options));
                 continuationToken = result.nextLink;
-                yield yield tslib.__await(result.value || []);
+                let page = result.value || [];
+                setContinuationToken(page, continuationToken);
+                yield yield tslib.__await(page);
             }
         });
     }
@@ -5064,7 +5195,7 @@ class CognitiveServicesManagementClient extends coreClient__namespace.ServiceCli
      * @param options The parameter options
      */
     constructor(credentials, subscriptionId, options) {
-        var _a, _b;
+        var _a, _b, _c;
         if (credentials === undefined) {
             throw new Error("'credentials' cannot be null");
         }
@@ -5079,16 +5210,13 @@ class CognitiveServicesManagementClient extends coreClient__namespace.ServiceCli
             requestContentType: "application/json; charset=utf-8",
             credential: credentials
         };
-        const packageDetails = `azsdk-js-arm-cognitiveservices/7.3.0`;
+        const packageDetails = `azsdk-js-arm-cognitiveservices/7.3.1`;
         const userAgentPrefix = options.userAgentOptions && options.userAgentOptions.userAgentPrefix
             ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`
             : `${packageDetails}`;
-        if (!options.credentialScopes) {
-            options.credentialScopes = ["https://management.azure.com/.default"];
-        }
         const optionsWithDefaults = Object.assign(Object.assign(Object.assign({}, defaults), options), { userAgentOptions: {
                 userAgentPrefix
-            }, baseUri: (_b = (_a = options.endpoint) !== null && _a !== void 0 ? _a : options.baseUri) !== null && _b !== void 0 ? _b : "https://management.azure.com" });
+            }, endpoint: (_b = (_a = options.endpoint) !== null && _a !== void 0 ? _a : options.baseUri) !== null && _b !== void 0 ? _b : "https://management.azure.com" });
         super(optionsWithDefaults);
         let bearerTokenAuthenticationPolicyFound = false;
         if ((options === null || options === void 0 ? void 0 : options.pipeline) && options.pipeline.getOrderedPolicies().length > 0) {
@@ -5105,7 +5233,7 @@ class CognitiveServicesManagementClient extends coreClient__namespace.ServiceCli
             });
             this.pipeline.addPolicy(coreRestPipeline__namespace.bearerTokenAuthenticationPolicy({
                 credential: credentials,
-                scopes: `${optionsWithDefaults.credentialScopes}`,
+                scopes: (_c = optionsWithDefaults.credentialScopes) !== null && _c !== void 0 ? _c : `${optionsWithDefaults.endpoint}/.default`,
                 challengeCallbacks: {
                     authorizeRequestOnChallenge: coreClient__namespace.authorizeRequestOnClaimChallenge
                 }
@@ -5229,4 +5357,5 @@ const checkDomainAvailabilityOperationSpec = {
 };
 
 exports.CognitiveServicesManagementClient = CognitiveServicesManagementClient;
+exports.getContinuationToken = getContinuationToken;
 //# sourceMappingURL=index.js.map