Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 3e9052c4a7 |
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@ztimson/utils",
|
"name": "@ztimson/utils",
|
||||||
"version": "0.27.12",
|
"version": "0.27.13",
|
||||||
"description": "Utility library",
|
"description": "Utility library",
|
||||||
"author": "Zak Timson",
|
"author": "Zak Timson",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
|||||||
@@ -40,6 +40,7 @@ export function PE(str: TemplateStringsArray, ...args: any[]) {
|
|||||||
* @param {TemplateStringsArray} str
|
* @param {TemplateStringsArray} str
|
||||||
* @param {string} args
|
* @param {string} args
|
||||||
* @return {string}
|
* @return {string}
|
||||||
|
* @constructor
|
||||||
*/
|
*/
|
||||||
export function PES(str: TemplateStringsArray, ...args: any[]) {
|
export function PES(str: TemplateStringsArray, ...args: any[]) {
|
||||||
let combined = [];
|
let combined = [];
|
||||||
@@ -292,11 +293,7 @@ export class PathEvent {
|
|||||||
static filter(target: string | PathEvent | (string | PathEvent)[], ...filter: (string | PathEvent)[]): PathEvent[] {
|
static filter(target: string | PathEvent | (string | PathEvent)[], ...filter: (string | PathEvent)[]): PathEvent[] {
|
||||||
const parsedTarget = makeArray(target).map(pe => pe instanceof PathEvent ? pe : new PathEvent(pe));
|
const parsedTarget = makeArray(target).map(pe => pe instanceof PathEvent ? pe : new PathEvent(pe));
|
||||||
const parsedFilter = makeArray(filter).map(pe => pe instanceof PathEvent ? pe : new PathEvent(pe));
|
const parsedFilter = makeArray(filter).map(pe => pe instanceof PathEvent ? pe : new PathEvent(pe));
|
||||||
|
return parsedTarget.filter(t => !!parsedFilter.find(r => PathEvent.matches(r, t)));
|
||||||
return parsedTarget.filter(t => {
|
|
||||||
const combined = PathEvent.combine(t);
|
|
||||||
return !!parsedFilter.find(r => PathEvent.matches(r, combined));
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -338,10 +335,8 @@ export class PathEvent {
|
|||||||
const parsedTarget = makeArray(target).map(pe => pe instanceof PathEvent ? pe : new PathEvent(pe));
|
const parsedTarget = makeArray(target).map(pe => pe instanceof PathEvent ? pe : new PathEvent(pe));
|
||||||
const parsedRequired = makeArray(has).map(pe => pe instanceof PathEvent ? pe : new PathEvent(pe));
|
const parsedRequired = makeArray(has).map(pe => pe instanceof PathEvent ? pe : new PathEvent(pe));
|
||||||
|
|
||||||
// If target is a single item, check directly; if multiple, combine first
|
// Check if any target permission matches any required permission
|
||||||
const effectiveTarget = parsedTarget.length === 1 ? parsedTarget[0] : PathEvent.combine(...parsedTarget);
|
return !!parsedRequired.find(r => !!parsedTarget.find(t => PathEvent.matches(r, t)));
|
||||||
|
|
||||||
return !!parsedRequired.find(r => PathEvent.matches(r, effectiveTarget));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -81,6 +81,7 @@ describe('Path Events', () => {
|
|||||||
expect(c.methods.has('c')).toBe(true);
|
expect(c.methods.has('c')).toBe(true);
|
||||||
expect(c.methods.has('r')).toBe(true);
|
expect(c.methods.has('r')).toBe(true);
|
||||||
expect(c.methods.has('u')).toBe(true);
|
expect(c.methods.has('u')).toBe(true);
|
||||||
|
expect(c.delete).toBe(false);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('combine stops at none', () => {
|
it('combine stops at none', () => {
|
||||||
@@ -95,6 +96,17 @@ describe('Path Events', () => {
|
|||||||
expect(d.none).toBe(false);
|
expect(d.none).toBe(false);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('combine works with wildcards', () => {
|
||||||
|
expect(PathEvent.has([
|
||||||
|
'payments/anonymous:d',
|
||||||
|
'payments/anonymous:c',
|
||||||
|
'payments/system:cr',
|
||||||
|
'logs/Momentum:c',
|
||||||
|
'products:r',
|
||||||
|
'*'
|
||||||
|
], 'actions/692a92d18afa11e6722e9f2e:r')).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
it('filter finds overlap by path and methods', () => {
|
it('filter finds overlap by path and methods', () => {
|
||||||
const events = [
|
const events = [
|
||||||
new PathEvent('users/sys:cr'),
|
new PathEvent('users/sys:cr'),
|
||||||
|
|||||||
Reference in New Issue
Block a user