Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions public/locales/de-DE/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -639,6 +639,10 @@
"create": "Neue Autorisierung erstellen",
"cancel-create": "Erstellung der Autorisierung abbrechen",
"user-group": "Benutzer / Gruppe",
"user": "Benutzer",
"group": "Gruppe",
"user-id": "Benutzer-ID",
"group-id": "Gruppen-ID",
"permissions": "Berechtigungen",
"resource-id": "Ressourcen-ID",
"global": "GLOBAL",
Expand Down
4 changes: 4 additions & 0 deletions public/locales/en-US/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -639,6 +639,10 @@
"create": "Create new authorization",
"cancel-create": "Cancel creating new authorization",
"user-group": "User / Group",
"user": "User",
"group": "Group",
"user-id": "User ID",
"group-id": "Group ID",
"permissions": "Permissions",
"resource-id": "Resource ID",
"global": "GLOBAL",
Expand Down
31 changes: 25 additions & 6 deletions src/pages/Admin.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -932,10 +932,11 @@ const AuthorizationCreate = ({ resource, resource_type, on_done }) => {
state = useContext(AppState),
{ api: { authorization: { create } } } = state,
[t] = useTranslation(),
form = useSignal({ type: 1, userId: '', permissions: [], resourceId: '*' })
form = useSignal({ type: 1, assigneeType: 'user', userId: '', groupId: '', permissions: [], resourceId: '*' })

const
set_value = (k, e) => form.value = { ...form.peek(), [k]: e.currentTarget.value },
set_assignee_type = (e) => form.value = { ...form.peek(), assigneeType: e.currentTarget.value, userId: '', groupId: '' },
toggle_permission = (name, checked) => {
const current = form.peek().permissions
form.value = {
Expand All @@ -945,11 +946,15 @@ const AuthorizationCreate = ({ resource, resource_type, on_done }) => {
},
on_submit = e => {
e.preventDefault()
const { type, userId, permissions, resourceId } = form.value
const { type, assigneeType, userId, groupId, permissions, resourceId } = form.value,
assignee = assigneeType === 'group'
? { groupId: groupId || '*', userId: null }
: { userId: userId || '*', groupId: null }

void engine_rest.authorization.create(state, {
type: Number(type),
permissions,
userId: userId || '*',
...assignee,
resourceType: Number(resource_type),
resourceId,
}).then(() => {
Expand All @@ -970,9 +975,23 @@ const AuthorizationCreate = ({ resource, resource_type, on_done }) => {
<option value="2">{t("admin.authorization.deny")}</option>
</select>

<label for="auth-user">{t("admin.authorization.user-group")}</label>
<input id="auth-user" type="text" value={form.value.userId}
onInput={(e) => set_value('userId', e)} placeholder="*" />
<label for="auth-assignee-type">{t("admin.authorization.user-group")}</label>
<select id="auth-assignee-type" value={form.value.assigneeType} onInput={set_assignee_type}>
<option value="user">{t("admin.authorization.user")}</option>
<option value="group">{t("admin.authorization.group")}</option>
</select>

{form.value.assigneeType === 'group'
? <>
<label for="auth-group">{t("admin.authorization.group-id")}</label>
<input id="auth-group" type="text" value={form.value.groupId}
onInput={(e) => set_value('groupId', e)} placeholder="*" />
</>
: <>
<label for="auth-user">{t("admin.authorization.user-id")}</label>
<input id="auth-user" type="text" value={form.value.userId}
onInput={(e) => set_value('userId', e)} placeholder="*" />
</>}

<fieldset>
<legend>{t("admin.authorization.available-permissions")}</legend>
Expand Down
29 changes: 29 additions & 0 deletions src/pages/Admin.test.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,35 @@ describe("AdminPage", () => {
const call = engine_rest.authorization.create.mock.lastCall;
expect(call[0]).toBe(state);
expect(call[1].userId).toBe("carol");
expect(call[1].groupId).toBeNull();
expect(call[1].type).toBe(1);
expect(call[1].resourceType).toBe(1);
});

it("creates a group authorization via engine_rest.authorization.create", () => {
mockParams = {
page_id: "authorizations",
selection_id: "resource-type",
sub_selection_id: "1",
};
signal_response(state.api.authorization.create, { id: "a3" });
const { container, getByText } = renderPage(state);

fireEvent.click(getByText("admin.authorization.create"));
fireEvent.input(container.querySelector("#auth-assignee-type"), {
target: { value: "group" },
});
fireEvent.input(container.querySelector("#auth-group"), {
target: { value: "ops" },
});
fireEvent.submit(container.querySelector("form.authorization-create"));

expect(engine_rest.authorization.create).toHaveBeenCalled();
const call = engine_rest.authorization.create.mock.lastCall;
expect(call[0]).toBe(state);
expect(call[1].userId).toBeNull();
expect(call[1].groupId).toBe("ops");
expect(call[1].type).toBe(1);
expect(call[1].resourceType).toBe(1);
});

Expand Down