npm - @memberjunction/server - Versions diffs - 2.20.0 → 2.20.2 - Mend

@memberjunction/server 2.20.0 → 2.20.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

package/dist/index.d.ts +5 -1
package/dist/index.d.ts.map +1 -1
package/dist/index.js +5 -1
package/dist/index.js.map +1 -1
package/dist/resolvers/SyncRolesUsersResolver.d.ts +46 -0
package/dist/resolvers/SyncRolesUsersResolver.d.ts.map +1 -0
package/dist/resolvers/SyncRolesUsersResolver.js +389 -0
package/dist/resolvers/SyncRolesUsersResolver.js.map +1 -0
package/package.json +22 -22
package/src/index.ts +10 -1
package/src/resolvers/SyncRolesUsersResolver.ts +401 -0

package/dist/index.d.ts CHANGED Viewed

@@ -22,7 +22,11 @@ export * from './resolvers/DatasetResolver.js';
 export * from './resolvers/EntityRecordNameResolver.js';
 export * from './resolvers/MergeRecordsResolver.js';
 export * from './resolvers/ReportResolver.js';
+export * from './resolvers/SyncRolesUsersResolver.js';
 export * from './generated/generated.js';
+export type MJServerOptions = {
+    onBeforeServe?: () => void | Promise<void>;
+};
 export declare const createApp: () => import("express-serve-static-core").Express;
-export declare const serve: (resolverPaths: Array<string>, app?: import("express-serve-static-core").Express) => Promise<void>;
+export declare const serve: (resolverPaths: Array<string>, app?: import("express-serve-static-core").Express, options?: MJServerOptions) => Promise<void>;
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAgBA,OAAO,kBAAkB,CAAC;AAqB1B,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,cAAc,cAAc,CAAC;AAC7B,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,cAAc,uBAAuB,CAAC;AACtC,cAAc,6CAA6C,CAAC;AAC5D,cAAc,gDAAgD,CAAC;AAC/D,cAAc,iDAAiD,CAAC;AAChE,cAAc,2CAA2C,CAAC;AAC1D,cAAc,YAAY,CAAC;AAC3B,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEnE,cAAc,iCAAiC,CAAC;AAChD,cAAc,2BAA2B,CAAC;AAC1C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,kCAAkC,CAAC;AACjD,cAAc,iCAAiC,CAAC;AAEhD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,yCAAyC,CAAC;AACxD,cAAc,qCAAqC,CAAC;AACpD,cAAc,+BAA+B,CAAC;~~AAE9C~~,cAAc,0BAA0B,CAAC;~~AAYzC~~,eAAO,MAAM,SAAS,mDAAkB,CAAC;AAEzC,eAAO,MAAM,KAAK,kBAAyB,MAAM,MAAM,CAAC~~,qEA~~+~~FvD~~,CAAC"}
1	+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAgBA,OAAO,kBAAkB,CAAC;AAqB1B,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,cAAc,cAAc,CAAC;AAC7B,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,cAAc,uBAAuB,CAAC;AACtC,cAAc,6CAA6C,CAAC;AAC5D,cAAc,gDAAgD,CAAC;AAC/D,cAAc,iDAAiD,CAAC;AAChE,cAAc,2CAA2C,CAAC;AAC1D,cAAc,YAAY,CAAC;AAC3B,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEnE,cAAc,iCAAiC,CAAC;AAChD,cAAc,2BAA2B,CAAC;AAC1C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,kCAAkC,CAAC;AACjD,cAAc,iCAAiC,CAAC;AAEhD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,yCAAyC,CAAC;AACxD,cAAc,qCAAqC,CAAC;AACpD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,uCAAuC,CAAC;AAEtD,cAAc,0BAA0B,CAAC;AAIzC,MAAM,MAAM,eAAe,GAAG;IAC5B,aAAa,CAAC,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5C,CAAC;AAUF,eAAO,MAAM,SAAS,mDAAkB,CAAC;AAEzC,eAAO,MAAM,KAAK,kBAAyB,MAAM,MAAM,CAAC,+DAA+B,eAAe,kBAmGrG,CAAC"}

package/dist/index.js CHANGED Viewed

@@ -50,6 +50,7 @@ export * from './resolvers/DatasetResolver.js';
 export * from './resolvers/EntityRecordNameResolver.js';
 export * from './resolvers/MergeRecordsResolver.js';
 export * from './resolvers/ReportResolver.js';
+export * from './resolvers/SyncRolesUsersResolver.js';
 export * from './generated/generated.js';
 import { resolve } from 'node:path';
 const localPath = (p) => {
@@ -58,7 +59,7 @@ const localPath = (p) => {
     return resolvedPath;
 };
 export const createApp = () => express();
-export const serve = async (resolverPaths, app = createApp()) => {
+export const serve = async (resolverPaths, app = createApp(), options) => {
     const localResolverPaths = ['resolvers/**/*Resolver.{js,ts}', 'generic/*Resolver.{js,ts}', 'generated/generated.{js,ts}'].map(localPath);
     const combinedResolverPaths = [...resolverPaths, ...localResolverPaths];
     const isWindows = sep === '\\';
@@ -114,6 +115,9 @@ export const serve = async (resolverPaths, app = createApp()) => {
     app.use(graphqlRootPath, cors(), BodyParser.json({ limit: '50mb' }), expressMiddleware(apolloServer, {
         context: contextFunction({ setupComplete$, dataSource }),
     }));
+    if (options?.onBeforeServe) {
+        await Promise.resolve(options.onBeforeServe());
+    }
     await new Promise((resolve) => httpServer.listen({ port: graphqlPort }, resolve));
     console.log(`🚀 Server ready at http://localhost:${graphqlPort}/`);
 };

package/dist/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,MAAM,CAAC,MAAM,EAAE,CAAC;AAEhB,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAE,2BAA2B,EAAa,MAAM,wCAAwC,CAAC;AACtH,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,OAAO,IAAI,EAAE,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAChC,OAAO,kBAAkB,CAAC;AAC1B,OAAO,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;AACrC,OAAO,EAAsB,eAAe,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACrF,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,eAAe,EAAE,MAAM,IAAI,CAAC;AACrC,OAAO,iBAAiB,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,eAAe,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAC9G,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC/D,OAAO,EAAE,0BAA0B,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACpF,OAAO,GAAG,MAAM,UAAU,CAAC;AAE3B,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACjE,sBAAsB,EAAE,CAAC;AAEzB,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,oBAAoB,EAAE,CAAC;AAIvB,MAAM,oBAAoB,GAAG,UAAU,CAAC,gBAAgB,CAAC,4BAA4B,CAAC;AAEtF,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,cAAc,cAAc,CAAC;AAC7B,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,cAAc,uBAAuB,CAAC;AACtC,cAAc,6CAA6C,CAAC;AAC5D,cAAc,gDAAgD,CAAC;AAC/D,cAAc,iDAAiD,CAAC;AAChE,cAAc,2CAA2C,CAAC;AAC1D,cAAc,YAAY,CAAC;AAC3B,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEnE,cAAc,iCAAiC,CAAC;AAChD,cAAc,2BAA2B,CAAC;AAC1C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,kCAAkC,CAAC;AACjD,cAAc,iCAAiC,CAAC;AAEhD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,yCAAyC,CAAC;AACxD,cAAc,qCAAqC,CAAC;AACpD,cAAc,+BAA+B,CAAC;~~AAE9C~~,cAAc,0BAA0B,CAAC;AAEzC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;~~AAEpC~~,MAAM,SAAS,GAAG,CAAC,CAAS,EAAE,EAAE;IAE9B,MAAM,OAAO,GAAG,aAAa,CAAC,IAAI,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IAE7D,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IACzC,OAAO,YAAY,CAAC;AACtB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,SAAS,GAAG,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;AAEzC,MAAM,CAAC,MAAM,KAAK,GAAG,KAAK,EAAE,aAA4B,EAAE,GAAG,GAAG,SAAS,EAAE,EAAE,EAAE;~~IAC7E~~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"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/resolvers/SyncRolesUsersResolver.d.ts ADDED Viewed

@@ -0,0 +1,46 @@
+import { AppContext } from '../types.js';
+import { RunView, UserInfo } from '@memberjunction/core';
+import { RoleEntity, UserEntity } from '@memberjunction/core-entities';
+export declare class SyncRolesAndUsersResultType {
+    Success: boolean;
+}
+export declare class RoleInputType {
+    ID: string;
+    Name: string;
+    Description: string;
+}
+export declare enum UserType {
+    Owner = "Owner",
+    User = "User"
+}
+export declare class UserInputType {
+    ID: string;
+    Name: string;
+    Email: string;
+    Type: UserType;
+    FirstName: string;
+    LastName: string;
+    Title: string;
+    Roles?: RoleInputType[];
+}
+export declare class RolesAndUsersInputType {
+    Users: UserInputType[];
+    Roles: RoleInputType[];
+}
+export declare class SyncRolesAndUsersResolver {
+    SyncRolesAndUsers(data: RolesAndUsersInputType, context: AppContext): Promise<SyncRolesAndUsersResultType>;
+    SyncRoles(roles: RoleInputType[], context: AppContext): Promise<SyncRolesAndUsersResultType>;
+    protected UpdateExistingRoles(currentRoles: RoleEntity[], futureRoles: RoleInputType[], user: UserInfo): Promise<SyncRolesAndUsersResultType>;
+    protected AddNewRoles(currentRoles: RoleEntity[], futureRoles: RoleInputType[], user: UserInfo): Promise<boolean>;
+    protected DeleteRemovedRoles(currentRoles: RoleEntity[], futureRoles: RoleInputType[], user: UserInfo): Promise<boolean>;
+    get StandardRoles(): string[];
+    IsStandardRole(roleName: string): boolean;
+    protected DeleteSingleRole(role: RoleEntity, rv: RunView, user: UserInfo): Promise<boolean>;
+    SyncUsers(users: UserInputType[], context: AppContext): Promise<SyncRolesAndUsersResultType>;
+    protected UpdateExistingUsers(currentUsers: UserEntity[], futureUsers: UserInputType[], u: UserInfo): Promise<boolean>;
+    protected AddNewUsers(currentUsers: UserEntity[], futureUsers: UserInputType[], u: UserInfo): Promise<boolean>;
+    protected DeleteRemovedUsers(currentUsers: UserEntity[], futureUsers: UserInputType[], u: UserInfo): Promise<boolean>;
+    protected DeleteSingleUser(user: UserEntity, rv: RunView, u: UserInfo): Promise<boolean>;
+    protected SyncUserRoles(users: UserInputType[], u: UserInfo): Promise<boolean>;
+}
+//# sourceMappingURL=SyncRolesUsersResolver.d.ts.map

package/dist/resolvers/SyncRolesUsersResolver.d.ts.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"SyncRolesUsersResolver.d.ts","sourceRoot":"","sources":["../../src/resolvers/SyncRolesUsersResolver.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAsB,OAAO,EAAwB,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEnG,OAAO,EAAE,UAAU,EAAE,UAAU,EAAkB,MAAM,+BAA+B,CAAC;AAEvF,qBACa,2BAA2B;IAEtC,OAAO,EAAE,OAAO,CAAC;CAClB;AAGD,qBACa,aAAa;IAEtB,EAAE,EAAE,MAAM,CAAC;IAGX,IAAI,EAAE,MAAM,CAAC;IAGb,WAAW,EAAE,MAAM,CAAC;CACvB;AAGD,oBAAY,QAAQ;IAClB,KAAK,UAAU;IACf,IAAI,SAAS;CACd;AAOD,qBACa,aAAa;IAEtB,EAAE,EAAG,MAAM,CAAC;IAGZ,IAAI,EAAG,MAAM,CAAC;IAGd,KAAK,EAAG,MAAM,CAAC;IAIf,IAAI,EAAG,QAAQ,CAAC;IAGhB,SAAS,EAAE,MAAM,CAAC;IAGlB,QAAQ,EAAE,MAAM,CAAC;IAGjB,KAAK,EAAE,MAAM,CAAC;IAGd,KAAK,CAAC,EAAE,aAAa,EAAE,CAAC;CAC3B;AAGD,qBACa,sBAAsB;IAExB,KAAK,EAAE,aAAa,EAAE,CAAC;IAGvB,KAAK,EAAE,aAAa,EAAE,CAAC;CACjC;AAGD,qBAAa,yBAAyB;IAQ5B,iBAAiB,CACqB,IAAI,EAAE,sBAAsB,EACjE,OAAO,EAAE,UAAU;IAwBpB,SAAS,CACsB,KAAK,EAAE,aAAa,EAAE,EACpD,OAAO,EAAE,UAAU,GACtB,OAAO,CAAC,2BAA2B,CAAC;cA0BxB,mBAAmB,CAAC,YAAY,EAAE,UAAU,EAAE,EAAE,WAAW,EAAE,aAAa,EAAE,EAAE,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,2BAA2B,CAAC;cAenI,WAAW,CAAC,YAAY,EAAE,UAAU,EAAE,EAAE,WAAW,EAAE,aAAa,EAAE,EAAE,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;cAiBvG,kBAAkB,CAAC,YAAY,EAAE,UAAU,EAAE,EAAE,WAAW,EAAE,aAAa,EAAE,EAAE,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;IAe9H,IAAW,aAAa,IAAI,MAAM,EAAE,CAEnC;IACM,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;cAIhC,gBAAgB,CAAC,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;IAwB3F,SAAS,CACsB,KAAK,EAAE,aAAa,EAAE,EACpD,OAAO,EAAE,UAAU,GACtB,OAAO,CAAC,2BAA2B,CAAC;cA8BxB,mBAAmB,CAAC,YAAY,EAAE,UAAU,EAAE,EAAE,WAAW,EAAE,aAAa,EAAE,EAAE,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;cAgB5G,WAAW,CAAC,YAAY,EAAE,UAAU,EAAE,EAAE,WAAW,EAAE,aAAa,EAAE,EAAE,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;cA4BpG,kBAAkB,CAAC,YAAY,EAAE,UAAU,EAAE,EAAE,WAAW,EAAE,aAAa,EAAE,EAAE,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;cAiB3G,gBAAgB,CAAC,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;cAwB9E,aAAa,CAAC,KAAK,EAAE,aAAa,EAAE,EAAE,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;CAiEvF"}

package/dist/resolvers/SyncRolesUsersResolver.js ADDED Viewed

@@ -0,0 +1,389 @@
+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); }
+};
+import { Arg, Ctx, Field, InputType, Mutation, ObjectType, registerEnumType } from 'type-graphql';
+import { LogError, Metadata, RunView } from '@memberjunction/core';
+import { RequireSystemUser } from '../directives/RequireSystemUser.js';
+let SyncRolesAndUsersResultType = class SyncRolesAndUsersResultType {
+    Success;
+};
+__decorate([
+    Field(() => Boolean),
+    __metadata("design:type", Boolean)
+], SyncRolesAndUsersResultType.prototype, "Success", void 0);
+SyncRolesAndUsersResultType = __decorate([
+    ObjectType()
+], SyncRolesAndUsersResultType);
+export { SyncRolesAndUsersResultType };
+let RoleInputType = class RoleInputType {
+    ID;
+    Name;
+    Description;
+};
+__decorate([
+    Field(() => String),
+    __metadata("design:type", String)
+], RoleInputType.prototype, "ID", void 0);
+__decorate([
+    Field(() => String),
+    __metadata("design:type", String)
+], RoleInputType.prototype, "Name", void 0);
+__decorate([
+    Field(() => String, { nullable: true }),
+    __metadata("design:type", String)
+], RoleInputType.prototype, "Description", void 0);
+RoleInputType = __decorate([
+    InputType()
+], RoleInputType);
+export { RoleInputType };
+export var UserType;
+(function (UserType) {
+    UserType["Owner"] = "Owner";
+    UserType["User"] = "User";
+})(UserType || (UserType = {}));
+registerEnumType(UserType, {
+    name: "UserType",
+    description: "Defines whether a user is an Owner or a User",
+});
+let UserInputType = class UserInputType {
+    ID;
+    Name;
+    Email;
+    Type;
+    FirstName;
+    LastName;
+    Title;
+    Roles;
+};
+__decorate([
+    Field(() => String),
+    __metadata("design:type", String)
+], UserInputType.prototype, "ID", void 0);
+__decorate([
+    Field(() => String),
+    __metadata("design:type", String)
+], UserInputType.prototype, "Name", void 0);
+__decorate([
+    Field(() => String),
+    __metadata("design:type", String)
+], UserInputType.prototype, "Email", void 0);
+__decorate([
+    Field(() => UserType),
+    __metadata("design:type", String)
+], UserInputType.prototype, "Type", void 0);
+__decorate([
+    Field(() => String, { nullable: true }),
+    __metadata("design:type", String)
+], UserInputType.prototype, "FirstName", void 0);
+__decorate([
+    Field(() => String, { nullable: true }),
+    __metadata("design:type", String)
+], UserInputType.prototype, "LastName", void 0);
+__decorate([
+    Field(() => String, { nullable: true }),
+    __metadata("design:type", String)
+], UserInputType.prototype, "Title", void 0);
+__decorate([
+    Field(() => [RoleInputType], { nullable: true }),
+    __metadata("design:type", Array)
+], UserInputType.prototype, "Roles", void 0);
+UserInputType = __decorate([
+    InputType()
+], UserInputType);
+export { UserInputType };
+let RolesAndUsersInputType = class RolesAndUsersInputType {
+    Users;
+    Roles;
+};
+__decorate([
+    Field(() => [UserInputType]),
+    __metadata("design:type", Array)
+], RolesAndUsersInputType.prototype, "Users", void 0);
+__decorate([
+    Field(() => [RoleInputType]),
+    __metadata("design:type", Array)
+], RolesAndUsersInputType.prototype, "Roles", void 0);
+RolesAndUsersInputType = __decorate([
+    InputType()
+], RolesAndUsersInputType);
+export { RolesAndUsersInputType };
+export class SyncRolesAndUsersResolver {
+    async SyncRolesAndUsers(data, context) {
+        try {
+            const roleResult = await this.SyncRoles(data.Roles, context);
+            if (roleResult.Success) {
+                return await this.SyncUsers(data.Users, context);
+            }
+            else {
+                return roleResult;
+            }
+        }
+        catch (err) {
+            LogError(err);
+            throw new Error('Error syncing roles and users\n\n' + err);
+        }
+    }
+    async SyncRoles(roles, context) {
+        try {
+            const rv = new RunView();
+            const result = await rv.RunView({
+                EntityName: "Roles",
+                ResultType: 'entity_object'
+            }, context.userPayload.userRecord);
+            if (result && result.Success) {
+                const currentRoles = result.Results;
+                if (await this.DeleteRemovedRoles(currentRoles, roles, context.userPayload.userRecord)) {
+                    if (await this.AddNewRoles(currentRoles, roles, context.userPayload.userRecord)) {
+                        return await this.UpdateExistingRoles(currentRoles, roles, context.userPayload.userRecord);
+                    }
+                }
+            }
+            return { Success: false };
+        }
+        catch (err) {
+            LogError(err);
+            throw new Error('Error syncing roles and users\n\n' + err);
+        }
+    }
+    async UpdateExistingRoles(currentRoles, futureRoles, user) {
+        const md = new Metadata();
+        let ok = true;
+        for (const update of futureRoles) {
+            const currentRole = currentRoles.find(r => r.Name.trim().toLowerCase() === update.Name.trim().toLowerCase());
+            if (currentRole) {
+                currentRole.Description = update.Description;
+                ok = ok && await currentRole.Save();
+            }
+        }
+        return { Success: ok };
+    }
+    async AddNewRoles(currentRoles, futureRoles, user) {
+        const md = new Metadata();
+        let ok = true;
+        for (const add of futureRoles) {
+            if (!currentRoles.find(r => r.Name.trim().toLowerCase() === add.Name.trim().toLowerCase())) {
+                const role = await md.GetEntityObject("Roles", user);
+                role.Name = add.Name;
+                role.Description = add.Description;
+                ok = ok && await role.Save();
+            }
+        }
+        return ok;
+    }
+    async DeleteRemovedRoles(currentRoles, futureRoles, user) {
+        const rv = new RunView();
+        let ok = true;
+        for (const remove of currentRoles) {
+            if (!this.IsStandardRole(remove.Name)) {
+                if (!futureRoles.find(r => r.Name.trim().toLowerCase() === remove.Name.trim().toLowerCase())) {
+                    ok = ok && await this.DeleteSingleRole(remove, rv, user);
+                }
+            }
+        }
+        return ok;
+    }
+    get StandardRoles() {
+        return ['Developer', 'Integration', 'UI'];
+    }
+    IsStandardRole(roleName) {
+        return this.StandardRoles.find(r => r.toLowerCase() === roleName.toLowerCase()) !== undefined;
+    }
+    async DeleteSingleRole(role, rv, user) {
+        let ok = true;
+        const r2 = await rv.RunView({
+            EntityName: "User Roles",
+            ExtraFilter: "RoleID = '" + role.ID + "'",
+            ResultType: 'entity_object'
+        }, user);
+        if (r2.Success) {
+            for (const ur of r2.Results) {
+                ok = ok && await ur.Delete();
+            }
+        }
+        return ok && role.Delete();
+    }
+    async SyncUsers(users, context) {
+        try {
+            const rv = new RunView();
+            const result = await rv.RunView({
+                EntityName: "Users",
+                ResultType: 'entity_object'
+            }, context.userPayload.userRecord);
+            if (result && result.Success) {
+                const currentUsers = result.Results;
+                if (await this.DeleteRemovedUsers(currentUsers, users, context.userPayload.userRecord)) {
+                    if (await this.AddNewUsers(currentUsers, users, context.userPayload.userRecord)) {
+                        if (await this.UpdateExistingUsers(currentUsers, users, context.userPayload.userRecord)) {
+                            if (await this.SyncUserRoles(users, context.userPayload.userRecord)) {
+                                return { Success: true };
+                            }
+                        }
+                    }
+                }
+            }
+            return { Success: false };
+        }
+        catch (err) {
+            LogError(err);
+            throw new Error('Error syncing roles and users\n\n' + err);
+        }
+    }
+    async UpdateExistingUsers(currentUsers, futureUsers, u) {
+        let ok = true;
+        for (const update of futureUsers) {
+            const current = currentUsers.find(c => c.Email?.trim().toLowerCase() === update.Email?.trim().toLowerCase());
+            if (current) {
+                current.Name = update.Name;
+                current.Type = update.Type;
+                current.FirstName = update.FirstName;
+                current.LastName = update.LastName;
+                current.Title = update.Title;
+                ok = ok && await current.Save();
+            }
+        }
+        return ok;
+    }
+    async AddNewUsers(currentUsers, futureUsers, u) {
+        const md = new Metadata();
+        let ok = true;
+        for (const add of futureUsers) {
+            const match = currentUsers.find(currentUser => currentUser.Email?.trim().toLowerCase() === add.Email?.trim().toLowerCase());
+            if (match) {
+                match.IsActive = true;
+                ok = ok && await match.Save();
+            }
+            else {
+                const user = await md.GetEntityObject("Users", u);
+                user.Name = add.Name;
+                user.Type = add.Type;
+                user.Email = add.Email;
+                user.FirstName = add.FirstName;
+                user.LastName = add.LastName;
+                user.Title = add.Title;
+                user.IsActive = true;
+                ok = ok && await user.Save();
+            }
+        }
+        return ok;
+    }
+    async DeleteRemovedUsers(currentUsers, futureUsers, u) {
+        const rv = new RunView();
+        const md = new Metadata();
+        let ok = true;
+        for (const remove of currentUsers) {
+            if (remove.Type.trim().toLowerCase() !== 'owner') {
+                if (!futureUsers.find(r => r.Email.trim().toLowerCase() === remove.Email.trim().toLowerCase())) {
+                    ok = ok && await this.DeleteSingleUser(remove, rv, u);
+                }
+            }
+        }
+        return ok;
+    }
+    async DeleteSingleUser(user, rv, u) {
+        let ok = true;
+        const r2 = await rv.RunView({
+            EntityName: "User Roles",
+            ExtraFilter: "UserID = '" + user.ID + "'",
+            ResultType: 'entity_object'
+        }, u);
+        if (r2.Success) {
+            for (const ur of r2.Results) {
+                ok = ok && await ur.Delete();
+            }
+        }
+        if (await user.Delete()) {
+            return ok;
+        }
+        else {
+            user.IsActive = false;
+            return await user.Save() && ok;
+        }
+    }
+    async SyncUserRoles(users, u) {
+        const rv = new RunView();
+        const md = new Metadata();
+        const p1 = rv.RunView({
+            EntityName: "Users",
+            ResultType: 'entity_object'
+        }, u);
+        const p2 = rv.RunView({
+            EntityName: "Roles",
+            ResultType: 'entity_object'
+        }, u);
+        const p3 = rv.RunView({
+            EntityName: "User Roles",
+            ResultType: 'entity_object'
+        }, u);
+        const [uResult, rResult, urResult] = await Promise.all([p1, p2, p3]);
+        if (uResult.Success && rResult.Success && urResult.Success) {
+            const dbUsers = uResult.Results;
+            const dbRoles = rResult.Results;
+            const dbUserRoles = urResult.Results;
+            let ok = true;
+            for (const user of users) {
+                const dbUser = dbUsers.find(u => u.Email.trim().toLowerCase() === user.Email.trim().toLowerCase());
+                if (dbUser) {
+                    for (const role of user.Roles) {
+                        const dbRole = dbRoles.find(r => r.Name.trim().toLowerCase() === role.Name.trim().toLowerCase());
+                        if (dbRole) {
+                            if (!dbUserRoles.find(ur => ur.UserID === dbUser.ID && ur.RoleID === dbRole.ID)) {
+                                const ur = await md.GetEntityObject("User Roles", u);
+                                ur.UserID = dbUser.ID;
+                                ur.RoleID = dbRole.ID;
+                                ok = ok && await ur.Save();
+                            }
+                        }
+                    }
+                    const thisUserDBRoles = dbUserRoles.filter(ur => ur.UserID === dbUser.ID);
+                    for (const dbUserRole of thisUserDBRoles) {
+                        const role = user.Roles.find(r => r.Name.trim().toLowerCase() === dbRoles.find(rr => rr.ID === dbUserRole.RoleID)?.Name.trim().toLowerCase());
+                        if (!role && !this.IsStandardRole(dbUserRole.Role)) {
+                            ok = ok && await dbUserRole.Delete();
+                        }
+                    }
+                }
+            }
+            return ok;
+        }
+        else {
+            return false;
+        }
+    }
+}
+__decorate([
+    RequireSystemUser(),
+    Mutation(() => SyncRolesAndUsersResultType),
+    __param(0, Arg('data', () => RolesAndUsersInputType)),
+    __param(1, Ctx()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [RolesAndUsersInputType, Object]),
+    __metadata("design:returntype", Promise)
+], SyncRolesAndUsersResolver.prototype, "SyncRolesAndUsers", null);
+__decorate([
+    RequireSystemUser(),
+    Mutation(() => SyncRolesAndUsersResultType),
+    __param(0, Arg('roles', () => [RoleInputType])),
+    __param(1, Ctx()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Array, Object]),
+    __metadata("design:returntype", Promise)
+], SyncRolesAndUsersResolver.prototype, "SyncRoles", null);
+__decorate([
+    RequireSystemUser(),
+    Mutation(() => SyncRolesAndUsersResultType),
+    __param(0, Arg('users', () => [UserInputType])),
+    __param(1, Ctx()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Array, Object]),
+    __metadata("design:returntype", Promise)
+], SyncRolesAndUsersResolver.prototype, "SyncUsers", null);
+//# sourceMappingURL=SyncRolesUsersResolver.js.map

package/dist/resolvers/SyncRolesUsersResolver.js.map ADDED Viewed

@@ -0,0 +1 @@

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

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@memberjunction/server",
-  "version": "2.20.0",
+  "version": "2.20.2",
   "description": "MemberJunction: This project provides API access via GraphQL to the common data store.",
   "main": "./dist/index.js",
   "types": "./src/index.ts",
@@ -22,27 +22,27 @@
   "dependencies": {
     "@apollo/server": "^4.9.1",
     "@graphql-tools/utils": "^10.0.1",
-    "@memberjunction/actions": "2.20.0",
-    "@memberjunction/ai": "2.20.0",
-    "@memberjunction/ai-mistral": "2.20.0",
-    "@memberjunction/ai-openai": "2.20.0",
-    "@memberjunction/ai-vectors-pinecone": "2.20.0",
-    "@memberjunction/aiengine": "2.20.0",
-    "@memberjunction/core": "2.20.0",
-    "@memberjunction/core-actions": "2.20.0",
-    "@memberjunction/core-entities": "2.20.0",
-    "@memberjunction/data-context": "2.20.0",
-    "@memberjunction/data-context-server": "2.20.0",
-    "@memberjunction/doc-utils": "2.20.0",
-    "@memberjunction/entity-communications-server": "2.20.0",
-    "@memberjunction/external-change-detection": "2.20.0",
-    "@memberjunction/global": "2.20.0",
-    "@memberjunction/graphql-dataprovider": "2.20.0",
-    "@memberjunction/queue": "2.20.0",
-    "@memberjunction/skip-types": "2.20.0",
-    "@memberjunction/sqlserver-dataprovider": "2.20.0",
-    "@memberjunction/storage": "2.20.0",
-    "@memberjunction/templates": "2.20.0",
+    "@memberjunction/actions": "2.20.2",
+    "@memberjunction/ai": "2.20.2",
+    "@memberjunction/ai-mistral": "2.20.2",
+    "@memberjunction/ai-openai": "2.20.2",
+    "@memberjunction/ai-vectors-pinecone": "2.20.2",
+    "@memberjunction/aiengine": "2.20.2",
+    "@memberjunction/core": "2.20.2",
+    "@memberjunction/core-actions": "2.20.2",
+    "@memberjunction/core-entities": "2.20.2",
+    "@memberjunction/data-context": "2.20.2",
+    "@memberjunction/data-context-server": "2.20.2",
+    "@memberjunction/doc-utils": "2.20.2",
+    "@memberjunction/entity-communications-server": "2.20.2",
+    "@memberjunction/external-change-detection": "2.20.2",
+    "@memberjunction/global": "2.20.2",
+    "@memberjunction/graphql-dataprovider": "2.20.2",
+    "@memberjunction/queue": "2.20.2",
+    "@memberjunction/skip-types": "2.20.2",
+    "@memberjunction/sqlserver-dataprovider": "2.20.2",
+    "@memberjunction/storage": "2.20.2",
+    "@memberjunction/templates": "2.20.2",
     "@types/cors": "^2.8.13",
     "@types/jsonwebtoken": "9.0.6",
     "@types/node": "20.14.2",

package/src/index.ts CHANGED Viewed

@@ -60,11 +60,16 @@ export * from './resolvers/DatasetResolver.js';
 export * from './resolvers/EntityRecordNameResolver.js';
 export * from './resolvers/MergeRecordsResolver.js';
 export * from './resolvers/ReportResolver.js';
+export * from './resolvers/SyncRolesUsersResolver.js';
 export * from './generated/generated.js';
 import { resolve } from 'node:path';
+export type MJServerOptions = {
+  onBeforeServe?: () => void | Promise<void>;
+};
 const localPath = (p: string) => {
   // Convert import.meta.url to a local directory path
   const dirname = fileURLToPath(new URL('.', import.meta.url));
@@ -75,7 +80,7 @@ const localPath = (p: string) => {
 export const createApp = () => express();
-export const serve = async (resolverPaths: Array<string>, app = createApp()) => {
+export const serve = async (resolverPaths: Array<string>, app = createApp(), options?: MJServerOptions) => {
   const localResolverPaths = ['resolvers/**/*Resolver.{js,ts}', 'generic/*Resolver.{js,ts}', 'generated/generated.{js,ts}'].map(localPath);
   const combinedResolverPaths = [...resolverPaths, ...localResolverPaths];
@@ -168,6 +173,10 @@ export const serve = async (resolverPaths: Array<string>, app = createApp()) =>
     })
   );
+  if (options?.onBeforeServe) {
+    await Promise.resolve(options.onBeforeServe());
+  }
   await new Promise<void>((resolve) => httpServer.listen({ port: graphqlPort }, resolve));
   console.log(`🚀 Server ready at http://localhost:${graphqlPort}/`);
 };

package/src/resolvers/SyncRolesUsersResolver.ts ADDED Viewed

@@ -0,0 +1,401 @@
+import { Arg, Ctx, Field, InputType, Int, Mutation, ObjectType, Query, Resolver, registerEnumType } from 'type-graphql';
+import { AppContext } from '../types.js';
+import { LogError, Metadata, RunView, TransactionGroupBase, UserInfo } from '@memberjunction/core';
+import { RequireSystemUser } from '../directives/RequireSystemUser.js';
+import { RoleEntity, UserEntity, UserRoleEntity } from '@memberjunction/core-entities';
+@ObjectType()
+export class SyncRolesAndUsersResultType {
+  @Field(() => Boolean)
+  Success: boolean;
+}
+@InputType()
+export class RoleInputType {
+    @Field(() => String)
+    ID: string;
+    @Field(() => String)
+    Name: string;
+    @Field(() => String, {nullable: true})
+    Description: string;
+}
+export enum UserType {
+  Owner = "Owner",
+  User = "User",
+}
+registerEnumType(UserType, {
+  name: "UserType", // GraphQL Enum Name
+  description: "Defines whether a user is an Owner or a User",
+});
+@InputType()
+export class UserInputType {
+    @Field(() => String)
+    ID!: string;
+    @Field(() => String)
+    Name!: string;
+    @Field(() => String)
+    Email!: string;
+    // the next field needs to have GraphQL enum with only Owner or User being allowed
+    @Field(() => UserType)
+    Type!: UserType;
+    @Field(() => String, {nullable: true})
+    FirstName: string;
+    @Field(() => String, {nullable: true})
+    LastName: string;
+    @Field(() => String, {nullable: true})
+    Title: string;
+    @Field(() => [RoleInputType], {nullable: true})
+    Roles?: RoleInputType[];
+}
+@InputType()
+export class RolesAndUsersInputType {
+    @Field(() => [UserInputType])
+    public Users: UserInputType[];
+    @Field(() => [RoleInputType])
+    public Roles: RoleInputType[];
+}
+export class SyncRolesAndUsersResolver {
+    /**
+     * This mutation will sync both the roles and the users, and the user/role relationships in the system with the data provided in the input.
+     * Roles are matched by the name (case insensitive) and users are matched by email
+     * @param data
+     */
+    @RequireSystemUser()
+    @Mutation(() => SyncRolesAndUsersResultType)
+    async SyncRolesAndUsers(
+    @Arg('data', () => RolesAndUsersInputType ) data: RolesAndUsersInputType,
+    @Ctx() context: AppContext
+    ) {
+        try {
+            // first we sync the roles, then the users
+            const roleResult = await this.SyncRoles(data.Roles, context);
+            if (roleResult.Success) {
+                return await this.SyncUsers(data.Users, context);
+            }
+            else {
+                return roleResult;
+            }
+        }
+        catch (err) {
+            LogError(err);
+            throw new Error('Error syncing roles and users\n\n' + err);
+        }
+    }
+    /**
+     * This mutation will sync the roles in the system with the data provided in the input, using the role name for matching (case insensitive)
+     * @param data
+     */
+    @RequireSystemUser()
+    @Mutation(() => SyncRolesAndUsersResultType)
+    async SyncRoles(
+    @Arg('roles', () => [RoleInputType]) roles: RoleInputType[],
+    @Ctx() context: AppContext
+    ) : Promise<SyncRolesAndUsersResultType> {
+        try {
+            // we iterate through the provided roles and we remove roles that are not in the input and add roles that are new
+            // and update roles that already exist
+            const rv = new RunView();
+            const result = await rv.RunView<RoleEntity>({
+                EntityName: "Roles",
+                ResultType: 'entity_object'
+            }, context.userPayload.userRecord);
+            if (result && result.Success) {
+                const currentRoles = result.Results;
+                if (await this.DeleteRemovedRoles(currentRoles, roles, context.userPayload.userRecord)) {
+                    if ( await this.AddNewRoles(currentRoles, roles, context.userPayload.userRecord)) {
+                        return await this.UpdateExistingRoles(currentRoles, roles, context.userPayload.userRecord);
+                    }
+                }
+            }
+            return { Success: false }; // if we get here, something went wrong
+        } catch (err) {
+            LogError(err);
+            throw new Error('Error syncing roles and users\n\n' + err);
+        }
+    }
+    protected async UpdateExistingRoles(currentRoles: RoleEntity[], futureRoles: RoleInputType[], user: UserInfo): Promise<SyncRolesAndUsersResultType> {
+        // go through the future roles and update any that are in the current roles
+        const md = new Metadata();
+        let ok: boolean = true;
+        for (const update of futureRoles) {
+            const currentRole = currentRoles.find(r => r.Name.trim().toLowerCase() === update.Name.trim().toLowerCase());
+            if (currentRole) {
+                currentRole.Description = update.Description;
+                ok = ok && await currentRole.Save(); // no await, we do that with submit below
+            }
+        }
+        return { Success: ok };
+    }
+    protected async AddNewRoles(currentRoles: RoleEntity[], futureRoles: RoleInputType[], user: UserInfo): Promise<boolean> {
+        // go through the future roles and add any that are not in the current roles
+        const md = new Metadata();
+        let ok: boolean = true;
+        for (const add of futureRoles) {
+            if (!currentRoles.find(r => r.Name.trim().toLowerCase() === add.Name.trim().toLowerCase())) {
+                const role = await md.GetEntityObject<RoleEntity>("Roles", user);
+                role.Name = add.Name;
+                role.Description = add.Description;
+                ok = ok && await role.Save(); // no await, we do that with submit below
+            }
+        }
+        return ok;
+    }
+    protected async DeleteRemovedRoles(currentRoles: RoleEntity[], futureRoles: RoleInputType[], user: UserInfo): Promise<boolean> {
+        const rv = new RunView();
+        let ok: boolean = true;
+        // iterate through the existing roles and remove any that are not in the input
+        for (const remove of currentRoles) {
+            if (!this.IsStandardRole(remove.Name)) {
+                if (!futureRoles.find(r => r.Name.trim().toLowerCase() === remove.Name.trim().toLowerCase())) {
+                    ok = ok && await this.DeleteSingleRole(remove, rv, user);
+                }
+            }
+        }
+        return ok;
+    }
+    public get StandardRoles(): string[] {
+        return ['Developer', 'Integration', 'UI']
+    }
+    public IsStandardRole(roleName: string): boolean {
+        return this.StandardRoles.find(r => r.toLowerCase() === roleName.toLowerCase()) !== undefined;
+    }
+    protected async DeleteSingleRole(role: RoleEntity, rv: RunView, user: UserInfo): Promise<boolean> {
+        // first, remove all the UserRole records that match this role
+        let ok: boolean = true;
+        const r2 = await rv.RunView<UserRoleEntity>({
+            EntityName: "User Roles",
+            ExtraFilter: "RoleID = '" + role.ID + "'",
+            ResultType: 'entity_object'
+        }, user);
+        if (r2.Success) {
+            for (const ur of r2.Results) {
+                ok = ok && await ur.Delete(); // remove the user role
+            }
+        }
+        return ok && role.Delete(); // remove the role
+    }
+    /**
+     * This mutation will sync the just the users in the system with the data provided in the input, matches existing users by email
+     * @important This method will NOT work if the roles are not already in sync, meaning if User/Role relationships exist in the input data where the Role doesn't already exist in this system the sync will fail
+     * @param data
+     */
+    @RequireSystemUser()
+    @Mutation(() => SyncRolesAndUsersResultType)
+    async SyncUsers(
+    @Arg('users', () => [UserInputType]) users: UserInputType[],
+    @Ctx() context: AppContext
+    ) : Promise<SyncRolesAndUsersResultType> {
+        try {
+            // first, we sync up the users and then the user roles.
+            // for syncing users we first remove users that are no longer in the input, then we add new users and update existing users
+            const rv = new RunView();
+            const result = await rv.RunView<UserEntity>({
+                EntityName: "Users",
+                ResultType: 'entity_object'
+            }, context.userPayload.userRecord);
+            if (result && result.Success) {
+                // go through current users and remove those that are not in the input
+                const currentUsers = result.Results;
+                if (await this.DeleteRemovedUsers(currentUsers, users, context.userPayload.userRecord)) {
+                    if (await this.AddNewUsers(currentUsers, users, context.userPayload.userRecord)) {
+                        if (await this.UpdateExistingUsers(currentUsers, users, context.userPayload.userRecord)) {
+                            if (await this.SyncUserRoles(users, context.userPayload.userRecord)) {
+                                return { Success: true };
+                            }
+                        }
+                    }
+                }
+            }
+            return { Success: false }; // if we get here, something went wrong
+        } catch (err) {
+            LogError(err);
+            throw new Error('Error syncing roles and users\n\n' + err);
+        }
+    }
+    protected async UpdateExistingUsers(currentUsers: UserEntity[], futureUsers: UserInputType[], u: UserInfo): Promise<boolean> {
+        // go through the future users and update any that are in the current users
+        let ok: boolean = true;
+        for (const update of futureUsers) {
+            const current = currentUsers.find(c => c.Email?.trim().toLowerCase() === update.Email?.trim().toLowerCase());
+            if (current) {
+                current.Name = update.Name;
+                current.Type = update.Type;
+                current.FirstName = update.FirstName;
+                current.LastName = update.LastName;
+                current.Title = update.Title;
+                ok = ok && await current.Save();
+            }
+        }
+        return ok;
+    }
+    protected async AddNewUsers(currentUsers: UserEntity[], futureUsers: UserInputType[], u: UserInfo): Promise<boolean> {
+        // add users that are not in the current users
+        const md = new Metadata();
+        let ok: boolean = true;
+        for (const add of futureUsers) {
+            const match = currentUsers.find(currentUser => currentUser.Email?.trim().toLowerCase() === add.Email?.trim().toLowerCase());
+            if (match) {
+                // make sure the IsActive bit is set to true
+                match.IsActive = true;
+                ok = ok && await match.Save();
+            }
+            else {
+                const user = await md.GetEntityObject<UserEntity>("Users", u);
+                user.Name = add.Name;
+                user.Type = add.Type;
+                user.Email = add.Email;
+                user.FirstName = add.FirstName;
+                user.LastName = add.LastName;
+                user.Title = add.Title;
+                user.IsActive = true;
+                ok = ok && await user.Save();
+            }
+        }
+        return ok;
+    }
+    protected async DeleteRemovedUsers(currentUsers: UserEntity[], futureUsers: UserInputType[], u: UserInfo): Promise<boolean> {
+        // remove users that are not in the future users
+        const rv = new RunView();
+        const md = new Metadata();
+        let ok: boolean = true;
+        //const tg = await md.CreateTransactionGroup(); HAVING PROBLEMS with this, so skipping for now, I think the entire thing is wrapped in a transaction and that's causing issues with two styles of trans wrappers
+        for (const remove of currentUsers) {
+            if (remove.Type.trim().toLowerCase() !== 'owner') {
+                if (!futureUsers.find(r => r.Email.trim().toLowerCase() === remove.Email.trim().toLowerCase())) {
+                    ok = ok && await this.DeleteSingleUser(remove, rv, u);
+                }
+            }
+        }
+        return ok;
+    }
+    protected async DeleteSingleUser(user: UserEntity, rv: RunView, u: UserInfo): Promise<boolean> {
+        // first, remove all the UserRole records that match this user
+        let ok: boolean = true;
+        const r2 = await rv.RunView<UserRoleEntity>({
+            EntityName: "User Roles",
+            ExtraFilter: "UserID = '" + user.ID + "'",
+            ResultType: 'entity_object'
+        }, u);
+        if (r2.Success) {
+            for (const ur of r2.Results) {
+                //ur.TransactionGroup = tg;
+                ok = ok && await ur.Delete(); // remove the user role
+            }
+        }
+        if (await user.Delete()) {
+            return ok;
+        }
+        else {
+            // in some cases there are a lot of fkey constraints that prevent the user from being deleted, so we mark the user as inactive instead
+            user.IsActive = false;
+            return await user.Save() && ok;
+        }
+    }
+    protected async SyncUserRoles(users: UserInputType[], u: UserInfo): Promise<boolean> {
+        // for each user in the users array, make sure there is a User Role that matches. First, get a list of all DATABASE user and roels so we have that for fast lookup in memory
+        const rv = new RunView();
+        const md = new Metadata();
+        const p1 = rv.RunView<UserEntity>({
+            EntityName: "Users",
+            ResultType: 'entity_object'
+        }, u);
+        const p2 = rv.RunView<RoleEntity>({
+            EntityName: "Roles",
+            ResultType: 'entity_object'
+        }, u);
+        const p3 = rv.RunView<UserRoleEntity>({
+            EntityName: "User Roles",
+            ResultType: 'entity_object'
+        }, u);
+        // await both
+        const [uResult,rResult, urResult] = await Promise.all([p1, p2, p3]);
+        if (uResult.Success && rResult.Success && urResult.Success) {
+            // we have the DB users and roles, and user roles
+            const dbUsers = uResult.Results;
+            const dbRoles = rResult.Results;
+            const dbUserRoles = urResult.Results;
+            let ok: boolean = true;
+            // now, we can do lookups in memory from those DB roles and Users for their ID values
+            // now we will iterate through the users input type and for each role, make sure it is in there
+            //const tg = await md.CreateTransactionGroup();
+            for (const user of users) {
+                const dbUser = dbUsers.find(u => u.Email.trim().toLowerCase() === user.Email.trim().toLowerCase());
+                if (dbUser) {
+                    for (const role of user.Roles) {
+                        const dbRole = dbRoles.find(r => r.Name.trim().toLowerCase() === role.Name.trim().toLowerCase());
+                        if (dbRole) {
+                            // now we need to make sure there is a user role that matches this user and role
+                            if (!dbUserRoles.find(ur => ur.UserID === dbUser.ID && ur.RoleID === dbRole.ID)) {
+                                // we need to add a user role
+                                const ur = await md.GetEntityObject<UserRoleEntity>("User Roles", u);
+                                ur.UserID = dbUser.ID;
+                                ur.RoleID = dbRole.ID;
+                                ok = ok && await ur.Save(); // no await, we do that with submit below
+                            }
+                        }
+                    }
+                    // now, we check for DB user roles that are NOT in the user.Roles property as they are no longer part of the user's roles
+                    const thisUserDBRoles = dbUserRoles.filter(ur => ur.UserID === dbUser.ID);
+                    for (const dbUserRole of thisUserDBRoles) {
+                        const role = user.Roles.find(r => r.Name.trim().toLowerCase() === dbRoles.find(rr => rr.ID === dbUserRole.RoleID)?.Name.trim().toLowerCase());
+                        if (!role && !this.IsStandardRole(dbUserRole.Role)) {
+                            // this user role is no longer in the user's roles, we need to remove it
+                            //dbUserRole.TransactionGroup = tg;
+                            ok = ok && await dbUserRole.Delete(); // remove the user role - we use await for the DELETE, not the save
+                        }
+                    }
+                }
+            }
+            return ok;
+        }
+        else {
+            return false;
+        }
+    }
+}