This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new eeac05a0a [OPENMEETINGS-2253] 'uuid' NPM module is replaced with
'crypto.randomUUID()'
eeac05a0a is described below
commit eeac05a0a7687a992148d872e93988c861f5954d
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Sat Dec 10 17:10:01 2022 +0700
[OPENMEETINGS-2253] 'uuid' NPM module is replaced with 'crypto.randomUUID()'
---
openmeetings-web/src/main/front/room/src/video.js | 4 ++--
openmeetings-web/src/main/front/settings/package.json | 1 -
openmeetings-web/src/main/front/settings/src/WebRtcPeer.js | 2 +-
openmeetings-web/src/main/front/settings/src/index.js | 5 +----
openmeetings-web/src/main/front/wb/src/wb-tool-base.js | 2 +-
openmeetings-web/src/main/front/wb/src/wb.js | 4 ++--
6 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/openmeetings-web/src/main/front/room/src/video.js
b/openmeetings-web/src/main/front/room/src/video.js
index 8ca6ea7c5..da71ed5c2 100644
--- a/openmeetings-web/src/main/front/room/src/video.js
+++ b/openmeetings-web/src/main/front/room/src/video.js
@@ -270,7 +270,7 @@ module.exports = class Video {
if (hasVideo) {
if (opts.interview) {
const area = $('.pod-area');
- const contId = uuidv4();
+ const contId = crypto.randomUUID();
contSel = '#' + contId;
area.append($('<div
class="pod"></div>').attr('id', contId));
WbArea.updateAreaClass();
@@ -640,7 +640,7 @@ module.exports = class Video {
function _init(_msg) {
sd = _msg.stream;
sd.activities = sd.activities.sort();
- _msg.instanceUid = uuidv4();
+ _msg.instanceUid = crypto.randomUUID();
iceServers = _msg.iceServers;
__initUI(_msg.instanceUid);
_refresh(_msg);
diff --git a/openmeetings-web/src/main/front/settings/package.json
b/openmeetings-web/src/main/front/settings/package.json
index a3a075c82..0e2758d6e 100644
--- a/openmeetings-web/src/main/front/settings/package.json
+++ b/openmeetings-web/src/main/front/settings/package.json
@@ -17,7 +17,6 @@
},
"dependencies": {
"freeice": "2.2.2",
- "uuid": "^9.0.0",
"webrtc-adapter": "^8.2.0"
}
}
diff --git a/openmeetings-web/src/main/front/settings/src/WebRtcPeer.js
b/openmeetings-web/src/main/front/settings/src/WebRtcPeer.js
index d40d4b015..903065988 100644
--- a/openmeetings-web/src/main/front/settings/src/WebRtcPeer.js
+++ b/openmeetings-web/src/main/front/settings/src/WebRtcPeer.js
@@ -529,7 +529,7 @@ class WebRtcPeer {
* @hidden
*/
generateUniqueId() {
- return uuidv4();
+ return crypto.randomUUID();
}
get stream() {
diff --git a/openmeetings-web/src/main/front/settings/src/index.js
b/openmeetings-web/src/main/front/settings/src/index.js
index 7edcb067f..1d575b88a 100644
--- a/openmeetings-web/src/main/front/settings/src/index.js
+++ b/openmeetings-web/src/main/front/settings/src/index.js
@@ -1,7 +1,6 @@
/* Licensed under the Apache License, Version 2.0 (the "License")
http://www.apache.org/licenses/LICENSE-2.0 */
-const VideoUtil = require('./video-util');
require('webrtc-adapter');
-const {v4: uuidv4} = require('uuid');
+const VideoUtil = require('./video-util');
const {WebRtcPeerRecvonly, WebRtcPeerSendonly} = require('./WebRtcPeer');
if (window.hasOwnProperty('isSecureContext') === false) {
@@ -16,6 +15,4 @@ Object.assign(window, {
, WebRtcPeerRecvonly: WebRtcPeerRecvonly
, WebRtcPeerSendonly: WebRtcPeerSendonly
, VideoSettings: require('./settings')
-
- , uuidv4: uuidv4
});
diff --git a/openmeetings-web/src/main/front/wb/src/wb-tool-base.js
b/openmeetings-web/src/main/front/wb/src/wb-tool-base.js
index b0a8df7f0..5dcb222fd 100644
--- a/openmeetings-web/src/main/front/wb/src/wb-tool-base.js
+++ b/openmeetings-web/src/main/front/wb/src/wb-tool-base.js
@@ -1,7 +1,7 @@
/* Licensed under the Apache License, Version 2.0 (the "License")
http://www.apache.org/licenses/LICENSE-2.0 */
module.exports = class WbToolBase {
objectCreated(o, canvas) {
- o.uid = uuidv4();
+ o.uid = crypto.randomUUID();
o.slide = canvas.slide;
canvas.fire("wb:object:created", o);
return o.uid;
diff --git a/openmeetings-web/src/main/front/wb/src/wb.js
b/openmeetings-web/src/main/front/wb/src/wb.js
index adbff2fe6..fa4a4f806 100644
--- a/openmeetings-web/src/main/front/wb/src/wb.js
+++ b/openmeetings-web/src/main/front/wb/src/wb.js
@@ -124,7 +124,7 @@ module.exports = class Wb {
switch(o.omType) {
case 'textbox':
case 'i-text':
- o.uid = uuidv4();
+ o.uid = crypto.randomUUID();
o.slide = this.slide;
objCreatedHandler(o);
break;
@@ -179,7 +179,7 @@ module.exports = class Wb {
}
}
function pathCreatedHandler(o) {
- o.path.uid = uuidv4();
+ o.path.uid = crypto.randomUUID();
o.path.slide = this.slide;
o.path.omType = 'freeDraw';
objCreatedHandler(o.path);
