Skip to content

fix: move field-level restrictions for create and edit operations to api call #126

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 1 commit into from
Feb 24, 2025
Merged

fix: move field-level restrictions for create and edit operations to api call #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 0 additions & 18 deletions adminforth/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,15 +413,6 @@ class AdminForth implements IAdminForth {
return { error: err };
}

for (const column of resource.columns) {
const fieldName = column.name;
if (fieldName in record) {
if (!column.showIn?.create || column.backendOnly) {
return { error: `Field "${fieldName}" cannot be modified as it is restricted from creation` };
}
}
}

// execute hook if needed
for (const hook of listify(resource.hooks?.create?.beforeSave)) {
console.log('🪲 Hook beforeSave', hook);
Expand Down Expand Up @@ -498,15 +489,6 @@ class AdminForth implements IAdminForth {
delete record[column.name];
}

for (const column of resource.columns) {
const fieldName = column.name;
if (fieldName in record) {
if (!column.showIn?.edit || column.editReadonly || column.backendOnly) {
return { error: `Field "${fieldName}" cannot be modified as it is restricted from editing` };
}
}
}

// execute hook if needed
for (const hook of listify(resource.hooks?.edit?.beforeSave)) {
const resp = await hook({
Expand Down
18 changes: 18 additions & 0 deletions adminforth/modules/restApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -896,6 +896,15 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI {
}
}

for (const column of resource.columns) {
const fieldName = column.name;
if (fieldName in record) {
if (!column.showIn?.create || column.backendOnly) {
return { error: `Field "${fieldName}" cannot be modified as it is restricted from creation`, ok: false };
}
}
}

const response = await this.adminforth.createResourceRecord({ resource, record, adminUser, extra: { body, query, headers, cookies, requestUrl } });
if (response.error) {
return { error: response.error, ok: false };
Expand Down Expand Up @@ -939,6 +948,15 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI {
return { error: allowedError };
}

for (const column of resource.columns) {
const fieldName = column.name;
if (fieldName in record) {
if (!column.showIn?.edit || column.editReadonly || column.backendOnly) {
return { error: `Field "${fieldName}" cannot be modified as it is restricted from editing` };
}
}
}

const { error } = await this.adminforth.updateResourceRecord({ resource, record, adminUser, oldRecord, recordId, extra: { body, query, headers, cookies, requestUrl} });
if (error) {
return { error };
Expand Down