@azure/notification-hubs 1.0.0-beta.6 → 1.0.0-beta.8

package/dist/index.cjs

@@ -14,7 +14,7 @@ var uuid = require('uuid');
 
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
-const SDK_VERSION = "1.0.0-beta.6";
+const SDK_VERSION = "1.0.0-beta.8";
 const JSON_CONTENT_TYPE = "application/json;charset=utf-8";
 const XML_CONTENT_TYPE = "application/xml";
 const STREAM_CONTENT_TYPE = "application/octet-stream";
@@ -157,48 +157,6 @@ function parseNotificationHubsConnectionString(connectionString) {
     return output;
 }
 
-// Copyright (c) Microsoft Corporation.
-const API_VERSION = "2020-06";
-/**
- * Creates a NotificationHubClient from the Access Policy connection string and hub name.
- * @param connectionString - The Access Policy connection string for the notification hub.
- * @param hubName - The notification hub name.
- * @returns A NotificationHubsClientContext initialized from the connection string and hub name.
- */
-function createClientContext(connectionString, hubName, options = {}) {
-    return new NotificationHubsServiceClient$1(connectionString, hubName, options);
-}
-class NotificationHubsServiceClient$1 extends coreClient.ServiceClient {
-    constructor(connectionString, hubName, options = {}) {
-        super(Object.assign({ deserializationOptions: {
-                parseXML: coreXml.parseXML,
-            }, serializationOptions: {
-                stringifyXML: coreXml.stringifyXML,
-            }, userAgentOptions: {
-                userAgentPrefix: `azsdk-js-messaging-notificationhubs/${SDK_VERSION}`,
-            } }, options));
-        this.hubName = hubName;
-        const parsedConnection = parseNotificationHubsConnectionString(connectionString);
-        this.baseUrl = parsedConnection.endpoint;
-        this.sasTokenProvider = createTokenProviderFromConnection(parsedConnection.sharedAccessKey, parsedConnection.sharedAccessKeyName);
-    }
-    async createHeaders(operationName, rawHeaders) {
-        const authorization = await this.sasTokenProvider.getToken(this.baseUrl);
-        const headers = coreRestPipeline.createHttpHeaders(rawHeaders);
-        headers.set("Authorization", authorization.token);
-        headers.set("x-ms-version", API_VERSION);
-        headers.set("x-ms-azsdk-telemetry", `class=NotificationHubsServiceClient;method=${operationName}`);
-        return headers;
-    }
-    requestUrl() {
-        // Node doesn't allow change in protocol but browsers do, so doing a string replace
-        const url = new URL(this.baseUrl.replace("sb://", "https://"));
-        url.pathname = this.hubName;
-        url.searchParams.set("api-version", API_VERSION);
-        return url;
-    }
-}
-
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 /**
@@ -209,14 +167,6 @@ class NotificationHubsServiceClient$1 extends coreClient.ServiceClient {
 function isDefined(thing) {
     return typeof thing !== "undefined" && thing !== null;
 }
-/**
- * Helper TypeGuard that checks if something is a string or not.
- * @param thing - Anything
- * @internal
- */
-function isString(thing) {
-    return typeof thing === "string" || thing instanceof String;
-}
 /**
  * @internal
  * Helper utility to retrieve `string` value from given string,
@@ -311,8 +261,8 @@ async function parseNotificationOutcome(bodyText) {
     const xml = await coreXml.parseXML(bodyText, { includeRoot: true });
     const outcome = xml.NotificationOutcome;
     return {
-        success: getInteger(outcome.Success, "Success"),
-        failure: getInteger(outcome.Failure, "Failure"),
+        successCount: getInteger(outcome.Success, "Success"),
+        failureCount: getInteger(outcome.Failure, "Failure"),
         results: parseRegistrationResults(outcome.Results.RegistrationResult),
         state: "DetailedStateAvailable",
     };
@@ -472,7 +422,7 @@ async function parseNotificationSendResponse(response) {
     }
 }
 function createDefaultResponse(response, notificationId) {
-    return Object.assign(Object.assign({}, response), { notificationId, success: 0, failure: 0, results: [], state: "Enqueued" });
+    return Object.assign(Object.assign({}, response), { notificationId, successCount: 0, failureCount: 0, results: [], state: "Enqueued" });
 }
 /**
  * Sends a request through the client context.
@@ -600,7 +550,7 @@ const tracingClient = coreTracing.createTracingClient({
 });
 
 // Copyright (c) Microsoft Corporation.
-const OPERATION_NAME$h = "getNotificationHubJob";
+const OPERATION_NAME$g = "getNotificationHubJob";
 /**
  * Gets a Notification Hub Job by the ID.
  * @param context - The Notification Hubs client.
@@ -609,10 +559,10 @@ const OPERATION_NAME$h = "getNotificationHubJob";
  * @returns The Notification Hub Job with the matching ID.
  */
 function getNotificationHubJob(context, jobId, options = {}) {
-    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$h}`, options, async (updatedOptions) => {
+    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$g}`, options, async (updatedOptions) => {
         const endpoint = context.requestUrl();
         endpoint.pathname += `/jobs/${jobId}`;
-        const headers = await context.createHeaders(OPERATION_NAME$h);
+        const headers = await context.createHeaders(OPERATION_NAME$g);
         headers.set("Content-Type", "application/atom+xml;type=entry;charset=utf-8");
         const request = createRequest(endpoint, "GET", headers, updatedOptions);
         const response = await sendRequest(context, request, 200);
@@ -621,7 +571,7 @@ function getNotificationHubJob(context, jobId, options = {}) {
 }
 
 // Copyright (c) Microsoft Corporation.
-const OPERATION_NAME$g = "submitNotificationHubJob";
+const OPERATION_NAME$f = "submitNotificationHubJob";
 /**
  * Submits a Notification Hub Job.
  * Note: this is available to Standard SKU namespace and above.
@@ -631,10 +581,10 @@ const OPERATION_NAME$g = "submitNotificationHubJob";
  * @returns The notification hub job details including job ID and status.
  */
 function submitNotificationHubJob(context, job, options = {}) {
-    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$g}`, options, async (updatedOptions) => {
+    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$f}`, options, async (updatedOptions) => {
         const endpoint = context.requestUrl();
         endpoint.pathname += "/jobs";
-        const headers = await context.createHeaders(OPERATION_NAME$g);
+        const headers = await context.createHeaders(OPERATION_NAME$f);
         headers.set("Content-Type", "application/atom+xml;type=entry;charset=utf-8");
         const request = createRequest(endpoint, "POST", headers, updatedOptions);
         request.body = serializeNotificationHubJobEntry(job);
@@ -771,7 +721,7 @@ function sleep(ms, signal) {
 }
 
 // Copyright (c) Microsoft Corporation.
-const OPERATION_NAME$f = "cancelScheduledNotification";
+const OPERATION_NAME$e = "cancelScheduledNotification";
 /**
  * Cancels the scheduled notification with the given notification ID.
  * NOTE: This is only available in Standard SKU Azure Notification Hubs.
@@ -781,10 +731,10 @@ const OPERATION_NAME$f = "cancelScheduledNotification";
  * @returns A notification hub response with correlation ID and tracking ID.
  */
 function cancelScheduledNotification(context, notificationId, options = {}) {
-    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$f}`, options, async (updatedOptions) => {
+    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$e}`, options, async (updatedOptions) => {
         const endpoint = context.requestUrl();
         endpoint.pathname += `/schedulednotifications/${notificationId}`;
-        const headers = await context.createHeaders(OPERATION_NAME$f);
+        const headers = await context.createHeaders(OPERATION_NAME$e);
         const request = createRequest(endpoint, "DELETE", headers, updatedOptions);
         const response = await sendRequest(context, request, 200);
         return parseNotificationSendResponse(response);
@@ -792,7 +742,7 @@ function cancelScheduledNotification(context, notificationId, options = {}) {
 }
 
 // Copyright (c) Microsoft Corporation.
-const OPERATION_NAME$e = "createOrUpdateInstallation";
+const OPERATION_NAME$d = "createOrUpdateInstallation";
 /**
  * Creates or overwrites an installation to a Notification Hub.
  * @param context - The Notification Hubs client.
@@ -801,10 +751,10 @@ const OPERATION_NAME$e = "createOrUpdateInstallation";
  * @returns A NotificationHubResponse with the tracking ID, correlation ID and location.
  */
 function createOrUpdateInstallation(context, installation, options = {}) {
-    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$e}`, options, async (updatedOptions) => {
+    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$d}`, options, async (updatedOptions) => {
         const endpoint = context.requestUrl();
         endpoint.pathname += `/installations/${installation.installationId}`;
-        const headers = await context.createHeaders(OPERATION_NAME$e);
+        const headers = await context.createHeaders(OPERATION_NAME$d);
         headers.set("Content-Type", "application/json");
         const request = createRequest(endpoint, "PUT", headers, updatedOptions);
         request.body = JSON.stringify(installation);
@@ -821,6 +771,7 @@ const registrationDescriptionParser = {
      */
     async parseRegistrationEntry(bodyText) {
         const xml = await coreXml.parseXML(bodyText, { includeRoot: true });
+        delete xml.entry.content["$"];
         const keyName = Object.keys(xml.entry.content)[0];
         const content = xml.entry.content[keyName];
         const methodName = `create${keyName}`;
@@ -859,21 +810,21 @@ const registrationDescriptionParser = {
      * Creates an ADM registration description from incoming XML property bag.
      */
     createAdmRegistrationDescription(rawRegistrationDescription) {
-        return Object.assign(Object.assign({ admRegistrationId: getString(rawRegistrationDescription["AdmRegistrationId"], "admRegistrationId") }, createRegistrationDescription(rawRegistrationDescription)), { type: "Adm" });
+        return Object.assign(Object.assign({ admRegistrationId: getString(rawRegistrationDescription["AdmRegistrationId"], "admRegistrationId") }, createRegistrationDescription(rawRegistrationDescription)), { kind: "Adm" });
     },
     /**
      * @internal
      * Creates an ADM template registration description from incoming XML property bag.
      */
     createAdmTemplateRegistrationDescription(rawRegistrationDescription) {
-        return Object.assign(Object.assign(Object.assign({}, this.createAdmRegistrationDescription(rawRegistrationDescription)), createTemplateRegistrationDescription(rawRegistrationDescription)), { type: "AdmTemplate" });
+        return Object.assign(Object.assign(Object.assign({}, this.createAdmRegistrationDescription(rawRegistrationDescription)), createTemplateRegistrationDescription(rawRegistrationDescription)), { kind: "AdmTemplate" });
     },
     /**
      * @internal
      * Creates an Apple registration description from incoming XML property bag.
      */
     createAppleRegistrationDescription(rawRegistrationDescription) {
-        return Object.assign(Object.assign({ deviceToken: getString(rawRegistrationDescription["DeviceToken"], "deviceToken") }, createRegistrationDescription(rawRegistrationDescription)), { type: "Apple" });
+        return Object.assign(Object.assign({ deviceToken: getString(rawRegistrationDescription["DeviceToken"], "deviceToken") }, createRegistrationDescription(rawRegistrationDescription)), { kind: "Apple" });
     },
     /**
      * @internal
@@ -881,56 +832,56 @@ const registrationDescriptionParser = {
      */
     createAppleTemplateRegistrationDescription(rawRegistrationDescription) {
         var _a;
-        return Object.assign(Object.assign(Object.assign({ priority: getStringOrUndefined(rawRegistrationDescription["Priority"]), apnsHeaders: getHeadersOrUndefined((_a = rawRegistrationDescription["ApnsHeaders"]) === null || _a === void 0 ? void 0 : _a["ApnsHeader"]) }, this.createAppleRegistrationDescription(rawRegistrationDescription)), createTemplateRegistrationDescription(rawRegistrationDescription)), { type: "AppleTemplate" });
+        return Object.assign(Object.assign(Object.assign({ priority: getStringOrUndefined(rawRegistrationDescription["Priority"]), apnsHeaders: getHeadersOrUndefined((_a = rawRegistrationDescription["ApnsHeaders"]) === null || _a === void 0 ? void 0 : _a["ApnsHeader"]) }, this.createAppleRegistrationDescription(rawRegistrationDescription)), createTemplateRegistrationDescription(rawRegistrationDescription)), { kind: "AppleTemplate" });
     },
     /**
      * @internal
      * Creates a Baidu registration description from incoming XML property bag.
      */
     createBaiduRegistrationDescription(rawRegistrationDescription) {
-        return Object.assign(Object.assign({ baiduChannelId: getString(rawRegistrationDescription["BaiduChannelId"], "baiduChannelId"), baiduUserId: getString(rawRegistrationDescription["BaiduUserId"], "baiduUserId") }, createRegistrationDescription(rawRegistrationDescription)), { type: "Baidu" });
+        return Object.assign(Object.assign({ baiduChannelId: getString(rawRegistrationDescription["BaiduChannelId"], "baiduChannelId"), baiduUserId: getString(rawRegistrationDescription["BaiduUserId"], "baiduUserId") }, createRegistrationDescription(rawRegistrationDescription)), { kind: "Baidu" });
     },
     /**
      * @internal
      * Creates a Baidu template registration description from incoming XML property bag.
      */
     createBaiduTemplateRegistrationDescription(rawRegistrationDescription) {
-        return Object.assign(Object.assign(Object.assign({}, this.createBaiduRegistrationDescription(rawRegistrationDescription)), createTemplateRegistrationDescription(rawRegistrationDescription)), { type: "BaiduTemplate" });
+        return Object.assign(Object.assign(Object.assign({}, this.createBaiduRegistrationDescription(rawRegistrationDescription)), createTemplateRegistrationDescription(rawRegistrationDescription)), { kind: "BaiduTemplate" });
     },
     /**
      * @internal
      * Creates a Browser registration description from incoming XML property bag.
      */
     createBrowserRegistrationDescription(rawRegistrationDescription) {
-        return Object.assign(Object.assign({ endpoint: getString(rawRegistrationDescription["Endpoint"], "endpoint"), p256dh: getString(rawRegistrationDescription["P256DH"], "p256dh"), auth: getString(rawRegistrationDescription["Auth"], "auth") }, createRegistrationDescription(rawRegistrationDescription)), { type: "Browser" });
+        return Object.assign(Object.assign({ endpoint: getString(rawRegistrationDescription["Endpoint"], "endpoint"), p256dh: getString(rawRegistrationDescription["P256DH"], "p256dh"), auth: getString(rawRegistrationDescription["Auth"], "auth") }, createRegistrationDescription(rawRegistrationDescription)), { kind: "Browser" });
     },
     /**
      * @internal
      * Creates a Browser template registration description from incoming XML property bag.
      */
     createBrowserTemplateRegistrationDescription(rawRegistrationDescription) {
-        return Object.assign(Object.assign(Object.assign({}, this.createBrowserRegistrationDescription(rawRegistrationDescription)), createTemplateRegistrationDescription(rawRegistrationDescription)), { type: "BrowserTemplate" });
+        return Object.assign(Object.assign(Object.assign({}, this.createBrowserRegistrationDescription(rawRegistrationDescription)), createTemplateRegistrationDescription(rawRegistrationDescription)), { kind: "BrowserTemplate" });
     },
     /**
      * @internal
      * Creates an GCM registration description from incoming XML property bag.
      */
     createGcmRegistrationDescription(rawRegistrationDescription) {
-        return Object.assign(Object.assign({ gcmRegistrationId: getString(rawRegistrationDescription["GcmRegistrationId"], "gcmRegistrationId") }, createRegistrationDescription(rawRegistrationDescription)), { type: "Gcm" });
+        return Object.assign(Object.assign({ gcmRegistrationId: getString(rawRegistrationDescription["GcmRegistrationId"], "gcmRegistrationId") }, createRegistrationDescription(rawRegistrationDescription)), { kind: "Gcm" });
     },
     /**
      * @internal
      * Creates an FCM template registration description from incoming XML property bag.
      */
     createGcmTemplateRegistrationDescription(rawRegistrationDescription) {
-        return Object.assign(Object.assign(Object.assign({}, this.createGcmRegistrationDescription(rawRegistrationDescription)), createTemplateRegistrationDescription(rawRegistrationDescription)), { type: "GcmTemplate" });
+        return Object.assign(Object.assign(Object.assign({}, this.createGcmRegistrationDescription(rawRegistrationDescription)), createTemplateRegistrationDescription(rawRegistrationDescription)), { kind: "GcmTemplate" });
     },
     /**
      * @internal
      * Creates a Windows Phone registration description from incoming XML property bag.
      */
     createMpnsRegistrationDescription(rawRegistrationDescription) {
-        return Object.assign(Object.assign({ channelUri: getString(rawRegistrationDescription["ChannelUri"], "channelUri") }, createRegistrationDescription(rawRegistrationDescription)), { type: "Mpns" });
+        return Object.assign(Object.assign({ channelUri: getString(rawRegistrationDescription["ChannelUri"], "channelUri") }, createRegistrationDescription(rawRegistrationDescription)), { kind: "Mpns" });
     },
     /**
      * @internal
@@ -938,14 +889,14 @@ const registrationDescriptionParser = {
      */
     createMpnsTemplateRegistrationDescription(rawRegistrationDescription) {
         var _a;
-        return Object.assign(Object.assign(Object.assign({ mpnsHeaders: getHeadersOrUndefined((_a = rawRegistrationDescription["MpnsHeaders"]) === null || _a === void 0 ? void 0 : _a["MpnsHeader"]) }, this.createWindowsRegistrationDescription(rawRegistrationDescription)), createTemplateRegistrationDescription(rawRegistrationDescription)), { type: "MpnsTemplate" });
+        return Object.assign(Object.assign(Object.assign({ mpnsHeaders: getHeadersOrUndefined((_a = rawRegistrationDescription["MpnsHeaders"]) === null || _a === void 0 ? void 0 : _a["MpnsHeader"]) }, this.createWindowsRegistrationDescription(rawRegistrationDescription)), createTemplateRegistrationDescription(rawRegistrationDescription)), { kind: "MpnsTemplate" });
     },
     /**
      * @internal
      * Creates a Windows registration description from incoming XML property bag.
      */
     createWindowsRegistrationDescription(rawRegistrationDescription) {
-        return Object.assign(Object.assign({ channelUri: getString(rawRegistrationDescription["ChannelUri"], "channelUri") }, createRegistrationDescription(rawRegistrationDescription)), { type: "Windows" });
+        return Object.assign(Object.assign({ channelUri: getString(rawRegistrationDescription["ChannelUri"], "channelUri") }, createRegistrationDescription(rawRegistrationDescription)), { kind: "Windows" });
     },
     /**
      * @internal
@@ -953,7 +904,7 @@ const registrationDescriptionParser = {
      */
     createWindowsTemplateRegistrationDescription(rawRegistrationDescription) {
         var _a;
-        return Object.assign(Object.assign(Object.assign({ wnsHeaders: getHeadersOrUndefined((_a = rawRegistrationDescription["WnsHeaders"]) === null || _a === void 0 ? void 0 : _a["WnsHeader"]) }, this.createWindowsRegistrationDescription(rawRegistrationDescription)), createTemplateRegistrationDescription(rawRegistrationDescription)), { type: "WindowsTemplate" });
+        return Object.assign(Object.assign(Object.assign({ wnsHeaders: getHeadersOrUndefined((_a = rawRegistrationDescription["WnsHeaders"]) === null || _a === void 0 ? void 0 : _a["WnsHeader"]) }, this.createWindowsRegistrationDescription(rawRegistrationDescription)), createTemplateRegistrationDescription(rawRegistrationDescription)), { kind: "WindowsTemplate" });
     },
 };
 function getHeadersOrUndefined(value) {
@@ -988,11 +939,11 @@ function createTemplateRegistrationDescription(rawRegistrationDescription) {
  */
 const registrationDescriptionSerializer = {
     serializeRegistrationDescription(description) {
-        const rootName = `${description.type}RegistrationDescription`;
+        const rootName = `${description.kind}RegistrationDescription`;
         const methodName = `serialize${rootName}`;
         const method = this[methodName].bind(this);
         if (!isDefined(method)) {
-            throw new coreRestPipeline.RestError(`Undefined platform ${description.type}`, { statusCode: 400 });
+            throw new coreRestPipeline.RestError(`Undefined platform ${description.kind}`, { statusCode: 400 });
         }
         const registration = method(description);
         const requestObject = serializeToAtomXmlRequest(rootName, registration);
@@ -1187,7 +1138,7 @@ async function createOrUpdateRegistrationDescription(context, registration, oper
 }
 
 // Copyright (c) Microsoft Corporation.
-const OPERATION_NAME$d = "createOrUpdateRegistration";
+const OPERATION_NAME$c = "createOrUpdateRegistration";
 /**
  * Creates or updates a registration.
  * @param context - The Notification Hubs client.
@@ -1196,32 +1147,8 @@ const OPERATION_NAME$d = "createOrUpdateRegistration";
  * @returns The created or updated registration description.
  */
 function createOrUpdateRegistration(context, registration, options = {}) {
-    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$d}`, options, async (updatedOptions) => {
-        return createOrUpdateRegistrationDescription(context, registration, "createOrUpdate", updatedOptions);
-    });
-}
-
-// Copyright (c) Microsoft Corporation.
-const OPERATION_NAME$c = "createRegistrationId";
-/**
- * Creates a new registration ID.
- * @param context - The Notification Hubs client.
- * @param options - The options for creating a new registration ID.
- * @returns The newly created registration ID.
- */
-function createRegistrationId(context, options = {}) {
     return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$c}`, options, async (updatedOptions) => {
-        const endpoint = context.requestUrl();
-        endpoint.pathname += "/registrationIDs";
-        const headers = await context.createHeaders(OPERATION_NAME$c);
-        headers.set("Content-Type", "application/xml;type=entry;charset=utf-8");
-        const request = createRequest(endpoint, "POST", headers, updatedOptions);
-        const response = await sendRequest(context, request, 201);
-        // In the form: https://{namespace}.servicebus.windows.net/{NotificationHub}/registrations/<registrationId>
-        const locationHeader = response.headers.get("Location");
-        const locationUrl = new URL(locationHeader);
-        const registrationId = locationUrl.pathname.split("/")[3];
-        return registrationId;
+        return createOrUpdateRegistrationDescription(context, registration, "createOrUpdate", updatedOptions);
     });
 }
 
@@ -1247,7 +1174,38 @@ function createRegistration(context, registration, options = {}) {
 }
 
 // Copyright (c) Microsoft Corporation.
-const OPERATION_NAME$a = "deleteInstallation";
+const OPERATION_NAME$a = "createRegistrationId";
+/**
+ * Creates a new registration ID.
+ * @param context - The Notification Hubs client.
+ * @param options - The options for creating a new registration ID.
+ * @returns The newly created registration ID.
+ */
+function createRegistrationId(context, options = {}) {
+    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$a}`, options, async (updatedOptions) => {
+        const endpoint = context.requestUrl();
+        endpoint.pathname += "/registrationIDs";
+        const headers = await context.createHeaders(OPERATION_NAME$a);
+        headers.set("Content-Type", "application/xml;type=entry;charset=utf-8");
+        const request = createRequest(endpoint, "POST", headers, updatedOptions);
+        const response = await sendRequest(context, request, 201);
+        // In the form: https://{namespace}.servicebus.windows.net/{NotificationHub}/registrations/<registrationId>
+        const locationHeader = response.headers.get("Location");
+        if (!locationHeader || !locationHeader.startsWith("https://")) {
+            throw new coreRestPipeline.RestError(`Location header ${locationHeader} is an invalid URL`, {
+                statusCode: 500,
+                request,
+                response,
+            });
+        }
+        const locationUrl = new URL(locationHeader);
+        const registrationId = locationUrl.pathname.split("/")[3];
+        return registrationId;
+    });
+}
+
+// Copyright (c) Microsoft Corporation.
+const OPERATION_NAME$9 = "deleteInstallation";
 /**
  * Deletes an installation from a Notification Hub.
  * @param context - The Notification Hubs client.
@@ -1256,10 +1214,10 @@ const OPERATION_NAME$a = "deleteInstallation";
  * @returns A NotificationHubResponse with the tracking ID, correlation ID and location.
  */
 function deleteInstallation(context, installationId, options = {}) {
-    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$a}`, options, async (updatedOptions) => {
+    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$9}`, options, async (updatedOptions) => {
         const endpoint = context.requestUrl();
         endpoint.pathname += `/installations/${installationId}`;
-        const headers = await context.createHeaders(OPERATION_NAME$a);
+        const headers = await context.createHeaders(OPERATION_NAME$9);
         const request = createRequest(endpoint, "DELETE", headers, updatedOptions);
         const response = await sendRequest(context, request, 204);
         return parseNotificationResponse(response);
@@ -1267,7 +1225,7 @@ function deleteInstallation(context, installationId, options = {}) {
 }
 
 // Copyright (c) Microsoft Corporation.
-const OPERATION_NAME$9 = "deleteRegistration";
+const OPERATION_NAME$8 = "deleteRegistration";
 /**
  * Deletes a registration with the given registration ID.
  * @param context - The Notification Hubs client.
@@ -1276,10 +1234,10 @@ const OPERATION_NAME$9 = "deleteRegistration";
  * @returns A NotificationHubResponse with the tracking ID, correlation ID and location.
  */
 function deleteRegistration(context, registrationId, options = {}) {
-    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$9}`, options, async (updatedOptions) => {
+    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$8}`, options, async (updatedOptions) => {
         const endpoint = context.requestUrl();
         endpoint.pathname += `/registrations/${registrationId}`;
-        const headers = await context.createHeaders(OPERATION_NAME$9);
+        const headers = await context.createHeaders(OPERATION_NAME$8);
         headers.set("Content-Type", "application/atom+xml;type=entry;charset=utf-8");
         headers.set("If-Match", isDefined(options.etag) ? `"${options.etag}"` : "*");
         const request = createRequest(endpoint, "GET", headers, updatedOptions);
@@ -1289,7 +1247,7 @@ function deleteRegistration(context, registrationId, options = {}) {
 }
 
 // Copyright (c) Microsoft Corporation.
-const OPERATION_NAME$8 = "getFeedbackContainerUrl";
+const OPERATION_NAME$7 = "getFeedbackContainerUrl";
 /**
  * Retrieves an Azure Storage container URL. The container has feedback data for the notification hub.
  * The caller can then use the Azure Storage Services SDK to retrieve the contents of the container.
@@ -1298,10 +1256,10 @@ const OPERATION_NAME$8 = "getFeedbackContainerUrl";
  * @returns The URL of the Azure Storage Container containing the feedback data.
  */
 function getFeedbackContainerUrl(context, options = {}) {
-    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$8}`, options, async (updatedOptions) => {
+    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$7}`, options, async (updatedOptions) => {
         const endpoint = context.requestUrl();
         endpoint.pathname += "/feedbackcontainer";
-        const headers = await context.createHeaders(OPERATION_NAME$8);
+        const headers = await context.createHeaders(OPERATION_NAME$7);
         headers.set("Content-Type", "application/xml;type=entry;charset=utf-8");
         const request = createRequest(endpoint, "GET", headers, updatedOptions);
         const response = await sendRequest(context, request, 200);
@@ -1310,7 +1268,7 @@ function getFeedbackContainerUrl(context, options = {}) {
 }
 
 // Copyright (c) Microsoft Corporation.
-const OPERATION_NAME$7 = "getInstallation";
+const OPERATION_NAME$6 = "getInstallation";
 /**
  * Gets an Azure Notification Hub installation by the installation ID.
  * @param context - The Notification Hubs client.
@@ -1319,10 +1277,10 @@ const OPERATION_NAME$7 = "getInstallation";
  * @returns The installation that matches the installation ID.
  */
 function getInstallation(context, installationId, options = {}) {
-    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$7}`, options, async (updatedOptions) => {
+    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$6}`, options, async (updatedOptions) => {
         const endpoint = context.requestUrl();
         endpoint.pathname += `/installations/${installationId}`;
-        const headers = await context.createHeaders(OPERATION_NAME$7);
+        const headers = await context.createHeaders(OPERATION_NAME$6);
         headers.set("Content-Type", "application/json");
         const request = createRequest(endpoint, "GET", headers, updatedOptions);
         const response = await sendRequest(context, request, 200);
@@ -1370,6 +1328,7 @@ async function parseNotificationDetails(bodyText) {
         endTime: getDateOrUndefined(notificationDetails["EndTime"]),
         pnsErrorDetailsUrl: getStringOrUndefined(notificationDetails["PnsErrorDetailsUri"]),
         targetPlatforms: getStringOrUndefined(notificationDetails["TargetPlatforms"]),
+        notificationBody: getStringOrUndefined(notificationDetails["NotificationBody"]),
         apnsOutcomeCounts,
         admOutcomeCounts,
         baiduOutcomeCounts,
@@ -1387,7 +1346,7 @@ function parseOutcomeCounts(counts) {
 }
 
 // Copyright (c) Microsoft Corporation.
-const OPERATION_NAME$6 = "getNotificationOutcomeDetails";
+const OPERATION_NAME$5 = "getNotificationOutcomeDetails";
 /**
  * Retrieves the results of a send operation. This can retrieve intermediate results if the send is being processed
  * or final results if the Send* has completed. This API can only be called for Standard SKU and above.
@@ -1397,10 +1356,10 @@ const OPERATION_NAME$6 = "getNotificationOutcomeDetails";
  * @returns The results of the send operation.
  */
 function getNotificationOutcomeDetails(context, notificationId, options = {}) {
-    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$6}`, options, async (updatedOptions) => {
+    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$5}`, options, async (updatedOptions) => {
         const endpoint = context.requestUrl();
         endpoint.pathname += `/messages/${notificationId}`;
-        const headers = await context.createHeaders(OPERATION_NAME$6);
+        const headers = await context.createHeaders(OPERATION_NAME$5);
         const request = createRequest(endpoint, "GET", headers, updatedOptions);
         const response = await sendRequest(context, request, 200);
         return parseNotificationDetails(response.bodyAsText);
@@ -1408,7 +1367,7 @@ function getNotificationOutcomeDetails(context, notificationId, options = {}) {
 }
 
 // Copyright (c) Microsoft Corporation.
-const OPERATION_NAME$5 = "getRegistration";
+const OPERATION_NAME$4 = "getRegistration";
 /**
  * Gets a registration by the given registration ID.
  * @param context - The Notification Hubs client.
@@ -1417,10 +1376,10 @@ const OPERATION_NAME$5 = "getRegistration";
  * @returns A RegistrationDescription that has the given registration ID.
  */
 function getRegistration(context, registrationId, options = {}) {
-    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$5}`, options, async (updatedOptions) => {
+    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$4}`, options, async (updatedOptions) => {
         const endpoint = context.requestUrl();
         endpoint.pathname += `/registrations/${registrationId}`;
-        const headers = await context.createHeaders(OPERATION_NAME$5);
+        const headers = await context.createHeaders(OPERATION_NAME$4);
         headers.set("Content-Type", "application/xml;type=entry;charset=utf-8");
         const request = createRequest(endpoint, "GET", headers, updatedOptions);
         const response = await sendRequest(context, request, 200);
@@ -1429,7 +1388,7 @@ function getRegistration(context, registrationId, options = {}) {
 }
 
 // Copyright (c) Microsoft Corporation.
-const OPERATION_NAME$4 = "listNotificationHubJobs";
+const OPERATION_NAME$3 = "listNotificationHubJobs";
 /**
  * Gets all Notification Hub Jobs for this Notification Hub.
  * @param context - The Notification Hubs client.xs
@@ -1437,10 +1396,10 @@ const OPERATION_NAME$4 = "listNotificationHubJobs";
  * @returns An array of all Notification Hub Jobs for this Notification Hub.
  */
 function listNotificationHubJobs(context, options = {}) {
-    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$4}`, options, async (updatedOptions) => {
+    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$3}`, options, async (updatedOptions) => {
         const endpoint = context.requestUrl();
         endpoint.pathname += "/jobs";
-        const headers = await context.createHeaders(OPERATION_NAME$4);
+        const headers = await context.createHeaders(OPERATION_NAME$3);
         headers.set("Content-Type", "application/atom+xml;type=entry;charset=utf-8");
         const request = createRequest(endpoint, "GET", headers, updatedOptions);
         const response = await sendRequest(context, request, 200);
@@ -1449,43 +1408,11 @@ function listNotificationHubJobs(context, options = {}) {
 }
 
 // Copyright (c) Microsoft Corporation.
-const OPERATION_NAME$3 = "listRegistrationsByTag";
-/**
- * Lists all registrations with the matching tag.
- * @param context - The Notification Hubs client.
- * @param tag - The tag to query for matching registrations.
- * @param options - The query options such as $top.
- * @returns A paged async iterable containing the matching registrations for the notification hub.
- */
-function listRegistrationsByTag(context, tag, options = {}) {
-    const { span, updatedOptions } = tracingClient.startSpan(`NotificationHubsClientContext.${OPERATION_NAME$3}`, options);
-    try {
-        const iter = listRegistrationsByTagAll(context, tag, updatedOptions);
-        return {
-            next() {
-                return iter.next();
-            },
-            [Symbol.asyncIterator]() {
-                return this;
-            },
-            byPage: () => {
-                return listRegistrationsByTagPagingPage(context, tag, options);
-            },
-        };
-    }
-    catch (e) {
-        span.setStatus({ status: "error", error: e });
-        throw e;
-    }
-    finally {
-        span.end();
-    }
-}
-function listRegistrationsByTagAll(context, tag, options) {
-    return tslib.__asyncGenerator(this, arguments, function* listRegistrationsByTagAll_1() {
+function listRegistrationsAll(context, options) {
+    return tslib.__asyncGenerator(this, arguments, function* listRegistrationsAll_1() {
         var e_1, _a;
         try {
-            for (var _b = tslib.__asyncValues(listRegistrationsByTagPagingPage(context, tag, options)), _c; _c = yield tslib.__await(_b.next()), !_c.done;) {
+            for (var _b = tslib.__asyncValues(listRegistrationPagingPage(context, options)), _c; _c = yield tslib.__await(_b.next()), !_c.done;) {
                 const page = _c.value;
                 yield tslib.__await(yield* tslib.__asyncDelegator(tslib.__asyncValues(page)));
             }
@@ -1499,28 +1426,31 @@ function listRegistrationsByTagAll(context, tag, options) {
         }
     });
 }
-function listRegistrationsByTagPagingPage(context, tag, options) {
-    return tslib.__asyncGenerator(this, arguments, function* listRegistrationsByTagPagingPage_1() {
-        let result = yield tslib.__await(_listRegistrationsByTag(context, tag, options));
+function listRegistrationPagingPage(context, options) {
+    return tslib.__asyncGenerator(this, arguments, function* listRegistrationPagingPage_1() {
+        let result = yield tslib.__await(_listRegistrations(context, options));
         yield yield tslib.__await(result.registrations || []);
         let continuationToken = result.continuationToken;
         while (continuationToken) {
-            result = yield tslib.__await(_listRegistrationsByTag(context, tag, options, continuationToken));
+            result = yield tslib.__await(_listRegistrations(context, options, continuationToken));
             continuationToken = result.continuationToken;
             yield yield tslib.__await(result.registrations || []);
         }
     });
 }
-async function _listRegistrationsByTag(context, tag, options, continuationToken) {
+async function _listRegistrations(context, options, continuationToken) {
     const endpoint = context.requestUrl();
-    endpoint.pathname += `/tags/${tag}/registrations`;
+    endpoint.pathname += "/registrations";
     if (options.top !== undefined) {
         endpoint.searchParams.set("$top", `${options.top}`);
     }
+    if (options.filter !== undefined) {
+        endpoint.searchParams.set("$filter", options.filter);
+    }
     if (continuationToken !== undefined) {
         endpoint.searchParams.set("continuationtoken", continuationToken);
     }
-    const headers = await context.createHeaders(OPERATION_NAME$3);
+    const headers = await context.createHeaders("listRegistrations");
     const request = createRequest(endpoint, "GET", headers, options);
     const response = await sendRequest(context, request, 200);
     const registrations = await registrationDescriptionParser.parseRegistrationFeed(response.bodyAsText);
@@ -1532,15 +1462,14 @@ async function _listRegistrationsByTag(context, tag, options, continuationToken)
 }
 
 // Copyright (c) Microsoft Corporation.
-const OPERATION_NAME$2 = "listRegistrations";
 /**
  * Gets all registrations for the notification hub with the given query options.
  * @param context - The Notification Hubs client.
- * @param options - The options for querying the registrations such as $top and $filter.
+ * @param options - The options for querying the registrations such as $top.
  * @returns A paged async iterable containing all of the registrations for the notification hub.
  */
 function listRegistrations(context, options = {}) {
-    const { span, updatedOptions } = tracingClient.startSpan(`NotificationHubsClientContext.${OPERATION_NAME$2}`, options);
+    const { span, updatedOptions } = tracingClient.startSpan("NotificationHubsClientContext.listRegistrations", options);
     try {
         const iter = listRegistrationsAll(context, updatedOptions);
         return {
@@ -1551,7 +1480,7 @@ function listRegistrations(context, options = {}) {
                 return this;
             },
             byPage: () => {
-                return listRegistrationPagingPage(context, options);
+                return listRegistrationPagingPage(context, updatedOptions);
             },
         };
     }
@@ -1563,11 +1492,99 @@ function listRegistrations(context, options = {}) {
         span.end();
     }
 }
-function listRegistrationsAll(context, options) {
-    return tslib.__asyncGenerator(this, arguments, function* listRegistrationsAll_1() {
+
+// Copyright (c) Microsoft Corporation.
+/**
+ * Gets all registrations for the notification hub with the given device information and options.
+ * @param context - The Notification Hubs client.
+ * @param channel - The Registration channel information to query per PNS type.
+ * @param options - The options for querying the registrations such as $top.
+ * @returns A paged async iterable containing all of the registrations for the notification hub.
+ */
+function listRegistrationsByChannel(context, channel, options = {}) {
+    const newOptions = Object.assign(Object.assign({}, options), { filter: getFilterByChannel(channel) });
+    const { span, updatedOptions } = tracingClient.startSpan("NotificationHubsClientContext.listRegistrationsByDevice", newOptions);
+    try {
+        const iter = listRegistrationsAll(context, updatedOptions);
+        return {
+            next() {
+                return iter.next();
+            },
+            [Symbol.asyncIterator]() {
+                return this;
+            },
+            byPage: () => {
+                return listRegistrationPagingPage(context, updatedOptions);
+            },
+        };
+    }
+    catch (e) {
+        span.setStatus({ status: "error", error: e });
+        throw e;
+    }
+    finally {
+        span.end();
+    }
+}
+function getFilterByChannel(device) {
+    switch (device.kind) {
+        case "adm":
+            return `AdmRegistrationId eq '${device.admRegistrationId}'`;
+        case "apple":
+            return `DeviceToken eq '${device.deviceToken.toLocaleUpperCase()}'`;
+        case "baidu":
+            return `BaiduChannelId eq ${device.baiduChannelId}' and BaiduUserId eq '${device.baiduUserId}'`;
+        case "browser":
+            return `Endpoint eq '${encodeURIComponent(device.endpoint)}' and P256DH eq '${device.p256dh}' and Auth eq '${device.auth}'`;
+        case "gcm":
+            return `GcmRegistrationId eq '${device.gcmRegistrationId}'`;
+        case "windows":
+            return `ChannelUri eq '${encodeURIComponent(device.channelUri)}'`;
+        default:
+            throw new coreRestPipeline.RestError(`Device type is unsupported`, {
+                statusCode: 400,
+            });
+    }
+}
+
+// Copyright (c) Microsoft Corporation.
+const OPERATION_NAME$2 = "listRegistrationsByTag";
+/**
+ * Lists all registrations with the matching tag.
+ * @param context - The Notification Hubs client.
+ * @param tag - The tag to query for matching registrations.
+ * @param options - The query options such as $top.
+ * @returns A paged async iterable containing the matching registrations for the notification hub.
+ */
+function listRegistrationsByTag(context, tag, options = {}) {
+    const { span, updatedOptions } = tracingClient.startSpan(`NotificationHubsClientContext.${OPERATION_NAME$2}`, options);
+    try {
+        const iter = listRegistrationsByTagAll(context, tag, updatedOptions);
+        return {
+            next() {
+                return iter.next();
+            },
+            [Symbol.asyncIterator]() {
+                return this;
+            },
+            byPage: () => {
+                return listRegistrationsByTagPagingPage(context, tag, options);
+            },
+        };
+    }
+    catch (e) {
+        span.setStatus({ status: "error", error: e });
+        throw e;
+    }
+    finally {
+        span.end();
+    }
+}
+function listRegistrationsByTagAll(context, tag, options) {
+    return tslib.__asyncGenerator(this, arguments, function* listRegistrationsByTagAll_1() {
         var e_1, _a;
         try {
-            for (var _b = tslib.__asyncValues(listRegistrationPagingPage(context, options)), _c; _c = yield tslib.__await(_b.next()), !_c.done;) {
+            for (var _b = tslib.__asyncValues(listRegistrationsByTagPagingPage(context, tag, options)), _c; _c = yield tslib.__await(_b.next()), !_c.done;) {
                 const page = _c.value;
                 yield tslib.__await(yield* tslib.__asyncDelegator(tslib.__asyncValues(page)));
             }
@@ -1581,27 +1598,24 @@ function listRegistrationsAll(context, options) {
         }
     });
 }
-function listRegistrationPagingPage(context, options) {
-    return tslib.__asyncGenerator(this, arguments, function* listRegistrationPagingPage_1() {
-        let result = yield tslib.__await(_listRegistrations(context, options));
+function listRegistrationsByTagPagingPage(context, tag, options) {
+    return tslib.__asyncGenerator(this, arguments, function* listRegistrationsByTagPagingPage_1() {
+        let result = yield tslib.__await(_listRegistrationsByTag(context, tag, options));
         yield yield tslib.__await(result.registrations || []);
         let continuationToken = result.continuationToken;
         while (continuationToken) {
-            result = yield tslib.__await(_listRegistrations(context, options, continuationToken));
+            result = yield tslib.__await(_listRegistrationsByTag(context, tag, options, continuationToken));
             continuationToken = result.continuationToken;
             yield yield tslib.__await(result.registrations || []);
         }
     });
 }
-async function _listRegistrations(context, options, continuationToken) {
+async function _listRegistrationsByTag(context, tag, options, continuationToken) {
     const endpoint = context.requestUrl();
-    endpoint.pathname += "/registrations";
+    endpoint.pathname += `/tags/${tag}/registrations`;
     if (options.top !== undefined) {
         endpoint.searchParams.set("$top", `${options.top}`);
     }
-    if (options.filter !== undefined) {
-        endpoint.searchParams.set("$filter", options.filter);
-    }
     if (continuationToken !== undefined) {
         endpoint.searchParams.set("continuationtoken", continuationToken);
     }
@@ -1616,31 +1630,6 @@ async function _listRegistrations(context, options, continuationToken) {
     };
 }
 
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-/**
- * @internal
- */
-function createMultipartDirectNotification(boundaryName, notification, deviceHandles) {
-    return (`--${boundaryName}\r\n` +
-        `Content-type: ${notification.contentType}\r\n` +
-        "Content-Disposition: inline; name=notification\r\n\r\n" +
-        notification.body +
-        "\r\n" +
-        `--${boundaryName}\r\n` +
-        "Content-type: application/json\r\n" +
-        "Content-Disposition: inline; name=devices\r\n\r\n" +
-        JSON.stringify(deviceHandles) +
-        "\r\n" +
-        `--${boundaryName}--`);
-}
-/**
- * @internal
- */
-function normalizeTags(tags) {
-    return Array.isArray(tags) ? tags.join("||") : tags;
-}
-
 // Copyright (c) Microsoft Corporation.
 /**
  * Schedules a push notification to devices that match the given tags or tag expression at the specified time.
@@ -1659,8 +1648,8 @@ function scheduleNotification(context, scheduledTime, notification, options = {}
         headers.set("ServiceBusNotification-ScheduleTime", scheduledTime.toISOString());
         headers.set("Content-Type", notification.contentType);
         headers.set("ServiceBusNotification-Format", notification.platform);
-        if (options.tags) {
-            headers.set("ServiceBusNotification-Tags", normalizeTags(options.tags));
+        if (options.tagExpression) {
+            headers.set("ServiceBusNotification-Tags", options.tagExpression);
         }
         const request = createRequest(endpoint, "POST", headers, updatedOptions);
         request.body = notification.body;
@@ -1687,6 +1676,25 @@ function isDirectSendNotificationOptions(options) {
     return coreUtil.objectHasProperty(options, "deviceHandle");
 }
 
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+/**
+ * @internal
+ */
+function createMultipartDirectNotification(boundaryName, notification, deviceHandles) {
+    return (`--${boundaryName}\r\n` +
+        `Content-type: ${notification.contentType}\r\n` +
+        "Content-Disposition: inline; name=notification\r\n\r\n" +
+        notification.body +
+        "\r\n" +
+        `--${boundaryName}\r\n` +
+        "Content-type: application/json\r\n" +
+        "Content-Disposition: inline; name=devices\r\n\r\n" +
+        JSON.stringify(deviceHandles) +
+        "\r\n" +
+        `--${boundaryName}--`);
+}
+
 // Copyright (c) Microsoft Corporation.
 /**
  * Sends push notifications to devices that match the given tags or tag expression.
@@ -1731,8 +1739,8 @@ function sendNotification(context, notification, options = { enableTestSend: fal
             }
         }
         else if (isSendNotificationOptions(options)) {
-            if (options.tags) {
-                headers.set("ServiceBusNotification-Tags", normalizeTags(options.tags));
+            if (options.tagExpression) {
+                headers.set("ServiceBusNotification-Tags", options.tagExpression);
             }
         }
         headers.set("Content-Type", contentType);
@@ -1785,12 +1793,54 @@ function updateRegistration(context, registration, options = {}) {
     });
 }
 
+// Copyright (c) Microsoft Corporation.
+const API_VERSION = "2020-06";
+/**
+ * Creates a NotificationHubClient from the Access Policy connection string and hub name.
+ * @param connectionString - The Access Policy connection string for the notification hub.
+ * @param hubName - The notification hub name.
+ * @returns A NotificationHubsClientContext initialized from the connection string and hub name.
+ */
+function createClientContext(connectionString, hubName, options = {}) {
+    return new NotificationHubsServiceClient(connectionString, hubName, options);
+}
+class NotificationHubsServiceClient extends coreClient.ServiceClient {
+    constructor(connectionString, hubName, options = {}) {
+        super(Object.assign({ deserializationOptions: {
+                parseXML: coreXml.parseXML,
+            }, serializationOptions: {
+                stringifyXML: coreXml.stringifyXML,
+            }, userAgentOptions: {
+                userAgentPrefix: `azsdk-js-messaging-notificationhubs/${SDK_VERSION}`,
+            } }, options));
+        this.hubName = hubName;
+        const parsedConnection = parseNotificationHubsConnectionString(connectionString);
+        this.baseUrl = parsedConnection.endpoint;
+        this.sasTokenProvider = createTokenProviderFromConnection(parsedConnection.sharedAccessKey, parsedConnection.sharedAccessKeyName);
+    }
+    async createHeaders(operationName, rawHeaders) {
+        const authorization = await this.sasTokenProvider.getToken(this.baseUrl);
+        const headers = coreRestPipeline.createHttpHeaders(rawHeaders);
+        headers.set("Authorization", authorization.token);
+        headers.set("x-ms-version", API_VERSION);
+        headers.set("x-ms-azsdk-telemetry", `class=NotificationHubsServiceClient;method=${operationName}`);
+        return headers;
+    }
+    requestUrl() {
+        // Node doesn't allow change in protocol but browsers do, so doing a string replace
+        const url = new URL(this.baseUrl.replace("sb://", "https://"));
+        url.pathname = this.hubName;
+        url.searchParams.set("api-version", API_VERSION);
+        return url;
+    }
+}
+
 // Copyright (c) Microsoft Corporation.
 /**
  * This represents a client for Azure Notification Hubs to manage installations and send
  * messages to devices.
  */
-class NotificationHubsServiceClient {
+class NotificationHubsClient {
     /**
      * Creates a new instance of the NotificationClient with a connection string, hub name and options.
      * @param connectionString - The Notification Hub Access Policy connection string.
@@ -1894,12 +1944,21 @@ class NotificationHubsServiceClient {
     }
     /**
      * Gets all registrations for the notification hub with the given query options.
-     * @param options - The options for querying the registrations such as $top and $filter.
+     * @param options - The options for querying the registrations such as $top.
      * @returns A paged async iterable containing all of the registrations for the notification hub.
      */
     listRegistrations(options = {}) {
         return listRegistrations(this._client, options);
     }
+    /**
+     * Gets all registrations for the notification hub with the given device information and options.
+     * @param channel - The registration channel information to query per PNS type.
+     * @param options - The options for querying the registrations such as $top.
+     * @returns A paged async iterable containing all of the registrations for the notification hub.
+     */
+    listRegistrationsByChannel(channel, options = {}) {
+        return listRegistrationsByChannel(this._client, channel, options);
+    }
     /**
      * Lists all registrations with the matching tag.
      * @param tag - The tag to query for matching registrations.
@@ -2148,168 +2207,49 @@ function createWindowsRawNotification(notification) {
 }
 
 // Copyright (c) Microsoft Corporation.
-function createAppleNativeAlert(nativeAlert) {
-    if (!isDefined(nativeAlert)) {
-        return undefined;
-    }
-    if (isString(nativeAlert)) {
-        return nativeAlert;
-    }
-    const alert = {
-        title: nativeAlert.title,
-        subtitle: nativeAlert.subtitle,
-        body: nativeAlert.body,
-        "launch-image": nativeAlert.launchImage,
-        "title-loc-key": nativeAlert.titleLocKey,
-        "title-loc-args": nativeAlert.titleLocArgs,
-        "subtitle-loc-key": nativeAlert.subtitleLocKey,
-        "subtitle-loc-args": nativeAlert.subtitleLocArgs,
-        "loc-key": nativeAlert.locKey,
-        "loc-args": nativeAlert.locArgs,
-    };
-    return alert;
-}
 /**
  * Creates an APNs native message to send to Notification Hubs.
  * @param nativeMessage - The Apple native message properties to set.
  * @param additionalProperties - Additional properties for Apple messages.
  * @returns An AppleNotification to send to Notification Hubs.
  */
-function buildAppleNativeMessage(nativeMessage, additionalProperties) {
-    const headers = {};
-    const message = Object.assign({ aps: {
-            alert: createAppleNativeAlert(nativeMessage.alert),
-            sound: nativeMessage.sound,
-            badge: nativeMessage.badge,
-            "thread-id": nativeMessage.threadId,
-            category: nativeMessage.category,
-            "content-available": nativeMessage.contentAvailable,
-            "mutable-content": nativeMessage.mutableContent,
-            "target-content-id": nativeMessage.targetContentId,
-            "interruption-level": nativeMessage.interruptionLevel,
-            "relevance-score": nativeMessage.relevanceScore,
-            "filter-criteria": nativeMessage.filterCriteria,
-        } }, additionalProperties);
-    const apnsPriority = (nativeMessage === null || nativeMessage === void 0 ? void 0 : nativeMessage.contentAvailable) === 1 ? "5" : "10";
-    headers["apns-priority"] = apnsPriority;
-    return createAppleNotification({
-        body: JSON.stringify(message),
-        headers: headers,
-    });
-}
-function buildFcmLegacyNativePayload(nativeNotification) {
-    if (!isDefined(nativeNotification)) {
-        return undefined;
-    }
-    const androidMessage = nativeNotification;
-    const appleMessage = nativeNotification;
-    const notification = {
-        title: nativeNotification.title,
-        body: nativeNotification.body,
-        click_action: nativeNotification.clickAction,
-        // Apple/Android fields
-        sound: appleMessage.sound,
-        badge: appleMessage.badge,
-        subtitle: appleMessage.subtitle,
-        body_loc_key: appleMessage.bodyLocKey,
-        body_loc_args: appleMessage.bodyLocArgs,
-        title_loc_key: appleMessage.bodyLocKey,
-        title_loc_args: appleMessage.bodyLocArgs,
-        // Android/Web fields
-        android_channel_id: androidMessage.androidChannelId,
-        icon: androidMessage.icon,
-        tag: androidMessage.tag,
-        color: androidMessage.color,
-    };
-    return notification;
+function createAppleNotificationBody(nativeMessage) {
+    return JSON.stringify(nativeMessage);
 }
 /**
  * Creates a FcmLegacyNotification from a native Firebase payload.
  * @param nativeMessage - The native message payload to send to Notification Hubs.
- * @returns The FcmLegacyNotification to send to Notification Hubs.
- */
-function buildFirebaseLegacyNativeMessage(nativeMessage) {
-    const jsonMessage = {
-        to: nativeMessage.to,
-        registration_ids: nativeMessage.registrationIds,
-        condition: nativeMessage.condition,
-        collapse_key: nativeMessage.collapseKey,
-        priority: nativeMessage.priority,
-        content_available: nativeMessage.contentAvailable,
-        mutable_content: nativeMessage.mutableContent,
-        time_to_live: nativeMessage.timeToLive,
-        restricted_package_name: nativeMessage.restrictedPackageName,
-        dry_run: nativeMessage.dryRun,
-        data: nativeMessage.data,
-        notification: buildFcmLegacyNativePayload(nativeMessage.notification),
-    };
-    return createFcmLegacyNotification({
-        body: JSON.stringify(jsonMessage),
-    });
-}
-function buildAdmNativeNotification(nativeNotification) {
-    if (!isDefined(nativeNotification)) {
-        return undefined;
-    }
-    return {
-        title: nativeNotification.title,
-        body: nativeNotification.body,
-        icon: nativeNotification.icon,
-        color: nativeNotification.color,
-        sound: nativeNotification.sound,
-        tag: nativeNotification.tag,
-        click_action: nativeNotification.clickAction,
-        body_loc_key: nativeNotification.bodyLocKey,
-        body_loc_args: nativeNotification.bodyLocArgs,
-        title_loc_key: nativeNotification.titleLocKey,
-        title_loc_args: nativeNotification.titleLocArgs,
-        channel_id: nativeNotification.channelId,
-        ticker: nativeNotification.ticker,
-        sticky: nativeNotification.sticky,
-        event_time: nativeNotification.eventTime,
-        local_only: nativeNotification.localOnly,
-        notification_priority: nativeNotification.notificationPriority,
-        default_sound: nativeNotification.defaultSound,
-        visibility: nativeNotification.visibility,
-        notification_count: nativeNotification.notificationCount,
-        image: nativeNotification.image,
-    };
+ * @returns The JSON body to send to Notification Hubs.
+ */
+function createFirebaseLegacyNotificationBody(nativeMessage) {
+    return JSON.stringify(nativeMessage);
 }
 /**
  * Creates a AdmNotification from a native ADM payload.
  * @param nativeMessage - The native message payload to send to Notification Hubs.
  * @returns The AdmNotification to send to Notification Hubs.
  */
-function buildAdmNativeMessage(nativeMessage) {
-    const jsonObj = Object.assign({ notification: buildAdmNativeNotification(nativeMessage.notification), data: nativeMessage.data || {} }, nativeMessage);
-    return createAdmNotification({
-        body: JSON.stringify(jsonObj),
-    });
+function createAdmNotificationBody(nativeMessage) {
+    return JSON.stringify(nativeMessage);
 }
 /**
  * Creates a BaiduNotification from a native Baidu payload.
  * @param nativeMessage - The native message payload to send to Notification Hubs.
- * @param additionalProperties - Additional properties for Apple Baidu messages.
- * @returns The BaiduNotification to send to Notification Hubs.
+ * @returns The JSON body to send to Notification Hubs.
  */
-function buildBaiduNativeMessage(nativeMessage, additionalProperties) {
-    const jsonObj = Object.assign({ title: nativeMessage.title, description: nativeMessage.description, notification_builder_id: nativeMessage.notificationBuilderId, notification_basic_style: nativeMessage.notificationBasicStyle, open_type: nativeMessage.openType, net_support: nativeMessage.netSupport, user_confirm: nativeMessage.userConfirm, url: nativeMessage.url, pkg_content: nativeMessage.pkgContent, pkg_version: nativeMessage.pkgVersion, custom_content: nativeMessage.customContent, aps: nativeMessage.aps }, additionalProperties);
-    return createBaiduNotification({
-        body: JSON.stringify(jsonObj),
-    });
+function createBaiduNotificationBody(nativeMessage) {
+    return JSON.stringify(nativeMessage);
 }
 /**
  * Builds a WindowsNotification from a Windows Badge.
  * @param nativeMessage - The Windows Badge Message to build.
- * @returns A WindowsNotification created with the badge information.
+ * @returns The WNS XML created with the badge information.
  */
-function buildWindowsBadgeNativeMessage(nativeMessage) {
+function createWindowsBadgeNotificationBody(nativeMessage) {
     const badge = {
         $: { value: nativeMessage.value },
     };
-    return createWindowsBadgeNotification({
-        body: coreXml.stringifyXML(badge, { rootName: "badge" }),
-    });
+    return coreXml.stringifyXML(badge, { rootName: "badge" });
 }
 
 // Copyright (c) Microsoft Corporation.
@@ -2320,7 +2260,7 @@ function buildWindowsBadgeNativeMessage(nativeMessage) {
  * @returns A created ADM registration description.
  */
 function createAdmRegistrationDescription(description) {
-    return Object.assign(Object.assign({}, description), { type: "Adm" });
+    return Object.assign(Object.assign({}, description), { kind: "Adm" });
 }
 /**
  * Creates an ADM template registration description.
@@ -2328,7 +2268,7 @@ function createAdmRegistrationDescription(description) {
  * @returns A created ADM template registration description.
  */
 function createAdmTemplateRegistrationDescription(description) {
-    return Object.assign(Object.assign({}, description), { type: "AdmTemplate" });
+    return Object.assign(Object.assign({}, description), { kind: "AdmTemplate" });
 }
 /**
  * Creates an Apple registration description.
@@ -2336,7 +2276,7 @@ function createAdmTemplateRegistrationDescription(description) {
  * @returns A created Apple registration description.
  */
 function createAppleRegistrationDescription(description) {
-    return Object.assign(Object.assign({}, description), { type: "Apple" });
+    return Object.assign(Object.assign({}, description), { kind: "Apple" });
 }
 /**
  * Creates an Apple template registration description.
@@ -2344,7 +2284,7 @@ function createAppleRegistrationDescription(description) {
  * @returns A created Apple template registration description.
  */
 function createAppleTemplateRegistrationDescription(description) {
-    return Object.assign(Object.assign({}, description), { type: "AppleTemplate" });
+    return Object.assign(Object.assign({}, description), { kind: "AppleTemplate" });
 }
 /**
  * Creates a Baidu registration description.
@@ -2352,7 +2292,7 @@ function createAppleTemplateRegistrationDescription(description) {
  * @returns A created Baidu registration description.
  */
 function createBaiduRegistrationDescription(description) {
-    return Object.assign(Object.assign({}, description), { type: "Baidu" });
+    return Object.assign(Object.assign({}, description), { kind: "Baidu" });
 }
 /**
  * Creates a Baidu template registration description.
@@ -2360,7 +2300,7 @@ function createBaiduRegistrationDescription(description) {
  * @returns A created Baidu template registration description.
  */
 function createBaiduTemplateRegistrationDescription(description) {
-    return Object.assign(Object.assign({}, description), { type: "BaiduTemplate" });
+    return Object.assign(Object.assign({}, description), { kind: "BaiduTemplate" });
 }
 /**
  * Creates a Web Push registration description.
@@ -2368,7 +2308,7 @@ function createBaiduTemplateRegistrationDescription(description) {
  * @returns A created Web Push registration description.
  */
 function createBrowserRegistrationDescription(description) {
-    return Object.assign(Object.assign({}, description), { type: "Browser" });
+    return Object.assign(Object.assign({}, description), { kind: "Browser" });
 }
 /**
  * Creates a Web Push registration description.
@@ -2376,7 +2316,7 @@ function createBrowserRegistrationDescription(description) {
  * @returns A created Web Push template registration description.
  */
 function createBrowserTemplateRegistrationDescription(description) {
-    return Object.assign(Object.assign({}, description), { type: "BrowserTemplate" });
+    return Object.assign(Object.assign({}, description), { kind: "BrowserTemplate" });
 }
 /**
  * Creates a Firebase Legacy registration description.
@@ -2384,7 +2324,7 @@ function createBrowserTemplateRegistrationDescription(description) {
  * @returns A created GCM registration description.
  */
 function createFcmLegacyRegistrationDescription(description) {
-    return Object.assign(Object.assign({}, description), { type: "Gcm" });
+    return Object.assign(Object.assign({}, description), { kind: "Gcm" });
 }
 /**
  * Creates a GCM template registration description.
@@ -2392,7 +2332,7 @@ function createFcmLegacyRegistrationDescription(description) {
  * @returns A created GCM template registration description.
  */
 function createFcmLegacyTemplateRegistrationDescription(description) {
-    return Object.assign(Object.assign({}, description), { type: "GcmTemplate" });
+    return Object.assign(Object.assign({}, description), { kind: "GcmTemplate" });
 }
 /**
  * Creates a Windows registration description.
@@ -2400,7 +2340,7 @@ function createFcmLegacyTemplateRegistrationDescription(description) {
  * @returns A created Windows registration description.
  */
 function createWindowsRegistrationDescription(description) {
-    return Object.assign(Object.assign({}, description), { type: "Windows" });
+    return Object.assign(Object.assign({}, description), { kind: "Windows" });
 }
 /**
  * Creates a Windows template registration description.
@@ -2408,25 +2348,34 @@ function createWindowsRegistrationDescription(description) {
  * @returns A created Windows template registration description.
  */
 function createWindowsTemplateRegistrationDescription(description) {
-    return Object.assign(Object.assign({}, description), { type: "WindowsTemplate" });
+    return Object.assign(Object.assign({}, description), { kind: "WindowsTemplate" });
+}
+
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+/**
+ * Creates a tag expression from a list of tags as a || expression.
+ * @param tags - The tags to create the || expression
+ * @returns The tag expression made from the array of strings into an || expression.
+ */
+function createTagExpression(tags) {
+    return tags.join("||");
 }
 
-exports.NotificationHubsServiceClient = NotificationHubsServiceClient;
-exports.buildAdmNativeMessage = buildAdmNativeMessage;
-exports.buildAppleNativeMessage = buildAppleNativeMessage;
-exports.buildBaiduNativeMessage = buildBaiduNativeMessage;
-exports.buildFirebaseLegacyNativeMessage = buildFirebaseLegacyNativeMessage;
-exports.buildWindowsBadgeNativeMessage = buildWindowsBadgeNativeMessage;
+exports.NotificationHubsClient = NotificationHubsClient;
 exports.createAdmInstallation = createAdmInstallation;
 exports.createAdmNotification = createAdmNotification;
+exports.createAdmNotificationBody = createAdmNotificationBody;
 exports.createAdmRegistrationDescription = createAdmRegistrationDescription;
 exports.createAdmTemplateRegistrationDescription = createAdmTemplateRegistrationDescription;
 exports.createAppleInstallation = createAppleInstallation;
 exports.createAppleNotification = createAppleNotification;
+exports.createAppleNotificationBody = createAppleNotificationBody;
 exports.createAppleRegistrationDescription = createAppleRegistrationDescription;
 exports.createAppleTemplateRegistrationDescription = createAppleTemplateRegistrationDescription;
 exports.createBaiduInstallation = createBaiduInstallation;
 exports.createBaiduNotification = createBaiduNotification;
+exports.createBaiduNotificationBody = createBaiduNotificationBody;
 exports.createBaiduRegistrationDescription = createBaiduRegistrationDescription;
 exports.createBaiduTemplateRegistrationDescription = createBaiduTemplateRegistrationDescription;
 exports.createBrowserInstallation = createBrowserInstallation;
@@ -2437,8 +2386,11 @@ exports.createFcmLegacyInstallation = createFcmLegacyInstallation;
 exports.createFcmLegacyNotification = createFcmLegacyNotification;
 exports.createFcmLegacyRegistrationDescription = createFcmLegacyRegistrationDescription;
 exports.createFcmLegacyTemplateRegistrationDescription = createFcmLegacyTemplateRegistrationDescription;
+exports.createFirebaseLegacyNotificationBody = createFirebaseLegacyNotificationBody;
+exports.createTagExpression = createTagExpression;
 exports.createTemplateNotification = createTemplateNotification;
 exports.createWindowsBadgeNotification = createWindowsBadgeNotification;
+exports.createWindowsBadgeNotificationBody = createWindowsBadgeNotificationBody;
 exports.createWindowsInstallation = createWindowsInstallation;
 exports.createWindowsRawNotification = createWindowsRawNotification;
 exports.createWindowsRegistrationDescription = createWindowsRegistrationDescription;