From d99b87e7d8dda0a23f1f3783779630dcbde602d2 Mon Sep 17 00:00:00 2001
From: timothycarambat <rambat1010@gmail.com>
Date: Tue, 2 Jan 2024 12:44:17 -0800
Subject: [PATCH] patch workspace-chats API endpoint to be generally available
instead of forced multi-user
---
server/endpoints/api/admin/index.js | 7 -------
server/models/workspaceChats.js | 2 +-
server/swagger/openapi.json | 3 ---
3 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/server/endpoints/api/admin/index.js b/server/endpoints/api/admin/index.js
index 9b4816474..ebe662c69 100644
--- a/server/endpoints/api/admin/index.js
+++ b/server/endpoints/api/admin/index.js
@@ -523,16 +523,9 @@ function apiAdminEndpoints(app) {
schema: {
"$ref": "#/definitions/InvalidAPIKey"
}
- }
- #swagger.responses[401] = {
- description: "Instance is not in Multi-User mode. Method denied",
}
*/
try {
- if (!multiUserMode(response)) {
- response.sendStatus(401).end();
- return;
- }
const pgSize = 20;
const { offset = 0 } = reqBody(request);
const chats = await WorkspaceChats.whereWithData(
diff --git a/server/models/workspaceChats.js b/server/models/workspaceChats.js
index 6dfbafeff..b91b675ee 100644
--- a/server/models/workspaceChats.js
+++ b/server/models/workspaceChats.js
@@ -158,7 +158,7 @@ const WorkspaceChats = {
? { name: workspace.name, slug: workspace.slug }
: { name: "deleted workspace", slug: null };
- const user = await User.get({ id: res.user_id });
+ const user = res.user_id ? await User.get({ id: res.user_id }) : null;
res.user = user
? { username: user.username }
: { username: "unknown user" };
diff --git a/server/swagger/openapi.json b/server/swagger/openapi.json
index fce0ca967..cb065522e 100644
--- a/server/swagger/openapi.json
+++ b/server/swagger/openapi.json
@@ -665,9 +665,6 @@
}
}
},
- "401": {
- "description": "Instance is not in Multi-User mode. Method denied"
- },
"403": {
"description": "Forbidden",
"content": {