Skip to content

Commit fc70106

Browse files
committed
Tweak UpdatePermissionTargetObject logic
1 parent c5c9e5b commit fc70106

File tree

2 files changed

+24
-24
lines changed

2 files changed

+24
-24
lines changed

src/lib/code/api.ts

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -444,14 +444,7 @@ export function createPanelUser(newUser: INewPanelUser, completed: (wasSuccess:
444444
customServerPermissions: {}
445445
}
446446

447-
Object.entries(newUser.serverAccessDetails.serverPermissions).forEach((perms) => {
448-
requestBody.customServerPermissions[perms[1].serverId] = {
449-
viewStats: perms[1]?.permissions.viewStats ?? false,
450-
viewConsole: perms[1]?.permissions.viewConsole ?? false,
451-
useConsole: perms[1]?.permissions.useConsole ?? false,
452-
useServerActions: perms[1]?.permissions.useServerActions ?? false,
453-
}
454-
});
447+
ServerAccessDetails.UpdatePermissionTargetObject(newUser.serverAccessDetails, requestBody);
455448

456449
log("API Request: createPanelUser");
457450
axiosClient().post(`/api/v2/users`, JSON.stringify(requestBody))
@@ -482,14 +475,7 @@ export function editPanelUser(updatedUser: IEditPanelUser, completed: (wasSucces
482475
customServerPermissions: {}
483476
}
484477

485-
Object.entries(updatedUser.serverAccessDetails.serverPermissions).forEach((perms) => {
486-
requestBody.customServerPermissions[perms[1].serverId] = {
487-
viewStats: perms[1]?.permissions.viewStats ?? false,
488-
viewConsole: perms[1]?.permissions.viewConsole ?? false,
489-
useConsole: perms[1]?.permissions.useConsole ?? false,
490-
useServerActions: perms[1]?.permissions.useServerActions ?? false,
491-
}
492-
});
478+
ServerAccessDetails.UpdatePermissionTargetObject(updatedUser.serverAccessDetails, requestBody);
493479

494480
log("API Request: editPanelUser");
495481
axiosClient().put(`/api/v2/users/${updatedUser.userId}`, JSON.stringify(requestBody))
@@ -1089,14 +1075,7 @@ export function createApiKey(newApiKey: INewApiKey, completed: (wasSuccess: bool
10891075
customServerPermissions: {}
10901076
}
10911077

1092-
Object.entries(newApiKey.serverAccessDetails.serverPermissions).forEach((perms) => {
1093-
requestBody.customServerPermissions[perms[1].serverId] = {
1094-
viewStats: perms[1]?.permissions.viewStats ?? false,
1095-
viewConsole: perms[1]?.permissions.viewConsole ?? false,
1096-
useConsole: perms[1]?.permissions.useConsole ?? false,
1097-
useServerActions: perms[1]?.permissions.useServerActions ?? false,
1098-
}
1099-
});
1078+
ServerAccessDetails.UpdatePermissionTargetObject(newApiKey.serverAccessDetails, requestBody);
11001079

11011080
log("API Request: createApiKey");
11021081
axiosClient().post(`/api/v2/keys`, JSON.stringify(requestBody))

src/types.ts

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,27 @@ export class ServerAccessDetails {
279279

280280
return truePermissions;
281281
}
282+
283+
static UpdatePermissionTargetObject(serverAccessDetails: ServerAccessDetails, targetObject: any) {
284+
Object.entries(serverAccessDetails.serverPermissions).forEach((perms) => {
285+
targetObject.customServerPermissions[perms[1].serverId] = {
286+
viewStats: perms[1]?.permissions.viewStats ?? false,
287+
viewConsole: perms[1]?.permissions.viewConsole ?? false,
288+
useConsole: perms[1]?.permissions.useConsole ?? false,
289+
editServer: perms[1]?.permissions.editServer ?? false,
290+
viewBackups: perms[1]?.permissions.viewBackups ?? false,
291+
createBackup: perms[1]?.permissions.createBackup ?? false,
292+
editBackup: perms[1]?.permissions.editBackup ?? false,
293+
deleteBackups: perms[1]?.permissions.deleteBackups ?? false,
294+
triggerBackup: perms[1]?.permissions.triggerBackup ?? false,
295+
viewSchedulerTasks: perms[1]?.permissions.viewSchedulerTasks ?? false,
296+
createSchedulerTasks: perms[1]?.permissions.createSchedulerTasks ?? false,
297+
editSchedulerTask: perms[1]?.permissions.editSchedulerTask ?? false,
298+
deleteSchedulerTasks: perms[1]?.permissions.deleteSchedulerTasks ?? false,
299+
triggerSchedulerTask: perms[1]?.permissions.triggerSchedulerTask ?? false,
300+
};
301+
});
302+
}
282303
}
283304

284305
export class ServerPermissions {

0 commit comments

Comments
 (0)