@azure/arm-azurestack 3.0.0-beta.4 → 3.0.0-beta.5

package/CHANGELOG.md

@@ -1,4 +1,14 @@
 # Release History
+    
+## 3.0.0-beta.5 (2022-11-16)
+
+**Features**
+
+ -  Exposes `getContinuationToken` helper function to extract continuation token
+
+**Bugs Fixed**
+
+  - A series of small bug fixs relevant to authentication and apiVersion policy
 
 ## 3.0.0-beta.4 (2022-10-08)
 

package/dist/index.js

@@ -2,8 +2,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var coreClient = require('@azure/core-client');
 var tslib = require('tslib');
+var coreClient = require('@azure/core-client');
+var coreRestPipeline = require('@azure/core-rest-pipeline');
 
 function _interopNamespace(e) {
     if (e && e.__esModule) return e;
@@ -24,6 +25,39 @@ 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.
@@ -35,48 +69,71 @@ var coreClient__namespace = /*#__PURE__*/_interopNamespace(coreClient);
 /** Known values of {@link CreatedByType} that the service accepts. */
 exports.KnownCreatedByType = void 0;
 (function (KnownCreatedByType) {
+    /** User */
     KnownCreatedByType["User"] = "User";
+    /** Application */
     KnownCreatedByType["Application"] = "Application";
+    /** ManagedIdentity */
     KnownCreatedByType["ManagedIdentity"] = "ManagedIdentity";
+    /** Key */
     KnownCreatedByType["Key"] = "Key";
 })(exports.KnownCreatedByType || (exports.KnownCreatedByType = {}));
 /** Known values of {@link CompatibilityIssue} that the service accepts. */
 exports.KnownCompatibilityIssue = void 0;
 (function (KnownCompatibilityIssue) {
+    /** HigherDeviceVersionRequired */
     KnownCompatibilityIssue["HigherDeviceVersionRequired"] = "HigherDeviceVersionRequired";
+    /** LowerDeviceVersionRequired */
     KnownCompatibilityIssue["LowerDeviceVersionRequired"] = "LowerDeviceVersionRequired";
+    /** CapacityBillingModelRequired */
     KnownCompatibilityIssue["CapacityBillingModelRequired"] = "CapacityBillingModelRequired";
+    /** PayAsYouGoBillingModelRequired */
     KnownCompatibilityIssue["PayAsYouGoBillingModelRequired"] = "PayAsYouGoBillingModelRequired";
+    /** DevelopmentBillingModelRequired */
     KnownCompatibilityIssue["DevelopmentBillingModelRequired"] = "DevelopmentBillingModelRequired";
+    /** AzureADIdentitySystemRequired */
     KnownCompatibilityIssue["AzureADIdentitySystemRequired"] = "AzureADIdentitySystemRequired";
+    /** AdfsIdentitySystemRequired */
     KnownCompatibilityIssue["AdfsIdentitySystemRequired"] = "ADFSIdentitySystemRequired";
+    /** ConnectionToInternetRequired */
     KnownCompatibilityIssue["ConnectionToInternetRequired"] = "ConnectionToInternetRequired";
+    /** ConnectionToAzureRequired */
     KnownCompatibilityIssue["ConnectionToAzureRequired"] = "ConnectionToAzureRequired";
+    /** DisconnectedEnvironmentRequired */
     KnownCompatibilityIssue["DisconnectedEnvironmentRequired"] = "DisconnectedEnvironmentRequired";
 })(exports.KnownCompatibilityIssue || (exports.KnownCompatibilityIssue = {}));
 /** Known values of {@link ComputeRole} that the service accepts. */
 exports.KnownComputeRole = void 0;
 (function (KnownComputeRole) {
+    /** None */
     KnownComputeRole["None"] = "None";
+    /** IaaS */
     KnownComputeRole["IaaS"] = "IaaS";
+    /** PaaS */
     KnownComputeRole["PaaS"] = "PaaS";
 })(exports.KnownComputeRole || (exports.KnownComputeRole = {}));
 /** Known values of {@link OperatingSystem} that the service accepts. */
 exports.KnownOperatingSystem = void 0;
 (function (KnownOperatingSystem) {
+    /** None */
     KnownOperatingSystem["None"] = "None";
+    /** Windows */
     KnownOperatingSystem["Windows"] = "Windows";
+    /** Linux */
     KnownOperatingSystem["Linux"] = "Linux";
 })(exports.KnownOperatingSystem || (exports.KnownOperatingSystem = {}));
 /** Known values of {@link Category} that the service accepts. */
 exports.KnownCategory = void 0;
 (function (KnownCategory) {
+    /** AzureAD */
     KnownCategory["AzureAD"] = "AzureAD";
+    /** Adfs */
     KnownCategory["Adfs"] = "ADFS";
 })(exports.KnownCategory || (exports.KnownCategory = {}));
 /** Known values of {@link Location} that the service accepts. */
 exports.KnownLocation = void 0;
 (function (KnownLocation) {
+    /** Global */
     KnownLocation["Global"] = "global";
 })(exports.KnownLocation || (exports.KnownLocation = {}));
 
@@ -1517,20 +1574,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);
             }
         });
     }
@@ -1702,20 +1770,31 @@ class CustomerSubscriptionsImpl {
             [Symbol.asyncIterator]() {
                 return this;
             },
-            byPage: () => {
-                return this.listPagingPage(resourceGroup, registrationName, 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(resourceGroup, registrationName, options, settings);
             }
         };
     }
-    listPagingPage(resourceGroup, registrationName, options) {
+    listPagingPage(resourceGroup, registrationName, options, settings) {
         return tslib.__asyncGenerator(this, arguments, function* listPagingPage_1() {
-            let result = yield tslib.__await(this._list(resourceGroup, registrationName, 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(resourceGroup, registrationName, options));
+                let page = result.value || [];
+                continuationToken = result.nextLink;
+                setContinuationToken(page, continuationToken);
+                yield yield tslib.__await(page);
+            }
             while (continuationToken) {
                 result = yield tslib.__await(this._listNext(resourceGroup, registrationName, continuationToken, options));
                 continuationToken = result.nextLink;
-                yield yield tslib.__await(result.value || []);
+                let page = result.value || [];
+                setContinuationToken(page, continuationToken);
+                yield yield tslib.__await(page);
             }
         });
     }
@@ -1939,20 +2018,31 @@ class ProductsImpl {
             [Symbol.asyncIterator]() {
                 return this;
             },
-            byPage: () => {
-                return this.listPagingPage(resourceGroup, registrationName, 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(resourceGroup, registrationName, options, settings);
             }
         };
     }
-    listPagingPage(resourceGroup, registrationName, options) {
+    listPagingPage(resourceGroup, registrationName, options, settings) {
         return tslib.__asyncGenerator(this, arguments, function* listPagingPage_1() {
-            let result = yield tslib.__await(this._list(resourceGroup, registrationName, 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(resourceGroup, registrationName, options));
+                let page = result.value || [];
+                continuationToken = result.nextLink;
+                setContinuationToken(page, continuationToken);
+                yield yield tslib.__await(page);
+            }
             while (continuationToken) {
                 result = yield tslib.__await(this._listNext(resourceGroup, registrationName, continuationToken, options));
                 continuationToken = result.nextLink;
-                yield yield tslib.__await(result.value || []);
+                let page = result.value || [];
+                setContinuationToken(page, continuationToken);
+                yield yield tslib.__await(page);
             }
         });
     }
@@ -2237,20 +2327,31 @@ class RegistrationsImpl {
             [Symbol.asyncIterator]() {
                 return this;
             },
-            byPage: () => {
-                return this.listPagingPage(resourceGroup, 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(resourceGroup, options, settings);
             }
         };
     }
-    listPagingPage(resourceGroup, options) {
+    listPagingPage(resourceGroup, options, settings) {
         return tslib.__asyncGenerator(this, arguments, function* listPagingPage_1() {
-            let result = yield tslib.__await(this._list(resourceGroup, 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(resourceGroup, options));
+                let page = result.value || [];
+                continuationToken = result.nextLink;
+                setContinuationToken(page, continuationToken);
+                yield yield tslib.__await(page);
+            }
             while (continuationToken) {
                 result = yield tslib.__await(this._listNext(resourceGroup, continuationToken, options));
                 continuationToken = result.nextLink;
-                yield yield tslib.__await(result.value || []);
+                let page = result.value || [];
+                setContinuationToken(page, continuationToken);
+                yield yield tslib.__await(page);
             }
         });
     }
@@ -2285,20 +2386,31 @@ class RegistrationsImpl {
             [Symbol.asyncIterator]() {
                 return this;
             },
-            byPage: () => {
-                return this.listBySubscriptionPagingPage(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.listBySubscriptionPagingPage(options, settings);
             }
         };
     }
-    listBySubscriptionPagingPage(options) {
+    listBySubscriptionPagingPage(options, settings) {
         return tslib.__asyncGenerator(this, arguments, function* listBySubscriptionPagingPage_1() {
-            let result = yield tslib.__await(this._listBySubscription(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._listBySubscription(options));
+                let page = result.value || [];
+                continuationToken = result.nextLink;
+                setContinuationToken(page, continuationToken);
+                yield yield tslib.__await(page);
+            }
             while (continuationToken) {
                 result = yield tslib.__await(this._listBySubscriptionNext(continuationToken, options));
                 continuationToken = result.nextLink;
-                yield yield tslib.__await(result.value || []);
+                let page = result.value || [];
+                setContinuationToken(page, continuationToken);
+                yield yield tslib.__await(page);
             }
         });
     }
@@ -2649,20 +2761,31 @@ class LinkedSubscriptionsImpl {
             [Symbol.asyncIterator]() {
                 return this;
             },
-            byPage: () => {
-                return this.listByResourceGroupPagingPage(resourceGroup, 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(resourceGroup, options, settings);
             }
         };
     }
-    listByResourceGroupPagingPage(resourceGroup, options) {
+    listByResourceGroupPagingPage(resourceGroup, options, settings) {
         return tslib.__asyncGenerator(this, arguments, function* listByResourceGroupPagingPage_1() {
-            let result = yield tslib.__await(this._listByResourceGroup(resourceGroup, 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(resourceGroup, options));
+                let page = result.value || [];
+                continuationToken = result.nextLink;
+                setContinuationToken(page, continuationToken);
+                yield yield tslib.__await(page);
+            }
             while (continuationToken) {
                 result = yield tslib.__await(this._listByResourceGroupNext(resourceGroup, continuationToken, options));
                 continuationToken = result.nextLink;
-                yield yield tslib.__await(result.value || []);
+                let page = result.value || [];
+                setContinuationToken(page, continuationToken);
+                yield yield tslib.__await(page);
             }
         });
     }
@@ -2697,20 +2820,31 @@ class LinkedSubscriptionsImpl {
             [Symbol.asyncIterator]() {
                 return this;
             },
-            byPage: () => {
-                return this.listBySubscriptionPagingPage(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.listBySubscriptionPagingPage(options, settings);
             }
         };
     }
-    listBySubscriptionPagingPage(options) {
+    listBySubscriptionPagingPage(options, settings) {
         return tslib.__asyncGenerator(this, arguments, function* listBySubscriptionPagingPage_1() {
-            let result = yield tslib.__await(this._listBySubscription(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._listBySubscription(options));
+                let page = result.value || [];
+                continuationToken = result.nextLink;
+                setContinuationToken(page, continuationToken);
+                yield yield tslib.__await(page);
+            }
             while (continuationToken) {
                 result = yield tslib.__await(this._listBySubscriptionNext(continuationToken, options));
                 continuationToken = result.nextLink;
-                yield yield tslib.__await(result.value || []);
+                let page = result.value || [];
+                setContinuationToken(page, continuationToken);
+                yield yield tslib.__await(page);
             }
         });
     }
@@ -2989,7 +3123,7 @@ class AzureStackManagementClient extends coreClient__namespace.ServiceClient {
      * @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");
         }
@@ -3004,17 +3138,35 @@ class AzureStackManagementClient extends coreClient__namespace.ServiceClient {
             requestContentType: "application/json; charset=utf-8",
             credential: credentials
         };
-        const packageDetails = `azsdk-js-arm-azurestack/3.0.0-beta.4`;
+        const packageDetails = `azsdk-js-arm-azurestack/3.0.0-beta.5`;
         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) {
+            const pipelinePolicies = options.pipeline.getOrderedPolicies();
+            bearerTokenAuthenticationPolicyFound = pipelinePolicies.some((pipelinePolicy) => pipelinePolicy.name ===
+                coreRestPipeline__namespace.bearerTokenAuthenticationPolicyName);
+        }
+        if (!options ||
+            !options.pipeline ||
+            options.pipeline.getOrderedPolicies().length == 0 ||
+            !bearerTokenAuthenticationPolicyFound) {
+            this.pipeline.removePolicy({
+                name: coreRestPipeline__namespace.bearerTokenAuthenticationPolicyName
+            });
+            this.pipeline.addPolicy(coreRestPipeline__namespace.bearerTokenAuthenticationPolicy({
+                credential: credentials,
+                scopes: (_c = optionsWithDefaults.credentialScopes) !== null && _c !== void 0 ? _c : `${optionsWithDefaults.endpoint}/.default`,
+                challengeCallbacks: {
+                    authorizeRequestOnChallenge: coreClient__namespace.authorizeRequestOnClaimChallenge
+                }
+            }));
+        }
         // Parameter assignments
         this.subscriptionId = subscriptionId;
         // Assigning values to Constant parameters
@@ -3026,8 +3178,37 @@ class AzureStackManagementClient extends coreClient__namespace.ServiceClient {
         this.products = new ProductsImpl(this);
         this.registrations = new RegistrationsImpl(this);
         this.linkedSubscriptions = new LinkedSubscriptionsImpl(this);
+        this.addCustomApiVersionPolicy(options.apiVersion);
+    }
+    /** A function that adds a policy that sets the api-version (or equivalent) to reflect the library version. */
+    addCustomApiVersionPolicy(apiVersion) {
+        if (!apiVersion) {
+            return;
+        }
+        const apiVersionPolicy = {
+            name: "CustomApiVersionPolicy",
+            sendRequest(request, next) {
+                return tslib.__awaiter(this, void 0, void 0, function* () {
+                    const param = request.url.split("?");
+                    if (param.length > 1) {
+                        const newParams = param[1].split("&").map((item) => {
+                            if (item.indexOf("api-version") > -1) {
+                                return "api-version=" + apiVersion;
+                            }
+                            else {
+                                return item;
+                            }
+                        });
+                        request.url = param[0] + "?" + newParams.join("&");
+                    }
+                    return next(request);
+                });
+            }
+        };
+        this.pipeline.addPolicy(apiVersionPolicy);
     }
 }
 
 exports.AzureStackManagementClient = AzureStackManagementClient;
+exports.getContinuationToken = getContinuationToken;
 //# sourceMappingURL=index.js.map