Allow each req key in the URL hash to have comma-separated multiple…

… requirements (#595)
whitphx · Jul 24, 2023 · e5c0bda · e5c0bda
1 parent 1eea90e
commit e5c0bda
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/packages/sharing-common/src/url.test.ts b/packages/sharing-common/src/url.test.ts
@@ -1,5 +1,5 @@
-import { describe, test, expect } from "vitest";
-import { processGitblobUrl } from "./url";
+import { describe, it, test, expect } from "vitest";
+import { processGitblobUrl, parseHash } from "./url";
 
 describe("processGitblobUrl", () => {
   const githubUrls: [string, string][] = [
@@ -73,3 +73,17 @@ describe("processGitblobUrl", () => {
     });
   });
 });
+
+describe("parseHash", () => {
+  const reqTestCases: [string, string[]][] = [
+    ["code=xxx&req=foo", ["foo"]],
+    ["code=xxx&req=foo&req=bar", ["foo", "bar"]],
+    ["code=xxx&req=foo&req=bar&req=baz", ["foo", "bar", "baz"]],
+    ["code=xxx&req=foo&req=bar,baz", ["foo", "bar", "baz"]],
+  ];
+  reqTestCases.forEach(([hash, requirements]) => {
+    it(`parses requirements from "${hash}"`, () => {
+      expect(parseHash(hash)).toEqual({ requirements, code: "xxx" });
+    });
+  });
+});
diff --git a/packages/sharing-common/src/url.ts b/packages/sharing-common/src/url.ts
@@ -36,7 +36,7 @@ export function processGitblobUrl(url: string): string {
   return url + "/raw";
 }
 
-function parseHash(
+export function parseHash(
   hashValue: string
 ):
   | { url: string; requirements: string[] }
@@ -49,7 +49,12 @@ function parseHash(
   const params = new URLSearchParams(hashValue);
   const url = params.get("url");
   const code = params.get("code");
-  const requirements = params.getAll("req");
+  const requirements = params
+    .getAll("req")
+    .map((r) => r.split(","))
+    .flat()
+    .map((r) => r.trim())
+    .filter((r) => r.length > 0);
 
   if (code) {
     if (url) {