@memberjunction/server 5.15.0 → 5.17.0

package/dist/resolvers/RSUResolver.js

@@ -0,0 +1,424 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+/**
+ * RSUResolver — GraphQL API for the Runtime Schema Update pipeline.
+ *
+ * Exposes:
+ *   - Query: RuntimeSchemaUpdateStatus — current RSU system status
+ *   - Mutation: RunRuntimeSchemaUpdate — execute the full RSU pipeline
+ *   - Mutation: PreviewRuntimeSchemaUpdate — dry-run preview
+ *
+ * All mutations require system user authorization.
+ */
+import { Arg, Ctx, Field, InputType, Mutation, ObjectType, Query, Resolver, Int, } from 'type-graphql';
+import { RequireSystemUser } from '../directives/RequireSystemUser.js';
+import { RuntimeSchemaManager, } from '@memberjunction/schema-engine';
+import { readFileSync, existsSync } from 'node:fs';
+// ─── RSU Input Types ─────────────────────────────────────────────────
+let RSUMetadataFileInput = class RSUMetadataFileInput {
+};
+__decorate([
+    Field(() => String),
+    __metadata("design:type", String)
+], RSUMetadataFileInput.prototype, "Path", void 0);
+__decorate([
+    Field(() => String),
+    __metadata("design:type", String)
+], RSUMetadataFileInput.prototype, "Content", void 0);
+RSUMetadataFileInput = __decorate([
+    InputType()
+], RSUMetadataFileInput);
+export { RSUMetadataFileInput };
+let RSUPipelineInputGQL = class RSUPipelineInputGQL {
+};
+__decorate([
+    Field(() => String, { description: 'The migration SQL to execute' }),
+    __metadata("design:type", String)
+], RSUPipelineInputGQL.prototype, "MigrationSQL", void 0);
+__decorate([
+    Field(() => String, { description: 'Descriptive name for this schema change' }),
+    __metadata("design:type", String)
+], RSUPipelineInputGQL.prototype, "Description", void 0);
+__decorate([
+    Field(() => [String], { description: 'Tables being created or modified' }),
+    __metadata("design:type", Array)
+], RSUPipelineInputGQL.prototype, "AffectedTables", void 0);
+__decorate([
+    Field(() => String, { nullable: true, description: 'additionalSchemaInfo JSON for soft FKs' }),
+    __metadata("design:type", String)
+], RSUPipelineInputGQL.prototype, "AdditionalSchemaInfo", void 0);
+__decorate([
+    Field(() => [RSUMetadataFileInput], { nullable: true, description: 'Metadata JSON files for mj-sync' }),
+    __metadata("design:type", Array)
+], RSUPipelineInputGQL.prototype, "MetadataFiles", void 0);
+__decorate([
+    Field(() => Boolean, { nullable: true, description: 'Skip git commit/push step' }),
+    __metadata("design:type", Boolean)
+], RSUPipelineInputGQL.prototype, "SkipGitCommit", void 0);
+__decorate([
+    Field(() => Boolean, { nullable: true, description: 'Skip MJAPI restart' }),
+    __metadata("design:type", Boolean)
+], RSUPipelineInputGQL.prototype, "SkipRestart", void 0);
+RSUPipelineInputGQL = __decorate([
+    InputType()
+], RSUPipelineInputGQL);
+export { RSUPipelineInputGQL };
+// ─── Output Types ────────────────────────────────────────────────────
+let RSUPipelineStepGQL = class RSUPipelineStepGQL {
+};
+__decorate([
+    Field(() => String),
+    __metadata("design:type", String)
+], RSUPipelineStepGQL.prototype, "Name", void 0);
+__decorate([
+    Field(() => String),
+    __metadata("design:type", String)
+], RSUPipelineStepGQL.prototype, "Status", void 0);
+__decorate([
+    Field(() => Int),
+    __metadata("design:type", Number)
+], RSUPipelineStepGQL.prototype, "DurationMs", void 0);
+__decorate([
+    Field(() => String),
+    __metadata("design:type", String)
+], RSUPipelineStepGQL.prototype, "Message", void 0);
+RSUPipelineStepGQL = __decorate([
+    ObjectType()
+], RSUPipelineStepGQL);
+export { RSUPipelineStepGQL };
+let RSUPipelineResultGQL = class RSUPipelineResultGQL {
+};
+__decorate([
+    Field(() => Boolean),
+    __metadata("design:type", Boolean)
+], RSUPipelineResultGQL.prototype, "Success", void 0);
+__decorate([
+    Field(() => String, { nullable: true }),
+    __metadata("design:type", String)
+], RSUPipelineResultGQL.prototype, "BranchName", void 0);
+__decorate([
+    Field(() => String, { nullable: true }),
+    __metadata("design:type", String)
+], RSUPipelineResultGQL.prototype, "MigrationFilePath", void 0);
+__decorate([
+    Field(() => Int, { nullable: true }),
+    __metadata("design:type", Number)
+], RSUPipelineResultGQL.prototype, "EntitiesProcessed", void 0);
+__decorate([
+    Field(() => Boolean),
+    __metadata("design:type", Boolean)
+], RSUPipelineResultGQL.prototype, "APIRestarted", void 0);
+__decorate([
+    Field(() => Boolean),
+    __metadata("design:type", Boolean)
+], RSUPipelineResultGQL.prototype, "GitCommitSuccess", void 0);
+__decorate([
+    Field(() => [RSUPipelineStepGQL]),
+    __metadata("design:type", Array)
+], RSUPipelineResultGQL.prototype, "Steps", void 0);
+__decorate([
+    Field(() => String, { nullable: true }),
+    __metadata("design:type", String)
+], RSUPipelineResultGQL.prototype, "ErrorMessage", void 0);
+__decorate([
+    Field(() => String, { nullable: true }),
+    __metadata("design:type", String)
+], RSUPipelineResultGQL.prototype, "ErrorStep", void 0);
+RSUPipelineResultGQL = __decorate([
+    ObjectType()
+], RSUPipelineResultGQL);
+export { RSUPipelineResultGQL };
+let RSUPipelineBatchResultGQL = class RSUPipelineBatchResultGQL {
+};
+__decorate([
+    Field(() => [RSUPipelineResultGQL]),
+    __metadata("design:type", Array)
+], RSUPipelineBatchResultGQL.prototype, "Results", void 0);
+__decorate([
+    Field(() => Int),
+    __metadata("design:type", Number)
+], RSUPipelineBatchResultGQL.prototype, "SuccessCount", void 0);
+__decorate([
+    Field(() => Int),
+    __metadata("design:type", Number)
+], RSUPipelineBatchResultGQL.prototype, "FailureCount", void 0);
+__decorate([
+    Field(() => Int),
+    __metadata("design:type", Number)
+], RSUPipelineBatchResultGQL.prototype, "TotalCount", void 0);
+RSUPipelineBatchResultGQL = __decorate([
+    ObjectType()
+], RSUPipelineBatchResultGQL);
+export { RSUPipelineBatchResultGQL };
+let RSUPreviewResultGQL = class RSUPreviewResultGQL {
+};
+__decorate([
+    Field(() => String),
+    __metadata("design:type", String)
+], RSUPreviewResultGQL.prototype, "MigrationSQL", void 0);
+__decorate([
+    Field(() => [String]),
+    __metadata("design:type", Array)
+], RSUPreviewResultGQL.prototype, "AffectedTables", void 0);
+__decorate([
+    Field(() => [String]),
+    __metadata("design:type", Array)
+], RSUPreviewResultGQL.prototype, "ValidationErrors", void 0);
+__decorate([
+    Field(() => Boolean),
+    __metadata("design:type", Boolean)
+], RSUPreviewResultGQL.prototype, "WouldExecute", void 0);
+RSUPreviewResultGQL = __decorate([
+    ObjectType()
+], RSUPreviewResultGQL);
+export { RSUPreviewResultGQL };
+let RSUStatusGQL = class RSUStatusGQL {
+};
+__decorate([
+    Field(() => Boolean),
+    __metadata("design:type", Boolean)
+], RSUStatusGQL.prototype, "Enabled", void 0);
+__decorate([
+    Field(() => Boolean),
+    __metadata("design:type", Boolean)
+], RSUStatusGQL.prototype, "Running", void 0);
+__decorate([
+    Field(() => Boolean),
+    __metadata("design:type", Boolean)
+], RSUStatusGQL.prototype, "OutOfSync", void 0);
+__decorate([
+    Field(() => Date, { nullable: true }),
+    __metadata("design:type", Date)
+], RSUStatusGQL.prototype, "OutOfSyncSince", void 0);
+__decorate([
+    Field(() => Date, { nullable: true }),
+    __metadata("design:type", Date)
+], RSUStatusGQL.prototype, "LastRunAt", void 0);
+__decorate([
+    Field(() => String, { nullable: true }),
+    __metadata("design:type", String)
+], RSUStatusGQL.prototype, "LastRunResult", void 0);
+RSUStatusGQL = __decorate([
+    ObjectType()
+], RSUStatusGQL);
+export { RSUStatusGQL };
+let RSUQueueStatusGQL = class RSUQueueStatusGQL {
+};
+__decorate([
+    Field(() => Int),
+    __metadata("design:type", Number)
+], RSUQueueStatusGQL.prototype, "PendingCount", void 0);
+__decorate([
+    Field(() => Boolean),
+    __metadata("design:type", Boolean)
+], RSUQueueStatusGQL.prototype, "IsCycleRunning", void 0);
+RSUQueueStatusGQL = __decorate([
+    ObjectType()
+], RSUQueueStatusGQL);
+export { RSUQueueStatusGQL };
+// ─── Resolver ────────────────────────────────────────────────────────
+let RSUResolver = class RSUResolver {
+    /**
+     * Query: Get current RSU system status.
+     * Available to any authenticated user (status is informational).
+     */
+    RuntimeSchemaUpdateStatus() {
+        const rsm = RuntimeSchemaManager.Instance;
+        const status = rsm.GetStatus();
+        return {
+            Enabled: status.Enabled,
+            Running: status.Running,
+            OutOfSync: status.OutOfSync,
+            OutOfSyncSince: status.OutOfSyncSince,
+            LastRunAt: status.LastRunAt,
+            LastRunResult: status.LastRunResult,
+        };
+    }
+    /**
+     * Query: Tail the RSU pipeline log file. Returns the last N lines.
+     */
+    RuntimeSchemaUpdateLogTail(lines) {
+        try {
+            const logPath = `${process.env.RSU_WORK_DIR || process.cwd()}/rsu-pipeline.log`;
+            if (!existsSync(logPath))
+                return ['(no log file found)'];
+            const content = readFileSync(logPath, 'utf-8');
+            const allLines = content.split('\n').filter(l => l.trim());
+            const maxLines = Math.min(Math.max(lines, 1), 1000);
+            return allLines.slice(-maxLines);
+        }
+        catch (e) {
+            return [`Error reading log: ${e.message}`];
+        }
+    }
+    /**
+     * Query: Get RSU CodeGen queue status.
+     * Shows how many requests are pending and whether a cycle is running.
+     */
+    RuntimeSchemaUpdateQueueStatus() {
+        const rsm = RuntimeSchemaManager.Instance;
+        return {
+            PendingCount: 0, // Batching is explicit via RunPipelineBatch — no implicit queue
+            IsCycleRunning: rsm.IsRunning,
+        };
+    }
+    /**
+     * Mutation: Execute the full RSU pipeline.
+     * Requires system user authorization.
+     */
+    async RunRuntimeSchemaUpdate(input, _ctx) {
+        const rsm = RuntimeSchemaManager.Instance;
+        const pipelineInput = {
+            MigrationSQL: input.MigrationSQL,
+            Description: input.Description,
+            AffectedTables: input.AffectedTables,
+            AdditionalSchemaInfo: input.AdditionalSchemaInfo ?? undefined,
+            MetadataFiles: input.MetadataFiles?.map(mf => ({ Path: mf.Path, Content: mf.Content })),
+            SkipGitCommit: input.SkipGitCommit ?? undefined,
+            SkipRestart: input.SkipRestart ?? undefined,
+        };
+        const result = await rsm.RunPipeline(pipelineInput);
+        return {
+            Success: result.Success,
+            BranchName: result.BranchName,
+            MigrationFilePath: result.MigrationFilePath,
+            EntitiesProcessed: result.EntitiesProcessed,
+            APIRestarted: result.APIRestarted,
+            GitCommitSuccess: result.GitCommitSuccess,
+            Steps: result.Steps.map(s => ({
+                Name: s.Name,
+                Status: s.Status,
+                DurationMs: s.DurationMs,
+                Message: s.Message,
+            })),
+            ErrorMessage: result.ErrorMessage,
+            ErrorStep: result.ErrorStep,
+        };
+    }
+    /**
+     * Mutation: Execute the RSU pipeline for a batch of inputs.
+     * All migrations execute under one lock, then one CodeGen/compile/restart/git.
+     * Per-item migration results + shared post-migration result.
+     */
+    async RunRuntimeSchemaUpdateBatch(inputs, _ctx) {
+        const rsm = RuntimeSchemaManager.Instance;
+        const pipelineInputs = inputs.map(input => ({
+            MigrationSQL: input.MigrationSQL,
+            Description: input.Description,
+            AffectedTables: input.AffectedTables,
+            AdditionalSchemaInfo: input.AdditionalSchemaInfo ?? undefined,
+            MetadataFiles: input.MetadataFiles?.map(mf => ({ Path: mf.Path, Content: mf.Content })),
+            SkipGitCommit: input.SkipGitCommit ?? undefined,
+            SkipRestart: input.SkipRestart ?? undefined,
+        }));
+        const batchResult = await rsm.RunPipelineBatch(pipelineInputs);
+        return {
+            Results: batchResult.Results.map(result => ({
+                Success: result.Success,
+                BranchName: result.BranchName,
+                MigrationFilePath: result.MigrationFilePath,
+                EntitiesProcessed: result.EntitiesProcessed,
+                APIRestarted: result.APIRestarted,
+                GitCommitSuccess: result.GitCommitSuccess,
+                Steps: result.Steps.map(s => ({
+                    Name: s.Name,
+                    Status: s.Status,
+                    DurationMs: s.DurationMs,
+                    Message: s.Message,
+                })),
+                ErrorMessage: result.ErrorMessage,
+                ErrorStep: result.ErrorStep,
+            })),
+            SuccessCount: batchResult.SuccessCount,
+            FailureCount: batchResult.FailureCount,
+            TotalCount: batchResult.TotalCount,
+        };
+    }
+    /**
+     * Mutation: Preview mode — validate SQL and return what would happen.
+     * Requires system user authorization.
+     */
+    PreviewRuntimeSchemaUpdate(input, _ctx) {
+        const rsm = RuntimeSchemaManager.Instance;
+        const pipelineInput = {
+            MigrationSQL: input.MigrationSQL,
+            Description: input.Description,
+            AffectedTables: input.AffectedTables,
+        };
+        const preview = rsm.Preview(pipelineInput);
+        return {
+            MigrationSQL: preview.MigrationSQL,
+            AffectedTables: preview.AffectedTables,
+            ValidationErrors: preview.ValidationErrors,
+            WouldExecute: preview.WouldExecute,
+        };
+    }
+};
+__decorate([
+    Query(() => RSUStatusGQL, { description: 'Returns the current Runtime Schema Update status' }),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", RSUStatusGQL)
+], RSUResolver.prototype, "RuntimeSchemaUpdateStatus", null);
+__decorate([
+    Query(() => [String], { description: 'Returns recent lines from the RSU pipeline log' }),
+    __param(0, Arg('lines', () => Int, { defaultValue: 100 })),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Number]),
+    __metadata("design:returntype", Array)
+], RSUResolver.prototype, "RuntimeSchemaUpdateLogTail", null);
+__decorate([
+    Query(() => RSUQueueStatusGQL, { description: 'Returns the RSU pipeline status' }),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", RSUQueueStatusGQL)
+], RSUResolver.prototype, "RuntimeSchemaUpdateQueueStatus", null);
+__decorate([
+    Mutation(() => RSUPipelineResultGQL, {
+        description: 'Execute the Runtime Schema Update pipeline. Requires system user.',
+    }),
+    RequireSystemUser(),
+    __param(0, Arg('input', () => RSUPipelineInputGQL)),
+    __param(1, Ctx()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [RSUPipelineInputGQL, Object]),
+    __metadata("design:returntype", Promise)
+], RSUResolver.prototype, "RunRuntimeSchemaUpdate", null);
+__decorate([
+    Mutation(() => RSUPipelineBatchResultGQL, {
+        description: 'Execute Runtime Schema Update for a batch of inputs. Requires system user.',
+    }),
+    RequireSystemUser(),
+    __param(0, Arg('inputs', () => [RSUPipelineInputGQL])),
+    __param(1, Ctx()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Array, Object]),
+    __metadata("design:returntype", Promise)
+], RSUResolver.prototype, "RunRuntimeSchemaUpdateBatch", null);
+__decorate([
+    Mutation(() => RSUPreviewResultGQL, {
+        description: 'Preview Runtime Schema Update without executing. Requires system user.',
+    }),
+    RequireSystemUser(),
+    __param(0, Arg('input', () => RSUPipelineInputGQL)),
+    __param(1, Ctx()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [RSUPipelineInputGQL, Object]),
+    __metadata("design:returntype", RSUPreviewResultGQL)
+], RSUResolver.prototype, "PreviewRuntimeSchemaUpdate", null);
+RSUResolver = __decorate([
+    Resolver()
+], RSUResolver);
+export { RSUResolver };
+export default RSUResolver;
+//# sourceMappingURL=RSUResolver.js.map

package/dist/resolvers/RSUResolver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RSUResolver.js","sourceRoot":"","sources":["../../src/resolvers/RSUResolver.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@memberjunction/server",
-  "version": "5.15.0",
+  "version": "5.17.0",
   "description": "MemberJunction: This project provides API access via GraphQL to the common data store.",
   "main": "./dist/index.js",
   "types": "./src/index.ts",
@@ -27,66 +27,72 @@
     "@as-integrations/express5": "^1.0.0",
     "@graphql-tools/schema": "latest",
     "@graphql-tools/utils": "^11.0.0",
-    "@memberjunction/actions": "5.15.0",
-    "@memberjunction/actions-base": "5.15.0",
-    "@memberjunction/actions-apollo": "5.15.0",
-    "@memberjunction/actions-bizapps-accounting": "5.15.0",
-    "@memberjunction/actions-bizapps-crm": "5.15.0",
-    "@memberjunction/actions-bizapps-formbuilders": "5.15.0",
-    "@memberjunction/actions-bizapps-lms": "5.15.0",
-    "@memberjunction/actions-bizapps-social": "5.15.0",
-    "@memberjunction/ai": "5.15.0",
-    "@memberjunction/ai-mcp-client": "5.15.0",
-    "@memberjunction/ai-agent-manager": "5.15.0",
-    "@memberjunction/ai-agent-manager-actions": "5.15.0",
-    "@memberjunction/ai-agents": "5.15.0",
-    "@memberjunction/ai-core-plus": "5.15.0",
-    "@memberjunction/ai-prompts": "5.15.0",
-    "@memberjunction/ai-provider-bundle": "5.15.0",
-    "@memberjunction/ai-vectors-pinecone": "5.15.0",
-    "@memberjunction/aiengine": "5.15.0",
-    "@memberjunction/communication-ms-graph": "5.15.0",
-    "@memberjunction/communication-sendgrid": "5.15.0",
-    "@memberjunction/communication-types": "5.15.0",
-    "@memberjunction/component-registry-client-sdk": "5.15.0",
-    "@memberjunction/config": "5.15.0",
-    "@memberjunction/core": "5.15.0",
-    "@memberjunction/core-actions": "5.15.0",
-    "@memberjunction/core-entities": "5.15.0",
-    "@memberjunction/core-entities-server": "5.15.0",
-    "@memberjunction/data-context": "5.15.0",
-    "@memberjunction/data-context-server": "5.15.0",
-    "@memberjunction/doc-utils": "5.15.0",
-    "@memberjunction/api-keys": "5.15.0",
-    "@memberjunction/encryption": "5.15.0",
-    "@memberjunction/entity-communications-base": "5.15.0",
-    "@memberjunction/entity-communications-server": "5.15.0",
-    "@memberjunction/external-change-detection": "5.15.0",
-    "@memberjunction/generic-database-provider": "5.15.0",
-    "@memberjunction/global": "5.15.0",
-    "@memberjunction/graphql-dataprovider": "5.15.0",
-    "@memberjunction/integration-engine": "5.15.0",
-    "@memberjunction/integration-schema-builder": "5.15.0",
-    "@memberjunction/interactive-component-types": "5.15.0",
-    "@memberjunction/computer-use-engine": "5.15.0",
-    "@memberjunction/notifications": "5.15.0",
-    "@memberjunction/queue": "5.15.0",
-    "@memberjunction/redis-provider": "5.15.0",
-    "@memberjunction/scheduling-actions": "5.15.0",
-    "@memberjunction/scheduling-base-types": "5.15.0",
-    "@memberjunction/scheduling-engine": "5.15.0",
-    "@memberjunction/scheduling-engine-base": "5.15.0",
-    "@memberjunction/skip-types": "5.15.0",
-    "@memberjunction/sqlserver-dataprovider": "5.15.0",
-    "@memberjunction/storage": "5.15.0",
-    "@memberjunction/templates": "5.15.0",
-    "@memberjunction/testing-engine": "5.15.0",
-    "@memberjunction/testing-engine-base": "5.15.0",
-    "@memberjunction/version-history": "5.15.0",
+    "@memberjunction/actions": "5.17.0",
+    "@memberjunction/actions-apollo": "5.17.0",
+    "@memberjunction/actions-base": "5.17.0",
+    "@memberjunction/actions-bizapps-accounting": "5.17.0",
+    "@memberjunction/actions-bizapps-crm": "5.17.0",
+    "@memberjunction/actions-bizapps-formbuilders": "5.17.0",
+    "@memberjunction/actions-bizapps-lms": "5.17.0",
+    "@memberjunction/actions-bizapps-social": "5.17.0",
+    "@memberjunction/ai": "5.17.0",
+    "@memberjunction/ai-agent-manager": "5.17.0",
+    "@memberjunction/ai-agent-manager-actions": "5.17.0",
+    "@memberjunction/ai-agents": "5.17.0",
+    "@memberjunction/ai-core-plus": "5.17.0",
+    "@memberjunction/ai-mcp-client": "5.17.0",
+    "@memberjunction/ai-prompts": "5.17.0",
+    "@memberjunction/ai-provider-bundle": "5.17.0",
+    "@memberjunction/ai-vectors-pinecone": "5.17.0",
+    "@memberjunction/aiengine": "5.17.0",
+    "@memberjunction/api-keys": "5.17.0",
+    "@memberjunction/auth-providers": "5.17.0",
+    "@memberjunction/codegen-lib": "5.17.0",
+    "@memberjunction/communication-ms-graph": "5.17.0",
+    "@memberjunction/communication-sendgrid": "5.17.0",
+    "@memberjunction/communication-types": "5.17.0",
+    "@memberjunction/component-registry-client-sdk": "5.17.0",
+    "@memberjunction/computer-use-engine": "5.17.0",
+    "@memberjunction/config": "5.17.0",
+    "@memberjunction/core": "5.17.0",
+    "@memberjunction/core-actions": "5.17.0",
+    "@memberjunction/core-entities": "5.17.0",
+    "@memberjunction/core-entities-server": "5.17.0",
+    "@memberjunction/data-context": "5.17.0",
+    "@memberjunction/data-context-server": "5.17.0",
+    "@memberjunction/doc-utils": "5.17.0",
+    "@memberjunction/encryption": "5.17.0",
+    "@memberjunction/entity-communications-base": "5.17.0",
+    "@memberjunction/entity-communications-server": "5.17.0",
+    "@memberjunction/external-change-detection": "5.17.0",
+    "@memberjunction/generic-database-provider": "5.17.0",
+    "@memberjunction/global": "5.17.0",
+    "@memberjunction/graphql-dataprovider": "5.17.0",
+    "@memberjunction/integration-engine": "5.17.0",
+    "@memberjunction/integration-schema-builder": "5.17.0",
+    "@memberjunction/interactive-component-types": "5.17.0",
+    "@memberjunction/notifications": "5.17.0",
+    "@memberjunction/postgresql-dataprovider": "5.17.0",
+    "@memberjunction/queue": "5.17.0",
+    "@memberjunction/redis-provider": "5.17.0",
+    "@memberjunction/scheduling-actions": "5.17.0",
+    "@memberjunction/scheduling-base-types": "5.17.0",
+    "@memberjunction/scheduling-engine": "5.17.0",
+    "@memberjunction/scheduling-engine-base": "5.17.0",
+    "@memberjunction/server-extensions-core": "5.17.0",
+    "@memberjunction/skip-types": "5.17.0",
+    "@memberjunction/sql-dialect": "5.17.0",
+    "@memberjunction/sqlserver-dataprovider": "5.17.0",
+    "@memberjunction/storage": "5.17.0",
+    "@memberjunction/templates": "5.17.0",
+    "@memberjunction/testing-engine": "5.17.0",
+    "@memberjunction/testing-engine-base": "5.17.0",
+    "@memberjunction/version-history": "5.17.0",
     "@types/compression": "^1.8.1",
     "@types/cors": "^2.8.19",
     "@types/jsonwebtoken": "9.0.10",
     "@types/node": "24.10.11",
+    "@types/pg": "^8.11.11",
     "@types/ws": "8.18.1",
     "axios": "^1.13.4",
     "body-parser": "^2.2.2",
@@ -107,10 +113,7 @@
     "jwks-rsa": "^3.2.2",
     "lru-cache": "^11.2.5",
     "mssql": "^12.2.0",
-    "@memberjunction/postgresql-dataprovider": "5.15.0",
-    "@memberjunction/sql-dialect": "5.15.0",
     "pg": "^8.13.3",
-    "@types/pg": "^8.11.11",
     "reflect-metadata": "0.2.2",
     "rxjs": "^7.8.2",
     "type-graphql": "2.0.0-beta.3",

package/src/__tests__/unifiedAuth.test.ts

@@ -64,7 +64,6 @@ vi.mock('../auth/index.js', () => ({
   getValidationOptions: mockGetValidationOptions,
   verifyUserRecord: mockVerifyUserRecord,
   extractUserInfoFromPayload: mockExtractUserInfo,
-  TokenExpiredError: MockTokenExpiredError,
 }));
 
 vi.mock('../cache.js', () => {
@@ -84,9 +83,11 @@ vi.mock('../config.js', () => ({
   mj_core_schema: '__mj',
 }));
 
-vi.mock('../auth/AuthProviderFactory.js', () => ({
+vi.mock('@memberjunction/auth-providers', () => ({
+  TokenExpiredError: MockTokenExpiredError,
   AuthProviderFactory: {
     getInstance: () => ({ getByIssuer: mockGetByIssuer }),
+    get Instance() { return { getByIssuer: mockGetByIssuer }; },
   },
 }));
 

package/src/auth/__tests__/backward-compatibility.test.ts

@@ -11,8 +11,7 @@ vi.mock('../../config', () => ({
   },
 }));
 
-import { AuthProviderFactory } from '../AuthProviderFactory';
-import { IAuthProvider } from '../IAuthProvider';
+import { AuthProviderFactory, IAuthProvider } from '@memberjunction/auth-providers';
 import { initializeAuthProviders } from '../initializeProviders';
 
 /**
@@ -22,7 +21,7 @@ describe('Authentication Provider Backward Compatibility', () => {
   let factory: AuthProviderFactory;
   
   beforeEach(() => {
-    factory = AuthProviderFactory.getInstance();
+    factory = AuthProviderFactory.Instance;
     factory.clear();
   });