@memberjunction/server 0.9.128 → 0.9.141

package/dist/resolvers/UserResolver.js

@@ -1,70 +1,70 @@
-"use strict";
-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); }
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.UserResolver = void 0;
-const server_1 = require("@memberjunction/server");
-const generated_1 = require("../generated/generated");
-let UserResolver = class UserResolver extends generated_1.UserResolverBase {
-    async CurrentUser({ dataSource, userPayload }) {
-        return await this.UserByEmail(userPayload.email, { dataSource, userPayload });
-    }
-    async UserByID(ID, { dataSource }) {
-        return super.safeFirstArrayElement(await this.findBy(dataSource, 'Users', { ID }));
-    }
-    async UserByEmployeeID(EmployeeID, { dataSource }) {
-        return super.safeFirstArrayElement(await this.findBy(dataSource, 'Users', { EmployeeID }));
-    }
-    async UserByEmail(Email, { dataSource }) {
-        const searchEmail = Email;
-        const returnVal = super.safeFirstArrayElement(await this.findBy(dataSource, 'Users', { Email: searchEmail }));
-        return returnVal;
-    }
-};
-__decorate([
-    (0, server_1.Query)(() => generated_1.User_),
-    __param(0, (0, server_1.Ctx)()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object]),
-    __metadata("design:returntype", Promise)
-], UserResolver.prototype, "CurrentUser", null);
-__decorate([
-    (0, server_1.Query)(() => generated_1.User_),
-    __param(0, (0, server_1.Arg)('ID', () => server_1.Int)),
-    __param(1, (0, server_1.Ctx)()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Number, Object]),
-    __metadata("design:returntype", Promise)
-], UserResolver.prototype, "UserByID", null);
-__decorate([
-    (0, server_1.Query)(() => generated_1.User_),
-    __param(0, (0, server_1.Arg)('EmployeeID', () => server_1.Int)),
-    __param(1, (0, server_1.Ctx)()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Number, Object]),
-    __metadata("design:returntype", Promise)
-], UserResolver.prototype, "UserByEmployeeID", null);
-__decorate([
-    (0, server_1.Query)(() => generated_1.User_),
-    __param(0, (0, server_1.Arg)('Email', () => String)),
-    __param(1, (0, server_1.Ctx)()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String, Object]),
-    __metadata("design:returntype", Promise)
-], UserResolver.prototype, "UserByEmail", null);
-UserResolver = __decorate([
-    (0, server_1.Resolver)(generated_1.User_)
-], UserResolver);
-exports.UserResolver = UserResolver;
-exports.default = UserResolver;
+"use strict";
+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); }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UserResolver = void 0;
+const server_1 = require("@memberjunction/server");
+const generated_1 = require("../generated/generated");
+let UserResolver = class UserResolver extends generated_1.UserResolverBase {
+    async CurrentUser({ dataSource, userPayload }) {
+        return await this.UserByEmail(userPayload.email, { dataSource, userPayload });
+    }
+    async UserByID(ID, { dataSource }) {
+        return super.safeFirstArrayElement(await this.findBy(dataSource, 'Users', { ID }));
+    }
+    async UserByEmployeeID(EmployeeID, { dataSource }) {
+        return super.safeFirstArrayElement(await this.findBy(dataSource, 'Users', { EmployeeID }));
+    }
+    async UserByEmail(Email, { dataSource }) {
+        const searchEmail = Email;
+        const returnVal = super.safeFirstArrayElement(await this.findBy(dataSource, 'Users', { Email: searchEmail }));
+        return returnVal;
+    }
+};
+exports.UserResolver = UserResolver;
+__decorate([
+    (0, server_1.Query)(() => generated_1.User_),
+    __param(0, (0, server_1.Ctx)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], UserResolver.prototype, "CurrentUser", null);
+__decorate([
+    (0, server_1.Query)(() => generated_1.User_),
+    __param(0, (0, server_1.Arg)('ID', () => server_1.Int)),
+    __param(1, (0, server_1.Ctx)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Number, Object]),
+    __metadata("design:returntype", Promise)
+], UserResolver.prototype, "UserByID", null);
+__decorate([
+    (0, server_1.Query)(() => generated_1.User_),
+    __param(0, (0, server_1.Arg)('EmployeeID', () => server_1.Int)),
+    __param(1, (0, server_1.Ctx)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Number, Object]),
+    __metadata("design:returntype", Promise)
+], UserResolver.prototype, "UserByEmployeeID", null);
+__decorate([
+    (0, server_1.Query)(() => generated_1.User_),
+    __param(0, (0, server_1.Arg)('Email', () => String)),
+    __param(1, (0, server_1.Ctx)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String, Object]),
+    __metadata("design:returntype", Promise)
+], UserResolver.prototype, "UserByEmail", null);
+exports.UserResolver = UserResolver = __decorate([
+    (0, server_1.Resolver)(generated_1.User_)
+], UserResolver);
+exports.default = UserResolver;
 //# sourceMappingURL=UserResolver.js.map

package/dist/resolvers/UserResolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"UserResolver.js","sourceRoot":"","sources":["../../src/resolvers/UserResolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,mDAAoF;AACpF,sDAAiE;AAG1D,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,4BAAgB;IAE1C,AAAN,KAAK,CAAC,WAAW,CAAQ,EAAE,UAAU,EAAE,WAAW,EAAc;QAC9D,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE,CAAC,CAAC;IAChF,CAAC;IAGK,AAAN,KAAK,CAAC,QAAQ,CAAuB,EAAU,EAAS,EAAE,UAAU,EAAc;QAChF,OAAO,KAAK,CAAC,qBAAqB,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;IACrF,CAAC;IAGK,AAAN,KAAK,CAAC,gBAAgB,CAA+B,UAAkB,EAAS,EAAE,UAAU,EAAc;QACxG,OAAO,KAAK,CAAC,qBAAqB,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;IAC7F,CAAC;IAGK,AAAN,KAAK,CAAC,WAAW,CAA6B,KAAa,EAAS,EAAE,UAAU,EAAc;QAE5F,MAAM,WAAW,GAAG,KAAK,CAAC;QAC1B,MAAM,SAAS,GAAG,KAAK,CAAC,qBAAqB,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC;QAC9G,OAAO,SAAS,CAAC;IACnB,CAAC;CACF,CAAA;AArBO;IADL,IAAA,cAAK,EAAC,GAAG,EAAE,CAAC,iBAAK,CAAC;IACA,WAAA,IAAA,YAAG,GAAE,CAAA;;;;+CAEvB;AAGK;IADL,IAAA,cAAK,EAAC,GAAG,EAAE,CAAC,iBAAK,CAAC;IACH,WAAA,IAAA,YAAG,EAAC,IAAI,EAAE,GAAG,EAAE,CAAC,YAAG,CAAC,CAAA;IAAc,WAAA,IAAA,YAAG,GAAE,CAAA;;;;4CAEtD;AAGK;IADL,IAAA,cAAK,EAAC,GAAG,EAAE,CAAC,iBAAK,CAAC;IACK,WAAA,IAAA,YAAG,EAAC,YAAY,EAAE,GAAG,EAAE,CAAC,YAAG,CAAC,CAAA;IAAsB,WAAA,IAAA,YAAG,GAAE,CAAA;;;;oDAE9E;AAGK;IADL,IAAA,cAAK,EAAC,GAAG,EAAE,CAAC,iBAAK,CAAC;IACA,WAAA,IAAA,YAAG,EAAC,OAAO,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,CAAA;IAAiB,WAAA,IAAA,YAAG,GAAE,CAAA;;;;+CAKlE;AAtBU,YAAY;IADxB,IAAA,iBAAQ,EAAC,iBAAK,CAAC;GACH,YAAY,CAuBxB;AAvBY,oCAAY;AAwBzB,kBAAe,YAAY,CAAC"}
+{"version":3,"file":"UserResolver.js","sourceRoot":"","sources":["../../src/resolvers/UserResolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,mDAAoF;AACpF,sDAAiE;AAG1D,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,4BAAgB;IAE1C,AAAN,KAAK,CAAC,WAAW,CAAQ,EAAE,UAAU,EAAE,WAAW,EAAc;QAC9D,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE,CAAC,CAAC;IAChF,CAAC;IAGK,AAAN,KAAK,CAAC,QAAQ,CAAuB,EAAU,EAAS,EAAE,UAAU,EAAc;QAChF,OAAO,KAAK,CAAC,qBAAqB,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;IACrF,CAAC;IAGK,AAAN,KAAK,CAAC,gBAAgB,CAA+B,UAAkB,EAAS,EAAE,UAAU,EAAc;QACxG,OAAO,KAAK,CAAC,qBAAqB,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;IAC7F,CAAC;IAGK,AAAN,KAAK,CAAC,WAAW,CAA6B,KAAa,EAAS,EAAE,UAAU,EAAc;QAE5F,MAAM,WAAW,GAAG,KAAK,CAAC;QAC1B,MAAM,SAAS,GAAG,KAAK,CAAC,qBAAqB,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC;QAC9G,OAAO,SAAS,CAAC;IACnB,CAAC;CACF,CAAA;AAvBY,oCAAY;AAEjB;IADL,IAAA,cAAK,EAAC,GAAG,EAAE,CAAC,iBAAK,CAAC;IACA,WAAA,IAAA,YAAG,GAAE,CAAA;;;;+CAEvB;AAGK;IADL,IAAA,cAAK,EAAC,GAAG,EAAE,CAAC,iBAAK,CAAC;IACH,WAAA,IAAA,YAAG,EAAC,IAAI,EAAE,GAAG,EAAE,CAAC,YAAG,CAAC,CAAA;IAAc,WAAA,IAAA,YAAG,GAAE,CAAA;;;;4CAEtD;AAGK;IADL,IAAA,cAAK,EAAC,GAAG,EAAE,CAAC,iBAAK,CAAC;IACK,WAAA,IAAA,YAAG,EAAC,YAAY,EAAE,GAAG,EAAE,CAAC,YAAG,CAAC,CAAA;IAAsB,WAAA,IAAA,YAAG,GAAE,CAAA;;;;oDAE9E;AAGK;IADL,IAAA,cAAK,EAAC,GAAG,EAAE,CAAC,iBAAK,CAAC;IACA,WAAA,IAAA,YAAG,EAAC,OAAO,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,CAAA;IAAiB,WAAA,IAAA,YAAG,GAAE,CAAA;;;;+CAKlE;uBAtBU,YAAY;IADxB,IAAA,iBAAQ,EAAC,iBAAK,CAAC;GACH,YAAY,CAuBxB;AACD,kBAAe,YAAY,CAAC"}

package/dist/resolvers/UserViewResolver.js

@@ -1,102 +1,102 @@
-"use strict";
-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); }
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.UserViewResolver = void 0;
-const core_1 = require("@memberjunction/core");
-const server_1 = require("@memberjunction/server");
-const generated_1 = require("../generated/generated");
-const UserResolver_1 = require("./UserResolver");
-let UserViewResolver = class UserViewResolver extends generated_1.UserViewResolverBase {
-    async UserViewsByUserID(UserID, { dataSource }) {
-        return await this.findBy(dataSource, 'User Views', { UserID });
-    }
-    async DefaultViewByUserAndEntity(UserID, EntityID, { dataSource }) {
-        return await this.findBy(dataSource, 'User Views', { UserID, EntityID, IsDefault: true });
-    }
-    async CurrentUserDefaultViewByEntityID(EntityID, { dataSource, userPayload }) {
-        return await this.findBy(dataSource, 'User Views', {
-            UserID: await this.getCurrentUserID(dataSource, userPayload),
-            EntityID,
-            IsDefault: true,
-        });
-    }
-    async getCurrentUserID(dataSource, userPayload) {
-        const userResolver = new UserResolver_1.UserResolver();
-        const user = await userResolver.UserByEmail(userPayload.email, { dataSource, userPayload });
-        return user.ID;
-    }
-    async CurrentUserUserViewsByEntityID(EntityID, { dataSource, userPayload }) {
-        return this.findBy(dataSource, 'User Views', { UserID: await this.getCurrentUserID(dataSource, userPayload), EntityID });
-    }
-    async UpdateWhereClause(ID, { userPayload }) {
-        const md = new core_1.Metadata();
-        const u = this.GetUserFromPayload(userPayload);
-        const viewEntity = await md.GetEntityObject('User Views', u);
-        await viewEntity.Load(ID);
-        viewEntity.UpdateWhereClause();
-        if (await viewEntity.Save()) {
-            return viewEntity.GetAll();
-        }
-        else {
-            throw new Error('Failed to update where clause');
-        }
-    }
-};
-__decorate([
-    (0, server_1.Query)(() => [generated_1.UserView_]),
-    __param(0, (0, server_1.Arg)('UserID', () => server_1.Int)),
-    __param(1, (0, server_1.Ctx)()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Number, Object]),
-    __metadata("design:returntype", Promise)
-], UserViewResolver.prototype, "UserViewsByUserID", null);
-__decorate([
-    (0, server_1.Query)(() => [generated_1.UserView_]),
-    __param(0, (0, server_1.Arg)('UserID', () => server_1.Int)),
-    __param(1, (0, server_1.Arg)('EntityID', () => server_1.Int)),
-    __param(2, (0, server_1.Ctx)()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Number, Number, Object]),
-    __metadata("design:returntype", Promise)
-], UserViewResolver.prototype, "DefaultViewByUserAndEntity", null);
-__decorate([
-    (0, server_1.Query)(() => [generated_1.UserView_]),
-    __param(0, (0, server_1.Arg)('EntityID', () => server_1.Int)),
-    __param(1, (0, server_1.Ctx)()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Number, Object]),
-    __metadata("design:returntype", Promise)
-], UserViewResolver.prototype, "CurrentUserDefaultViewByEntityID", null);
-__decorate([
-    (0, server_1.Query)(() => [generated_1.UserView_]),
-    __param(0, (0, server_1.Arg)('EntityID', () => server_1.Int)),
-    __param(1, (0, server_1.Ctx)()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Number, Object]),
-    __metadata("design:returntype", Promise)
-], UserViewResolver.prototype, "CurrentUserUserViewsByEntityID", null);
-__decorate([
-    (0, server_1.Query)(() => [generated_1.UserView_]),
-    __param(0, (0, server_1.Arg)('ID', () => server_1.Int)),
-    __param(1, (0, server_1.Ctx)()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Number, Object]),
-    __metadata("design:returntype", Promise)
-], UserViewResolver.prototype, "UpdateWhereClause", null);
-UserViewResolver = __decorate([
-    (0, server_1.Resolver)(generated_1.UserView_)
-], UserViewResolver);
-exports.UserViewResolver = UserViewResolver;
-exports.default = UserViewResolver;
+"use strict";
+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); }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UserViewResolver = void 0;
+const core_1 = require("@memberjunction/core");
+const server_1 = require("@memberjunction/server");
+const generated_1 = require("../generated/generated");
+const UserResolver_1 = require("./UserResolver");
+let UserViewResolver = class UserViewResolver extends generated_1.UserViewResolverBase {
+    async UserViewsByUserID(UserID, { dataSource }) {
+        return await this.findBy(dataSource, 'User Views', { UserID });
+    }
+    async DefaultViewByUserAndEntity(UserID, EntityID, { dataSource }) {
+        return await this.findBy(dataSource, 'User Views', { UserID, EntityID, IsDefault: true });
+    }
+    async CurrentUserDefaultViewByEntityID(EntityID, { dataSource, userPayload }) {
+        return await this.findBy(dataSource, 'User Views', {
+            UserID: await this.getCurrentUserID(dataSource, userPayload),
+            EntityID,
+            IsDefault: true,
+        });
+    }
+    async getCurrentUserID(dataSource, userPayload) {
+        const userResolver = new UserResolver_1.UserResolver();
+        const user = await userResolver.UserByEmail(userPayload.email, { dataSource, userPayload });
+        return user.ID;
+    }
+    async CurrentUserUserViewsByEntityID(EntityID, { dataSource, userPayload }) {
+        return this.findBy(dataSource, 'User Views', { UserID: await this.getCurrentUserID(dataSource, userPayload), EntityID });
+    }
+    async UpdateWhereClause(ID, { userPayload }) {
+        const md = new core_1.Metadata();
+        const u = this.GetUserFromPayload(userPayload);
+        const viewEntity = await md.GetEntityObject('User Views', u);
+        await viewEntity.Load(ID);
+        viewEntity.UpdateWhereClause();
+        if (await viewEntity.Save()) {
+            return viewEntity.GetAll();
+        }
+        else {
+            throw new Error('Failed to update where clause');
+        }
+    }
+};
+exports.UserViewResolver = UserViewResolver;
+__decorate([
+    (0, server_1.Query)(() => [generated_1.UserView_]),
+    __param(0, (0, server_1.Arg)('UserID', () => server_1.Int)),
+    __param(1, (0, server_1.Ctx)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Number, Object]),
+    __metadata("design:returntype", Promise)
+], UserViewResolver.prototype, "UserViewsByUserID", null);
+__decorate([
+    (0, server_1.Query)(() => [generated_1.UserView_]),
+    __param(0, (0, server_1.Arg)('UserID', () => server_1.Int)),
+    __param(1, (0, server_1.Arg)('EntityID', () => server_1.Int)),
+    __param(2, (0, server_1.Ctx)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Number, Number, Object]),
+    __metadata("design:returntype", Promise)
+], UserViewResolver.prototype, "DefaultViewByUserAndEntity", null);
+__decorate([
+    (0, server_1.Query)(() => [generated_1.UserView_]),
+    __param(0, (0, server_1.Arg)('EntityID', () => server_1.Int)),
+    __param(1, (0, server_1.Ctx)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Number, Object]),
+    __metadata("design:returntype", Promise)
+], UserViewResolver.prototype, "CurrentUserDefaultViewByEntityID", null);
+__decorate([
+    (0, server_1.Query)(() => [generated_1.UserView_]),
+    __param(0, (0, server_1.Arg)('EntityID', () => server_1.Int)),
+    __param(1, (0, server_1.Ctx)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Number, Object]),
+    __metadata("design:returntype", Promise)
+], UserViewResolver.prototype, "CurrentUserUserViewsByEntityID", null);
+__decorate([
+    (0, server_1.Query)(() => [generated_1.UserView_]),
+    __param(0, (0, server_1.Arg)('ID', () => server_1.Int)),
+    __param(1, (0, server_1.Ctx)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Number, Object]),
+    __metadata("design:returntype", Promise)
+], UserViewResolver.prototype, "UpdateWhereClause", null);
+exports.UserViewResolver = UserViewResolver = __decorate([
+    (0, server_1.Resolver)(generated_1.UserView_)
+], UserViewResolver);
+exports.default = UserViewResolver;
 //# sourceMappingURL=UserViewResolver.js.map

package/dist/resolvers/UserViewResolver.js.map

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

package/dist/types.js

@@ -1,3 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=types.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@memberjunction/server",
-  "version": "0.9.128",
+  "version": "0.9.141",
   "description": "MemberJunction: This project provides API access via GraphQL to the common data store.",
   "main": "dist/index.js",
   "types": "src/index.ts",
@@ -21,13 +21,13 @@
   "dependencies": {
     "@apollo/server": "^4.9.1",
     "@graphql-tools/utils": "^10.0.1",
-    "@memberjunction/ai": "^0.9.119",
-    "@memberjunction/core": "^0.9.128",
-    "@memberjunction/core-entities": "^0.9.105",
-    "@memberjunction/global": "^0.9.117",
-    "@memberjunction/queue": "^0.9.122",
-    "@memberjunction/sqlserver-dataprovider": "^0.9.132",
-    "@types/axios": "^0.14.0",
+    "@memberjunction/ai": "^0.9.127",
+    "@memberjunction/aiengine": "^0.9.9",
+    "@memberjunction/core": "^0.9.134",
+    "@memberjunction/core-entities": "^0.9.112",
+    "@memberjunction/global": "^0.9.123",
+    "@memberjunction/queue": "^0.9.131",
+    "@memberjunction/sqlserver-dataprovider": "^0.9.142",
     "@types/cors": "^2.8.13",
     "@types/jsonwebtoken": "^8.5.9",
     "@types/node": "^18.11.14",
@@ -45,12 +45,12 @@
     "jsonwebtoken": "^8.5.1",
     "jwks-rsa": "^3.0.0",
     "lru-cache": "^10.0.0",
-    "mssql": "^9.1.1",
+    "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.17",
+    "typeorm": "^0.3.20",
     "ws": "^8.13.0",
     "zod": "^3.22.4"
   },
@@ -70,6 +70,6 @@
     "rimraf": "^4.4.0",
     "ts-node": "^10.9.1",
     "ts-node-dev": "^2.0.0",
-    "typescript": "^4.9.4"
+    "typescript": "^5.3.3"
   }
 }

package/src/apolloServer/TransactionPlugin.ts

@@ -9,7 +9,7 @@ export const TransactionPlugin: ApolloServerPlugin<AppContext> = {
     const isMutation = /^\s*mutation\b/i.test(query);
 
     if (!isMutation) {
-      return;
+      return null;
     }
 
     // Start transaction, one or more mutations. If it is just one mutation, this trans wrapper isn't really needed

package/src/auth/exampleNewUserSubClass.ts

@@ -9,7 +9,9 @@ import { configInfo } from "../config";
  * 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.
  */
-@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*/
+// 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 {

package/src/auth/index.ts

@@ -87,10 +87,19 @@ export const verifyUserRecord = async (email?: string, firstName?: string, lastN
   });
 
   if (!user) {
-    if (configInfo.userHandling.autoCreateNewUsers && firstName && lastName && requestDomain) {
+    if (configInfo.userHandling.autoCreateNewUsers && firstName && lastName && (requestDomain || configInfo.userHandling.newUserLimitedToAuthorizedDomains === false)) {
       // check to see if the domain that we have a request coming in from matches one of the domains in the autoCreateNewUsersDomains setting
-      const domainMatch: boolean = configInfo.userHandling.newUserAuthorizedDomains.some((domain) => domain.toLowerCase().trim() === requestDomain.toLowerCase().trim());
-      if (domainMatch) {
+      let passesDomainCheck: boolean =  configInfo.userHandling.newUserLimitedToAuthorizedDomains === false /*in this first condition, we are set up to NOT care about domain */
+      if (!passesDomainCheck && requestDomain) {
+          /*in this second condition, we check the domain against authorized domains*/
+          passesDomainCheck = configInfo.userHandling.newUserAuthorizedDomains.some((pattern) => {
+                                    // Convert wildcard domain patterns to regular expressions
+                                    const regex = new RegExp('^' + pattern.toLowerCase().trim().replace(/\./g, '\\.').replace(/\*/g, '.*') + '$');
+                                    return regex.test(requestDomain?.toLowerCase().trim());
+                                  });
+      }
+      
+      if (passesDomainCheck) {
         // we have a domain from the request that matches one of the domains provided by the configuration, so we will create a new user
         console.warn(`User ${email} not found in cache. Attempting to create a new user...`);
         const newUserCreator: NewUserBase = <NewUserBase>MJGlobal.Instance.ClassFactory.CreateInstance(NewUserBase); // this will create the object that handles creating the new user for us
@@ -106,7 +115,7 @@ export const verifyUserRecord = async (email?: string, firstName?: string, lastN
         }
       }
       else {
-        console.warn(`User ${email} not found in cache. Request domain '${requestDomain}' does not match any of the domains in the newUserAuthorizedDomains setting. NOT creating a new user.`);
+        console.warn(`User ${email} not found in cache. Request domain '${requestDomain}' does not match any of the domains in the newUserAuthorizedDomains setting. To ignore domain, make sure you set the newUserLimitedToAuthorizedDomains setting to false. In this case we are NOT creating a new user.`);
       }
     }
     if(!user && configInfo.userHandling.updateCacheWhenNotFound && dataSource && attemptCacheUpdateIfNeeded) {

package/src/config.ts

@@ -33,6 +33,7 @@ export const configFile = env.get('CONFIG_FILE').asString();
 
 const userHandlingInfoSchema = z.object({
   autoCreateNewUsers: z.boolean().optional().default(false),
+  newUserLimitedToAuthorizedDomains: z.boolean().optional().default(false),
   newUserAuthorizedDomains: z.array(z.string()).optional().default([]),
   newUserRoles: z.array(z.string()).optional().default([]),
   updateCacheWhenNotFound: z.boolean().optional().default(false),