@memberjunction/server 1.0.6 → 1.0.7

package/dist/index.d.ts

@@ -5,6 +5,7 @@ export { NewUserBase } from './auth/newUsers';
 export { configInfo } from './config';
 export * from './directives';
 export * from './entitySubclasses/userViewEntity.server';
+export * from './entitySubclasses/entityPermissions.server';
 export * from './types';
 export { TokenExpiredError } from './auth';
 export * from './generic/PushStatusResolver';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAeA,OAAO,kBAAkB,CAAC;AAa1B,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,cAAc,cAAc,CAAC;AAC7B,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,cAAc,cAAc,CAAC;AAC7B,cAAc,0CAA0C,CAAC;AACzD,cAAc,SAAS,CAAC;AACxB,OAAO,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AAE3C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,wBAAwB,CAAC;AACvC,cAAc,2BAA2B,CAAC;AAE1C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,sCAAsC,CAAC;AAErD,cAAc,kCAAkC,CAAC;AACjD,cAAc,4BAA4B,CAAC;AAE3C,cAAc,uBAAuB,CAAA;AAUrC,eAAO,MAAM,KAAK,kBAAyB,MAAM,MAAM,CAAC,kBA2EvD,CAAC;AAEF,eAAe,KAAK,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAeA,OAAO,kBAAkB,CAAC;AAa1B,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,cAAc,cAAc,CAAC;AAC7B,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,cAAc,cAAc,CAAC;AAC7B,cAAc,0CAA0C,CAAC;AACzD,cAAc,6CAA6C,CAAC;AAC5D,cAAc,SAAS,CAAC;AACxB,OAAO,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AAE3C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,wBAAwB,CAAC;AACvC,cAAc,2BAA2B,CAAC;AAE1C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,sCAAsC,CAAC;AACrD,cAAc,kCAAkC,CAAC;AACjD,cAAc,4BAA4B,CAAC;AAE3C,cAAc,uBAAuB,CAAA;AAMrC,eAAO,MAAM,KAAK,kBAAyB,MAAM,MAAM,CAAC,kBA2EvD,CAAC;AAEF,eAAe,KAAK,CAAC"}

package/dist/index.js

@@ -63,6 +63,7 @@ var config_2 = require("./config");
 Object.defineProperty(exports, "configInfo", { enumerable: true, get: function () { return config_2.configInfo; } });
 __exportStar(require("./directives"), exports);
 __exportStar(require("./entitySubclasses/userViewEntity.server"), exports);
+__exportStar(require("./entitySubclasses/entityPermissions.server"), exports);
 __exportStar(require("./types"), exports);
 var auth_1 = require("./auth");
 Object.defineProperty(exports, "TokenExpiredError", { enumerable: true, get: function () { return auth_1.TokenExpiredError; } });

package/dist/index.js.map

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

package/dist/resolvers/AskSkipResolver.js

@@ -318,13 +318,13 @@ let AskSkipResolver = AskSkipResolver_1 = class AskSkipResolver {
         try {
             const md = new core_1.Metadata();
             const e = md.Entities.find((e) => e.Name === 'Conversation Details');
-            const sql = `SELECT 
-                      ${maxHistoricalMessages ? 'TOP ' + maxHistoricalMessages : ''} ID, Message, Role, CreatedAt 
-                   FROM 
-                      ${e.SchemaName}.${e.BaseView} 
-                   WHERE 
-                      ConversationID = ${ConversationId} 
-                   ORDER 
+            const sql = `SELECT 
+                      ${maxHistoricalMessages ? 'TOP ' + maxHistoricalMessages : ''} ID, Message, Role, CreatedAt 
+                   FROM 
+                      ${e.SchemaName}.${e.BaseView} 
+                   WHERE 
+                      ConversationID = ${ConversationId} 
+                   ORDER 
                       BY CreatedAt DESC`;
             const result = await dataSource.query(sql);
             if (!result)
@@ -518,7 +518,7 @@ let AskSkipResolver = AskSkipResolver_1 = class AskSkipResolver {
             const executionErrors = [];
             let dataRequest = apiResponse.dataRequest;
             apiRequest.messages.push({
-                content: `Skip API Requested Data as shown below
+                content: `Skip API Requested Data as shown below
                   ${JSON.stringify(apiResponse.dataRequest)}`,
                 role: 'system'
             });
@@ -586,8 +586,8 @@ let AskSkipResolver = AskSkipResolver_1 = class AskSkipResolver {
                     (0, core_1.LogStatus)(`Execution errors for Skip data request occured, sending those errors back to the Skip API to get new instructions.`);
                     apiRequest.requestPhase = 'data_gathering_failure';
                     apiRequest.messages.push({
-                        content: `${_dataGatheringFailureHeaderMessage} #${dataGatheringFailedAttemptCount} of ${_maxDataGatheringRetries} attempts to gather data failed. Errors:
-                      ${JSON.stringify(executionErrors)}
+                        content: `${_dataGatheringFailureHeaderMessage} #${dataGatheringFailedAttemptCount} of ${_maxDataGatheringRetries} attempts to gather data failed. Errors:
+                      ${JSON.stringify(executionErrors)}
                     `,
                         role: 'user'
                     });

package/dist/resolvers/FileCategoryResolver.js

@@ -31,8 +31,8 @@ class FileResolver extends generated_1.FileCategoryResolver {
         await fileCategoryEntity.Load(ID);
         const returnValue = fileCategoryEntity.GetAll();
         await dataSource.transaction(async () => {
-            const sSQL = `UPDATE [${config_1.mj_core_schema}].[File] 
-                      SET [CategoryID]=${fileCategoryEntity.ParentID}
+            const sSQL = `UPDATE [${config_1.mj_core_schema}].[File] 
+                      SET [CategoryID]=${fileCategoryEntity.ParentID}
                       WHERE [CategoryID]=${fileCategoryEntity.ID}`;
             await dataSource.query(sSQL);
             await fileCategoryEntity.Delete();

package/dist/resolvers/ReportResolver.js

@@ -93,10 +93,10 @@ let ReportResolverExtended = class ReportResolverExtended {
         const cd = md.Entities.find(e => e.Name === 'Conversations');
         if (!cd)
             throw new Error('Unable to find Conversations Entity metadata');
-        const sql = `SELECT cd.Message, cd.ConversationID, c.DataContextID
-                 FROM ${cde.SchemaName}.${cde.BaseView} cd
-                 INNER JOIN ${cd.SchemaName}.${cd.BaseView} c 
-                 ON cd.ConversationID = c.ID
+        const sql = `SELECT cd.Message, cd.ConversationID, c.DataContextID
+                 FROM ${cde.SchemaName}.${cde.BaseView} cd
+                 INNER JOIN ${cd.SchemaName}.${cd.BaseView} c 
+                 ON cd.ConversationID = c.ID
                  WHERE cd.ID=${ConversationDetailID}`;
         const result = await dataSource.query(sql);
         if (!result || result.length === 0)

package/package.json

@@ -1,80 +1,80 @@
-{
-  "name": "@memberjunction/server",
-  "version": "1.0.6",
-  "description": "MemberJunction: This project provides API access via GraphQL to the common data store.",
-  "main": "dist/index.js",
-  "types": "src/index.ts",
-  "author": "MemberJunction.com",
-  "license": "ISC",
-  "scripts": {
-    "clean": "rimraf dist",
-    "build": "rimraf dist && tsc",
-    "watch": "tsc -w",
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "lint:eslint": "eslint \"**/*.{ts,js,}\" --max-warnings=0",
-    "lint:tsc": "tsc --noemit",
-    "lint": "concurrently \"npm:lint:eslint\" \"npm:lint:tsc\"",
-    "pretty": "prettier --write \"**/*.{ts,js,}\"",
-    "codegen": "cpy --flat ../codegen/output/entities/*.ts src/entities",
-    "postcodegen": "npm run pretty"
-  },
-  "dependencies": {
-    "@apollo/server": "^4.9.1",
-    "@graphql-tools/utils": "^10.0.1",
-    "@memberjunction/ai": "^1.0.6",
-    "@memberjunction/ai-openai": "^1.0.6",
-    "@memberjunction/aiengine": "^1.0.6",
-    "@memberjunction/core": "^1.0.6",
-    "@memberjunction/core-entities": "^1.0.6",
-    "@memberjunction/data-context": "^1.0.6",
-    "@memberjunction/data-context-server": "^1.0.6",
-    "@memberjunction/global": "^1.0.6",
-    "@memberjunction/storage": "^1.0.6",
-    "@memberjunction/queue": "^1.0.6",
-    "@memberjunction/sqlserver-dataprovider": "^1.0.6",
-    "@memberjunction/skip-types": "^1.0.6",
-    "@types/cors": "^2.8.13",
-    "@types/jsonwebtoken": "^8.5.9",
-    "@types/node": "^18.11.14",
-    "@types/ws": "^8.5.5",
-    "axios": "^1.4.0",
-    "body-parser": "^1.20.2",
-    "class-validator": "^0.14.0",
-    "cors": "^2.8.5",
-    "dotenv": "^16.0.3",
-    "env-var": "^7.3.0",
-    "express": "^4.18.2",
-    "fast-glob": "^3.3.1",
-    "graphql": "^16.8.0",
-    "graphql-ws": "^5.14.0",
-    "jsonwebtoken": "^8.5.1",
-    "jwks-rsa": "^3.0.0",
-    "lru-cache": "^10.0.0",
-    "mssql": "^10.0.2",
-    "reflect-metadata": "^0.1.13",
-    "rxjs": "^7.8.1",
-    "type-graphql": "2.0.0-beta.3",
-    "typedi": "^0.10.0",
-    "typeorm": "^0.3.20",
-    "ws": "^8.13.0",
-    "zod": "^3.22.4"
-  },
-  "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^5.46.1",
-    "@typescript-eslint/parser": "^5.46.1",
-    "concurrently": "^7.6.0",
-    "cpy-cli": "^4.2.0",
-    "eslint": "^8.29.0",
-    "eslint-config-airbnb": "^19.0.4",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-import-resolver-typescript": "^3.5.2",
-    "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-jsx-a11y": "^6.6.1",
-    "eslint-plugin-prettier": "^4.2.1",
-    "prettier": "^2.8.1",
-    "rimraf": "^4.4.0",
-    "ts-node": "^10.9.1",
-    "ts-node-dev": "^2.0.0",
-    "typescript": "^5.3.3"
-  }
-}
+{
+  "name": "@memberjunction/server",
+  "version": "1.0.7",
+  "description": "MemberJunction: This project provides API access via GraphQL to the common data store.",
+  "main": "dist/index.js",
+  "types": "src/index.ts",
+  "author": "MemberJunction.com",
+  "license": "ISC",
+  "scripts": {
+    "clean": "rimraf dist",
+    "build": "rimraf dist && tsc",
+    "watch": "tsc -w",
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "lint:eslint": "eslint \"**/*.{ts,js,}\" --max-warnings=0",
+    "lint:tsc": "tsc --noemit",
+    "lint": "concurrently \"npm:lint:eslint\" \"npm:lint:tsc\"",
+    "pretty": "prettier --write \"**/*.{ts,js,}\"",
+    "codegen": "cpy --flat ../codegen/output/entities/*.ts src/entities",
+    "postcodegen": "npm run pretty"
+  },
+  "dependencies": {
+    "@apollo/server": "^4.9.1",
+    "@graphql-tools/utils": "^10.0.1",
+    "@memberjunction/ai": "^1.0.7",
+    "@memberjunction/ai-openai": "^1.0.7",
+    "@memberjunction/aiengine": "^1.0.7",
+    "@memberjunction/core": "^1.0.7",
+    "@memberjunction/core-entities": "^1.0.7",
+    "@memberjunction/data-context": "^1.0.7",
+    "@memberjunction/data-context-server": "^1.0.7",
+    "@memberjunction/global": "^1.0.7",
+    "@memberjunction/storage": "^1.0.7",
+    "@memberjunction/queue": "^1.0.7",
+    "@memberjunction/sqlserver-dataprovider": "^1.0.7",
+    "@memberjunction/skip-types": "^1.0.7",
+    "@types/cors": "^2.8.13",
+    "@types/jsonwebtoken": "^8.5.9",
+    "@types/node": "^18.11.14",
+    "@types/ws": "^8.5.5",
+    "axios": "^1.4.0",
+    "body-parser": "^1.20.2",
+    "class-validator": "^0.14.0",
+    "cors": "^2.8.5",
+    "dotenv": "^16.0.3",
+    "env-var": "^7.3.0",
+    "express": "^4.18.2",
+    "fast-glob": "^3.3.1",
+    "graphql": "^16.8.0",
+    "graphql-ws": "^5.14.0",
+    "jsonwebtoken": "^8.5.1",
+    "jwks-rsa": "^3.0.0",
+    "lru-cache": "^10.0.0",
+    "mssql": "^10.0.2",
+    "reflect-metadata": "^0.1.13",
+    "rxjs": "^7.8.1",
+    "type-graphql": "2.0.0-beta.3",
+    "typedi": "^0.10.0",
+    "typeorm": "^0.3.20",
+    "ws": "^8.13.0",
+    "zod": "^3.22.4"
+  },
+  "devDependencies": {
+    "@typescript-eslint/eslint-plugin": "^5.46.1",
+    "@typescript-eslint/parser": "^5.46.1",
+    "concurrently": "^7.6.0",
+    "cpy-cli": "^4.2.0",
+    "eslint": "^8.29.0",
+    "eslint-config-airbnb": "^19.0.4",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-import-resolver-typescript": "^3.5.2",
+    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-jsx-a11y": "^6.6.1",
+    "eslint-plugin-prettier": "^4.2.1",
+    "prettier": "^2.8.1",
+    "rimraf": "^4.4.0",
+    "ts-node": "^10.9.1",
+    "ts-node-dev": "^2.0.0",
+    "typescript": "^5.3.3"
+  }
+}

package/src/apolloServer/TransactionPlugin.ts

@@ -1,57 +1,57 @@
-import { ApolloServerPlugin, GraphQLRequestContextDidEncounterErrors, GraphQLRequestListenerParsingDidEnd } from '@apollo/server';
-import { DataSource } from 'typeorm';
-import { AppContext } from '../types';
-
-export const TransactionPlugin: ApolloServerPlugin<AppContext> = {
-  async requestDidStart(requestContext) {
-    const start = Date.now();
-    const query = requestContext.request.query || '';
-    const isMutation = /^\s*mutation\b/i.test(query);
-
-    if (!isMutation) {
-      return null;
-    }
-
-    // Start transaction, one or more mutations. If it is just one mutation, this trans wrapper isn't really needed
-    // but there's no good way to know if it's one or more mutations, so we just start a transaction anyway and it isn't terribly expensive
-    // to do so with SQL Server anyway.
-    const dataSource: DataSource = requestContext.contextValue.dataSource;
-    const queryRunner = dataSource.createQueryRunner();
-
-    requestContext.contextValue.queryRunner = queryRunner;
-    console.log('Starting transaction wrapper, time spent: ', Date.now() - start, 'ms ');
-    await queryRunner.startTransaction();
-
-    return {
-      didEncounterErrors: async (requestContext) => {
-        console.log('Error in transaction wrapper: ' + requestContext.errors, 'time spent: ', Date.now() - start, 'ms');
-      },
-      executionDidStart: async () => {
-        return {
-          executionDidEnd: async (err) => {
-            try {
-              if (err) {
-                console.log(
-                  'Error in transaction, rolling back, time spent: ',
-                  Date.now() - start,
-                  'ms '
-                );
-                console.error('Rolling back transaction', err);
-                await queryRunner.rollbackTransaction();
-              } else {
-                console.log('Committing transaction, time spent: ', Date.now() - start, 'ms ');
-                await queryRunner.commitTransaction();
-              }
-            } catch (execErr) {
-              console.log('Execution Error, time spent: ', Date.now() - start, 'ms ');
-              console.error(execErr);
-            } finally {
-              await queryRunner.release();
-              console.log('Transaction complete, time spent: ', Date.now() - start, 'ms ');
-            }
-          },
-        };
-      },
-    };
-  },
-};
+import { ApolloServerPlugin, GraphQLRequestContextDidEncounterErrors, GraphQLRequestListenerParsingDidEnd } from '@apollo/server';
+import { DataSource } from 'typeorm';
+import { AppContext } from '../types';
+
+export const TransactionPlugin: ApolloServerPlugin<AppContext> = {
+  async requestDidStart(requestContext) {
+    const start = Date.now();
+    const query = requestContext.request.query || '';
+    const isMutation = /^\s*mutation\b/i.test(query);
+
+    if (!isMutation) {
+      return null;
+    }
+
+    // Start transaction, one or more mutations. If it is just one mutation, this trans wrapper isn't really needed
+    // but there's no good way to know if it's one or more mutations, so we just start a transaction anyway and it isn't terribly expensive
+    // to do so with SQL Server anyway.
+    const dataSource: DataSource = requestContext.contextValue.dataSource;
+    const queryRunner = dataSource.createQueryRunner();
+
+    requestContext.contextValue.queryRunner = queryRunner;
+    console.log('Starting transaction wrapper, time spent: ', Date.now() - start, 'ms ');
+    await queryRunner.startTransaction();
+
+    return {
+      didEncounterErrors: async (requestContext) => {
+        console.log('Error in transaction wrapper: ' + requestContext.errors, 'time spent: ', Date.now() - start, 'ms');
+      },
+      executionDidStart: async () => {
+        return {
+          executionDidEnd: async (err) => {
+            try {
+              if (err) {
+                console.log(
+                  'Error in transaction, rolling back, time spent: ',
+                  Date.now() - start,
+                  'ms '
+                );
+                console.error('Rolling back transaction', err);
+                await queryRunner.rollbackTransaction();
+              } else {
+                console.log('Committing transaction, time spent: ', Date.now() - start, 'ms ');
+                await queryRunner.commitTransaction();
+              }
+            } catch (execErr) {
+              console.log('Execution Error, time spent: ', Date.now() - start, 'ms ');
+              console.error(execErr);
+            } finally {
+              await queryRunner.release();
+              console.log('Transaction complete, time spent: ', Date.now() - start, 'ms ');
+            }
+          },
+        };
+      },
+    };
+  },
+};

package/src/apolloServer/index.ts

@@ -1,34 +1,34 @@
-import { ApolloServer, ApolloServerOptions } from '@apollo/server';
-import { ApolloServerPluginDrainHttpServer } from '@apollo/server/plugin/drainHttpServer';
-import { PubSub } from 'graphql-subscriptions';
-import { Disposable } from 'graphql-ws';
-import { Server } from 'http';
-import { enableIntrospection } from '../config';
-import { AppContext } from '../types';
-import { TransactionPlugin } from './TransactionPlugin';
-
-const buildApolloServer = (
-  configOverride: ApolloServerOptions<AppContext>,
-  { httpServer, serverCleanup }: { httpServer: Server; serverCleanup: Disposable }
-) =>
-  new ApolloServer({
-    csrfPrevention: true,
-    cache: 'bounded',
-    plugins: [
-      ApolloServerPluginDrainHttpServer({ httpServer }),
-      TransactionPlugin,
-      {
-        async serverWillStart() {
-          return {
-            async drainServer() {
-              await serverCleanup.dispose();
-            },
-          };
-        },
-      },
-    ],
-    introspection: enableIntrospection,
-    ...configOverride,
-  });
-
+import { ApolloServer, ApolloServerOptions } from '@apollo/server';
+import { ApolloServerPluginDrainHttpServer } from '@apollo/server/plugin/drainHttpServer';
+import { PubSub } from 'graphql-subscriptions';
+import { Disposable } from 'graphql-ws';
+import { Server } from 'http';
+import { enableIntrospection } from '../config';
+import { AppContext } from '../types';
+import { TransactionPlugin } from './TransactionPlugin';
+
+const buildApolloServer = (
+  configOverride: ApolloServerOptions<AppContext>,
+  { httpServer, serverCleanup }: { httpServer: Server; serverCleanup: Disposable }
+) =>
+  new ApolloServer({
+    csrfPrevention: true,
+    cache: 'bounded',
+    plugins: [
+      ApolloServerPluginDrainHttpServer({ httpServer }),
+      TransactionPlugin,
+      {
+        async serverWillStart() {
+          return {
+            async drainServer() {
+              await serverCleanup.dispose();
+            },
+          };
+        },
+      },
+    ],
+    introspection: enableIntrospection,
+    ...configOverride,
+  });
+
 export default buildApolloServer;

package/src/auth/exampleNewUserSubClass.ts

@@ -1,74 +1,74 @@
-import { RegisterClass } from "@memberjunction/global";
-import { Metadata, RunView, LogError } from "@memberjunction/core";
-import { NewUserBase } from "./newUsers";
-import { UserCache } from "@memberjunction/sqlserver-dataprovider";
-import { configInfo } from "../config";
-
-/**
- * This example class subclasses the @NewUserBase class and overrides the createNewUser method to create a new person record and then call the base class to create the user record. In this example there is an entity
- * called "Persons" that is mapped to the User table in the core MemberJunction schema. You can sub-class the NewUserBase to do whatever behavior you want and pre-process, post-process or entirely override the base
- * class behavior.
- */
-// NOTE: This is commented out becuase it is turned off by default. To make this work, you'd have to do a real implementation below, and then uncomment this decorator
-//       so that your class is actually used.
-//@RegisterClass(NewUserBase, undefined, 1) /*by putting 1 into the priority setting, MJGlobal ClassFactory will use this instead of the base class as that registration had no priority*/
-export class ExampleNewUserSubClass extends NewUserBase {
-    public override async createNewUser(firstName: string, lastName: string, email: string) {
-        try {
-            const md = new Metadata();
-            const contextUser = UserCache.Instance.Users.find(u => u.Email.trim().toLowerCase() === configInfo?.userHandling?.contextUserForNewUserCreation?.trim().toLowerCase())
-            if(!contextUser) {
-                LogError(`Failed to load context user ${configInfo?.userHandling?.contextUserForNewUserCreation}, if you've not specified this on your config.json you must do so. This is the user that is contextually used for creating a new user record dynamically.`);
-                return undefined;
-            }
-
-            const pEntity = md.Entities.find(e => e.Name === 'Persons'); // look up the entity info for the Persons entity
-            if (!pEntity) {
-                LogError('Failed to find Persons entity');
-                return undefined;
-            }
-
-            let personId;
-            // this block of code only executes if we have an entity called Persons
-            const rv = new RunView();
-            const viewResults = await rv.RunView({
-                EntityName: 'Persons',
-                ExtraFilter: `Email = '${email}'`
-            }, contextUser)
-    
-            if (viewResults && viewResults.Success && Array.isArray(viewResults.Results) && viewResults.Results.length > 0) {
-                // we have a match so use it
-                const row = (viewResults.Results as { ID: number }[])[0]; // we know the rows will have an ID number
-                personId = row['ID'];
-            }
-    
-            if (!personId) {
-                // we don't have a match so create a new person record
-                const p = await md.GetEntityObject('Persons', contextUser);
-                p.NewRecord(); // assumes we have an entity called Persons that has FirstName/LastName/Email fields
-                // this code is commented out because we don't have a strongly typed sub-class generatd for this "Persons" entity as it is a demo/hypothetical example
-                //p.FirstName = firstName;
-                //p.LastName = lastName;
-                //p.Email = email;
-                //p.Status = 'active';
-                if (await p.Save()) {
-                    personId = p.PrimaryKey.Value; // if we had a strongly typed sub-class above, we could use this code p.ID;
-                }   
-                else {
-                    LogError(`Failed to create new person ${firstName} ${lastName} ${email}`)
-                }
-            }
-    
-            // now call the base class to create the user, and pass in our LinkedRecordType and ID
-            return super.createNewUser(firstName, lastName, email, 'Other', pEntity?.ID, personId);        
-        }
-        catch (e) {
-            LogError(`Error creating new user ${email} ${e}`);
-            return undefined;
-        }
-    }
-}
-
-export function LoadExampleNewUserSubClass() {
-    // do nothing, just having this forces the above class to get registered via its @RegisterClass decorator
+import { RegisterClass } from "@memberjunction/global";
+import { Metadata, RunView, LogError } from "@memberjunction/core";
+import { NewUserBase } from "./newUsers";
+import { UserCache } from "@memberjunction/sqlserver-dataprovider";
+import { configInfo } from "../config";
+
+/**
+ * This example class subclasses the @NewUserBase class and overrides the createNewUser method to create a new person record and then call the base class to create the user record. In this example there is an entity
+ * called "Persons" that is mapped to the User table in the core MemberJunction schema. You can sub-class the NewUserBase to do whatever behavior you want and pre-process, post-process or entirely override the base
+ * class behavior.
+ */
+// NOTE: This is commented out becuase it is turned off by default. To make this work, you'd have to do a real implementation below, and then uncomment this decorator
+//       so that your class is actually used.
+//@RegisterClass(NewUserBase, undefined, 1) /*by putting 1 into the priority setting, MJGlobal ClassFactory will use this instead of the base class as that registration had no priority*/
+export class ExampleNewUserSubClass extends NewUserBase {
+    public override async createNewUser(firstName: string, lastName: string, email: string) {
+        try {
+            const md = new Metadata();
+            const contextUser = UserCache.Instance.Users.find(u => u.Email.trim().toLowerCase() === configInfo?.userHandling?.contextUserForNewUserCreation?.trim().toLowerCase())
+            if(!contextUser) {
+                LogError(`Failed to load context user ${configInfo?.userHandling?.contextUserForNewUserCreation}, if you've not specified this on your config.json you must do so. This is the user that is contextually used for creating a new user record dynamically.`);
+                return undefined;
+            }
+
+            const pEntity = md.Entities.find(e => e.Name === 'Persons'); // look up the entity info for the Persons entity
+            if (!pEntity) {
+                LogError('Failed to find Persons entity');
+                return undefined;
+            }
+
+            let personId;
+            // this block of code only executes if we have an entity called Persons
+            const rv = new RunView();
+            const viewResults = await rv.RunView({
+                EntityName: 'Persons',
+                ExtraFilter: `Email = '${email}'`
+            }, contextUser)
+    
+            if (viewResults && viewResults.Success && Array.isArray(viewResults.Results) && viewResults.Results.length > 0) {
+                // we have a match so use it
+                const row = (viewResults.Results as { ID: number }[])[0]; // we know the rows will have an ID number
+                personId = row['ID'];
+            }
+    
+            if (!personId) {
+                // we don't have a match so create a new person record
+                const p = await md.GetEntityObject('Persons', contextUser);
+                p.NewRecord(); // assumes we have an entity called Persons that has FirstName/LastName/Email fields
+                // this code is commented out because we don't have a strongly typed sub-class generatd for this "Persons" entity as it is a demo/hypothetical example
+                //p.FirstName = firstName;
+                //p.LastName = lastName;
+                //p.Email = email;
+                //p.Status = 'active';
+                if (await p.Save()) {
+                    personId = p.PrimaryKey.Value; // if we had a strongly typed sub-class above, we could use this code p.ID;
+                }   
+                else {
+                    LogError(`Failed to create new person ${firstName} ${lastName} ${email}`)
+                }
+            }
+    
+            // now call the base class to create the user, and pass in our LinkedRecordType and ID
+            return super.createNewUser(firstName, lastName, email, 'Other', pEntity?.ID, personId);        
+        }
+        catch (e) {
+            LogError(`Error creating new user ${email} ${e}`);
+            return undefined;
+        }
+    }
+}
+
+export function LoadExampleNewUserSubClass() {
+    // do nothing, just having this forces the above class to get registered via its @RegisterClass decorator
 }