Merge pull request #1245 from w3c/development

Create October 16, 2024 Release Includes the following changes: * #1244
w3c · Oct 16, 2024 · 702273b · 702273b
2 parents 9c4e1e9 + 25edf06
commit 702273b
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 11 deletions.
diff --git a/client/tests/e2e/snapshots/saved/_data-management.html b/client/tests/e2e/snapshots/saved/_data-management.html
@@ -1726,7 +1726,7 @@ <h2>Test Plans Status Summary</h2>
                 <td>
                   <div class="css-bpz90">
                     <span class="rd full-width css-be9e2a">R&amp;D</span>
-                    <p class="review-text">Complete <b>Aug 12, 2024</b></p>
+                    <p class="review-text">Complete <b>Oct 10, 2024</b></p>
                   </div>
                 </td>
                 <td>
@@ -1749,7 +1749,7 @@ <h2>Test Plans Status Summary</h2>
                             <path
                               fill="currentColor"
                               d="M256 512A256 256 0 1 0 256 0a256 256 0 1 0 0 512zM369 209L241 337c-9.4 9.4-24.6 9.4-33.9 0l-64-64c-9.4-9.4-9.4-24.6 0-33.9s24.6-9.4 33.9 0l47 47L335 175c9.4-9.4 24.6-9.4 33.9 0s9.4 24.6 0 33.9z"></path></svg
-                          ><b>V24.08.12</b></span
+                          ><b>V24.10.10</b></span
                         ></a
                       ></span
                     ><button
@@ -2298,7 +2298,7 @@ <h2>Test Plans Status Summary</h2>
                 <td>
                   <div class="css-bpz90">
                     <span class="rd full-width css-be9e2a">R&amp;D</span>
-                    <p class="review-text">Complete <b>Sep 19, 2024</b></p>
+                    <p class="review-text">Complete <b>Oct 12, 2024</b></p>
                   </div>
                 </td>
                 <td>
@@ -2321,7 +2321,7 @@ <h2>Test Plans Status Summary</h2>
                             <path
                               fill="currentColor"
                               d="M256 512A256 256 0 1 0 256 0a256 256 0 1 0 0 512zM369 209L241 337c-9.4 9.4-24.6 9.4-33.9 0l-64-64c-9.4-9.4-9.4-24.6 0-33.9s24.6-9.4 33.9 0l47 47L335 175c9.4-9.4 24.6-9.4 33.9 0s9.4 24.6 0 33.9z"></path></svg
-                          ><b>V24.09.19</b></span
+                          ><b>V24.10.12</b></span
                         ></a
                       ></span
                     ><button

diff --git a/server/controllers/AuthController.js b/server/controllers/AuthController.js
@@ -83,7 +83,7 @@ const oauthRedirectFromGithubController = async (req, res) => {
       vendor => vendor.split('|')[0] === githubUsername
     );
     if (vendorEntry) {
-      const [, companyName] = vendorEntry.split('|').trim();
+      const [, companyName] = vendorEntry.trim().split(/\s*\|\s*/);
       const vendor = await findVendorByName({
         name: companyName,
         transaction: req.transaction

diff --git a/server/util/getUsersFromFile.js b/server/util/getUsersFromFile.js
@@ -1,10 +1,22 @@
+const path = require('path');
+const fs = require('fs/promises');
+
 const getUsersFromFile = async file => {
-  const response = await fetch(
-    // This needs to be switched back the commented out path.
-    // `https://raw.githubusercontent.com/w3c/aria-at-app/main/${file}`
-    `https://raw.githubusercontent.com/w3c/aria-at-app/development/${file}`
-  );
-  const roleGroupTxt = await response.text();
+  const isDeployed =
+    process.env.ENVIRONMENT === 'sandbox' ||
+    process.env.ENVIRONMENT === 'staging' ||
+    process.env.ENVIRONMENT === 'production';
+
+  let roleGroupTxt;
+  if (isDeployed) {
+    const response = await fetch(
+      `https://raw.githubusercontent.com/w3c/aria-at-app/development/${file}`
+    );
+    roleGroupTxt = await response.text();
+  } else {
+    const filePath = path.join(__dirname, `../../${file}`);
+    roleGroupTxt = await fs.readFile(filePath, { encoding: 'utf8' });
+  }
   const linesRaw = roleGroupTxt.split('\n');
   const noComments = linesRaw.filter(line => line.substr(0, 1) !== '#');
   const noEmpties = noComments.filter(line => line.trim().length > 0);