npm package diff

Package: @forge/util

Versions: 1.4.10-next.0 - 1.4.10-next.0-experimental-effab31

File: package/packages/ari/microsoft/channel/index.js

Index: package/packages/ari/microsoft/channel/index.js
===================================================================
--- package/packages/ari/microsoft/channel/index.js
+++ package/packages/ari/microsoft/channel/index.js
@@ -27,9 +27,9 @@
 var ValidationError = class extends Error {
 };
 
 // src/core/rules/cloud-id.ts
-function validateCloudId(cloudId, format = new RegExp("^[a-zA-Z0-9\\-]*$")) {
+function validateCloudId(cloudId, format = new RegExp("^[a-zA-Z0-9_\\-.]{0,255}$")) {
   if (!cloudId.match(format))
     throw new ValidationError(`Invalid cloud ID, expected ID of format ${format}.`);
 }
 
@@ -49,9 +49,9 @@
     throw new ValidationError(`ARI must have a qualifier of 'ari'. Received: ${qualifier}`);
 }
 
 // src/core/rules/resource-id.ts
-function validateResourceId(id, format = new RegExp("[!a-zA-Z0-9\\-_.~@:{}=]+(/[!a-zA-Z0-9\\-_.~@:{}=]+)*" /* ANY_RESOURCE_ID */), key = "resourceId") {
+function validateResourceId(id, format = new RegExp("[!a-zA-Z0-9\\-_.~@:;{}=]+(/[!a-zA-Z0-9\\-_.~@:;{}=]+)*" /* ANY_RESOURCE_ID */), key = "resourceId") {
   let formatWithCarets = new RegExp(`^${format.source}$`);
   if (!id.match(formatWithCarets))
     throw new ValidationError(`Invalid ${key} - ${id}, expected ID of format ${formatWithCarets}.`);
 }
@@ -284,30 +284,26 @@
 var microsoftChannelAriStaticOpts = {
   qualifier: "ari",
   platformQualifier: "third-party",
   cloudId: new RegExp("^$"),
+  // eslint-disable-line no-useless-escape
   resourceOwner: MicrosoftChannelAriResourceOwner,
   resourceType: MicrosoftChannelAriResourceType,
-  resourceIdSlug: "tenantId/{tenantId}/teamId/{teamId}/channelId/{channelId}",
+  resourceIdSlug: "teamId/{teamId}/channelId/{channelId}",
   resourceIdSegmentFormats: {
-    tenantId: /[!a-zA-Z0-9\-_.~@:{}=]+(\/[!a-zA-Z0-9\-_.~@:{}=]+)*/,
+    teamId: /[!a-zA-Z0-9\-_.~@:;{}=]+(\/[!a-zA-Z0-9\-_.~@:;{}=]+)*/,
     // eslint-disable-line no-useless-escape
-    teamId: /[!a-zA-Z0-9\-_.~@:{}=]+(\/[!a-zA-Z0-9\-_.~@:{}=]+)*/,
+    channelId: /[!a-zA-Z0-9\-_.~@:;{}=]+(\/[!a-zA-Z0-9\-_.~@:;{}=]+)*/
     // eslint-disable-line no-useless-escape
-    channelId: /[!a-zA-Z0-9\-_.~@:{}=]+(\/[!a-zA-Z0-9\-_.~@:{}=]+)*/
-    // eslint-disable-line no-useless-escape
   }
 };
 
 // src/microsoft/channel/index.ts
 var MicrosoftChannelAri = class _MicrosoftChannelAri extends RegisteredAri {
   constructor(opts) {
     super(opts);
-    this._tenantId = opts.resourceIdSegmentValues.tenantId, this._teamId = opts.resourceIdSegmentValues.teamId, this._channelId = opts.resourceIdSegmentValues.channelId;
+    this._teamId = opts.resourceIdSegmentValues.teamId, this._channelId = opts.resourceIdSegmentValues.channelId;
   }
-  get tenantId() {
-    return this._tenantId;
-  }
   get teamId() {
     return this._teamId;
   }
   get channelId() {
@@ -319,11 +315,10 @@
       platformQualifier: microsoftChannelAriStaticOpts.platformQualifier,
       cloudId: void 0,
       resourceOwner: microsoftChannelAriStaticOpts.resourceOwner,
       resourceType: microsoftChannelAriStaticOpts.resourceType,
-      resourceId: `tenantId/${opts.tenantId}/teamId/${opts.teamId}/channelId/${opts.channelId}`,
+      resourceId: `teamId/${opts.teamId}/channelId/${opts.channelId}`,
       resourceIdSegmentValues: {
-        tenantId: opts.tenantId,
         teamId: opts.teamId,
         channelId: opts.channelId
       }
     }, ariOpts = AriParser.fromOpts(derivedOpts, microsoftChannelAriStaticOpts);
@@ -334,9 +329,8 @@
     return new _MicrosoftChannelAri(opts);
   }
   getVariables() {
     return {
-      tenantId: this.tenantId,
       teamId: this.teamId,
       channelId: this.channelId
     };
   }