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

package/src/resolvers/MCPResolver.ts

@@ -23,6 +23,19 @@ import { PublishStatusUpdate } from '../generic/PushStatusResolver.js';
 import { GraphQLJSONObject } from 'graphql-type-json';
 import { configInfo } from '../config.js';
 
+const UUID_SHAPE = /^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$/;
+
+/**
+ * Validates that a caller-supplied record id is a UUID before it is interpolated into a SQL
+ * filter, and returns it unchanged. A validated UUID cannot carry SQL.
+ */
+function sqlUuid(value: string, argName: string): string {
+    if (typeof value !== 'string' || !UUID_SHAPE.test(value)) {
+        throw new Error(`${argName} must be a UUID`);
+    }
+    return value;
+}
+
 /**
  * Input type for syncing MCP tools
  */
@@ -1289,7 +1302,7 @@ export class MCPResolver extends ResolverBase {
             // First get connection to get server ID
             const connResult = await rv.RunView<{ MCPServerID: string }>({
                 EntityName: 'MJ: MCP Server Connections',
-                ExtraFilter: `ID='${connectionId}'`,
+                ExtraFilter: `ID='${sqlUuid(connectionId, 'connectionId')}'`,
                 Fields: ['MCPServerID'],
                 ResultType: 'simple'
             }, contextUser);
@@ -1310,7 +1323,7 @@ export class MCPResolver extends ResolverBase {
                 OAuthRequirePKCE: boolean | null;
             }>({
                 EntityName: 'MJ: MCP Servers',
-                ExtraFilter: `ID='${serverId}'`,
+                ExtraFilter: `ID='${sqlUuid(serverId, 'serverId')}'`,
                 Fields: [
                     'OAuthIssuerURL',
                     'OAuthScopes',

package/src/resolvers/MergeRecordsResolver.ts

@@ -38,6 +38,18 @@ export class EntityDependencyResolver {
   }
 }
 
+@InputType()
+export class RecordDependencyOptionsInput {
+  @Field(() => String, { nullable: true })
+  LinkType?: 'both' | 'hard' | 'soft';
+
+  @Field(() => Boolean, { nullable: true })
+  IncludeSystemEntities?: boolean;
+
+  @Field(() => [String], { nullable: true })
+  EntityNames?: string[];
+}
+
 @ObjectType()
 export class RecordDependencyResult {
   @Field(() => String)
@@ -49,6 +61,9 @@ export class RecordDependencyResult {
   @Field(() => String)
   FieldName: string; // required
 
+  @Field(() => String, { nullable: true })
+  FieldDisplayName?: string;
+
   @Field(() => CompositeKeyOutputType)
   PrimaryKey: CompositeKey;
 
@@ -70,17 +85,23 @@ export class RecordDependencyResolver {
     @Arg('entityName', () => String) entityName: string,
     @Arg('CompositeKey', () => CompositeKeyInputType) ckInput: CompositeKeyInputType,
     @Ctx() { dataSource, userPayload, providers }: AppContext,
-    @PubSub() pubSub: PubSubEngine
+    @PubSub() pubSub: PubSubEngine,
+    @Arg('options', () => RecordDependencyOptionsInput, { nullable: true }) options?: RecordDependencyOptionsInput
   ) {
     try {
       const md = GetReadOnlyProvider(providers);
       const ck = new CompositeKey(ckInput.KeyValuePairs);
-      const result = await md.GetRecordDependencies(entityName, ck);
+      const contextUser = userPayload?.userRecord;
+      const result =
+        options !== undefined || contextUser !== undefined
+          ? await md.GetRecordDependencies(entityName, ck, contextUser, options)
+          : await md.GetRecordDependencies(entityName, ck);
       
       return result.map(dep => ({
         EntityName: dep.EntityName,
         RelatedEntityName: dep.RelatedEntityName,
         FieldName: dep.FieldName,
+        FieldDisplayName: dep.FieldDisplayName,
         PrimaryKey: dep.PrimaryKey,
         CompositeKey: dep.PrimaryKey,
         IsSoftLink: dep.IsSoftLink,

package/src/resolvers/PipelineProgressResolver.ts

@@ -1,6 +1,7 @@
 import { Resolver, Subscription, Root, ObjectType, Field, Float, Mutation, Arg, Ctx, PubSub, PubSubEngine } from 'type-graphql';
 import { AppContext } from '../types.js';
 import { LogStatus, LogError } from '@memberjunction/core';
+import { UUIDsEqual } from '@memberjunction/global';
 import { ResolverBase } from '../generic/ResolverBase.js';
 
 const PIPELINE_PROGRESS_TOPIC = 'PIPELINE_PROGRESS';
@@ -49,6 +50,16 @@ export class PipelineStartResult {
     ErrorMessage?: string;
 }
 
+export function PipelineProgressFilter({
+    payload,
+    args,
+}: {
+    payload: PipelineProgressNotification;
+    args: { pipelineRunID: string };
+}): boolean {
+    return UUIDsEqual(payload.PipelineRunID, args.pipelineRunID) || payload.PipelineRunID === args.pipelineRunID;
+}
+
 @Resolver()
 export class PipelineProgressResolver extends ResolverBase {
     /**
@@ -56,9 +67,7 @@ export class PipelineProgressResolver extends ResolverBase {
      */
     @Subscription(() => PipelineProgressNotification, {
         topics: PIPELINE_PROGRESS_TOPIC,
-        filter: ({ payload, args }: { payload: PipelineProgressNotification; args: { pipelineRunID: string } }) => {
-            return payload.PipelineRunID === args.pipelineRunID;
-        },
+        filter: PipelineProgressFilter,
     })
     PipelineProgress(
         @Root() notification: PipelineProgressNotification,

package/src/resolvers/QueryResolver.ts

@@ -226,7 +226,8 @@ export class RunQueryResolver extends ResolverBase {
         ForceAuditLog: ForceAuditLog,
         AuditLogDescription: AuditLogDescription,
         Enrichment: Enrichment,
-        DataSource: DataSource
+        DataSource: DataSource,
+        TimeZone: context.userPayload.TimeZone
       },
       context.userPayload.userRecord);
 
@@ -247,6 +248,7 @@ export class RunQueryResolver extends ResolverBase {
       QueryID: QueryID,
       QueryName: queryName || 'Unknown Query',
       Success: result.Success ?? false,
+      // fls-guard: saved-query rows. Its SQL is refused before it runs if it reads a field the caller is denied, unless the query has `MJ: Query Permissions` rows, which authorize it by role alone
       Results: JSON.stringify(result.Results ?? null),
       RowCount: result.RowCount ?? 0,
       TotalRowCount: result.TotalRowCount ?? 0,
@@ -288,7 +290,8 @@ export class RunQueryResolver extends ResolverBase {
         ForceAuditLog: ForceAuditLog,
         AuditLogDescription: AuditLogDescription,
         Enrichment: Enrichment,
-        DataSource: DataSource
+        DataSource: DataSource,
+        TimeZone: context.userPayload.TimeZone
       },
       context.userPayload.userRecord);
       
@@ -296,6 +299,7 @@ export class RunQueryResolver extends ResolverBase {
       QueryID: result.QueryID || '',
       QueryName: QueryName,
       Success: result.Success ?? false,
+      // fls-guard: saved-query rows. Its SQL is refused before it runs if it reads a field the caller is denied, unless the query has `MJ: Query Permissions` rows, which authorize it by role alone
       Results: JSON.stringify(result.Results ?? null),
       RowCount: result.RowCount ?? 0,
       TotalRowCount: result.TotalRowCount ?? 0,
@@ -337,7 +341,8 @@ export class RunQueryResolver extends ResolverBase {
         ForceAuditLog: ForceAuditLog,
         AuditLogDescription: AuditLogDescription,
         Enrichment: Enrichment,
-        DataSource: DataSource
+        DataSource: DataSource,
+        TimeZone: context.userPayload.TimeZone
       },
       context.userPayload.userRecord);
 
@@ -358,6 +363,7 @@ export class RunQueryResolver extends ResolverBase {
       QueryID: QueryID,
       QueryName: queryName || 'Unknown Query',
       Success: result.Success ?? false,
+      // fls-guard: saved-query rows. Its SQL is refused before it runs if it reads a field the caller is denied, unless the query has `MJ: Query Permissions` rows, which authorize it by role alone
       Results: JSON.stringify(result.Results ?? null),
       RowCount: result.RowCount ?? 0,
       TotalRowCount: result.TotalRowCount ?? 0,
@@ -398,7 +404,8 @@ export class RunQueryResolver extends ResolverBase {
         ForceAuditLog: ForceAuditLog,
         AuditLogDescription: AuditLogDescription,
         Enrichment: Enrichment,
-        DataSource: DataSource
+        DataSource: DataSource,
+        TimeZone: context.userPayload.TimeZone
       },
       context.userPayload.userRecord);
     
@@ -406,6 +413,7 @@ export class RunQueryResolver extends ResolverBase {
       QueryID: result.QueryID || '',
       QueryName: QueryName,
       Success: result.Success ?? false,
+      // fls-guard: saved-query rows. Its SQL is refused before it runs if it reads a field the caller is denied, unless the query has `MJ: Query Permissions` rows, which authorize it by role alone
       Results: JSON.stringify(result.Results ?? null),
       RowCount: result.RowCount ?? 0,
       TotalRowCount: result.TotalRowCount ?? 0,
@@ -447,7 +455,8 @@ export class RunQueryResolver extends ResolverBase {
       ForceAuditLog: i.ForceAuditLog,
       AuditLogDescription: i.AuditLogDescription,
       Enrichment: i.Enrichment,
-      DataSource: i.DataSource
+      DataSource: i.DataSource,
+      TimeZone: context.userPayload.TimeZone
     }));
 
     // Execute all queries in parallel using the batch method
@@ -460,6 +469,7 @@ export class RunQueryResolver extends ResolverBase {
         QueryID: result.QueryID || inputItem.QueryID || '',
         QueryName: result.QueryName || inputItem.QueryName || 'Unknown Query',
         Success: result.Success ?? false,
+        // fls-guard: saved-query rows. Its SQL is refused before it runs if it reads a field the caller is denied, unless the query has `MJ: Query Permissions` rows, which authorize it by role alone
         Results: JSON.stringify(result.Results ?? null),
         RowCount: result.RowCount ?? 0,
         TotalRowCount: result.TotalRowCount ?? 0,
@@ -498,7 +508,8 @@ export class RunQueryResolver extends ResolverBase {
       ForceAuditLog: i.ForceAuditLog,
       AuditLogDescription: i.AuditLogDescription,
       Enrichment: i.Enrichment,
-      DataSource: i.DataSource
+      DataSource: i.DataSource,
+      TimeZone: context.userPayload.TimeZone
     }));
 
     // Execute all queries in parallel using the batch method
@@ -511,6 +522,7 @@ export class RunQueryResolver extends ResolverBase {
         QueryID: result.QueryID || inputItem.QueryID || '',
         QueryName: result.QueryName || inputItem.QueryName || 'Unknown Query',
         Success: result.Success ?? false,
+        // fls-guard: saved-query rows. Its SQL is refused before it runs if it reads a field the caller is denied, unless the query has `MJ: Query Permissions` rows, which authorize it by role alone
         Results: JSON.stringify(result.Results ?? null),
         RowCount: result.RowCount ?? 0,
         TotalRowCount: result.TotalRowCount ?? 0,
@@ -563,6 +575,7 @@ export class RunQueryResolver extends ResolverBase {
           AuditLogDescription: item.params.AuditLogDescription,
           Enrichment: item.params.Enrichment,
           DataSource: item.params.DataSource,
+          TimeZone: context.userPayload.TimeZone,
         },
         cacheStatus: item.cacheStatus ? {
           maxUpdatedAt: item.cacheStatus.maxUpdatedAt,
@@ -578,6 +591,7 @@ export class RunQueryResolver extends ResolverBase {
         queryIndex: result.queryIndex,
         queryId: result.queryId,
         status: result.status,
+        // fls-guard: saved-query rows. Its SQL is refused before it runs if it reads a field the caller is denied, unless the query has `MJ: Query Permissions` rows, which authorize it by role alone
         Results: result.results ? JSON.stringify(result.results) : undefined,
         maxUpdatedAt: result.maxUpdatedAt,
         rowCount: result.rowCount,