@memberjunction/server 2.20.1 → 2.20.3

package/dist/resolvers/SyncRolesUsersResolver.js

@@ -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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@memberjunction/server",
-  "version": "2.20.1",
+  "version": "2.20.3",
   "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.1",
-    "@memberjunction/ai": "2.20.1",
-    "@memberjunction/ai-mistral": "2.20.1",
-    "@memberjunction/ai-openai": "2.20.1",
-    "@memberjunction/ai-vectors-pinecone": "2.20.1",
-    "@memberjunction/aiengine": "2.20.1",
-    "@memberjunction/core": "2.20.1",
-    "@memberjunction/core-actions": "2.20.1",
-    "@memberjunction/core-entities": "2.20.1",
-    "@memberjunction/data-context": "2.20.1",
-    "@memberjunction/data-context-server": "2.20.1",
-    "@memberjunction/doc-utils": "2.20.1",
-    "@memberjunction/entity-communications-server": "2.20.1",
-    "@memberjunction/external-change-detection": "2.20.1",
-    "@memberjunction/global": "2.20.1",
-    "@memberjunction/graphql-dataprovider": "2.20.1",
-    "@memberjunction/queue": "2.20.1",
-    "@memberjunction/skip-types": "2.20.1",
-    "@memberjunction/sqlserver-dataprovider": "2.20.1",
-    "@memberjunction/storage": "2.20.1",
-    "@memberjunction/templates": "2.20.1",
+    "@memberjunction/actions": "2.20.3",
+    "@memberjunction/ai": "2.20.3",
+    "@memberjunction/ai-mistral": "2.20.3",
+    "@memberjunction/ai-openai": "2.20.3",
+    "@memberjunction/ai-vectors-pinecone": "2.20.3",
+    "@memberjunction/aiengine": "2.20.3",
+    "@memberjunction/core": "2.20.3",
+    "@memberjunction/core-actions": "2.20.3",
+    "@memberjunction/core-entities": "2.20.3",
+    "@memberjunction/data-context": "2.20.3",
+    "@memberjunction/data-context-server": "2.20.3",
+    "@memberjunction/doc-utils": "2.20.3",
+    "@memberjunction/entity-communications-server": "2.20.3",
+    "@memberjunction/external-change-detection": "2.20.3",
+    "@memberjunction/global": "2.20.3",
+    "@memberjunction/graphql-dataprovider": "2.20.3",
+    "@memberjunction/queue": "2.20.3",
+    "@memberjunction/skip-types": "2.20.3",
+    "@memberjunction/sqlserver-dataprovider": "2.20.3",
+    "@memberjunction/storage": "2.20.3",
+    "@memberjunction/templates": "2.20.3",
     "@types/cors": "^2.8.13",
     "@types/jsonwebtoken": "9.0.6",
     "@types/node": "20.14.2",
@@ -70,6 +70,7 @@
     "type-graphql": "2.0.0-beta.3",
     "typedi": "^0.10.0",
     "typeorm": "^0.3.20",
+    "uuid": "^10.0.0",
     "ws": "^8.13.0",
     "zod": "^3.23.4"
   },

package/src/config.ts

@@ -43,6 +43,7 @@ const configInfoSchema = z.object({
   askSkip: askSkipInfoSchema.optional(),
 
   apiKey: z.string().optional(),
+  baseUrl: z.string().optional(),
 
   dbHost: z.string().default('localhost'),
   dbDatabase: z.string(),
@@ -107,6 +108,7 @@ export const {
   auth0WebClientID,
   auth0ClientSecret,
   apiKey,
+  baseUrl,
   mjCoreSchema: mj_core_schema,
 } = configInfo;