Merge remote-tracking branch 'origin/main' into jasper-securePrivatePersonalDetails-redo-v2

Author: jasperhuangg

.bun-version

@@ -0,0 +1 @@
+1.3.14

.github/ISSUE_TEMPLATE/Accessibility.md

@@ -4,7 +4,7 @@ about: A template to follow when creating a new issue for accessibility failures
 labels: ["Accessibility", "Weekly"]
 ---
 
-If you haven’t already, check out our [contributing guidelines](https://github.com/Expensify/ReactNativeChat/blob/main/contributingGuides/CONTRIBUTING.md) for onboarding and email contributors@expensify.com to request to join our Slack channel!
+If you haven’t already, check out our [contributing guidelines](https://github.com/Expensify/ReactNativeChat/blob/main/contributingGuides/CONTRIBUTING.md) for onboarding. To join our Slack channel, fill out [this form](https://forms.gle/Q7hnhUJPnQCK7Fe56). 
 ___
 
 ## Action Performed:

.github/ISSUE_TEMPLATE/Exploratory.md

@@ -4,7 +4,7 @@ about: A template to follow when creating a new issue in this repository that wa
 labels: Monthly, Not a priority
 ---
 
-If you haven’t already, check out our [contributing guidelines](https://github.com/Expensify/ReactNativeChat/blob/main/contributingGuides/CONTRIBUTING.md) for onboarding and email contributors@expensify.com to request to join our Slack channel!
+If you haven’t already, check out our [contributing guidelines](https://github.com/Expensify/ReactNativeChat/blob/main/contributingGuides/CONTRIBUTING.md) for onboarding. To join our Slack channel, fill out [this form](https://forms.gle/Q7hnhUJPnQCK7Fe56). 
 ___
 **For all Exploratory issues, start the title of the issue with `[Exploratory]`** (and, do **not** add the `External` label.
 

.github/ISSUE_TEMPLATE/Performance.md

@@ -5,7 +5,7 @@ title: "[Performance] "
 labels: Engineering, Daily
 ---
 
-If you haven’t already, check out our [contributing guidelines](https://github.com/Expensify/ReactNativeChat/blob/main/contributingGuides/CONTRIBUTING.md) for onboarding and email contributors@expensify.com to request to join our Slack channel!
+If you haven’t already, check out our [contributing guidelines](https://github.com/Expensify/ReactNativeChat/blob/main/contributingGuides/CONTRIBUTING.md) for onboarding. To join our Slack channel, fill out [this form](https://forms.gle/Q7hnhUJPnQCK7Fe56).
 ___
 
 ## What performance issue do we need to solve?

.github/ISSUE_TEMPLATE/Standard.md

@@ -4,7 +4,7 @@ about: A standard template to follow when creating a new issue in this repositor
 labels: Bug, Daily
 ---
 
-If you haven’t already, check out our [contributing guidelines](https://github.com/Expensify/ReactNativeChat/blob/main/contributingGuides/CONTRIBUTING.md) for onboarding and email contributors@expensify.com to request to join our Slack channel!
+If you haven’t already, check out our [contributing guidelines](https://github.com/Expensify/ReactNativeChat/blob/main/contributingGuides/CONTRIBUTING.md) for onboarding. To join our Slack channel, fill out [this form](https://forms.gle/Q7hnhUJPnQCK7Fe56).
 ___
 
 **Version Number:**

.github/actions/composite/announceFailedWorkflowInSlack/action.yml

@@ -13,20 +13,17 @@ inputs:
 runs:
   using: composite
   steps:
-    - uses: 8398a7/action-slack@1750b5085f3ec60384090fb7c52965ef822e869e
+    - uses: slackapi/slack-github-action@45a88b9581bfab2566dc881e2cd66d334e621e2c # v3.0.3
       name: Job failed Slack notification
       with:
-        status: custom
-        fields: workflow, repo
-        custom_payload: |
+        webhook: ${{ inputs.SLACK_WEBHOOK }}
+        webhook-type: incoming-webhook
+        payload: |
           {
-            channel: '${{ inputs.CHANNEL }}',
-            attachments: [{
-              color: "#DB4545",
-              pretext: `<!subteam^S4TJJ3PSL>`,
-              text: `💥 ${process.env.AS_REPO} failed on <https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}|${{ github.workflow }}> workflow 💥`,
+            "channel": "${{ inputs.CHANNEL }}",
+            "attachments": [{
+              "color": "#DB4545",
+              "pretext": "<!subteam^S4TJJ3PSL>",
+              "text": "💥 ${{ github.repository }} failed on <https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}|${{ github.workflow }}> workflow 💥"
             }]
           }
-      env:
-        GITHUB_TOKEN: ${{ github.token }}
-        SLACK_WEBHOOK_URL: ${{ inputs.SLACK_WEBHOOK }}

.github/actions/composite/isContributorPlus/action.yml

@@ -4,11 +4,11 @@ inputs:
     PR_NUMBER:
         description: Pull request number
         required: true
-    PR_AUTHOR:
-        description: Pull request author login
+    ACTOR:
+        description: Login of the user to authorize (PR author, comment author, etc.)
         required: true
-    AUTHOR_ASSOCIATION:
-        description: "Author's association with the repository (MEMBER, OWNER, CONTRIBUTOR, etc.)"
+    ACTOR_ASSOCIATION:
+        description: "Actor's association with the repository (MEMBER, OWNER, CONTRIBUTOR, etc.)"
         required: true
     GITHUB_TOKEN:
         description: Auth token for repository API calls

.github/actions/javascript/isAuthorizedContributor/action.yml

@@ -11587,7 +11587,7 @@ const github = __importStar(__nccwpck_require__(5438));
 const request_error_1 = __nccwpck_require__(537);
 const CONST_1 = __importDefault(__nccwpck_require__(9873));
 const GithubUtils_1 = __importDefault(__nccwpck_require__(9296));
-const AUTHORIZED_ASSOCIATIONS = new Set(['MEMBER', 'OWNER', 'CONTRIBUTOR']);
+const AUTHORIZED_ASSOCIATIONS = new Set(['MEMBER', 'OWNER', 'CONTRIBUTOR', 'COLLABORATOR']);
 const CONTRIBUTOR_PLUS_TEAM_SLUG = 'contributor-plus';
 const ISSUE_URL_PATTERN = /https:\/\/github\.com\/(Expensify\/[^/]+)\/issues\/(\d+)/g;
 function parseExpensifyLink(match) {
@@ -11630,7 +11630,7 @@ async function isContributorPlusMember(username, orgToken) {
         return false;
     }
 }
-async function isAuthorizedViaLinkedIssues(prBody, prAuthor) {
+async function isAuthorizedViaLinkedIssues(prBody, actor) {
     for (const match of prBody.matchAll(ISSUE_URL_PATTERN)) {
         const link = parseExpensifyLink(match);
         if (!link) {
@@ -11644,11 +11644,11 @@ async function isAuthorizedViaLinkedIssues(prBody, prAuthor) {
                 // eslint-disable-next-line @typescript-eslint/naming-convention
                 issue_number: number,
             });
-            if (issue.assignees?.some((assignee) => assignee.login?.toLowerCase() === prAuthor.toLowerCase())) {
-                console.log(`${prAuthor} is assigned to ${repoFullName}#${number}. Authorized.`);
+            if (issue.assignees?.some((assignee) => assignee.login?.toLowerCase() === actor.toLowerCase())) {
+                console.log(`${actor} is assigned to ${repoFullName}#${number}. Authorized.`);
                 return true;
             }
-            console.log(`${prAuthor} is NOT assigned to ${repoFullName}#${number}.`);
+            console.log(`${actor} is NOT assigned to ${repoFullName}#${number}.`);
         }
         catch (error) {
             logVerificationError(repoFullName, number, error);
@@ -11659,15 +11659,15 @@ async function isAuthorizedViaLinkedIssues(prBody, prAuthor) {
 /**
  * Returns whether a PR author is authorized to contribute per Expensify external contributor rules.
  */
-async function isAuthorizedContributor({ prNumber, prAuthor, authorAssociation, repoOwner, repoName, githubToken, orgToken }) {
-    if (AUTHORIZED_ASSOCIATIONS.has(authorAssociation)) {
-        console.log(`${prAuthor} is ${authorAssociation}. Authorized.`);
+async function isAuthorizedContributor({ prNumber, actor, actorAssociation, repoOwner, repoName, githubToken, orgToken }) {
+    if (AUTHORIZED_ASSOCIATIONS.has(actorAssociation)) {
+        console.log(`${actor} is ${actorAssociation}. Authorized.`);
         return true;
     }
-    if (await isContributorPlusMember(prAuthor, orgToken)) {
+    if (await isContributorPlusMember(actor, orgToken)) {
         return true;
     }
-    console.log(`${prAuthor} has association "${authorAssociation}". Checking linked issues...`);
+    console.log(`${actor} has association "${actorAssociation}". Checking linked issues...`);
     GithubUtils_1.default.initOctokitWithToken(githubToken);
     const { data: pr } = await GithubUtils_1.default.octokit.pulls.get({
         owner: repoOwner,
@@ -11676,23 +11676,23 @@ async function isAuthorizedContributor({ prNumber, prAuthor, authorAssociation,
         pull_number: prNumber,
     });
     const prBody = pr.body ?? '';
-    const isAuthorized = await isAuthorizedViaLinkedIssues(prBody, prAuthor);
+    const isAuthorized = await isAuthorizedViaLinkedIssues(prBody, actor);
     if (!isAuthorized) {
-        console.log(`No valid authorization found for ${prAuthor}.`);
+        console.log(`No valid authorization found for ${actor}.`);
     }
     return isAuthorized;
 }
 async function run() {
     const prNumber = Number.parseInt(core.getInput('PR_NUMBER', { required: true }), 10);
-    const prAuthor = core.getInput('PR_AUTHOR', { required: true });
-    const authorAssociation = core.getInput('AUTHOR_ASSOCIATION', { required: true });
+    const actor = core.getInput('ACTOR', { required: true });
+    const actorAssociation = core.getInput('ACTOR_ASSOCIATION', { required: true });
     const githubToken = core.getInput('GITHUB_TOKEN', { required: true });
     const orgToken = core.getInput('OS_BOTIFY_TOKEN', { required: true });
     const { owner, repo } = github.context.repo;
     const isAuthorized = await isAuthorizedContributor({
         prNumber,
-        prAuthor,
-        authorAssociation,
+        actor,
+        actorAssociation,
         repoOwner: owner,
         repoName: repo,
         githubToken,

.github/actions/javascript/isAuthorizedContributor/index.js

@@ -4,15 +4,15 @@ import {RequestError} from '@octokit/request-error';
 import CONST from '@github/libs/CONST';
 import GithubUtils from '@github/libs/GithubUtils';
 
-const AUTHORIZED_ASSOCIATIONS = new Set(['MEMBER', 'OWNER', 'CONTRIBUTOR']);
+const AUTHORIZED_ASSOCIATIONS = new Set(['MEMBER', 'OWNER', 'CONTRIBUTOR', 'COLLABORATOR']);
 const CONTRIBUTOR_PLUS_TEAM_SLUG = 'contributor-plus';
 
 const ISSUE_URL_PATTERN = /https:\/\/github\.com\/(Expensify\/[^/]+)\/issues\/(\d+)/g;
 
 type IsAuthorizedContributorParams = {
     prNumber: number;
-    prAuthor: string;
-    authorAssociation: string;
+    actor: string;
+    actorAssociation: string;
     repoOwner: string;
     repoName: string;
     githubToken: string;
@@ -70,7 +70,7 @@ async function isContributorPlusMember(username: string, orgToken: string): Prom
     }
 }
 
-async function isAuthorizedViaLinkedIssues(prBody: string, prAuthor: string): Promise<boolean> {
+async function isAuthorizedViaLinkedIssues(prBody: string, actor: string): Promise<boolean> {
     for (const match of prBody.matchAll(ISSUE_URL_PATTERN)) {
         const link = parseExpensifyLink(match);
         if (!link) {
@@ -87,12 +87,12 @@ async function isAuthorizedViaLinkedIssues(prBody: string, prAuthor: string): Pr
                 issue_number: number,
             });
 
-            if (issue.assignees?.some((assignee) => assignee.login?.toLowerCase() === prAuthor.toLowerCase())) {
-                console.log(`${prAuthor} is assigned to ${repoFullName}#${number}. Authorized.`);
+            if (issue.assignees?.some((assignee) => assignee.login?.toLowerCase() === actor.toLowerCase())) {
+                console.log(`${actor} is assigned to ${repoFullName}#${number}. Authorized.`);
                 return true;
             }
 
-            console.log(`${prAuthor} is NOT assigned to ${repoFullName}#${number}.`);
+            console.log(`${actor} is NOT assigned to ${repoFullName}#${number}.`);
         } catch (error: unknown) {
             logVerificationError(repoFullName, number, error);
         }
@@ -104,17 +104,17 @@ async function isAuthorizedViaLinkedIssues(prBody: string, prAuthor: string): Pr
 /**
  * Returns whether a PR author is authorized to contribute per Expensify external contributor rules.
  */
-async function isAuthorizedContributor({prNumber, prAuthor, authorAssociation, repoOwner, repoName, githubToken, orgToken}: IsAuthorizedContributorParams): Promise<boolean> {
-    if (AUTHORIZED_ASSOCIATIONS.has(authorAssociation)) {
-        console.log(`${prAuthor} is ${authorAssociation}. Authorized.`);
+async function isAuthorizedContributor({prNumber, actor, actorAssociation, repoOwner, repoName, githubToken, orgToken}: IsAuthorizedContributorParams): Promise<boolean> {
+    if (AUTHORIZED_ASSOCIATIONS.has(actorAssociation)) {
+        console.log(`${actor} is ${actorAssociation}. Authorized.`);
         return true;
     }
 
-    if (await isContributorPlusMember(prAuthor, orgToken)) {
+    if (await isContributorPlusMember(actor, orgToken)) {
         return true;
     }
 
-    console.log(`${prAuthor} has association "${authorAssociation}". Checking linked issues...`);
+    console.log(`${actor} has association "${actorAssociation}". Checking linked issues...`);
 
     GithubUtils.initOctokitWithToken(githubToken);
 
@@ -126,28 +126,28 @@ async function isAuthorizedContributor({prNumber, prAuthor, authorAssociation, r
     });
 
     const prBody = pr.body ?? '';
-    const isAuthorized = await isAuthorizedViaLinkedIssues(prBody, prAuthor);
+    const isAuthorized = await isAuthorizedViaLinkedIssues(prBody, actor);
 
     if (!isAuthorized) {
-        console.log(`No valid authorization found for ${prAuthor}.`);
+        console.log(`No valid authorization found for ${actor}.`);
     }
 
     return isAuthorized;
 }
 
 async function run(): Promise<void> {
     const prNumber = Number.parseInt(core.getInput('PR_NUMBER', {required: true}), 10);
-    const prAuthor = core.getInput('PR_AUTHOR', {required: true});
-    const authorAssociation = core.getInput('AUTHOR_ASSOCIATION', {required: true});
+    const actor = core.getInput('ACTOR', {required: true});
+    const actorAssociation = core.getInput('ACTOR_ASSOCIATION', {required: true});
     const githubToken = core.getInput('GITHUB_TOKEN', {required: true});
     const orgToken = core.getInput('OS_BOTIFY_TOKEN', {required: true});
 
     const {owner, repo} = github.context.repo;
 
     const isAuthorized = await isAuthorizedContributor({
         prNumber,
-        prAuthor,
-        authorAssociation,
+        actor,
+        actorAssociation,
         repoOwner: owner,
         repoName: repo,
         githubToken,