@azure/arm-extendedlocation 1.0.0-beta.2 → 1.0.0-beta.3

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Release History
-    
+
+## 1.0.0-beta.3 (2023-01-10)
+
+**Features**
+
+- Exposes `getContinuationToken` helper function to extract continuation token
+
+**Bugs Fixed**
+
+- A series of small bug fixs relevant to authentication and apiVersion policy
+
 ## 1.0.0-beta.2 (2022-07-20)
     
 **Features**

package/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2022 Microsoft
+Copyright (c) 2023 Microsoft
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -13,7 +13,7 @@ The customLocations Rest API spec.
 
 ### Currently supported environments
 
-- [LTS versions of Node.js](https://nodejs.org/about/releases/)
+- [LTS versions of Node.js](https://github.com/nodejs/release#release-schedule)
 - Latest versions of Safari, Chrome, Edge and Firefox.
 
 See our [support policy](https://github.com/Azure/azure-sdk-for-js/blob/main/SUPPORT.md) for more details.

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 the last `.value` produced by the `byPage` iterator,
+ * returns a continuation token that can be used to begin paging from
+ * that point later.
+ * @param page An object from accessing `value` on the IteratorResult from a `byPage` iterator.
+ * @returns The continuation token that can be passed into byPage() during future calls.
+ */
+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.
@@ -1057,20 +1089,31 @@ class CustomLocationsImpl {
             [Symbol.asyncIterator]() {
                 return this;
             },
-            byPage: () => {
-                return this.listOperationsPagingPage(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.listOperationsPagingPage(options, settings);
             }
         };
     }
-    listOperationsPagingPage(options) {
+    listOperationsPagingPage(options, settings) {
         return tslib.__asyncGenerator(this, arguments, function* listOperationsPagingPage_1() {
-            let result = yield tslib.__await(this._listOperations(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._listOperations(options));
+                let page = result.value || [];
+                continuationToken = result.nextLink;
+                setContinuationToken(page, continuationToken);
+                yield yield tslib.__await(page);
+            }
             while (continuationToken) {
                 result = yield tslib.__await(this._listOperationsNext(continuationToken, options));
                 continuationToken = result.nextLink;
-                yield yield tslib.__await(result.value || []);
+                let page = result.value || [];
+                setContinuationToken(page, continuationToken);
+                yield yield tslib.__await(page);
             }
         });
     }
@@ -1106,20 +1149,31 @@ class CustomLocationsImpl {
             [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);
             }
         });
     }
@@ -1156,20 +1210,31 @@ class CustomLocationsImpl {
             [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);
             }
         });
     }
@@ -1206,20 +1271,31 @@ class CustomLocationsImpl {
             [Symbol.asyncIterator]() {
                 return this;
             },
-            byPage: () => {
-                return this.listEnabledResourceTypesPagingPage(resourceGroupName, resourceName, 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.listEnabledResourceTypesPagingPage(resourceGroupName, resourceName, options, settings);
             }
         };
     }
-    listEnabledResourceTypesPagingPage(resourceGroupName, resourceName, options) {
+    listEnabledResourceTypesPagingPage(resourceGroupName, resourceName, options, settings) {
         return tslib.__asyncGenerator(this, arguments, function* listEnabledResourceTypesPagingPage_1() {
-            let result = yield tslib.__await(this._listEnabledResourceTypes(resourceGroupName, resourceName, 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._listEnabledResourceTypes(resourceGroupName, resourceName, options));
+                let page = result.value || [];
+                continuationToken = result.nextLink;
+                setContinuationToken(page, continuationToken);
+                yield yield tslib.__await(page);
+            }
             while (continuationToken) {
                 result = yield tslib.__await(this._listEnabledResourceTypesNext(resourceGroupName, resourceName, continuationToken, options));
                 continuationToken = result.nextLink;
-                yield yield tslib.__await(result.value || []);
+                let page = result.value || [];
+                setContinuationToken(page, continuationToken);
+                yield yield tslib.__await(page);
             }
         });
     }
@@ -1668,7 +1744,6 @@ const listOperationsNextOperationSpec = {
             bodyMapper: ErrorResponse
         }
     },
-    queryParameters: [apiVersion],
     urlParameters: [$host, nextLink],
     headerParameters: [accept],
     serializer: serializer$1
@@ -1684,7 +1759,6 @@ const listBySubscriptionNextOperationSpec = {
             bodyMapper: ErrorResponse
         }
     },
-    queryParameters: [apiVersion],
     urlParameters: [
         $host,
         subscriptionId,
@@ -1704,7 +1778,6 @@ const listByResourceGroupNextOperationSpec = {
             bodyMapper: ErrorResponse
         }
     },
-    queryParameters: [apiVersion],
     urlParameters: [
         $host,
         subscriptionId,
@@ -1725,7 +1798,6 @@ const listEnabledResourceTypesNextOperationSpec = {
             bodyMapper: ErrorResponse
         }
     },
-    queryParameters: [apiVersion],
     urlParameters: [
         $host,
         subscriptionId,
@@ -1770,20 +1842,31 @@ class ResourceSyncRulesImpl {
             [Symbol.asyncIterator]() {
                 return this;
             },
-            byPage: () => {
-                return this.listByCustomLocationIDPagingPage(resourceGroupName, resourceName, 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.listByCustomLocationIDPagingPage(resourceGroupName, resourceName, options, settings);
             }
         };
     }
-    listByCustomLocationIDPagingPage(resourceGroupName, resourceName, options) {
+    listByCustomLocationIDPagingPage(resourceGroupName, resourceName, options, settings) {
         return tslib.__asyncGenerator(this, arguments, function* listByCustomLocationIDPagingPage_1() {
-            let result = yield tslib.__await(this._listByCustomLocationID(resourceGroupName, resourceName, 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._listByCustomLocationID(resourceGroupName, resourceName, options));
+                let page = result.value || [];
+                continuationToken = result.nextLink;
+                setContinuationToken(page, continuationToken);
+                yield yield tslib.__await(page);
+            }
             while (continuationToken) {
                 result = yield tslib.__await(this._listByCustomLocationIDNext(resourceGroupName, resourceName, continuationToken, options));
                 continuationToken = result.nextLink;
-                yield yield tslib.__await(result.value || []);
+                let page = result.value || [];
+                setContinuationToken(page, continuationToken);
+                yield yield tslib.__await(page);
             }
         });
     }
@@ -2119,7 +2202,6 @@ const listByCustomLocationIDNextOperationSpec = {
             bodyMapper: ErrorResponse
         }
     },
-    queryParameters: [apiVersion],
     urlParameters: [
         $host,
         subscriptionId,
@@ -2146,7 +2228,7 @@ class CustomLocationsManagementClient extends coreClient__namespace.ServiceClien
      * @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");
         }
@@ -2161,32 +2243,34 @@ class CustomLocationsManagementClient extends coreClient__namespace.ServiceClien
             requestContentType: "application/json; charset=utf-8",
             credential: credentials
         };
-        const packageDetails = `azsdk-js-arm-extendedlocation/1.0.0-beta.2`;
+        const packageDetails = `azsdk-js-arm-extendedlocation/1.0.0-beta.3`;
         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();
-            const bearerTokenAuthenticationPolicyFound = pipelinePolicies.some((pipelinePolicy) => pipelinePolicy.name ===
+            bearerTokenAuthenticationPolicyFound = pipelinePolicies.some((pipelinePolicy) => pipelinePolicy.name ===
                 coreRestPipeline__namespace.bearerTokenAuthenticationPolicyName);
-            if (!bearerTokenAuthenticationPolicyFound) {
-                this.pipeline.removePolicy({
-                    name: coreRestPipeline__namespace.bearerTokenAuthenticationPolicyName
-                });
-                this.pipeline.addPolicy(coreRestPipeline__namespace.bearerTokenAuthenticationPolicy({
-                    scopes: `${optionsWithDefaults.baseUri}/.default`,
-                    challengeCallbacks: {
-                        authorizeRequestOnChallenge: coreClient__namespace.authorizeRequestOnClaimChallenge
-                    }
-                }));
-            }
+        }
+        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;
@@ -2227,4 +2311,5 @@ class CustomLocationsManagementClient extends coreClient__namespace.ServiceClien
 }
 
 exports.CustomLocationsManagementClient = CustomLocationsManagementClient;
+exports.getContinuationToken = getContinuationToken;
 //# sourceMappingURL=index.js.map