@memberjunction/server 5.15.0 → 5.17.0

package/src/auth/index.ts

@@ -6,12 +6,9 @@ import { Metadata, RoleInfo, UserInfo } from '@memberjunction/core';
 import { NewUserBase } from './newUsers.js';
 import { MJGlobal } from '@memberjunction/global';
 import { MJUserEntity, MJUserEntityType } from '@memberjunction/core-entities';
-import { AuthProviderFactory } from './AuthProviderFactory.js';
+import { AuthProviderFactory } from '@memberjunction/auth-providers';
 import { initializeAuthProviders } from './initializeProviders.js';
 
-export { TokenExpiredError } from './tokenExpiredError.js';
-export { IAuthProvider } from './IAuthProvider.js';
-export { AuthProviderFactory } from './AuthProviderFactory.js';
 export * from './APIKeyScopeAuth.js';
 
 // This is a hard-coded forever constant due to internal migrations
@@ -53,7 +50,7 @@ const refreshUserCache = async (dataSource?: sql.ConnectionPool) => {
  * are aggregated into an array. jwt.verify() natively accepts string | string[].
  */
 export const getValidationOptions = (issuer: string): { audience: string | string[]; jwksUri: string } | undefined => {
-  const factory = AuthProviderFactory.getInstance();
+  const factory = AuthProviderFactory.Instance;
   const providers = factory.getAllByIssuer(issuer);
 
   if (providers.length === 0) {
@@ -81,7 +78,7 @@ export const validationOptions: Record<string, { audience: string | string[]; jw
     return getValidationOptions(prop) !== undefined;
   },
   ownKeys: () => {
-    const factory = AuthProviderFactory.getInstance();
+    const factory = AuthProviderFactory.Instance;
     return factory.getAllProviders().map(p => p.issuer);
   }
 });
@@ -112,7 +109,7 @@ export class UserPayload {
  * Gets signing keys for JWT validation
  */
 export const getSigningKeys = (issuer: string) => (header: JwtHeader, cb: SigningKeyCallback) => {
-  const factory = AuthProviderFactory.getInstance();
+  const factory = AuthProviderFactory.Instance;
   
   // Initialize providers if not already done
   if (!factory.hasProviders()) {
@@ -142,7 +139,7 @@ export const extractUserInfoFromPayload = (payload: JwtPayload): {
   fullName?: string;
   preferredUsername?: string;
 } => {
-  const factory = AuthProviderFactory.getInstance();
+  const factory = AuthProviderFactory.Instance;
   const issuer = payload.iss;
   
   if (!issuer) {

package/src/auth/initializeProviders.ts

@@ -1,12 +1,12 @@
 import { configInfo } from '../config.js';
 import { AuthProviderConfig, LogError, LogStatus } from '@memberjunction/core';
-import { AuthProviderFactory } from './AuthProviderFactory.js';
+import { AuthProviderFactory } from '@memberjunction/auth-providers';
 
 /**
  * Initialize authentication providers from configuration
  */
 export function initializeAuthProviders(): void {
-  const factory = AuthProviderFactory.getInstance();
+  const factory = AuthProviderFactory.Instance;
   
   // Clear any existing providers
   factory.clear();

package/src/config.ts

@@ -185,6 +185,13 @@ const telemetrySchema = z.object({
   level: z.enum(['minimal', 'standard', 'verbose', 'debug']).optional().default('standard'),
 });
 
+const serverExtensionSchema = z.object({
+  Enabled: z.boolean().default(true),
+  DriverClass: z.string(),
+  RootPath: z.string(),
+  Settings: z.record(z.unknown()).default({})
+}).passthrough();
+
 const configInfoSchema = z.object({
   userHandling: userHandlingInfoSchema,
   databaseSettings: databaseSettingsInfoSchema,
@@ -198,6 +205,7 @@ const configInfoSchema = z.object({
   telemetry: telemetrySchema.optional().default({}),
   queryDialects: queryDialectSchema.optional().default({}),
   multiTenancy: multiTenancySchema.optional().default({}),
+  serverExtensions: z.array(serverExtensionSchema).optional().default([]),
 
   apiKey: z.string().optional(),
   baseUrl: z.string().default('http://localhost'),
@@ -243,6 +251,7 @@ export type ScheduledJobsConfig = z.infer<typeof scheduledJobsSchema>;
 export type TelemetryConfig = z.infer<typeof telemetrySchema>;
 export type QueryDialectConfig = z.infer<typeof queryDialectSchema>;
 export type MultiTenancyConfig = z.infer<typeof multiTenancySchema>;
+export type ServerExtensionConfig = z.infer<typeof serverExtensionSchema>;
 export type ConfigInfo = z.infer<typeof configInfoSchema>;
 
 /**

package/src/context.ts

@@ -5,7 +5,8 @@ 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 } from './auth/index.js';
+import { TokenExpiredError, AuthProviderFactory } from '@memberjunction/auth-providers';
 import { authCache } from './cache.js';
 import { userEmailMap, apiKey, mj_core_schema } from './config.js';
 import { DataSourceInfo, UserPayload } from './types.js';
@@ -15,7 +16,6 @@ import e from 'express';
 import type { RequestHandler, Request, Response, NextFunction } from 'express';
 import { DatabaseProviderBase } from '@memberjunction/core';
 import { SQLServerDataProvider, SQLServerProviderConfigData, UserCache } from '@memberjunction/sqlserver-dataprovider';
-import { AuthProviderFactory } from './auth/AuthProviderFactory.js';
 import { Metadata } from '@memberjunction/core';
 import { UUIDsEqual } from '@memberjunction/global';
 import { GetAPIKeyEngine } from '@memberjunction/api-keys';
@@ -167,7 +167,7 @@ export const getUserPayload = async (
       }
 
       // Verify issuer is supported
-      const factory = AuthProviderFactory.getInstance();
+      const factory = AuthProviderFactory.Instance;
       if (!factory.getByIssuer(issuer)) {
         console.warn(`Unsupported issuer: ${issuer}`);
         throw new AuthenticationError(`Unsupported authentication provider: ${issuer}`);