@uptime.app/contracts 3.0.54-rc.2 → 3.0.54

package/src/user-acl/user-acl-utils.test.ts

@@ -1,273 +1,273 @@
-import { parseAclEntry, getAclValuesByNamespace, aclFor, UserAclBuilder } from './user-acl-utils';
-
-describe('parseAclEntry', () => {
-
-    test('returns null for empty string', () => {
-        expect(parseAclEntry('')).toBeNull();
-    });
-
-    test('returns null for whitespace-only string', () => {
-        expect(parseAclEntry('   ')).toBeNull();
-    });
-
-    test('parses a simple namespace-only entry', () => {
-        expect(parseAclEntry('public')).toEqual({
-            raw: 'public',
-            excluded: false,
-            namespace: 'public',
-            value: null
-        });
-    });
-
-    test('parses a namespace:value entry', () => {
-        expect(parseAclEntry('catalogue:uptime')).toEqual({
-            raw: 'catalogue:uptime',
-            excluded: false,
-            namespace: 'catalogue',
-            value: 'uptime'
-        });
-    });
-
-    test('parses an excluded namespace-only entry', () => {
-        expect(parseAclEntry('!public')).toEqual({
-            raw: '!public',
-            excluded: true,
-            namespace: 'public',
-            value: null
-        });
-    });
-
-    test('parses an excluded namespace:value entry', () => {
-        expect(parseAclEntry('!catalogue:uptime')).toEqual({
-            raw: '!catalogue:uptime',
-            excluded: true,
-            namespace: 'catalogue',
-            value: 'uptime'
-        });
-    });
-
-    test('trims leading and trailing whitespace', () => {
-        expect(parseAclEntry('  catalogue:uptime  ')).toEqual({
-            raw: 'catalogue:uptime',
-            excluded: false,
-            namespace: 'catalogue',
-            value: 'uptime'
-        });
-    });
-
-    test('returns null when namespace is empty (entry starts with colon)', () => {
-        expect(parseAclEntry(':value')).toBeNull();
-    });
-
-    test('preserves colons in value', () => {
-        expect(parseAclEntry('catalogue:b2b:org-123')).toEqual({
-            raw: 'catalogue:b2b:org-123',
-            excluded: false,
-            namespace: 'catalogue',
-            value: 'b2b:org-123'
-        });
-    });
-});
-
-describe('getAclValuesByNamespace', () => {
-    const acl = [
-        'public',
-        'catalogue:uptime',
-        'catalogue:premium',
-        '!catalogue:restricted',
-        'b2b:org-1',
-        '!b2b:org-2',
-        'user:user-123'
-    ];
-
-    test('returns included values for a namespace by default', () => {
-        expect(getAclValuesByNamespace(acl, 'catalogue')).toEqual(['uptime', 'premium']);
-    });
-
-    test('returns excluded values when mode is "excluded"', () => {
-        expect(getAclValuesByNamespace(acl, 'catalogue', { mode: 'excluded' })).toEqual(['restricted']);
-    });
-
-    test('returns all values when mode is "all"', () => {
-        expect(getAclValuesByNamespace(acl, 'catalogue', { mode: 'all' })).toEqual(['uptime', 'premium', 'restricted']);
-    });
-
-    test('returns empty array when namespace has no matches', () => {
-        expect(getAclValuesByNamespace(acl, 'subject')).toEqual([]);
-    });
-
-    test('deduplicates values by default', () => {
-        const aclWithDupes = ['catalogue:uptime', 'catalogue:uptime', 'catalogue:premium'];
-        expect(getAclValuesByNamespace(aclWithDupes, 'catalogue')).toEqual(['uptime', 'premium']);
-    });
-
-    test('preserves duplicates when dedupe is false', () => {
-        const aclWithDupes = ['catalogue:uptime', 'catalogue:uptime', 'catalogue:premium'];
-        expect(getAclValuesByNamespace(aclWithDupes, 'catalogue', { dedupe: false })).toEqual(['uptime', 'uptime', 'premium']);
-    });
-
-    test('excludes namespace-only entries (no value)', () => {
-        expect(getAclValuesByNamespace(acl, 'public')).toEqual([]);
-    });
-
-    test('returns empty array for empty acl', () => {
-        expect(getAclValuesByNamespace([], 'catalogue')).toEqual([]);
-    });
-
-    test('skips invalid entries', () => {
-        const aclWithInvalid = ['', '   ', 'catalogue:uptime'];
-        expect(getAclValuesByNamespace(aclWithInvalid, 'catalogue')).toEqual(['uptime']);
-    });
-});
-
-describe('UserAclBuilder', () => {
-
-    test('does not include "public" by default', () => {
-        const acl = new UserAclBuilder().build();
-        expect(acl).not.toContain('public');
-    });
-
-    test('includes "public" when allowPublic is called', () => {
-        const acl = new UserAclBuilder().allowPublic().build();
-        expect(acl).toContain('public');
-    });
-
-    test('includes user entry when allowUser is called', () => {
-        const acl = new UserAclBuilder().allowUser('user-123').build();
-        expect(acl).toContain('user:user-123');
-    });
-
-    test('merges baseAcl entries', () => {
-        const acl = new UserAclBuilder({ baseAcl: ['catalogue:uptime', '!catalogue:restricted'] }).build();
-        expect(acl).toContain('catalogue:uptime');
-        expect(acl).toContain('!catalogue:restricted');
-    });
-
-    describe('allow', () => {
-        test('adds namespace:value entry', () => {
-            const acl = new UserAclBuilder().allow('catalogue', 'uptime').build();
-            expect(acl).toContain('catalogue:uptime');
-        });
-
-        test('adds namespace-only entry when no value provided', () => {
-            const acl = new UserAclBuilder().allow('public').build();
-            expect(acl).toContain('public');
-        });
-
-        test('removes entry from excluded when allowed', () => {
-            const acl = new UserAclBuilder()
-                .deny('catalogue', 'uptime')
-                .allow('catalogue', 'uptime')
-                .build();
-            expect(acl).toContain('catalogue:uptime');
-            expect(acl).not.toContain('!catalogue:uptime');
-        });
-    });
-
-    describe('deny', () => {
-        test('adds excluded namespace:value entry', () => {
-            const acl = new UserAclBuilder().deny('catalogue', 'restricted').build();
-            expect(acl).toContain('!catalogue:restricted');
-        });
-
-        test('removes entry from included when denied', () => {
-            const acl = new UserAclBuilder()
-                .allow('catalogue', 'uptime')
-                .deny('catalogue', 'uptime')
-                .build();
-            expect(acl).not.toContain('catalogue:uptime');
-            expect(acl).toContain('!catalogue:uptime');
-        });
-    });
-
-    describe('allowCatalogue', () => {
-        test('adds catalogue:<id> entry', () => {
-            const acl = new UserAclBuilder().allowCatalogue('premium').build();
-            expect(acl).toContain('catalogue:premium');
-        });
-    });
-
-    describe('denyCatalogue', () => {
-        test('adds !catalogue:<id> entry', () => {
-            const acl = new UserAclBuilder().denyCatalogue('restricted').build();
-            expect(acl).toContain('!catalogue:restricted');
-        });
-    });
-
-    describe('allowOrganisation', () => {
-        test('adds b2b:<id> entry', () => {
-            const acl = new UserAclBuilder().allowOrganisation('org-1').build();
-            expect(acl).toContain('b2b:org-1');
-        });
-    });
-
-    describe('denySubject', () => {
-        test('adds !subject:<value> entry', () => {
-            const acl = new UserAclBuilder().denySubject('some-topic').build();
-            expect(acl).toContain('!subject:some-topic');
-        });
-    });
-
-    describe('addRaw', () => {
-        test('adds an included raw entry', () => {
-            const acl = new UserAclBuilder().addRaw('catalogue:uptime').build();
-            expect(acl).toContain('catalogue:uptime');
-        });
-
-        test('adds an excluded raw entry', () => {
-            const acl = new UserAclBuilder().addRaw('!catalogue:restricted').build();
-            expect(acl).toContain('!catalogue:restricted');
-        });
-
-        test('ignores invalid raw entries', () => {
-            const acl = new UserAclBuilder().addRaw('').build();
-            expect(acl).toEqual([]);
-        });
-    });
-
-    describe('addMany', () => {
-        test('adds multiple entries at once', () => {
-            const acl = new UserAclBuilder()
-                .addMany(['catalogue:uptime', 'b2b:org-1', '!catalogue:restricted'])
-                .build();
-            expect(acl).toContain('catalogue:uptime');
-            expect(acl).toContain('b2b:org-1');
-            expect(acl).toContain('!catalogue:restricted');
-        });
-    });
-});
-
-describe('aclFor', () => {
-    test('includes user entry', () => {
-        const acl = aclFor({ userId: 'user-abc', organisationIds: [], catalogueIds: [] });
-        expect(acl).toContain('user:user-abc');
-    });
-
-    test('always includes catalogue:uptime', () => {
-        const acl = aclFor({ userId: 'user-abc', organisationIds: [], catalogueIds: [] });
-        expect(acl).toContain('catalogue:uptime');
-    });
-
-    test('includes provided catalogue ids', () => {
-        const acl = aclFor({ userId: 'user-abc', organisationIds: [], catalogueIds: ['premium', 'free'] });
-        expect(acl).toContain('catalogue:premium');
-        expect(acl).toContain('catalogue:free');
-    });
-
-    test('includes b2b catalogue entry for each organisation', () => {
-        const acl = aclFor({ userId: 'user-abc', organisationIds: ['org-1', 'org-2'], catalogueIds: [] });
-        expect(acl).toContain('catalogue:b2b:org-1');
-        expect(acl).toContain('catalogue:b2b:org-2');
-    });
-
-    test('includes b2b namespace entry for each organisation', () => {
-        const acl = aclFor({ userId: 'user-abc', organisationIds: ['org-1', 'org-2'], catalogueIds: [] });
-        expect(acl).toContain('b2b:org-1');
-        expect(acl).toContain('b2b:org-2');
-    });
-
-    test('includes public by default', () => {
-        const acl = aclFor({ userId: 'user-abc', organisationIds: [], catalogueIds: [] });
-        expect(acl).toContain('public');
-    });
-});
+import { parseAclEntry, getAclValuesByNamespace, aclFor, UserAclBuilder } from './user-acl-utils';
+
+describe('parseAclEntry', () => {
+
+    test('returns null for empty string', () => {
+        expect(parseAclEntry('')).toBeNull();
+    });
+
+    test('returns null for whitespace-only string', () => {
+        expect(parseAclEntry('   ')).toBeNull();
+    });
+
+    test('parses a simple namespace-only entry', () => {
+        expect(parseAclEntry('public')).toEqual({
+            raw: 'public',
+            excluded: false,
+            namespace: 'public',
+            value: null
+        });
+    });
+
+    test('parses a namespace:value entry', () => {
+        expect(parseAclEntry('catalogue:uptime')).toEqual({
+            raw: 'catalogue:uptime',
+            excluded: false,
+            namespace: 'catalogue',
+            value: 'uptime'
+        });
+    });
+
+    test('parses an excluded namespace-only entry', () => {
+        expect(parseAclEntry('!public')).toEqual({
+            raw: '!public',
+            excluded: true,
+            namespace: 'public',
+            value: null
+        });
+    });
+
+    test('parses an excluded namespace:value entry', () => {
+        expect(parseAclEntry('!catalogue:uptime')).toEqual({
+            raw: '!catalogue:uptime',
+            excluded: true,
+            namespace: 'catalogue',
+            value: 'uptime'
+        });
+    });
+
+    test('trims leading and trailing whitespace', () => {
+        expect(parseAclEntry('  catalogue:uptime  ')).toEqual({
+            raw: 'catalogue:uptime',
+            excluded: false,
+            namespace: 'catalogue',
+            value: 'uptime'
+        });
+    });
+
+    test('returns null when namespace is empty (entry starts with colon)', () => {
+        expect(parseAclEntry(':value')).toBeNull();
+    });
+
+    test('preserves colons in value', () => {
+        expect(parseAclEntry('catalogue:b2b:org-123')).toEqual({
+            raw: 'catalogue:b2b:org-123',
+            excluded: false,
+            namespace: 'catalogue',
+            value: 'b2b:org-123'
+        });
+    });
+});
+
+describe('getAclValuesByNamespace', () => {
+    const acl = [
+        'public',
+        'catalogue:uptime',
+        'catalogue:premium',
+        '!catalogue:restricted',
+        'b2b:org-1',
+        '!b2b:org-2',
+        'user:user-123'
+    ];
+
+    test('returns included values for a namespace by default', () => {
+        expect(getAclValuesByNamespace(acl, 'catalogue')).toEqual(['uptime', 'premium']);
+    });
+
+    test('returns excluded values when mode is "excluded"', () => {
+        expect(getAclValuesByNamespace(acl, 'catalogue', { mode: 'excluded' })).toEqual(['restricted']);
+    });
+
+    test('returns all values when mode is "all"', () => {
+        expect(getAclValuesByNamespace(acl, 'catalogue', { mode: 'all' })).toEqual(['uptime', 'premium', 'restricted']);
+    });
+
+    test('returns empty array when namespace has no matches', () => {
+        expect(getAclValuesByNamespace(acl, 'subject')).toEqual([]);
+    });
+
+    test('deduplicates values by default', () => {
+        const aclWithDupes = ['catalogue:uptime', 'catalogue:uptime', 'catalogue:premium'];
+        expect(getAclValuesByNamespace(aclWithDupes, 'catalogue')).toEqual(['uptime', 'premium']);
+    });
+
+    test('preserves duplicates when dedupe is false', () => {
+        const aclWithDupes = ['catalogue:uptime', 'catalogue:uptime', 'catalogue:premium'];
+        expect(getAclValuesByNamespace(aclWithDupes, 'catalogue', { dedupe: false })).toEqual(['uptime', 'uptime', 'premium']);
+    });
+
+    test('excludes namespace-only entries (no value)', () => {
+        expect(getAclValuesByNamespace(acl, 'public')).toEqual([]);
+    });
+
+    test('returns empty array for empty acl', () => {
+        expect(getAclValuesByNamespace([], 'catalogue')).toEqual([]);
+    });
+
+    test('skips invalid entries', () => {
+        const aclWithInvalid = ['', '   ', 'catalogue:uptime'];
+        expect(getAclValuesByNamespace(aclWithInvalid, 'catalogue')).toEqual(['uptime']);
+    });
+});
+
+describe('UserAclBuilder', () => {
+
+    test('does not include "public" by default', () => {
+        const acl = new UserAclBuilder().build();
+        expect(acl).not.toContain('public');
+    });
+
+    test('includes "public" when allowPublic is called', () => {
+        const acl = new UserAclBuilder().allowPublic().build();
+        expect(acl).toContain('public');
+    });
+
+    test('includes user entry when allowUser is called', () => {
+        const acl = new UserAclBuilder().allowUser('user-123').build();
+        expect(acl).toContain('user:user-123');
+    });
+
+    test('merges baseAcl entries', () => {
+        const acl = new UserAclBuilder({ baseAcl: ['catalogue:uptime', '!catalogue:restricted'] }).build();
+        expect(acl).toContain('catalogue:uptime');
+        expect(acl).toContain('!catalogue:restricted');
+    });
+
+    describe('allow', () => {
+        test('adds namespace:value entry', () => {
+            const acl = new UserAclBuilder().allow('catalogue', 'uptime').build();
+            expect(acl).toContain('catalogue:uptime');
+        });
+
+        test('adds namespace-only entry when no value provided', () => {
+            const acl = new UserAclBuilder().allow('public').build();
+            expect(acl).toContain('public');
+        });
+
+        test('removes entry from excluded when allowed', () => {
+            const acl = new UserAclBuilder()
+                .deny('catalogue', 'uptime')
+                .allow('catalogue', 'uptime')
+                .build();
+            expect(acl).toContain('catalogue:uptime');
+            expect(acl).not.toContain('!catalogue:uptime');
+        });
+    });
+
+    describe('deny', () => {
+        test('adds excluded namespace:value entry', () => {
+            const acl = new UserAclBuilder().deny('catalogue', 'restricted').build();
+            expect(acl).toContain('!catalogue:restricted');
+        });
+
+        test('removes entry from included when denied', () => {
+            const acl = new UserAclBuilder()
+                .allow('catalogue', 'uptime')
+                .deny('catalogue', 'uptime')
+                .build();
+            expect(acl).not.toContain('catalogue:uptime');
+            expect(acl).toContain('!catalogue:uptime');
+        });
+    });
+
+    describe('allowCatalogue', () => {
+        test('adds catalogue:<id> entry', () => {
+            const acl = new UserAclBuilder().allowCatalogue('premium').build();
+            expect(acl).toContain('catalogue:premium');
+        });
+    });
+
+    describe('denyCatalogue', () => {
+        test('adds !catalogue:<id> entry', () => {
+            const acl = new UserAclBuilder().denyCatalogue('restricted').build();
+            expect(acl).toContain('!catalogue:restricted');
+        });
+    });
+
+    describe('allowOrganisation', () => {
+        test('adds b2b:<id> entry', () => {
+            const acl = new UserAclBuilder().allowOrganisation('org-1').build();
+            expect(acl).toContain('b2b:org-1');
+        });
+    });
+
+    describe('denySubject', () => {
+        test('adds !subject:<value> entry', () => {
+            const acl = new UserAclBuilder().denySubject('some-topic').build();
+            expect(acl).toContain('!subject:some-topic');
+        });
+    });
+
+    describe('addRaw', () => {
+        test('adds an included raw entry', () => {
+            const acl = new UserAclBuilder().addRaw('catalogue:uptime').build();
+            expect(acl).toContain('catalogue:uptime');
+        });
+
+        test('adds an excluded raw entry', () => {
+            const acl = new UserAclBuilder().addRaw('!catalogue:restricted').build();
+            expect(acl).toContain('!catalogue:restricted');
+        });
+
+        test('ignores invalid raw entries', () => {
+            const acl = new UserAclBuilder().addRaw('').build();
+            expect(acl).toEqual([]);
+        });
+    });
+
+    describe('addMany', () => {
+        test('adds multiple entries at once', () => {
+            const acl = new UserAclBuilder()
+                .addMany(['catalogue:uptime', 'b2b:org-1', '!catalogue:restricted'])
+                .build();
+            expect(acl).toContain('catalogue:uptime');
+            expect(acl).toContain('b2b:org-1');
+            expect(acl).toContain('!catalogue:restricted');
+        });
+    });
+});
+
+describe('aclFor', () => {
+    test('includes user entry', () => {
+        const acl = aclFor({ userId: 'user-abc', organisationIds: [], catalogueIds: [] });
+        expect(acl).toContain('user:user-abc');
+    });
+
+    test('always includes catalogue:uptime', () => {
+        const acl = aclFor({ userId: 'user-abc', organisationIds: [], catalogueIds: [] });
+        expect(acl).toContain('catalogue:uptime');
+    });
+
+    test('includes provided catalogue ids', () => {
+        const acl = aclFor({ userId: 'user-abc', organisationIds: [], catalogueIds: ['premium', 'free'] });
+        expect(acl).toContain('catalogue:premium');
+        expect(acl).toContain('catalogue:free');
+    });
+
+    test('includes b2b catalogue entry for each organisation', () => {
+        const acl = aclFor({ userId: 'user-abc', organisationIds: ['org-1', 'org-2'], catalogueIds: [] });
+        expect(acl).toContain('catalogue:b2b:org-1');
+        expect(acl).toContain('catalogue:b2b:org-2');
+    });
+
+    test('includes b2b namespace entry for each organisation', () => {
+        const acl = aclFor({ userId: 'user-abc', organisationIds: ['org-1', 'org-2'], catalogueIds: [] });
+        expect(acl).toContain('b2b:org-1');
+        expect(acl).toContain('b2b:org-2');
+    });
+
+    test('includes public by default', () => {
+        const acl = aclFor({ userId: 'user-abc', organisationIds: [], catalogueIds: [] });
+        expect(acl).toContain('public');
+    });
+});