Tweak to redirect logic

GoogleChrome · Apr 4, 2022 · 156bac7 · 156bac7
1 parent 63539a2
commit 156bac7
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/server/not-found.js b/server/not-found.js
@@ -64,15 +64,19 @@ const getNonLocalizedURL = (
     // This throws if the path is invalid, and returns undefined if it's valid.
     // (existsSync() is deprecated.)
     fs.accessSync(possibleIndexPath);
-    // We have a valid file!
     // Setting the first item to '' will remove the default locale prefix from
     // the URL we redirect to, while ensuring the URL starts with '/'.
     pathParts[0] = '';
-    return pathParts.join('/');
+    // If there's at least one valid string, join it with '/' and redirect.
+    if (pathParts.some(part => part !== '')) {
+      return pathParts.join('/');
+    }
   } catch (err) {
     // There was no index.html at the default locale path.
-    return null;
   }
+
+  // If we get here, return null to indicate there's no non-localized URL.
+  return null;
 };
 
 /**

diff --git a/tests/server/fixtures/en/index.html b/tests/server/fixtures/en/index.html
@@ -0,0 +1,3 @@
+<html>
+  <!-- ignored -->
+</html>
diff --git a/tests/server/getNonLocalizedURL.js b/tests/server/getNonLocalizedURL.js
@@ -29,6 +29,11 @@ test('returns null if no redirect is possible, with an index.html suffix', t =>
   t.is(result, null);
 });
 
+test('returns null if no redirect is possible, without a trailing /', t => {
+  const result = getNonLocalizedURL('/doesnotexist', ROOT_DIR, DEFAULT_LOCALE);
+  t.is(result, null);
+});
+
 test('returns null if the URL starts with the default locale', t => {
   const result = getNonLocalizedURL('/en/ignored/', ROOT_DIR, DEFAULT_LOCALE);
   t.is(result, null);