Merge pull request #19084 from Snuffleupagus/getUuid-shorten

Simplify the `getUuid` helper function
mozilla · Nov 21, 2024 · 445b7ec · 445b7ec
2 parents 07765e9 + c290a12
commit 445b7ec
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/src/shared/util.js b/src/shared/util.js
@@ -1075,21 +1075,12 @@ function normalizeUnicode(str) {
 function getUuid() {
   if (
     (typeof PDFJSDev !== "undefined" && PDFJSDev.test("MOZCENTRAL")) ||
-    (typeof crypto !== "undefined" && typeof crypto?.randomUUID === "function")
+    typeof crypto.randomUUID === "function"
   ) {
     return crypto.randomUUID();
   }
   const buf = new Uint8Array(32);
-  if (
-    typeof crypto !== "undefined" &&
-    typeof crypto?.getRandomValues === "function"
-  ) {
-    crypto.getRandomValues(buf);
-  } else {
-    for (let i = 0; i < 32; i++) {
-      buf[i] = Math.floor(Math.random() * 255);
-    }
-  }
+  crypto.getRandomValues(buf);
   return bytesToString(buf);
 }
 

diff --git a/test/unit/util_spec.js b/test/unit/util_spec.js
@@ -18,6 +18,7 @@ import {
   bytesToString,
   createValidAbsoluteUrl,
   getModificationDate,
+  getUuid,
   string32,
   stringToBytes,
   stringToPDFString,
@@ -248,4 +249,12 @@ describe("util", function () {
       expect(getModificationDate(date)).toEqual("31410609020653");
     });
   });
+
+  describe("getUuid", function () {
+    it("should get uuid string", function () {
+      const uuid = getUuid();
+      expect(typeof uuid).toEqual("string");
+      expect(uuid.length).toBeGreaterThanOrEqual(32);
+    });
+  });
 });