You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2026/10/19 06:20:50 UTC
(openmeetings) branch master updated: [OPENMEETINGS-2826] client sid is used instead of uid
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 7971d8fc2 [OPENMEETINGS-2826] client sid is used instead of uid
7971d8fc2 is described below
commit 7971d8fc2b8bf12886ddff12244c0847087b997b
Author: Maxim Solodovnik <so...@apache.org>
AuthorDate: Mon Oct 19 13:20:40 2026 +0700
[OPENMEETINGS-2826] client sid is used instead of uid
---
.../java/org/apache/openmeetings/web/room/RoomResourceReference.java | 4 ++--
.../java/org/apache/openmeetings/web/room/wb/WbWebSocketHelper.java | 4 ++--
.../java/org/apache/openmeetings/web/user/record/VideoPlayer.java | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
index 38f1381c2..76639459f 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
@@ -89,7 +89,7 @@ public class RoomResourceReference extends FileItemResourceReference<FileItem> {
protected FileItem getFileItem(Attributes attr) {
PageParameters params = attr.getParameters();
StringValue idStr = params.get("id");
- String uid = params.get("uid").toString();
+ String sid = params.get("sid").toString();
Long id = null;
try {
id = idStr.toOptionalLong();
@@ -97,7 +97,7 @@ public class RoomResourceReference extends FileItemResourceReference<FileItem> {
//no-op expected
}
WebSession ws = WebSession.get();
- Client c = cm.get(uid);
+ Client c = cm.getBySid(sid);
if (id == null || !ws.isSignedIn() || c == null) {
return null;
}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbWebSocketHelper.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbWebSocketHelper.java
index ecb0a2719..77aed6e55 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbWebSocketHelper.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbWebSocketHelper.java
@@ -110,7 +110,7 @@ public class WbWebSocketHelper {
.add("ruid", ruid)
.add("wuid", inFile.optString("uid"));
if (c != null) {
- pp.add("uid", c.getUid());
+ pp.add("sid", c.getSid());
}
file.put("deleted", !fi.exists());
switch (fi.getType()) {
@@ -142,7 +142,7 @@ public class WbWebSocketHelper {
//This is required cause WebSocketHelper will send message async
private static String patchUrl(String url, Client c) {
- return url + "&uid=" + c.getUid();
+ return url + "&sid=" + c.getSid();
}
private static JSONObject patchUrls(BaseFileItem fi, Client c, JSONObject inFile) {
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.java
index 859cabacc..bb44d3090 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.java
@@ -77,7 +77,7 @@ public class VideoPlayer extends Panel {
player.replace(mp4Rec);
player.setPoster(posterRecRes, pp);
} else {
- pp.add("id", r.getId()).add("uid", findParent(MainPanel.class).getClient().getUid());
+ pp.add("id", r.getId()).add("sid", findParent(MainPanel.class).getClient().getSid());
mp4File.setPageParameters(pp);
player.replace(mp4File);
player.setPoster(posterFileRes, new PageParameters(pp).add("preview", true));