Fix: allow emails in provider map

DavideViolante · Jan 24, 2023 · cc906fb · cc906fb
1 parent 21cc3e4
commit cc906fb
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -46,7 +46,7 @@ jobs:
   pr-reviews-reminder:
     runs-on: ubuntu-latest
     steps:
-    - uses: davideviolante/[email protected].0
+    - uses: davideviolante/[email protected].1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:

diff --git a/dist/index.js b/dist/index.js
@@ -67,7 +67,8 @@ function createPr2UserArray(pullRequestsToReview) {
  */
 function checkGithubProviderFormat(str) {
   // Pattern made with the help of ChatGPT
-  const pattern = /^[A-z0-9_-]+:[A-z0-9_-]+(,\s*[A-z0-9_-]+:[A-z0-9_-]+)*$/m;
+  const az09 = '[A-z0-9_\\-@\\.]+';
+  const pattern = new RegExp(`^${az09}:${az09}(,\\s*${az09}:${az09})*$`, 'm');
   return pattern.test(str);
 }
 

diff --git a/functions.js b/functions.js
@@ -61,7 +61,8 @@ function createPr2UserArray(pullRequestsToReview) {
  */
 function checkGithubProviderFormat(str) {
   // Pattern made with the help of ChatGPT
-  const pattern = /^[A-z0-9_-]+:[A-z0-9_-]+(,\s*[A-z0-9_-]+:[A-z0-9_-]+)*$/m;
+  const az09 = '[A-z0-9_\\-@\\.]+';
+  const pattern = new RegExp(`^${az09}:${az09}(,\\s*${az09}:${az09})*$`, 'm');
   return pattern.test(str);
 }
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pr-reviews-reminder-action",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "description": "Reminder for Pull Request pending reviews",
   "scripts": {
     "build": "ncc build index.js",

diff --git a/test/test.js b/test/test.js
@@ -258,6 +258,10 @@ describe('Pull Request Reviews Reminder Action tests', () => {
       name3:ID3,  name4:ID4,
     name5:Id5`));
     assert.ok(checkGithubProviderFormat('name1:ID123, name2:ID456'));
+    assert.ok(checkGithubProviderFormat('name1:[email protected],name2:[email protected]'));
+    assert.ok(checkGithubProviderFormat('DavideViolante:[email protected], name2:[email protected]'));
+    assert.ok(checkGithubProviderFormat(`name1:[email protected],
+    name2:[email protected]`));
     assert.ok(!checkGithubProviderFormat('name1ID123,name2:ID456'));
     assert.ok(!checkGithubProviderFormat('name1:ID123name2:ID456'));
     assert.ok(!checkGithubProviderFormat('name1ID123,name2ID456'));