Skip to content

feat: added methods to enforcer for adding, removing and updating policies without usage of adapter (even if autoSave is true) #504

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

Closed
yiev wants to merge 8 commits into from
Closed

feat: added methods to enforcer for adding, removing and updating policies without usage of adapter (even if autoSave is true) #504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cc2963c
InternalEnforcer: added "useAdapter" param to methods for adding, upd…
Sep 23, 2025
0f126fc
fix removePolicyInternal in syncedEnforcer.ts
Sep 23, 2025
19ede2a
added methods for adding, updating and removing grouping policies wit…
Sep 24, 2025
625487e
fix method summaries
Sep 24, 2025
a33b6e3
feat: added methods to enforcer for adding, removing and updating pol…
yiev Sep 24, 2025
399da27
fix: lint error
yiev Sep 24, 2025
a64eada
refactor: renamed names of new methods, removed redundant methods
yiev Sep 29, 2025
0d82f36
Merge branch 'pr-add-del-update-without-adapter-usage'
yiev Sep 29, 2025
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
50 changes: 38 additions & 12 deletions src/internalEnforcer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,18 @@ export class InternalEnforcer extends CoreEnforcer {
/**
* addPolicyInternal adds a rule to the current policy.
*/
protected async addPolicyInternal(sec: string, ptype: string, rule: string[], useWatcher: boolean): Promise<boolean> {
protected async addPolicyInternal(
sec: string,
ptype: string,
rule: string[],
useWatcher: boolean,
useAdapter: boolean
): Promise<boolean> {
if (this.model.hasPolicy(sec, ptype, rule)) {
return false;
}

if (this.adapter && this.autoSave) {
if (this.adapter && this.autoSave && useAdapter) {
try {
await this.adapter.addPolicy(sec, ptype, rule);
} catch (e) {
Expand Down Expand Up @@ -60,14 +66,20 @@ export class InternalEnforcer extends CoreEnforcer {

// addPolicies adds rules to the current policy.
// removePolicies removes rules from the current policy.
protected async addPoliciesInternal(sec: string, ptype: string, rules: string[][], useWatcher: boolean): Promise<boolean> {
protected async addPoliciesInternal(
sec: string,
ptype: string,
rules: string[][],
useWatcher: boolean,
useAdapter: boolean
): Promise<boolean> {
for (const rule of rules) {
if (this.model.hasPolicy(sec, ptype, rule)) {
return false;
}
}

if (this.autoSave) {
if (this.autoSave && useAdapter) {
if ('addPolicies' in this.adapter) {
try {
await this.adapter.addPolicies(sec, ptype, rules);
Expand Down Expand Up @@ -107,13 +119,14 @@ export class InternalEnforcer extends CoreEnforcer {
ptype: string,
oldRule: string[],
newRule: string[],
useWatcher: boolean
useWatcher: boolean,
useAdapter: boolean
): Promise<boolean> {
if (!this.model.hasPolicy(sec, ptype, oldRule)) {
return false;
}

if (this.autoSave) {
if (this.autoSave && useAdapter) {
if ('updatePolicy' in this.adapter) {
try {
await this.adapter.updatePolicy(sec, ptype, oldRule, newRule);
Expand Down Expand Up @@ -149,12 +162,18 @@ export class InternalEnforcer extends CoreEnforcer {
/**
* removePolicyInternal removes a rule from the current policy.
*/
protected async removePolicyInternal(sec: string, ptype: string, rule: string[], useWatcher: boolean): Promise<boolean> {
protected async removePolicyInternal(
sec: string,
ptype: string,
rule: string[],
useWatcher: boolean,
useAdapter: boolean
): Promise<boolean> {
if (!this.model.hasPolicy(sec, ptype, rule)) {
return false;
}

if (this.adapter && this.autoSave) {
if (this.adapter && this.autoSave && useAdapter) {
try {
await this.adapter.removePolicy(sec, ptype, rule);
} catch (e) {
Expand Down Expand Up @@ -183,14 +202,20 @@ export class InternalEnforcer extends CoreEnforcer {
}

// removePolicies removes rules from the current policy.
protected async removePoliciesInternal(sec: string, ptype: string, rules: string[][], useWatcher: boolean): Promise<boolean> {
protected async removePoliciesInternal(
sec: string,
ptype: string,
rules: string[][],
useWatcher: boolean,
useAdapter: boolean
): Promise<boolean> {
for (const rule of rules) {
if (!this.model.hasPolicy(sec, ptype, rule)) {
return false;
}
}

if (this.autoSave) {
if (this.autoSave && useAdapter) {
if ('removePolicies' in this.adapter) {
try {
await this.adapter.removePolicies(sec, ptype, rules);
Expand Down Expand Up @@ -230,9 +255,10 @@ export class InternalEnforcer extends CoreEnforcer {
ptype: string,
fieldIndex: number,
fieldValues: string[],
useWatcher: boolean
useWatcher: boolean,
useAdapter: boolean
): Promise<boolean> {
if (this.adapter && this.autoSave) {
if (this.adapter && this.autoSave && useAdapter) {
try {
await this.adapter.removeFilteredPolicy(sec, ptype, fieldIndex, ...fieldValues);
} catch (e) {
Expand Down
Loading