@memberjunction/server 2.35.0 → 2.36.0

package/src/generated/generated.ts

@@ -1402,13 +1402,13 @@ export class AIAgentNote_ {
     @MaxLength(16)
     ID: string;
         
-    @Field({nullable: true}) 
+    @Field() 
     @MaxLength(16)
-    AgentID?: string;
+    AgentID: string;
         
-    @Field({nullable: true}) 
+    @Field() 
     @MaxLength(16)
-    AgentNoteTypeID?: string;
+    AgentNoteTypeID: string;
         
     @Field({nullable: true}) 
     Note?: string;
@@ -1449,10 +1449,10 @@ export class AIAgentNote_ {
 @InputType()
 export class CreateAIAgentNoteInput {
     @Field({ nullable: true })
-    AgentID: string | null;
+    AgentID?: string;
 
     @Field({ nullable: true })
-    AgentNoteTypeID: string | null;
+    AgentNoteTypeID?: string;
 
     @Field({ nullable: true })
     Note: string | null;
@@ -1474,10 +1474,10 @@ export class UpdateAIAgentNoteInput {
     ID: string;
 
     @Field({ nullable: true })
-    AgentID?: string | null;
+    AgentID?: string;
 
     @Field({ nullable: true })
-    AgentNoteTypeID?: string | null;
+    AgentNoteTypeID?: string;
 
     @Field({ nullable: true })
     Note?: string | null;
@@ -6271,9 +6271,6 @@ export class User_ {
     @Field(() => [UserFavorite_])
     UserFavorites_UserIDArray: UserFavorite_[]; // Link to UserFavorites
     
-    @Field(() => [ResourceLink_])
-    ResourceLinks_UserIDArray: ResourceLink_[]; // Link to ResourceLinks
-    
     @Field(() => [ListCategory_])
     ListCategories_UserIDArray: ListCategory_[]; // Link to ListCategories
     
@@ -6283,21 +6280,24 @@ export class User_ {
     @Field(() => [AIAgentRequest_])
     AIAgentRequests_ResponseByUserIDArray: AIAgentRequest_[]; // Link to AIAgentRequests
     
+    @Field(() => [ResourceLink_])
+    ResourceLinks_UserIDArray: ResourceLink_[]; // Link to ResourceLinks
+    
     @Field(() => [ReportUserState_])
     MJ_ReportUserStates_UserIDArray: ReportUserState_[]; // Link to MJ_ReportUserStates
     
     @Field(() => [AIAgentNote_])
     AIAgentNotes_UserIDArray: AIAgentNote_[]; // Link to AIAgentNotes
     
-    @Field(() => [ResourcePermission_])
-    ResourcePermissions_UserIDArray: ResourcePermission_[]; // Link to ResourcePermissions
-    
     @Field(() => [AIAgentRequest_])
     AIAgentRequests_RequestForUserIDArray: AIAgentRequest_[]; // Link to AIAgentRequests
     
     @Field(() => [ConversationDetail_])
     ConversationDetails_UserIDArray: ConversationDetail_[]; // Link to ConversationDetails
     
+    @Field(() => [ResourcePermission_])
+    ResourcePermissions_UserIDArray: ResourcePermission_[]; // Link to ResourcePermissions
+    
 }
 
 //****************************************************************************
@@ -6720,15 +6720,6 @@ export class UserResolverBase extends ResolverBase {
         return result;
     }
         
-    @FieldResolver(() => [ResourceLink_])
-    async ResourceLinks_UserIDArray(@Root() user_: User_, @Ctx() { dataSources, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
-        this.CheckUserReadPermissions('Resource Links', userPayload);
-        const dataSource = GetReadOnlyDataSource(dataSources, { allowFallbackToReadWrite: true });
-        const sSQL = `SELECT * FROM [${Metadata.Provider.ConfigData.MJCoreSchemaName}].[vwResourceLinks] WHERE [UserID]='${user_.ID}' ` + this.getRowLevelSecurityWhereClause('Resource Links', userPayload, EntityPermissionType.Read, 'AND');
-        const result = this.ArrayMapFieldNamesToCodeNames('Resource Links', await dataSource.query(sSQL));
-        return result;
-    }
-        
     @FieldResolver(() => [ListCategory_])
     async ListCategories_UserIDArray(@Root() user_: User_, @Ctx() { dataSources, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
         this.CheckUserReadPermissions('List Categories', userPayload);
@@ -6756,6 +6747,15 @@ export class UserResolverBase extends ResolverBase {
         return result;
     }
         
+    @FieldResolver(() => [ResourceLink_])
+    async ResourceLinks_UserIDArray(@Root() user_: User_, @Ctx() { dataSources, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        this.CheckUserReadPermissions('Resource Links', userPayload);
+        const dataSource = GetReadOnlyDataSource(dataSources, { allowFallbackToReadWrite: true });
+        const sSQL = `SELECT * FROM [${Metadata.Provider.ConfigData.MJCoreSchemaName}].[vwResourceLinks] WHERE [UserID]='${user_.ID}' ` + this.getRowLevelSecurityWhereClause('Resource Links', userPayload, EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Resource Links', await dataSource.query(sSQL));
+        return result;
+    }
+        
     @FieldResolver(() => [ReportUserState_])
     async MJ_ReportUserStates_UserIDArray(@Root() user_: User_, @Ctx() { dataSources, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
         this.CheckUserReadPermissions('MJ: Report User States', userPayload);
@@ -6774,15 +6774,6 @@ export class UserResolverBase extends ResolverBase {
         return result;
     }
         
-    @FieldResolver(() => [ResourcePermission_])
-    async ResourcePermissions_UserIDArray(@Root() user_: User_, @Ctx() { dataSources, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
-        this.CheckUserReadPermissions('Resource Permissions', userPayload);
-        const dataSource = GetReadOnlyDataSource(dataSources, { allowFallbackToReadWrite: true });
-        const sSQL = `SELECT * FROM [${Metadata.Provider.ConfigData.MJCoreSchemaName}].[vwResourcePermissions] WHERE [UserID]='${user_.ID}' ` + this.getRowLevelSecurityWhereClause('Resource Permissions', userPayload, EntityPermissionType.Read, 'AND');
-        const result = this.ArrayMapFieldNamesToCodeNames('Resource Permissions', await dataSource.query(sSQL));
-        return result;
-    }
-        
     @FieldResolver(() => [AIAgentRequest_])
     async AIAgentRequests_RequestForUserIDArray(@Root() user_: User_, @Ctx() { dataSources, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
         this.CheckUserReadPermissions('AI Agent Requests', userPayload);
@@ -6801,6 +6792,15 @@ export class UserResolverBase extends ResolverBase {
         return result;
     }
         
+    @FieldResolver(() => [ResourcePermission_])
+    async ResourcePermissions_UserIDArray(@Root() user_: User_, @Ctx() { dataSources, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        this.CheckUserReadPermissions('Resource Permissions', userPayload);
+        const dataSource = GetReadOnlyDataSource(dataSources, { allowFallbackToReadWrite: true });
+        const sSQL = `SELECT * FROM [${Metadata.Provider.ConfigData.MJCoreSchemaName}].[vwResourcePermissions] WHERE [UserID]='${user_.ID}' ` + this.getRowLevelSecurityWhereClause('Resource Permissions', userPayload, EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Resource Permissions', await dataSource.query(sSQL));
+        return result;
+    }
+        
     @Mutation(() => User_)
     async CreateUser(
         @Arg('input', () => CreateUserInput) input: CreateUserInput,
@@ -12023,6 +12023,9 @@ export class AIModel_ {
     @MaxLength(200)
     SupportedResponseFormats: string;
         
+    @Field(() => Boolean, {description: `Specifies if the model supports the concept of an effort level. For example, for a reasoning model, the options often include low, medium, and high.`}) 
+    SupportsEffortLevel: boolean;
+        
     @Field() 
     @MaxLength(100)
     AIModelType: string;
@@ -12039,15 +12042,15 @@ export class AIModel_ {
     @Field(() => [VectorIndex_])
     VectorIndexes_EmbeddingModelIDArray: VectorIndex_[]; // Link to VectorIndexes
     
-    @Field(() => [ContentType_])
-    ContentTypes_AIModelIDArray: ContentType_[]; // Link to ContentTypes
-    
     @Field(() => [AIResultCache_])
     AIResultCache_AIModelIDArray: AIResultCache_[]; // Link to AIResultCache
     
     @Field(() => [EntityAIAction_])
     EntityAIActions_AIModelIDArray: EntityAIAction_[]; // Link to EntityAIActions
     
+    @Field(() => [ContentType_])
+    ContentTypes_AIModelIDArray: ContentType_[]; // Link to ContentTypes
+    
     @Field(() => [AIAgentModel_])
     AIAgentModels_ModelIDArray: AIAgentModel_[]; // Link to AIAgentModels
     
@@ -12102,6 +12105,9 @@ export class CreateAIModelInput {
 
     @Field({ nullable: true })
     SupportedResponseFormats?: string;
+
+    @Field(() => Boolean, { nullable: true })
+    SupportsEffortLevel?: boolean;
 }
     
 
@@ -12155,6 +12161,9 @@ export class UpdateAIModelInput {
     @Field({ nullable: true })
     SupportedResponseFormats?: string;
 
+    @Field(() => Boolean, { nullable: true })
+    SupportsEffortLevel?: boolean;
+
     @Field(() => [KeyValuePairInput], { nullable: true })
     OldValues___?: KeyValuePairInput[];
 }
@@ -12260,15 +12269,6 @@ export class AIModelResolver extends ResolverBase {
         return result;
     }
         
-    @FieldResolver(() => [ContentType_])
-    async ContentTypes_AIModelIDArray(@Root() aimodel_: AIModel_, @Ctx() { dataSources, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
-        this.CheckUserReadPermissions('Content Types', userPayload);
-        const dataSource = GetReadOnlyDataSource(dataSources, { allowFallbackToReadWrite: true });
-        const sSQL = `SELECT * FROM [${Metadata.Provider.ConfigData.MJCoreSchemaName}].[vwContentTypes] WHERE [AIModelID]='${aimodel_.ID}' ` + this.getRowLevelSecurityWhereClause('Content Types', userPayload, EntityPermissionType.Read, 'AND');
-        const result = this.ArrayMapFieldNamesToCodeNames('Content Types', await dataSource.query(sSQL));
-        return result;
-    }
-        
     @FieldResolver(() => [AIResultCache_])
     async AIResultCache_AIModelIDArray(@Root() aimodel_: AIModel_, @Ctx() { dataSources, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
         this.CheckUserReadPermissions('AI Result Cache', userPayload);
@@ -12287,6 +12287,15 @@ export class AIModelResolver extends ResolverBase {
         return result;
     }
         
+    @FieldResolver(() => [ContentType_])
+    async ContentTypes_AIModelIDArray(@Root() aimodel_: AIModel_, @Ctx() { dataSources, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        this.CheckUserReadPermissions('Content Types', userPayload);
+        const dataSource = GetReadOnlyDataSource(dataSources, { allowFallbackToReadWrite: true });
+        const sSQL = `SELECT * FROM [${Metadata.Provider.ConfigData.MJCoreSchemaName}].[vwContentTypes] WHERE [AIModelID]='${aimodel_.ID}' ` + this.getRowLevelSecurityWhereClause('Content Types', userPayload, EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Content Types', await dataSource.query(sSQL));
+        return result;
+    }
+        
     @FieldResolver(() => [AIAgentModel_])
     async AIAgentModels_ModelIDArray(@Root() aimodel_: AIModel_, @Ctx() { dataSources, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
         this.CheckUserReadPermissions('AI Agent Models', userPayload);

package/src/index.ts

@@ -21,10 +21,11 @@ import { BuildSchemaOptions, buildSchemaSync, GraphQLTimestamp } from 'type-grap
 import { DataSource } from 'typeorm';
 import { WebSocketServer } from 'ws';
 import buildApolloServer from './apolloServer/index.js';
-import { configInfo, dbDatabase, dbHost, dbPort, dbUsername, graphqlPort, graphqlRootPath, mj_core_schema, websiteRunFromPackage } from './config.js';
+import { configInfo, dbDatabase, dbHost, dbPort, dbUsername, graphqlPort, graphqlRootPath, mj_core_schema, websiteRunFromPackage, RESTApiOptions } from './config.js';
 import { contextFunction, getUserPayload } from './context.js';
 import { requireSystemUserDirective, publicDirective } from './directives/index.js';
 import orm from './orm.js';
+import { setupRESTEndpoints } from './rest/setupRESTEndpoints.js';
 
 import { LoadActionEntityServer } from '@memberjunction/actions';
 LoadActionEntityServer(); // prevent tree shaking for this dynamic module
@@ -76,6 +77,7 @@ import { DataSourceInfo, raiseEvent } from './types.js';
 
 export type MJServerOptions = {
   onBeforeServe?: () => void | Promise<void>;
+  restApiOptions?: Partial<RESTApiOptions>; // Options for REST API configuration
 };
 
 const localPath = (p: string) => {
@@ -225,6 +227,59 @@ export const serve = async (resolverPaths: Array<string>, app = createApp(), opt
                                }),
     })
   );
+  
+  // Setup REST API endpoints
+  const authMiddleware = async (req, res, next) => {
+    try {
+      const sessionIdRaw = req.headers['x-session-id'];
+      const requestDomain = new URL(req.headers.origin || '').hostname;
+      const sessionId = sessionIdRaw ? sessionIdRaw.toString() : '';
+      const bearerToken = req.headers.authorization ?? '';
+      const apiKey = String(req.headers['x-mj-api-key']);
+
+      const userPayload = await getUserPayload(bearerToken, sessionId, dataSources, requestDomain, apiKey);
+      if (!userPayload) {
+        return res.status(401).json({ error: 'Invalid token' });
+      }
+      
+      req.user = userPayload;
+      next();
+    } catch (error) {
+      console.error('Auth error:', error);
+      return res.status(401).json({ error: 'Authentication failed' });
+    }
+  };
+  
+  // Get REST API configuration from the config file
+  const restApiConfig: RESTApiOptions = {
+    enabled: configInfo.restApiOptions?.enabled ?? true,
+    includeEntities: configInfo.restApiOptions?.includeEntities,
+    excludeEntities: configInfo.restApiOptions?.excludeEntities
+  };
+  
+  // Apply options from server options if provided (these override the config file)
+  if (options?.restApiOptions) {
+    Object.assign(restApiConfig, options.restApiOptions);
+  }
+  
+  // Get REST API configuration from environment variables if present (env vars override everything)
+  if (process.env.MJ_REST_API_ENABLED !== undefined) {
+    restApiConfig.enabled = process.env.MJ_REST_API_ENABLED === 'true';
+    if (restApiConfig.enabled) {
+      console.log('REST API is enabled via environment variable');
+    }
+  }
+  
+  if (process.env.MJ_REST_API_INCLUDE_ENTITIES) {
+    restApiConfig.includeEntities = process.env.MJ_REST_API_INCLUDE_ENTITIES.split(',').map(e => e.trim());
+  }
+  
+  if (process.env.MJ_REST_API_EXCLUDE_ENTITIES) {
+    restApiConfig.excludeEntities = process.env.MJ_REST_API_EXCLUDE_ENTITIES.split(',').map(e => e.trim());
+  }
+  
+  // Set up REST endpoints with the configured options and auth middleware
+  setupRESTEndpoints(app, restApiConfig, authMiddleware);
 
   if (options?.onBeforeServe) {
     await Promise.resolve(options.onBeforeServe());