@memberjunction/server 6.2.0-edge.4 → 6.2.0-edge.5

package/src/__tests__/ResolverBase.clauseUnscopedRead.test.ts

@@ -0,0 +1,127 @@
+// ResolverBase pulls in type-graphql decorators, which need the Reflect.metadata polyfill first.
+import 'reflect-metadata';
+import { describe, it, expect } from 'vitest';
+import type { DatabaseProviderBase, RunViewParams, RunViewResult, UserInfo } from '@memberjunction/core';
+import type { PubSubEngine } from 'type-graphql';
+import { ResolverBase } from '../generic/ResolverBase.js';
+import type { RunDynamicViewInput } from '../generic/RunViewResolver.js';
+import type { UserPayload } from '../types.js';
+
+/**
+ * `RunDynamicView` is the GraphQL entry point for a client RunView over one entity. A subquery in
+ * its ExtraFilter reads an entity's base view directly, so RunView applies neither that entity's
+ * row-level security nor its denied-field projection to the subquery. These tests pin that the
+ * boundary screen refuses such a subquery when the caller's read of that entity is narrowed (the
+ * rule the ad-hoc SQL screen applies) and still passes it when the read is not. Inputs are harmless.
+ */
+
+/** How the caller's read of an entity is narrowed: a row filter, denied fields, or neither. */
+interface ReadScope {
+    RowFilter?: string;
+    DeniedFields?: string[];
+}
+
+/** What the resolver handed to RunView; null when the request never got there. */
+type Captured = { params: RunViewParams | null };
+
+const USER = { ID: 'U1', Email: 'reader@example.com' } as UserInfo;
+const OWN_ROWS = "(OwnerID = 'U1')";
+const ORDERS_SUBQUERY = `ID IN (SELECT AccountID FROM [crm].[vwOrders] WHERE [Total] > 100)`;
+
+/** Provider double: two entities the caller can read, each under `scopes[Name]`, and a RunView that records its params. */
+function fakeProvider(captured: Captured, scopes: Record<string, ReadScope> = {}): DatabaseProviderBase {
+    const entity = (id: string, name: string, baseView: string) => ({
+        ID: id,
+        Name: name,
+        SchemaName: 'crm',
+        BaseView: baseView,
+        GetUserPermisions: () => ({ CanRead: true }),
+        GetEffectiveRowFilterWhereClause: () => scopes[name]?.RowFilter ?? '',
+        GetDeniedReadFields: () => new Set(scopes[name]?.DeniedFields ?? []),
+    });
+    return {
+        Entities: [entity('E1', 'Accounts', 'vwAccounts'), entity('E2', 'Orders', 'vwOrders')],
+        RunView: async (params: RunViewParams): Promise<RunViewResult> => {
+            captured.params = params;
+            return { Success: true, Results: [], RowCount: 0, TotalRowCount: 0, ErrorMessage: '' } as unknown as RunViewResult;
+        },
+    } as unknown as DatabaseProviderBase;
+}
+
+/** Runs `RunDynamicViewGeneric` over Accounts as USER. */
+class Probe extends ResolverBase {
+    public RunDynamic(input: Partial<RunDynamicViewInput>, provider: DatabaseProviderBase) {
+        const payload = { email: USER.Email, userRecord: USER } as UserPayload;
+        const view = { EntityName: 'Accounts', ...input } as RunDynamicViewInput;
+        return this.RunDynamicViewGeneric(view, provider, payload, undefined as unknown as PubSubEngine);
+    }
+}
+
+describe('RunDynamicViewGeneric — a client subquery reads an entity only when the caller may read it unscoped', () => {
+    it('refuses a subquery over an entity that is row-level-security filtered for the caller, before RunView', async () => {
+        const captured: Captured = { params: null };
+
+        await expect(
+            new Probe().RunDynamic({ ExtraFilter: ORDERS_SUBQUERY }, fakeProvider(captured, { Orders: { RowFilter: OWN_ROWS } })),
+        ).rejects.toThrow(/'Orders' is row-level-security filtered for you/);
+        expect(captured.params).toBeNull();
+    });
+
+    it('refuses a subquery over an entity with a field the caller may not read, before RunView', async () => {
+        const captured: Captured = { params: null };
+
+        await expect(
+            new Probe().RunDynamic({ ExtraFilter: ORDERS_SUBQUERY }, fakeProvider(captured, { Orders: { DeniedFields: ['total'] } })),
+        ).rejects.toThrow(/'Orders' has fields you are not permitted to read/);
+        expect(captured.params).toBeNull();
+    });
+
+    it('passes the same subquery through when the caller reads that entity unscoped', async () => {
+        const captured: Captured = { params: null };
+
+        await new Probe().RunDynamic({ ExtraFilter: ORDERS_SUBQUERY }, fakeProvider(captured));
+
+        expect(captured.params?.ExtraFilter).toBe(ORDERS_SUBQUERY);
+    });
+
+    it("refuses a subquery over the queried entity's own base view when the caller's read of it is row-filtered", async () => {
+        const captured: Captured = { params: null };
+        const ownView = `ID IN (SELECT ID FROM [crm].[vwAccounts] WHERE [Name] LIKE 'A%')`;
+
+        await expect(
+            new Probe().RunDynamic({ ExtraFilter: ownView }, fakeProvider(captured, { Accounts: { RowFilter: OWN_ROWS } })),
+        ).rejects.toThrow(/'Accounts' is row-level-security filtered for you/);
+        expect(captured.params).toBeNull();
+    });
+
+    it('refuses a CASE-WHEN subquery over a row-filtered entity, before RunView', async () => {
+        const captured: Captured = { params: null };
+        const caseWhen = `CASE WHEN (SELECT COUNT(*) FROM [crm].[vwOrders] WHERE [Total] > 100) > 0 THEN 1 ELSE 0 END = 1`;
+
+        await expect(
+            new Probe().RunDynamic({ ExtraFilter: caseWhen }, fakeProvider(captured, { Orders: { RowFilter: OWN_ROWS } })),
+        ).rejects.toThrow(/'Orders' is row-level-security filtered for you/);
+        expect(captured.params).toBeNull();
+    });
+
+    it("refuses a subquery over a row-filtered entity in a window's ORDER BY, before RunView", async () => {
+        const captured: Captured = { params: null };
+        const window = `ID IN (SELECT ID FROM (SELECT ID, ROW_NUMBER() OVER (ORDER BY (SELECT COUNT(*) FROM [crm].[vwOrders])) AS rn FROM [crm].[vwAccounts]) x)`;
+
+        await expect(
+            new Probe().RunDynamic({ ExtraFilter: window }, fakeProvider(captured, { Orders: { RowFilter: OWN_ROWS } })),
+        ).rejects.toThrow(/'Orders' is row-level-security filtered for you/);
+        expect(captured.params).toBeNull();
+    });
+
+    it('still passes an ordinary filter and sort on an entity the caller reads under a row filter', async () => {
+        const captured: Captured = { params: null };
+
+        await new Probe().RunDynamic(
+            { ExtraFilter: `[Name] = 'Acme'`, OrderBy: '[Name] DESC' },
+            fakeProvider(captured, { Accounts: { RowFilter: OWN_ROWS } }),
+        );
+
+        expect(captured.params?.ExtraFilter).toBe(`[Name] = 'Acme'`);
+    });
+});

package/src/__tests__/ResolverBase.clientOldValues.test.ts

@@ -1,7 +1,7 @@
 // Reflect.metadata polyfill at import time.
 import 'reflect-metadata';
 import { describe, it, expect } from 'vitest';
-import { EntityFieldTSType, EntityInfo, UserInfo, type EntityFieldInfo } from '@memberjunction/core';
+import { BaseEntity, EntityFieldTSType, EntityInfo, UserInfo, type EntityFieldInfo, type IMetadataProvider } from '@memberjunction/core';
 import { ResolverBase } from '../generic/ResolverBase.js';
 
 /**
@@ -13,11 +13,42 @@ class Probe extends ResolverBase {
     public Convert(field: Partial<EntityFieldInfo>, raw: unknown) {
         return this.ClientOldValueToFieldValue(field as EntityFieldInfo, raw);
     }
-    public MustLoad(entity: Record<string, unknown>, oldValues: boolean) {
+    public MustLoad(
+        entity: Record<string, unknown>,
+        oldValues: boolean | Array<{ Key: string; Value: unknown }>,
+        entityFields: Array<Record<string, unknown>> = []
+    ) {
         // A real entity with no permission rows and a user with no roles: no row filter applies.
         // The Update RLS term itself is covered in resolverBase.fls.test.ts.
         const user = new UserInfo(null, { ID: 'u-1', Name: 'Probe', Email: 'probe@example.test', IsActive: true, UserRoles: [] });
-        return this.MustLoadTruthFromDatabase(new EntityInfo({ Fields: [], ...entity }), { OldValues___: oldValues ? [{ Key: 'Comments', Value: null }] : undefined }, false, false, user);
+        const resolvedOldValues = Array.isArray(oldValues)
+            ? oldValues
+            : oldValues
+              ? [{ Key: 'Comments', Value: null }]
+              : undefined;
+        return this.MustLoadTruthFromDatabase(
+            new EntityInfo({ EntityFields: entityFields, ...entity }),
+            { OldValues___: resolvedOldValues },
+            false,
+            false,
+            user
+        );
+    }
+    public HasComplete(entityInfo: EntityInfo, oldValues?: Array<{ Key: string; Value: unknown }> | null): boolean {
+        return this.hasCompleteOldValues(entityInfo, oldValues);
+    }
+    public async TestAndSet(
+        entityObject: BaseEntity,
+        input: { OldValues___?: Array<{ Key: string; Value: unknown }> } & Record<string, unknown>,
+        contextUser: UserInfo
+    ): Promise<void> {
+        const clientNewValues: Record<string, unknown> = {};
+        for (const [k, v] of Object.entries(input)) {
+            if (k !== 'OldValues___') {
+                clientNewValues[k] = v;
+            }
+        }
+        await this.TestAndSetClientOldValuesToDBValues(input, clientNewValues, entityObject, contextUser);
     }
 }
 const probe = new Probe();
@@ -44,12 +75,184 @@ describe('ResolverBase.ClientOldValueToFieldValue', () => {
     });
 });
 
-describe('ResolverBase.MustLoadTruthFromDatabase', () => {
+function buildTagEntityFields(): Array<Record<string, unknown>> {
+    const entityId = 'E0000000-0000-4000-8000-000000000001';
+    return [
+        { ID: 'F-1', EntityID: entityId, Name: 'ID', Type: 'uniqueidentifier', IsPrimaryKey: true, AllowsNull: false, AllowUpdateAPI: false, IsVirtual: false, Sequence: 1, Status: 'Active' },
+        { ID: 'F-2', EntityID: entityId, Name: 'Name', Type: 'nvarchar', IsPrimaryKey: false, AllowsNull: false, AllowUpdateAPI: true, IsVirtual: false, Sequence: 2, Status: 'Active' },
+        { ID: 'F-3', EntityID: entityId, Name: 'Display Name', Type: 'nvarchar', IsPrimaryKey: false, AllowsNull: false, AllowUpdateAPI: true, IsVirtual: false, Sequence: 3, Status: 'Active' },
+        { ID: 'F-4', EntityID: entityId, Name: 'Description', Type: 'nvarchar', IsPrimaryKey: false, AllowsNull: true, AllowUpdateAPI: true, IsVirtual: false, Sequence: 4, Status: 'Active' },
+        { ID: 'F-5', EntityID: entityId, Name: '__mj_UpdatedAt', Type: 'datetimeoffset', IsPrimaryKey: false, AllowsNull: false, AllowUpdateAPI: false, IsVirtual: false, Sequence: 5, Status: 'Active' },
+        { ID: 'F-6', EntityID: entityId, Name: 'ParentName', Type: 'nvarchar', IsPrimaryKey: false, AllowsNull: true, AllowUpdateAPI: false, IsVirtual: true, Sequence: 6, Status: 'Active' },
+    ];
+}
+
+describe('ResolverBase.MustLoadTruthFromDatabase & hasCompleteOldValues', () => {
     it('always loads a Record Change from the database, so client OldValues cannot pin forged audit columns', () => {
         expect(probe.MustLoad({ Name: 'MJ: Record Changes', TrackRecordChanges: false }, true)).toBe(true);
     });
 
-    it('still trusts OldValues on other untracked entities without field security', () => {
-        expect(probe.MustLoad({ Name: 'MJ: Tags', TrackRecordChanges: false, EnableFieldLevelSecurity: false }, true)).toBe(false);
+    it("always loads a conversation message, so client OldValues cannot claim a message's author or role", () => {
+        expect(probe.MustLoad({ Name: 'MJ: Conversation Details', TrackRecordChanges: false }, true)).toBe(true);
+        expect(probe.MustLoad({ Name: ' mj: conversation details ', TrackRecordChanges: false }, true)).toBe(true);
+    });
+
+    it('still trusts OldValues on other untracked entities without field security when OldValues___ covers all writable fields', () => {
+        const fields = buildTagEntityFields();
+        const completeOldValues = [
+            { Key: 'ID', Value: '11111111-2222-3333-4444-555555555555' },
+            { Key: 'Name', Value: 'Original' },
+            { Key: 'Display_Name', Value: 'Original Display' },
+            { Key: 'Description', Value: 'Desc' },
+        ];
+        expect(
+            probe.MustLoad(
+                { ID: 'E0000000-0000-4000-8000-000000000001', Name: 'MJ: Tags', TrackRecordChanges: false, EnableFieldLevelSecurity: false },
+                completeOldValues,
+                fields
+            )
+        ).toBe(false);
+    });
+
+    it('requires loading truth from the database when OldValues___ is a partial delta (even when TrackRecordChanges === false)', () => {
+        const fields = buildTagEntityFields();
+        const deltaOldValues = [
+            { Key: 'ID', Value: '11111111-2222-3333-4444-555555555555' },
+            { Key: 'Name', Value: 'Original' },
+            // Display_Name and Description omitted because they were not dirty on the client
+        ];
+        expect(
+            probe.MustLoad(
+                { ID: 'E0000000-0000-4000-8000-000000000001', Name: 'MJ: Tags', TrackRecordChanges: false, EnableFieldLevelSecurity: false },
+                deltaOldValues,
+                fields
+            )
+        ).toBe(true);
+    });
+
+    it('requires loading truth from the database when OldValues___ is empty or undefined', () => {
+        const fields = buildTagEntityFields();
+        const entityMeta = { ID: 'E0000000-0000-4000-8000-000000000001', Name: 'MJ: Tags', TrackRecordChanges: false, EnableFieldLevelSecurity: false };
+        expect(probe.MustLoad(entityMeta, [], fields)).toBe(true);
+        expect(probe.MustLoad(entityMeta, false, fields)).toBe(true);
+    });
+});
+
+describe('ResolverBase.TestAndSetClientOldValuesToDBValues — partial delta Update', () => {
+    const tagEntityInfo = new EntityInfo({
+        ID: 'E0000000-0000-4000-8000-000000000001',
+        Name: 'MJ: Tags',
+        BaseTable: 'Tag',
+        BaseView: 'vwTags',
+        SchemaName: '__mj',
+        Status: 'Active',
+        EntityFields: buildTagEntityFields(),
+    });
+
+    function createLoadedTagEntity(errorLogSaves: Array<Record<string, unknown>> = []): { entity: BaseEntity; user: UserInfo } {
+        const fakeProvider = {
+            Entities: [tagEntityInfo],
+            GetEntityObject: async () => {
+                const errEntity: Record<string, unknown> = {
+                    Save: async () => {
+                        errorLogSaves.push({ ...errEntity });
+                        return true;
+                    },
+                };
+                return errEntity;
+            },
+        } as unknown as IMetadataProvider;
+
+        const entity = new BaseEntity(tagEntityInfo, fakeProvider);
+        entity.LoadFromData({
+            ID: '11111111-2222-3333-4444-555555555555',
+            Name: 'OriginalTag',
+            'Display Name': 'Original Display',
+            Description: 'Untouched DB Description',
+            __mj_UpdatedAt: new Date('2026-03-01T00:00:00.000Z'),
+            ParentName: 'RootTag',
+        });
+        const user = new UserInfo(null, { ID: 'u-1', Name: 'Probe', Email: 'probe@example.test', IsActive: true, UserRoles: [] });
+        return { entity, user };
+    }
+
+    it('preserves untouched DB fields and applies only the dirty field from a partial delta', async () => {
+        const errorLogSaves: Array<Record<string, unknown>> = [];
+        const { entity, user } = createLoadedTagEntity(errorLogSaves);
+
+        await probe.TestAndSet(
+            entity,
+            {
+                ID: '11111111-2222-3333-4444-555555555555',
+                Display_Name: 'Updated Display',
+                OldValues___: [
+                    { Key: 'ID', Value: '11111111-2222-3333-4444-555555555555' },
+                    { Key: 'Display_Name', Value: 'Original Display' },
+                ],
+            },
+            user
+        );
+
+        // Updated field is applied
+        expect(entity.Get('Display Name')).toBe('Updated Display');
+        // Untouched DB fields remain intact (never overwritten with null/defaults)
+        expect(entity.Get('Name')).toBe('OriginalTag');
+        expect(entity.Get('Description')).toBe('Untouched DB Description');
+        // No concurrency conflict warning logged
+        expect(errorLogSaves).toHaveLength(0);
+    });
+
+    it('detects a concurrent modification when the dirty field DB value differs from OldValues___', async () => {
+        const errorLogSaves: Array<Record<string, unknown>> = [];
+        const { entity, user } = createLoadedTagEntity(errorLogSaves);
+
+        // Client thinks Display_Name was 'Stale Client Display', but DB currently has 'Original Display'
+        await probe.TestAndSet(
+            entity,
+            {
+                ID: '11111111-2222-3333-4444-555555555555',
+                Display_Name: 'Client New Display',
+                OldValues___: [
+                    { Key: 'ID', Value: '11111111-2222-3333-4444-555555555555' },
+                    { Key: 'Display_Name', Value: 'Stale Client Display' },
+                ],
+            },
+            user
+        );
+
+        // Warning is logged to ErrorLog, and save still applies the new value
+        expect(errorLogSaves).toHaveLength(1);
+        expect(errorLogSaves[0].Code).toBe('ENTITY_SAVE_INCONSISTENCY');
+        expect(String(errorLogSaves[0].Message)).toContain('Display_Name');
+        expect(entity.Get('Display Name')).toBe('Client New Display');
+        expect(entity.Get('Description')).toBe('Untouched DB Description');
+    });
+
+    it('does not false-positive when a non-overlapping field differs in the DB', async () => {
+        const errorLogSaves: Array<Record<string, unknown>> = [];
+        const { entity, user } = createLoadedTagEntity(errorLogSaves);
+
+        // Suppose client sent full OldValues___ (e.g. IgnoreDirtyState: true) where Description
+        // changed in DB ('Untouched DB Description' vs 'Old Desc'), while the client only changed Name
+        await probe.TestAndSet(
+            entity,
+            {
+                ID: '11111111-2222-3333-4444-555555555555',
+                Name: 'RenamedTag',
+                Description: 'Old Desc',
+                OldValues___: [
+                    { Key: 'ID', Value: '11111111-2222-3333-4444-555555555555' },
+                    { Key: 'Name', Value: 'OriginalTag' },
+                    { Key: 'Description', Value: 'Old Desc' },
+                ],
+            },
+            user
+        );
+
+        // Description had a DB difference ('Untouched DB Description' !== 'Old Desc'),
+        // but client was NOT changing Description ('Old Desc' === 'Old Desc'), so overlap is empty!
+        expect(errorLogSaves).toHaveLength(0);
+        expect(entity.Get('Name')).toBe('RenamedTag');
     });
 });
+

package/src/__tests__/ResolverBase.filterEscaping.test.ts

@@ -36,9 +36,12 @@ type Captured = { params: RunViewParams | null };
 function fakeProvider(captured: Captured, rows: Record<string, unknown>[] = [], unreadableEntities: string[] = []): DatabaseProviderBase {
     const withPerms = (e: Record<string, unknown>) => ({
         ...e,
-        // Real EntityInfo aggregates per-user permissions; the boundary screen now consults
-        // CanRead for every subquery target, so the mock must answer it.
+        // Real EntityInfo aggregates per-user permissions; the boundary screen consults CanRead,
+        // the row filter and the denied fields for every subquery target, so the mock answers
+        // them (an unscoped read).
         GetUserPermisions: () => ({ CanRead: !unreadableEntities.includes(e.Name as string) }),
+        GetEffectiveRowFilterWhereClause: () => '',
+        GetDeniedReadFields: () => new Set<string>(),
     });
     return {
         Entities: [

package/src/__tests__/RunAIAgentResolver.branch.test.ts

@@ -159,6 +159,7 @@ describe('executeAIAgent — ConversationBranchID', () => {
             {}, {}, 'agent-1', userPayload, '[{"role":"user","content":"hi"}]', 'session-1', pubSub,
             undefined, undefined, undefined, undefined, undefined, undefined, 'detail-1', false, false,
             undefined, undefined, 'conv-1', undefined, undefined, undefined, undefined, undefined,
+            false, // trustReservedRunData
         ];
         await execute(...base, 'branch-b');
         await execute(...base, null);

package/src/__tests__/RunAIAgentResolver.historyFrom.test.ts

@@ -108,6 +108,8 @@ afterEach(() => {
 describe('RunAIAgentFromConversationDetail — agentHistoryFrom', () => {
     let resolver: RunAIAgentResolver;
     let seams: ResolverSeams;
+    /** The floor's position in executeAIAgent / executeAgentInBackground: third from last, before TrustReservedRunData and the branch. */
+    const FLOOR_ARG = -3;
 
     beforeEach(() => {
         ({ resolver, seams } = makeResolver());
@@ -124,7 +126,7 @@ describe('RunAIAgentFromConversationDetail — agentHistoryFrom', () => {
         expect(loaderArgs[0]).toBe('conv-1');
         expect(loaderArgs[4]).toEqual(['detail-1']);
         expect((loaderArgs[5] as Date).toISOString()).toBe(FLOOR_ISO);
-        const runFloor = seams.executeAIAgent.mock.calls[0].at(-2) as Date;
+        const runFloor = seams.executeAIAgent.mock.calls[0].at(FLOOR_ARG) as Date;
         expect(runFloor.toISOString()).toBe(FLOOR_ISO);
     });
 
@@ -133,7 +135,7 @@ describe('RunAIAgentFromConversationDetail — agentHistoryFrom', () => {
 
         expect(result.success).toBe(true);
         expect(seams.executeAIAgent).not.toHaveBeenCalled();
-        const runFloor = seams.executeAgentInBackground.mock.calls[0].at(-2) as Date;
+        const runFloor = seams.executeAgentInBackground.mock.calls[0].at(FLOOR_ARG) as Date;
         expect(runFloor.toISOString()).toBe(FLOOR_ISO);
     });
 
@@ -141,7 +143,7 @@ describe('RunAIAgentFromConversationDetail — agentHistoryFrom', () => {
         await runMutation(resolver, {});
 
         expect(seams.loadConversationHistoryWithAttachments.mock.calls[0][5]).toBeUndefined();
-        expect(seams.executeAIAgent.mock.calls[0].at(-2)).toBeUndefined();
+        expect(seams.executeAIAgent.mock.calls[0].at(FLOOR_ARG)).toBeUndefined();
     });
 
     it('fails the request on an unreadable floor, before loading or running anything', async () => {