Replace random uuid function

inmanta · Apr 29, 2024 · 97e6a8b · 97e6a8b
1 parent 5d4830c
commit 97e6a8b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 18 deletions.
diff --git a/changelogs/unreleased/5706-replace-random.yml b/changelogs/unreleased/5706-replace-random.yml
@@ -0,0 +1,6 @@
+description: "replace randomUUID function with adequate cryptographic substitute"
+issue-nr: 5706
+change-type: patch
+destination-branches: [master, iso7]
+sections:
+  minor-improvement: "{{description}}"
diff --git a/src/Slices/EditInstance/Data/CommandManager.ts b/src/Slices/EditInstance/Data/CommandManager.ts
@@ -48,19 +48,6 @@ export function TriggerInstanceUpdateCommandManager(apiHelper: ApiHelper) {
   );
 }
 
-export const create_UUID = () => {
-  let dt = new Date().getTime();
-  const uuid = "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(
-    /[xy]/g,
-    function (c) {
-      const r = (dt + Math.random() * 16) % 16 | 0;
-      dt = Math.floor(dt / 16);
-      return (c == "x" ? r : (r & 0x3) | 0x8).toString(16);
-    },
-  );
-  return uuid;
-};
-
 export const getBodyV1 = (
   fields: Field[],
   currentAttributes: InstanceAttributeModel | null,
@@ -95,5 +82,5 @@ export const getBodyV2 = (
     },
   ];
 
-  return { edit: patchData, patch_id: create_UUID() };
+  return { edit: patchData, patch_id: crypto.randomUUID() };
 };
diff --git a/src/UI/Components/Diagram/helpers.test.ts b/src/UI/Components/Diagram/helpers.test.ts
@@ -9,7 +9,6 @@ import {
   a as InstanceAttributesA,
   b as InstanceAttributesB,
 } from "@/Test/Data/ServiceInstance/Attributes";
-import * as uuidApi from "../../../Slices/EditInstance/Data/CommandManager";
 import {
   childModel,
   containerModel,
@@ -40,7 +39,10 @@ import {
   TypeEnum,
 } from "./interfaces";
 import { Link, ServiceEntityBlock } from "./shapes";
-jest.spyOn(uuidApi, "create_UUID").mockReturnValue("1");
+
+jest.mock("crypto", () => ({
+  randomUUID: jest.fn(() => "1"),
+}));
 
 describe("extractRelationsIds", () => {
   const serviceInstanceForThirdTest = {

diff --git a/src/UI/Components/Diagram/helpers.ts b/src/UI/Components/Diagram/helpers.ts
@@ -1,11 +1,11 @@
+import crypto from "crypto";
 import { dia, g, highlighters } from "@inmanta/rappid";
 import {
   EmbeddedEntity,
   InstanceAttributeModel,
   ServiceInstanceModel,
   ServiceModel,
 } from "@/Core";
-import { create_UUID } from "@/Slices/EditInstance/Data";
 import {
   ConnectionRules,
   InstanceForApi,
@@ -354,7 +354,7 @@ export const shapesDataTransform = (
     if (!!instance.attributes && !instance.edits) {
       instance.edits = [
         {
-          edit_id: `${instance.instance_id}_order_update-${create_UUID()}`,
+          edit_id: `${instance.instance_id}_order_update-${crypto.randomUUID()}`,
           operation: "replace",
           target: ".",
           value: instance.attributes,