isValidTeamsChannelId - Fixing regex to

balbany · balbany · commit 01d14dadd0bf · 2020-03-10T18:02:23.000+11:00
allow 'tacv2' channel id format.
diff --git a/src/Utils.spec.ts b/src/Utils.spec.ts
@@ -106,6 +106,11 @@ describe('Utils', () => {
     assert.strictEqual(result, true);
   });
 
+  it('isValidTeamsChannelId returns true if valid channelId with new tacv2 format', () => {
+    const result = Utils.isValidTeamsChannelId('19:ABZTZ000000000000000000000rstfv@thread.tacv2');
+    assert.strictEqual(result, true);
+  });
+
   it('isValidTeamsChannelId returns false if invalid channelId (missing colon)', () => {
     const result = Utils.isValidTeamsChannelId('190000000000000000000000000000000@thread.skype');
     assert.strictEqual(result, false);
diff --git a/src/Utils.ts b/src/Utils.ts
@@ -56,7 +56,7 @@ export default class Utils {
   }
 
   public static isValidTeamsChannelId(guid: string): boolean {
-    const guidRegEx: RegExp = new RegExp(/^19:[0-9a-zA-Z]+@thread\.skype$/i);
+    const guidRegEx: RegExp = new RegExp(/^19:[0-9a-zA-Z]+@thread\.(skype|tacv2)$/i);
 
     return guidRegEx.test(guid);
   }

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ export default class Utils {`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`public static isValidTeamsChannelId(guid: string): boolean {`
`59`		`- const guidRegEx: RegExp = new RegExp(/^19:[0-9a-zA-Z]+@thread\.skype$/i);`
	`59`	`+ const guidRegEx: RegExp = new RegExp(/^19:[0-9a-zA-Z]+@thread\.(skype\|tacv2)$/i);`
`60`	`60`
`61`	`61`	`return guidRegEx.test(guid);`
`62`	`62`	`}`