Merge pull request #1246 from w3c/releases

October 16, 2024 Production Release

Includes changes recently included in the [releases branch](https://github.com/w3c/aria-at-app/tree/releases) through #1245.

[Latest CHANGELOG.md update: v1.9.2](https://github.com/w3c/aria-at-app/blob/releases/CHANGELOG.md#192-2024-10-16)

CHANGELOG.md

@@ -1,3 +1,10 @@
+### [1.9.2](https://github.com/w3c/aria-at-app/compare/v1.9.1...v1.9.2) (2024-10-16)
+
+
+### Bug Fixes
+
+* Remove errant trim in vendor auth ([#1244](https://github.com/w3c/aria-at-app/issues/1244)) ([25edf06](https://github.com/w3c/aria-at-app/commit/25edf06156fe8f2e09bde72c093b61b3b03953ad))
+
 ### [1.9.1](https://github.com/w3c/aria-at-app/compare/v1.9.0...v1.9.1) (2024-10-10)
 
 

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "aria-at-app",
-  "version": "1.9.1",
+  "version": "1.9.2",
   "description": "Run ARIA-AT tests and report results",
   "main": "server/index.js",
   "private": true,

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

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);