@memberjunction/server 2.112.0 → 2.113.0

package/src/auth/providers/CognitoProvider.ts

@@ -1,8 +1,9 @@
 import { JwtPayload } from 'jsonwebtoken';
 import { RegisterClass } from '@memberjunction/global';
-import { AuthProviderConfig, AuthUserInfo } from '@memberjunction/global';
+import { AuthProviderConfig, AuthUserInfo } from '@memberjunction/core';
 import { BaseAuthProvider } from '../BaseAuthProvider.js';
 
+
 /**
  * AWS Cognito authentication provider implementation
  */
@@ -17,19 +18,21 @@ export class CognitoProvider extends BaseAuthProvider {
    */
   extractUserInfo(payload: JwtPayload): AuthUserInfo {
     // Cognito uses custom claims with 'cognito:' prefix for some fields
-    const email = (payload.email as string | undefined) || (payload['cognito:username'] as string | undefined);
+    const email = payload.email as string | undefined || 
+                  payload['cognito:username'] as string | undefined;
     const fullName = payload.name as string | undefined;
     const firstName = payload.given_name as string | undefined;
     const lastName = payload.family_name as string | undefined;
-    const preferredUsername =
-      (payload['cognito:username'] as string | undefined) || (payload.preferred_username as string | undefined) || email;
+    const preferredUsername = payload['cognito:username'] as string | undefined || 
+                             payload.preferred_username as string | undefined || 
+                             email;
 
     return {
       email,
       firstName: firstName || fullName?.split(' ')[0],
       lastName: lastName || fullName?.split(' ')[1] || fullName?.split(' ')[0],
       fullName,
-      preferredUsername,
+      preferredUsername
     };
   }
 
@@ -41,7 +44,7 @@ export class CognitoProvider extends BaseAuthProvider {
     const hasClientId = !!this.config.clientId;
     const hasRegion = !!this.config.region;
     const hasUserPoolId = !!this.config.userPoolId;
-
+    
     return baseValid && hasClientId && hasRegion && hasUserPoolId;
   }
-}
+}

package/src/auth/providers/GoogleProvider.ts

@@ -1,8 +1,9 @@
 import { JwtPayload } from 'jsonwebtoken';
 import { RegisterClass } from '@memberjunction/global';
-import { AuthProviderConfig, AuthUserInfo } from '@memberjunction/global';
+import { AuthProviderConfig, AuthUserInfo } from '@memberjunction/core';
 import { BaseAuthProvider } from '../BaseAuthProvider.js';
 
+
 /**
  * Google Identity Platform authentication provider implementation
  */
@@ -28,7 +29,7 @@ export class GoogleProvider extends BaseAuthProvider {
       firstName: firstName || fullName?.split(' ')[0],
       lastName: lastName || fullName?.split(' ')[1] || fullName?.split(' ')[0],
       fullName,
-      preferredUsername,
+      preferredUsername
     };
   }
 
@@ -38,7 +39,7 @@ export class GoogleProvider extends BaseAuthProvider {
   validateConfig(): boolean {
     const baseValid = super.validateConfig();
     const hasClientId = !!this.config.clientId;
-
+    
     return baseValid && hasClientId;
   }
-}
+}

package/src/auth/providers/MSALProvider.ts

@@ -1,6 +1,6 @@
 import { JwtPayload } from 'jsonwebtoken';
 import { RegisterClass } from '@memberjunction/global';
-import { AuthProviderConfig, AuthUserInfo } from '@memberjunction/global';
+import { AuthProviderConfig, AuthUserInfo } from '@memberjunction/core';
 import { BaseAuthProvider } from '../BaseAuthProvider.js';
 
 /**
@@ -17,7 +17,7 @@ export class MSALProvider extends BaseAuthProvider {
    */
   extractUserInfo(payload: JwtPayload): AuthUserInfo {
     // MSAL/Azure AD uses some custom claims
-    const email = (payload.email as string | undefined) || (payload.preferred_username as string | undefined);
+    const email = payload.email as string | undefined || payload.preferred_username as string | undefined;
     const fullName = payload.name as string | undefined;
     const firstName = payload.given_name as string | undefined;
     const lastName = payload.family_name as string | undefined;
@@ -28,7 +28,7 @@ export class MSALProvider extends BaseAuthProvider {
       firstName: firstName || fullName?.split(' ')[0],
       lastName: lastName || fullName?.split(' ')[1] || fullName?.split(' ')[0],
       fullName,
-      preferredUsername,
+      preferredUsername
     };
   }
 
@@ -39,7 +39,7 @@ export class MSALProvider extends BaseAuthProvider {
     const baseValid = super.validateConfig();
     const hasClientId = !!this.config.clientId;
     const hasTenantId = !!this.config.tenantId;
-
+    
     return baseValid && hasClientId && hasTenantId;
   }
-}
+}

package/src/auth/providers/OktaProvider.ts

@@ -1,8 +1,9 @@
 import { JwtPayload } from 'jsonwebtoken';
 import { RegisterClass } from '@memberjunction/global';
-import { AuthProviderConfig, AuthUserInfo } from '@memberjunction/global';
+import { AuthProviderConfig, AuthUserInfo } from '@memberjunction/core';
 import { BaseAuthProvider } from '../BaseAuthProvider.js';
 
+
 /**
  * Okta authentication provider implementation
  */
@@ -17,18 +18,18 @@ export class OktaProvider extends BaseAuthProvider {
    */
   extractUserInfo(payload: JwtPayload): AuthUserInfo {
     // Okta uses standard OIDC claims plus some custom ones
-    const email = (payload.email as string | undefined) || (payload.preferred_username as string | undefined);
+    const email = payload.email as string | undefined || payload.preferred_username as string | undefined;
     const fullName = payload.name as string | undefined;
     const firstName = payload.given_name as string | undefined;
     const lastName = payload.family_name as string | undefined;
-    const preferredUsername = (payload.preferred_username as string | undefined) || email;
+    const preferredUsername = payload.preferred_username as string | undefined || email;
 
     return {
       email,
       firstName: firstName || fullName?.split(' ')[0],
       lastName: lastName || fullName?.split(' ')[1] || fullName?.split(' ')[0],
       fullName,
-      preferredUsername,
+      preferredUsername
     };
   }
 
@@ -39,7 +40,7 @@ export class OktaProvider extends BaseAuthProvider {
     const baseValid = super.validateConfig();
     const hasClientId = !!this.config.clientId;
     const hasDomain = !!this.config.domain;
-
+    
     return baseValid && hasClientId && hasDomain;
   }
-}
+}

package/src/config.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import { cosmiconfigSync } from 'cosmiconfig';
-import { LogError, LogStatus } from '@memberjunction/global';
+import { LogError, LogStatus } from '@memberjunction/core';
 
 const explorer = cosmiconfigSync('mj', { searchStrategy: 'global' });
 
@@ -22,17 +22,14 @@ const databaseSettingsInfoSchema = z.object({
   metadataCacheRefreshInterval: z.number(),
   dbReadOnlyUsername: z.string().optional(),
   dbReadOnlyPassword: z.string().optional(),
-  connectionPool: z
-    .object({
-      max: z.number().optional().default(50),
-      min: z.number().optional().default(5),
-      idleTimeoutMillis: z.number().optional().default(30000),
-      acquireTimeoutMillis: z.number().optional().default(30000),
-    })
-    .optional()
-    .default({}),
+  connectionPool: z.object({
+    max: z.number().optional().default(50),
+    min: z.number().optional().default(5),
+    idleTimeoutMillis: z.number().optional().default(30000),
+    acquireTimeoutMillis: z.number().optional().default(30000),
+  }).optional().default({}),
 });
-
+ 
 const viewingSystemInfoSchema = z.object({
   enableSmartFilters: z.boolean().optional(),
 });
@@ -47,25 +44,28 @@ const restApiOptionsSchema = z.object({
 
 /**
  * Returns a new Zod object that accepts boolean, string, or number values and transforms them to boolean.
- * @returns
+ * @returns 
  */
 const zodBooleanWithTransforms = () => {
   return z
-    .union([z.boolean(), z.string(), z.number()])
-    .optional()
-    .default(false)
-    .transform((v) => {
-      if (typeof v === 'string') {
-        return v === '1' || v.toLowerCase() === 'true';
-      } else if (typeof v === 'number') {
-        return v === 1;
-      } else if (typeof v === 'boolean') {
-        return v;
-      } else {
-        return false;
-      }
-    });
-};
+      .union([z.boolean(), z.string(), z.number()])
+          .optional()
+          .default(false)
+          .transform((v) => {
+            if (typeof v === 'string') {
+              return v === '1' || v.toLowerCase() === 'true';
+            }
+            else if (typeof v === 'number') {
+              return v === 1;
+            }
+            else if (typeof v === 'boolean') {
+              return v;
+            }
+            else {
+              return false;
+            }
+          })
+}
 
 const askSkipInfoSchema = z.object({
   url: z.string().optional(), // Base URL for Skip API
@@ -103,38 +103,32 @@ const sqlLoggingSchema = z.object({
   sessionTimeout: z.number().optional().default(3600000), // 1 hour
 });
 
-const authProviderSchema = z
-  .object({
-    name: z.string(),
-    type: z.string(),
-    issuer: z.string(),
-    audience: z.string(),
-    jwksUri: z.string(),
-    clientId: z.string().optional(),
-    clientSecret: z.string().optional(),
-    tenantId: z.string().optional(),
-    domain: z.string().optional(),
-  })
-  .passthrough(); // Allow additional provider-specific fields
-
-const componentRegistrySchema = z
-  .object({
-    id: z.string().optional(),
-    name: z.string().optional(),
-    apiKey: z.string().optional(),
-    cache: z.boolean().optional().default(true),
-    timeout: z.number().optional(),
-    retryPolicy: z
-      .object({
-        maxRetries: z.number().optional(),
-        initialDelay: z.number().optional(),
-        maxDelay: z.number().optional(),
-        backoffMultiplier: z.number().optional(),
-      })
-      .optional(),
-    headers: z.record(z.string()).optional(),
-  })
-  .passthrough(); // Allow additional fields
+const authProviderSchema = z.object({
+  name: z.string(),
+  type: z.string(),
+  issuer: z.string(),
+  audience: z.string(),
+  jwksUri: z.string(),
+  clientId: z.string().optional(),
+  clientSecret: z.string().optional(),
+  tenantId: z.string().optional(),
+  domain: z.string().optional(),
+}).passthrough(); // Allow additional provider-specific fields
+
+const componentRegistrySchema = z.object({
+  id: z.string().optional(),
+  name: z.string().optional(),
+  apiKey: z.string().optional(),
+  cache: z.boolean().optional().default(true),
+  timeout: z.number().optional(),
+  retryPolicy: z.object({
+    maxRetries: z.number().optional(),
+    initialDelay: z.number().optional(),
+    maxDelay: z.number().optional(),
+    backoffMultiplier: z.number().optional(),
+  }).optional(),
+  headers: z.record(z.string()).optional(),
+}).passthrough(); // Allow additional fields
 
 const scheduledJobsSchema = z.object({
   enabled: z.boolean().optional().default(false),
@@ -157,10 +151,7 @@ const configInfoSchema = z.object({
 
   apiKey: z.string().optional(),
   baseUrl: z.string().default('http://localhost'),
-  publicUrl: z
-    .string()
-    .optional()
-    .default(process.env.MJAPI_PUBLIC_URL || ''), // Public URL for callbacks (e.g., ngrok URL when developing)
+  publicUrl: z.string().optional().default(process.env.MJAPI_PUBLIC_URL || ''), // Public URL for callbacks (e.g., ngrok URL when developing)
 
   dbHost: z.string().default('localhost'),
   dbDatabase: z.string(),

package/src/context.ts

@@ -5,29 +5,22 @@ import 'reflect-metadata';
 import { Subject, firstValueFrom } from 'rxjs';
 import { AuthenticationError, AuthorizationError } from 'type-graphql';
 import sql from 'mssql';
-import {
-  getSigningKeys,
-  getSystemUser,
-  getValidationOptions,
-  verifyUserRecord,
-  extractUserInfoFromPayload,
-  TokenExpiredError,
-} from './auth/index.js';
+import { getSigningKeys, getSystemUser, getValidationOptions, verifyUserRecord, extractUserInfoFromPayload, TokenExpiredError } from './auth/index.js';
 import { authCache } from './cache.js';
 import { userEmailMap, apiKey, mj_core_schema } from './config.js';
 import { DataSourceInfo, UserPayload } from './types.js';
 import { GetReadOnlyDataSource, GetReadWriteDataSource } from './util.js';
 import { v4 as uuidv4 } from 'uuid';
 import e from 'express';
-import { DatabaseProviderBase } from '@memberjunction/global';
+import { DatabaseProviderBase } from '@memberjunction/core';
 import { SQLServerDataProvider, SQLServerProviderConfigData } from '@memberjunction/sqlserver-dataprovider';
 import { AuthProviderFactory } from './auth/AuthProviderFactory.js';
-import { Metadata } from '@memberjunction/global';
+import { Metadata } from '@memberjunction/core';
 
 const verifyAsync = async (issuer: string, token: string): Promise<jwt.JwtPayload> =>
   new Promise((resolve, reject) => {
     const options = getValidationOptions(issuer);
-
+    
     if (!options) {
       reject(new Error(`No validation options found for issuer ${issuer}`));
       return;
@@ -53,7 +46,7 @@ export const getUserPayload = async (
   sessionId = 'default',
   dataSources: DataSourceInfo[],
   requestDomain?: string,
-  requestApiKey?: string
+  requestApiKey?: string 
 ): Promise<UserPayload> => {
   try {
     const readOnlyDataSource = GetReadOnlyDataSource(dataSources, { allowFallbackToReadWrite: true });
@@ -112,8 +105,14 @@ export const getUserPayload = async (
     // Use provider to extract user information
     const userInfo = extractUserInfoFromPayload(payload);
     const email = userInfo.email ? ((userEmailMap ?? {})[userInfo.email] ?? userInfo.email) : userInfo.preferredUsername;
-
-    const userRecord = await verifyUserRecord(email, userInfo.firstName, userInfo.lastName, requestDomain, readWriteDataSource);
+    
+    const userRecord = await verifyUserRecord(
+      email, 
+      userInfo.firstName, 
+      userInfo.lastName, 
+      requestDomain, 
+      readWriteDataSource
+    );
 
     if (!userRecord) {
       console.error(`User ${email} not found`);
@@ -134,15 +133,7 @@ export const getUserPayload = async (
 };
 
 export const contextFunction =
-  ({
-    setupComplete$,
-    dataSource,
-    dataSources,
-  }: {
-    setupComplete$: Subject<unknown>;
-    dataSource: sql.ConnectionPool;
-    dataSources: DataSourceInfo[];
-  }) =>
+  ({ setupComplete$, dataSource, dataSources }: { setupComplete$: Subject<unknown>; dataSource: sql.ConnectionPool, dataSources: DataSourceInfo[] }) =>
   async ({ req }: { req: IncomingMessage }) => {
     await firstValueFrom(setupComplete$); // wait for setup to complete before processing the request
 
@@ -152,7 +143,7 @@ export const contextFunction =
     const sessionId = sessionIdRaw ? sessionIdRaw.toString() : '';
     const bearerToken = req.headers.authorization ?? '';
     const apiKey = String(req.headers['x-mj-api-key']);
-
+    
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const reqAny = req as any;
     const operationName: string | undefined = reqAny.body?.operationName;
@@ -165,13 +156,11 @@ export const contextFunction =
       sessionId,
       dataSources,
       requestDomain?.hostname ? requestDomain.hostname : undefined,
-      apiKey
+      apiKey 
     );
 
-    if (Metadata.Provider.Entities.length === 0) {
-      console.warn(
-        'WARNING: No entities found in global/shared metadata, this can often be due to the use of **global** Metadata/RunView/DB Providers in a multi-user environment. Check your code to make sure you are using the providers passed to you in AppContext by MJServer and not calling new Metadata() new RunView() new RunQuery() and similar patterns as those are unstable at times in multi-user server environments!!!'
-      );
+    if (Metadata.Provider.Entities.length === 0 ) {
+      console.warn('WARNING: No entities found in global/shared metadata, this can often be due to the use of **global** Metadata/RunView/DB Providers in a multi-user environment. Check your code to make sure you are using the providers passed to you in AppContext by MJServer and not calling new Metadata() new RunView() new RunQuery() and similar patterns as those are unstable at times in multi-user server environments!!!');
     }
 
     // now create a new instance of SQLServerDataProvider for each request
@@ -187,29 +176,28 @@ export const contextFunction =
         const rConfig = new SQLServerProviderConfigData(readOnlyDataSource, mj_core_schema, 0, undefined, undefined, false);
         await rp.Config(rConfig);
       }
-    } catch (e) {
+    }
+    catch (e) {
       // no read only data source available, so rp will remain null, this is OK!
     }
 
-    const providers = [
-      {
-        provider: p,
-        type: 'Read-Write' as 'Read-Write' | 'Read-Only',
-      },
-    ];
+    const providers = [{
+      provider: p,
+      type: 'Read-Write' as 'Read-Write' | 'Read-Only'
+    }];
     if (rp) {
       providers.push({
         provider: rp,
-        type: 'Read-Only' as 'Read-Write' | 'Read-Only',
+        type: 'Read-Only' as 'Read-Write' | 'Read-Only'
       });
     }
 
-    const contextResult = {
-      dataSource,
-      dataSources,
+    const contextResult = { 
+      dataSource, 
+      dataSources, 
       userPayload: userPayload,
       providers,
     };
-
+    
     return contextResult;
-  };
+  };

package/src/entitySubclasses/entityPermissions.server.ts

@@ -1,5 +1,5 @@
 import { RegisterClass } from '@memberjunction/global';
-import { BaseEntity, EntityDeleteOptions, EntitySaveOptions } from '@memberjunction/global';
+import { BaseEntity, EntityDeleteOptions, EntitySaveOptions } from '@memberjunction/core';
 import { EntityPermissionEntity } from '@memberjunction/core-entities';
 import axios from 'axios';
 import { ___codeGenAPIPort, ___codeGenAPISubmissionDelay, ___codeGenAPIURL } from '../config.js';
@@ -7,7 +7,7 @@ import { ___codeGenAPIPort, ___codeGenAPISubmissionDelay, ___codeGenAPIURL } fro
 /**
  * Server-side only class that extends the entity permissions object to watch for changes to entity permissions, build a queue of entities that have been changed, and then from time to time, submit
  * them to an API server that will execute the underlying permission changes at the database level.
- *
+ * 
  * This class is within the memberjunction/server package because it is closely coupled to other aspects of what
  * happens in the server. That's why it is not in the core-entities-server package.
  */
@@ -104,4 +104,4 @@ export class EntityPermissionsEntity_Server extends EntityPermissionEntity {
   }
 }
 
-export function LoadEntityPermissionsServerSubClass() {}
+export function LoadEntityPermissionsServerSubClass() {}