@memberjunction/server 2.49.0 → 2.51.0

package/src/generic/ResolverBase.ts

@@ -14,7 +14,7 @@ import {
   UserInfo,
 } from '@memberjunction/core';
 import { AuditLogEntity, UserViewEntity } from '@memberjunction/core-entities';
-import { UserCache } from '@memberjunction/sqlserver-dataprovider';
+import { SQLServerDataProvider, UserCache } from '@memberjunction/sqlserver-dataprovider';
 import { PubSubEngine } from 'type-graphql';
 import { GraphQLError } from 'graphql';
 import sql from 'mssql';
@@ -80,7 +80,7 @@ export class ResolverBase {
     return dataObjectArray;
   }
 
-  protected async findBy(dataSource: sql.ConnectionPool, entity: string, params: any) {
+  protected async findBy(dataSource: sql.ConnectionPool, entity: string, params: any, contextUser: UserInfo) {
     // build the SQL query based on the params passed in
     const md = new Metadata();
     const e = md.Entities.find((e) => e.Name === entity);
@@ -98,15 +98,15 @@ export class ResolverBase {
     });
 
     // ok, now we have a SQL string, run it and return the results
-    const request = new sql.Request(dataSource);
-    const result = await request.query(sqlQuery);
-    return result.recordset;
+    // use the SQLServerDataProvider
+    const result = await SQLServerDataProvider.ExecuteSQLWithPool(dataSource, sqlQuery, undefined, contextUser);
+    return result;
   }
 
   async RunViewByNameGeneric(viewInput: RunViewByNameInput, dataSource: sql.ConnectionPool, userPayload: UserPayload, pubSub: PubSubEngine) {
     try {
       const viewInfo: UserViewEntity = this.safeFirstArrayElement(
-        await this.findBy(dataSource, 'User Views', { Name: viewInput.ViewName })
+        await this.findBy(dataSource, 'User Views', { Name: viewInput.ViewName }, userPayload.userRecord)
       );
       return this.RunViewGenericInternal(
         viewInfo,
@@ -134,7 +134,7 @@ export class ResolverBase {
 
   async RunViewByIDGeneric(viewInput: RunViewByIDInput, dataSource: sql.ConnectionPool, userPayload: UserPayload, pubSub: PubSubEngine) {
     try {
-      const viewInfo: UserViewEntity = this.safeFirstArrayElement(await this.findBy(dataSource, 'User Views', { ID: viewInput.ViewID }));
+      const viewInfo: UserViewEntity = this.safeFirstArrayElement(await this.findBy(dataSource, 'User Views', { ID: viewInput.ViewID }, userPayload.userRecord));
       return this.RunViewGenericInternal(
         viewInfo,
         dataSource,
@@ -209,9 +209,9 @@ export class ResolverBase {
         let viewInfo: UserViewEntity | null = null;
 
         if (viewInput.ViewName) {
-          viewInfo = this.safeFirstArrayElement(await this.findBy(dataSource, 'User Views', { Name: viewInput.ViewName }));
+          viewInfo = this.safeFirstArrayElement(await this.findBy(dataSource, 'User Views', { Name: viewInput.ViewName }, userPayload.userRecord));
         } else if (viewInput.ViewID) {
-          viewInfo = this.safeFirstArrayElement(await this.findBy(dataSource, 'User Views', { ID: viewInput.ViewID }));
+          viewInfo = this.safeFirstArrayElement(await this.findBy(dataSource, 'User Views', { ID: viewInput.ViewID }, userPayload.userRecord));
         } else if (viewInput.EntityName) {
           md = md || new Metadata();
           const entity = md.Entities.find((e) => e.Name === viewInput.EntityName);
@@ -612,7 +612,14 @@ export class ResolverBase {
     return UserCache.Users.find((u) => u.Email.toLowerCase().trim() === email.toLowerCase().trim());
   }
   protected GetUserFromPayload(userPayload: UserPayload): UserInfo | undefined {
-    if (!userPayload || !userPayload.email) return undefined;
+    if (!userPayload) 
+      return undefined;
+
+    if (userPayload.userRecord)
+      return userPayload.userRecord; // if we have a user record, use that directly
+
+    if (!userPayload.email) 
+      return undefined;
 
     const md = new Metadata();
     return UserCache.Users.find((u) => u.Email.toLowerCase().trim() === userPayload.email.toLowerCase().trim());

package/src/index.ts

@@ -66,6 +66,7 @@ export * from './resolvers/DatasetResolver.js';
 export * from './resolvers/EntityRecordNameResolver.js';
 export * from './resolvers/MergeRecordsResolver.js';
 export * from './resolvers/ReportResolver.js';
+export * from './resolvers/SqlLoggingConfigResolver.js';
 export * from './resolvers/SyncRolesUsersResolver.js';
 export * from './resolvers/SyncDataResolver.js';
 export * from './resolvers/GetDataResolver.js';
@@ -111,7 +112,7 @@ export const serve = async (resolverPaths: Array<string>, app = createApp(), opt
   const setupComplete$ = new ReplaySubject(1);
   await pool.connect();
 
-  const config = new SQLServerProviderConfigData(pool, '', mj_core_schema, cacheRefreshInterval);
+  const config = new SQLServerProviderConfigData(pool, mj_core_schema, cacheRefreshInterval);
   await setupSQLServerClient(config); // datasource is already initialized, so we can setup the client right away
   const md = new Metadata();
   console.log(`Data Source has been initialized. ${md?.Entities ? md.Entities.length : 0} entities loaded.`);

package/src/orm.ts

@@ -10,6 +10,12 @@ const createMSSQLConfig = (): sql.config => {
     database: dbDatabase,
     requestTimeout: configInfo.databaseSettings.requestTimeout,
     connectionTimeout: configInfo.databaseSettings.connectionTimeout,
+    pool: {
+      max: configInfo.databaseSettings.connectionPool?.max ?? 50,
+      min: configInfo.databaseSettings.connectionPool?.min ?? 5,
+      idleTimeoutMillis: configInfo.databaseSettings.connectionPool?.idleTimeoutMillis ?? 30000,
+      acquireTimeoutMillis: configInfo.databaseSettings.connectionPool?.acquireTimeoutMillis ?? 30000,
+    },
     options: {
       encrypt: true, // Use encryption
       enableArithAbort: true,

package/src/resolvers/ActionResolver.ts

@@ -2,9 +2,11 @@ import { Resolver, Mutation, Arg, Ctx } from "type-graphql";
 import { ActionEngineServer } from "@memberjunction/actions";
 import { EntityActionEngineServer } from "@memberjunction/actions";
 import { Metadata, UserInfo, BaseEntity, CompositeKey, KeyValuePair, LogError } from "@memberjunction/core";
-import { ActionParam } from "@memberjunction/actions-base";
+import { ActionParam, ActionResult } from "@memberjunction/actions-base";
 import { Field, InputType, ObjectType } from "type-graphql";
 import { KeyValuePairInput } from "../generic/KeyValuePairInput.js";
+import { AppContext } from "../types.js";
+import { CopyScalarsAndArrays } from "@memberjunction/global";
 
 /**
  * Input type for action parameters
@@ -178,11 +180,14 @@ export class ActionResolver {
   @Mutation(() => ActionResultOutput)
   async RunAction(
     @Arg("input") input: RunActionInput,
-    @Ctx() ctx: any
+    @Ctx() ctx: AppContext
   ): Promise<ActionResultOutput> {
     try {
       // Get the user from context
-      const user = this.getUserFromContext(ctx);
+      const user = ctx.userPayload.userRecord;
+      if (!user) {
+        throw new Error("User is not authenticated");
+      }
 
       // Initialize the action engine
       await ActionEngineServer.Instance.Config(false, user);
@@ -265,7 +270,7 @@ export class ActionResolver {
     user: UserInfo, 
     params: ActionParam[], 
     skipActionLog?: boolean
-  ): Promise<any> {
+  ): Promise<ActionResult> {
     return await ActionEngineServer.Instance.RunAction({
       Action: action,
       ContextUser: user,
@@ -281,12 +286,15 @@ export class ActionResolver {
    * @returns The formatted action result
    * @private
    */
-  private createActionResult(result: any): ActionResultOutput {
+  private createActionResult(result: ActionResult): ActionResultOutput {
+    const x =(result.Params || result.RunParams.Params || [])
+              .filter(p => p.Type.trim().toLowerCase() === 'output' ||
+                           p.Type.trim().toLowerCase() === 'both')     ;
     return {
       Success: result.Success,
       Message: result.Message,
       ResultCode: result.Result?.ResultCode,
-      ResultData: result.Result ? JSON.stringify(result.Result) : undefined
+      ResultData: x && x.length > 0 ? JSON.stringify(CopyScalarsAndArrays(x)) : undefined
     };
   }
 
@@ -314,12 +322,14 @@ export class ActionResolver {
   @Mutation(() => ActionResultOutput)
   async RunEntityAction(
     @Arg("input") input: EntityActionInput,
-    @Ctx() ctx: any
+    @Ctx() ctx: AppContext
   ): Promise<ActionResultOutput> {
     try {
-      // Get the user from context
-      const user = this.getUserFromContext(ctx);
-      
+      const user = ctx.userPayload.userRecord;
+      if (!user) {
+        throw new Error("User is not authenticated");
+      }
+
       // Initialize the entity action engine
       await EntityActionEngineServer.Instance.Config(false, user);
 
@@ -350,22 +360,7 @@ export class ActionResolver {
       return this.handleError(e);
     }
   }
-
-  /**
-   * Gets the authenticated user from the GraphQL context
-   * @param ctx The GraphQL context
-   * @returns The authenticated user
-   * @throws Error if user is not authenticated
-   * @private
-   */
-  private getUserFromContext(ctx: any): UserInfo {
-    const user = ctx.user as UserInfo;
-    if (!user) {
-      throw new Error("User not authenticated");
-    }
-    return user;
-  }
-
+ 
   /**
    * Gets an entity action by ID
    * @param actionID The ID of the entity action

package/src/resolvers/FileResolver.ts

@@ -57,7 +57,7 @@ export class FileResolver extends FileResolverBase {
     fileEntity.CheckPermissions(EntityPermissionType.Create, true);
 
     // Check to see if there's already an object with that name
-    const [sameName] = await this.findBy(context.dataSource, 'Files', { Name: input.Name, ProviderID: input.ProviderID });
+    const [sameName] = await this.findBy(context.dataSource, 'Files', { Name: input.Name, ProviderID: input.ProviderID }, context.userPayload.userRecord);
     const NameExists = Boolean(sameName);
 
     const fileRecord = (await super.CreateFile({ ...input, Status: 'Pending' }, context, pubSub)) as File_;