@memberjunction/server 1.8.1 → 2.0.0

package/CHANGELOG.json

@@ -2,7 +2,7 @@
   "name": "@memberjunction/server",
   "entries": [
     {
-      "date": "Fri, 21 Jun 2024 13:12:39 GMT",
+      "date": "Fri, 21 Jun 2024 13:15:28 GMT",
       "version": "1.8.1",
       "tag": "@memberjunction/server_v1.8.1",
       "comments": {

package/CHANGELOG.md

@@ -1,12 +1,12 @@
 # Change Log - @memberjunction/server
 
-This log was last generated on Fri, 21 Jun 2024 13:12:39 GMT and should not be manually modified.
+This log was last generated on Fri, 21 Jun 2024 13:15:28 GMT and should not be manually modified.
 
 <!-- Start content -->
 
 ## 1.8.1
 
-Fri, 21 Jun 2024 13:12:39 GMT
+Fri, 21 Jun 2024 13:15:28 GMT
 
 ### Patches
 

package/package.json

@@ -1,46 +1,40 @@
 {
   "name": "@memberjunction/server",
-  "version": "1.8.1",
+  "version": "2.0.0",
   "description": "MemberJunction: This project provides API access via GraphQL to the common data store.",
-  "main": "dist/index.js",
-  "types": "src/index.ts",
+  "main": "./dist/index.js",
+  "types": "./src/index.ts",
+  "type": "module",
   "author": "MemberJunction.com",
   "license": "ISC",
   "scripts": {
-    "clean": "rimraf dist",
     "build": "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"
+    "bundle": "tsc -noEmit && pkgroll --sourcemap --minify",
+    "watch": "tsc -w"
   },
   "dependencies": {
     "@apollo/server": "^4.9.1",
     "@graphql-tools/utils": "^10.0.1",
-    "@memberjunction/actions": "1.8.1",
-    "@memberjunction/ai": "1.8.1",
-    "@memberjunction/ai-mistral": "1.8.1",
-    "@memberjunction/ai-openai": "1.8.1",
-    "@memberjunction/ai-vectors-pinecone": "1.8.1",
-    "@memberjunction/aiengine": "1.8.1",
-    "@memberjunction/core": "1.8.1",
-    "@memberjunction/core-actions": "1.8.1",
-    "@memberjunction/core-entities": "1.8.1",
-    "@memberjunction/data-context": "1.8.1",
-    "@memberjunction/data-context-server": "1.8.1",
-    "@memberjunction/doc-utils": "1.8.1",
-    "@memberjunction/global": "1.8.1",
-    "@memberjunction/queue": "1.8.1",
-    "@memberjunction/skip-types": "1.8.1",
-    "@memberjunction/sqlserver-dataprovider": "1.8.1",
-    "@memberjunction/storage": "1.8.1",
-    "@memberjunction/templates": "1.8.1",
-    "@memberjunction/external-change-detection": "1.8.1",
-    "@memberjunction/entity-communications-server": "1.8.1",
+    "@memberjunction/actions": "2.0.0",
+    "@memberjunction/ai": "2.0.0",
+    "@memberjunction/ai-mistral": "2.0.0",
+    "@memberjunction/ai-openai": "2.0.0",
+    "@memberjunction/ai-vectors-pinecone": "2.0.0",
+    "@memberjunction/aiengine": "2.0.0",
+    "@memberjunction/core": "2.0.0",
+    "@memberjunction/core-actions": "2.0.0",
+    "@memberjunction/core-entities": "2.0.0",
+    "@memberjunction/data-context": "2.0.0",
+    "@memberjunction/data-context-server": "2.0.0",
+    "@memberjunction/doc-utils": "2.0.0",
+    "@memberjunction/entity-communications-server": "2.0.0",
+    "@memberjunction/external-change-detection": "2.0.0",
+    "@memberjunction/global": "2.0.0",
+    "@memberjunction/queue": "2.0.0",
+    "@memberjunction/skip-types": "2.0.0",
+    "@memberjunction/sqlserver-dataprovider": "2.0.0",
+    "@memberjunction/storage": "2.0.0",
+    "@memberjunction/templates": "2.0.0",
     "@types/cors": "^2.8.13",
     "@types/jsonwebtoken": "9.0.6",
     "@types/node": "20.14.2",
@@ -54,8 +48,10 @@
     "express": "^4.18.2",
     "fast-glob": "^3.3.1",
     "graphql": "^16.8.0",
-    "graphql-ws": "^5.14.0",
+    "graphql-scalars": "^1.23.0",
+    "graphql-subscriptions": "^2.0.0",
     "graphql-type-json": "0.3.2",
+    "graphql-ws": "^5.14.0",
     "jsonwebtoken": "9.0.2",
     "jwks-rsa": "^3.0.0",
     "lru-cache": "^10.0.0",
@@ -69,12 +65,7 @@
     "zod": "^3.23.4"
   },
   "devDependencies": {
-    "concurrently": "8.2.2",
-    "cpy-cli": "^5.0.0",
-    "prettier": "^3.3.1",
-    "rimraf": "5.0.7",
-    "ts-node": "^10.9.2",
-    "ts-node-dev": "^2.0.0",
+    "pkgroll": "2.1.1",
     "typescript": "^5.4.5"
   }
 }

package/src/apolloServer/index.ts

@@ -1,6 +1,5 @@
 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';

package/src/auth/newUsers.ts

@@ -6,7 +6,7 @@ import { UserEntity, UserRoleEntity } from "@memberjunction/core-entities";
 
 @RegisterClass(NewUserBase)
 export class NewUserBase {
-    public async createNewUser(firstName: string, lastName: string, email: string, linkedRecordType: string = 'None', linkedEntityId?: number, linkedEntityRecordId?: number) {
+    public async createNewUser(firstName: string, lastName: string, email: string, linkedRecordType: string = 'None', linkedEntityId?: string, linkedEntityRecordId?: string) {
         try {
             const md = new Metadata();
             const contextUser = UserCache.Instance.Users.find(u => u.Email.trim().toLowerCase() === configInfo?.userHandling?.contextUserForNewUserCreation?.trim().toLowerCase())
@@ -30,12 +30,13 @@ export class NewUserBase {
 
             if (await u.Save()) {
                 // user created, now create however many roles we need to create for this user based on the config settings
-                const ur = <UserRoleEntity>await md.GetEntityObject('User Roles', contextUser);
+                const ur = await md.GetEntityObject<UserRoleEntity>('User Roles', contextUser);
                 let bSuccess: boolean = true;
                 for (const role of configInfo.userHandling.newUserRoles) {
                     ur.NewRecord();
                     ur.UserID = u.ID;
-                    ur.RoleName = role;
+                    const roleID = md.Roles.find(r => r.Name === role)?.ID; 
+                    ur.RoleID = roleID;
                     bSuccess = bSuccess && await ur.Save();
                 }
                 if (!bSuccess) {

package/src/context.ts

@@ -1,6 +1,6 @@
 import { IncomingMessage } from 'http';
 import * as url from 'url';
-import { JwtPayload, VerifyOptions, decode, verify } from 'jsonwebtoken';
+import { default as jwt } from 'jsonwebtoken';
 import 'reflect-metadata';
 import { Subject, firstValueFrom } from 'rxjs';
 import { AuthenticationError, AuthorizationError } from 'type-graphql';
@@ -11,21 +11,13 @@ import { userEmailMap } from './config';
 import { UserPayload } from './types';
 import { TokenExpiredError } from './auth';
 
-const verifyAsync = async (
-  issuer: string,
-  options: VerifyOptions,
-  token: string
-): Promise<JwtPayload> =>
+const verifyAsync = async (issuer: string, options: jwt.VerifyOptions, token: string): Promise<jwt.JwtPayload> =>
   new Promise((resolve, reject) => {
-    verify(token, getSigningKeys(issuer), options, (err, jwt) => {
+    jwt.verify(token, getSigningKeys(issuer), options, (err, jwt) => {
       if (jwt && typeof jwt !== 'string' && !err) {
         const payload = jwt.payload ?? jwt;
 
-        console.log(
-          `Valid token: ${payload.name} (${
-            payload.email ? payload.email : payload.preferred_username
-          })`
-        ); // temporary fix to check preferred_username if email is not present
+        console.log(`Valid token: ${payload.name} (${payload.email ? payload.email : payload.preferred_username})`); // temporary fix to check preferred_username if email is not present
         resolve(payload);
       } else {
         console.warn('Invalid token');
@@ -48,12 +40,12 @@ export const getUserPayload = async (
       throw new AuthenticationError('Missing token');
     }
 
-    const payload = decode(token);
+    const payload = jwt.decode(token);
     if (!payload || typeof payload === 'string') {
       throw new AuthenticationError('Invalid token payload');
     }
 
-    const expiryDate = new Date( (payload.exp ?? 0) * 1000);
+    const expiryDate = new Date((payload.exp ?? 0) * 1000);
     if (expiryDate.getTime() <= Date.now()) {
       throw new TokenExpiredError(expiryDate);
     }
@@ -69,19 +61,16 @@ export const getUserPayload = async (
       authCache.set(token, true);
     }
 
-    const email = payload?.email
-      ? userEmailMap[payload?.email] ?? payload?.email
-      : payload?.preferred_username; // temporary fix to check preferred_username if email is not present
+    const email = payload?.email ? userEmailMap[payload?.email] ?? payload?.email : payload?.preferred_username; // temporary fix to check preferred_username if email is not present
     const fullName = payload?.name;
     const firstName = payload?.given_name || fullName?.split(' ')[0];
     const lastName = payload?.family_name || fullName?.split(' ')[1] || fullName?.split(' ')[0];
     const userRecord = await verifyUserRecord(email, firstName, lastName, requestDomain, dataSource);
 
     if (!userRecord) {
-      console.error(`User ${email} not found`); 
+      console.error(`User ${email} not found`);
       throw new AuthorizationError();
-    }
-    else if (!userRecord.IsActive) {
+    } else if (!userRecord.IsActive) {
       console.error(`User ${email} found but inactive`);
       throw new AuthorizationError();
     }
@@ -91,9 +80,7 @@ export const getUserPayload = async (
     console.error(e);
     if (e instanceof TokenExpiredError) {
       throw e;
-    }
-    else
-      return {} as UserPayload;
+    } else return {} as UserPayload;
   }
 };
 
@@ -103,17 +90,22 @@ export const contextFunction =
     await firstValueFrom(setupComplete$); // wait for setup to complete before processing the request
 
     const sessionIdRaw = req.headers['x-session-id'];
-    const requestDomain = url.parse(req.headers.origin || '')
+    const requestDomain = url.parse(req.headers.origin || '');
     const sessionId = sessionIdRaw ? sessionIdRaw.toString() : '';
     const bearerToken = req.headers.authorization ?? '';
 
-    const userPayload = await getUserPayload(bearerToken, sessionId, dataSource, requestDomain?.hostname ? requestDomain.hostname : undefined);
+    const userPayload = await getUserPayload(
+      bearerToken,
+      sessionId,
+      dataSource,
+      requestDomain?.hostname ? requestDomain.hostname : undefined
+    );
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const operationName: string| undefined = (req as any).body?.operationName;
+    const operationName: string | undefined = (req as any).body?.operationName;
     if (operationName !== 'IntrospectionQuery') {
       console.log({ operationName });
-    } 
+    }
 
     return { dataSource, userPayload };
   };

package/src/entitySubclasses/entityPermissions.server.ts

@@ -10,7 +10,7 @@ import { ___codeGenAPIPort, ___codeGenAPISubmissionDelay, ___codeGenAPIURL } fro
  */
 @RegisterClass(BaseEntity, 'Entity Permissions', 3)  
 export class EntityPermissionsEntity_Server extends EntityPermissionEntity  {
-    protected static _entityIDQueue: number[] = [];
+    protected static _entityIDQueue: string[] = [];
     protected static _lastModifiedTime: Date | null = null;
     protected static _submissionTimer: NodeJS.Timeout | null = null;
     protected static _submissionDelay: number = ___codeGenAPISubmissionDelay;  
@@ -23,7 +23,7 @@ export class EntityPermissionsEntity_Server extends EntityPermissionEntity  {
         return `${this._baseURL}:${this._port}${this._apiEndpoint}`;
     }
 
-    public static get EntityIDQueue(): number[] { 
+    public static get EntityIDQueue(): string[] { 
         return this._entityIDQueue; 
     }
 
@@ -31,7 +31,7 @@ export class EntityPermissionsEntity_Server extends EntityPermissionEntity  {
         this._entityIDQueue = [];
         this._submissionTimer = null;
     }
-    public static AddToQueue(entityID: number): void {
+    public static AddToQueue(entityID: string): void {
         if (this._entityIDQueue.indexOf(entityID) === -1)
             this._entityIDQueue.push(entityID); 
         this._lastModifiedTime = new Date();