这是indexloc提供的服务，不要输入任何密码
Skip to content

Patch ability to update multi-user-flag once set #993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 29, 2024
Merged

Patch ability to update multi-user-flag once set #993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
991dcdb
Patch ability to update multi-user-flag once set
timothycarambat Mar 29, 2024
9f317f4
update logo funciton to safeupdate
timothycarambat Mar 29, 2024
b4a164b
update logo funciton to safeupdate
timothycarambat Mar 29, 2024
77cdf44
update logo funciton to safeupdate
timothycarambat Mar 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions server/endpoints/system.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ function systemEndpoints(app) {
password,
role: ROLES.admin,
});
await SystemSettings.updateSettings({
await SystemSettings._updateSettings({
multi_user_mode: true,
users_can_delete_workspaces: false,
limit_user_messages: false,
Expand All @@ -422,7 +422,7 @@ function systemEndpoints(app) {
response.status(200).json({ success: !!user, error });
} catch (e) {
await User.delete({});
await SystemSettings.updateSettings({
await SystemSettings._updateSettings({
multi_user_mode: false,
});

Expand Down Expand Up @@ -623,7 +623,7 @@ function systemEndpoints(app) {
const existingLogoFilename = await SystemSettings.currentLogoFilename();
await removeCustomLogo(existingLogoFilename);

const { success, error } = await SystemSettings.updateSettings({
const { success, error } = await SystemSettings._updateSettings({
logo_filename: newFilename,
});

Expand Down Expand Up @@ -657,7 +657,7 @@ function systemEndpoints(app) {
try {
const currentLogoFilename = await SystemSettings.currentLogoFilename();
await removeCustomLogo(currentLogoFilename);
const { success, error } = await SystemSettings.updateSettings({
const { success, error } = await SystemSettings._updateSettings({
logo_filename: LOGO_FILENAME,
});

Expand Down
53 changes: 35 additions & 18 deletions server/models/systemSettings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ process.env.NODE_ENV === "development"
const prisma = require("../utils/prisma");

const SystemSettings = {
protectedFields: ["multi_user_mode"],
supportedFields: [
"multi_user_mode",
"users_can_delete_workspaces",
"limit_user_messages",
"message_limit",
Expand Down Expand Up @@ -287,26 +287,43 @@ const SystemSettings = {
}
},

// Can take generic keys and will pre-filter invalid keys
// from the set before sending to the explicit update function
// that will then enforce validations as well.
updateSettings: async function (updates = {}) {
const validFields = Object.keys(updates).filter((key) =>
this.supportedFields.includes(key)
);

Object.entries(updates).forEach(([key]) => {
if (validFields.includes(key)) return;
delete updates[key];
});

return this._updateSettings(updates);
},

// Explicit update of settings + key validations.
// Only use this method when directly setting a key value
// that takes no user input for the keys being modified.
_updateSettings: async function (updates = {}) {
try {
const updatePromises = Object.keys(updates)
.filter((key) => this.supportedFields.includes(key))
.map((key) => {
const validatedValue = this.validations.hasOwnProperty(key)
? this.validations[key](updates[key])
: updates[key];

return prisma.system_settings.upsert({
where: { label: key },
update: {
value: validatedValue === null ? null : String(validatedValue),
},
create: {
label: key,
value: validatedValue === null ? null : String(validatedValue),
},
});
const updatePromises = Object.keys(updates).map((key) => {
const validatedValue = this.validations.hasOwnProperty(key)
? this.validations[key](updates[key])
: updates[key];

return prisma.system_settings.upsert({
where: { label: key },
update: {
value: validatedValue === null ? null : String(validatedValue),
},
create: {
label: key,
value: validatedValue === null ? null : String(validatedValue),
},
});
});

await Promise.all(updatePromises);
return { success: true, error: null };
Expand Down
2 changes: 1 addition & 1 deletion server/models/telemetry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ const Telemetry = {

setUid: async function () {
const newId = v4();
await SystemSettings.updateSettings({ [this.label]: newId });
await SystemSettings._updateSettings({ [this.label]: newId });
return newId;
},

Expand Down