#1201 | Use crypto.randomUUID to generate random v4 uuids

avniproject · Nov 28, 2023 · 9aac1b8 · 9aac1b8
1 parent fa5254d
commit 9aac1b8
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/packages/openchs-android/package-lock.json b/packages/openchs-android/package-lock.json
diff --git a/packages/openchs-android/package.json b/packages/openchs-android/package.json
@@ -80,6 +80,7 @@
     "react-native-keep-awake": "^4.0.0",
     "react-native-keychain": "^8.1.1",
     "react-native-mime-types": "2.3.0",
+    "react-native-random-uuid": "^0.1.4",
     "react-native-randombytes": "^3.6.1",
     "react-native-restart": "0.0.24",
     "react-native-safe-area-context": "4.3.1",

diff --git a/packages/openchs-android/src/utility/General.js b/packages/openchs-android/src/utility/General.js
@@ -2,6 +2,7 @@ import {Concept, Duration, Observation} from 'avni-models';
 import _ from 'lodash';
 import moment from "moment";
 import EnvironmentConfig from "../framework/EnvironmentConfig";
+import 'react-native-random-uuid'
 
 let currentLogLevel;
 
@@ -178,12 +179,8 @@ class General {
         return dest;
     }
 
-    //http://stackoverflow.com/questions/105034/create-guid-uuid-in-javascript
     static randomUUID() {
-        return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-            const r = Math.random() * 16 | 0, v = c == 'x' ? r : (r & 0x3 | 0x8);
-            return v.toString(16);
-        });
+        return crypto.randomUUID();
     }
 
     static objectsShallowEquals(a: Object, b: Object): Boolean {