@nymphjs/tilmeld 1.0.0-beta.1 → 1.0.0-beta.100

package/dist/errors/BadUsernameError.d.ts

@@ -1,3 +1,4 @@
-export declare class BadUsernameError extends Error {
+import { HttpError } from '@nymphjs/server';
+export declare class BadUsernameError extends HttpError {
     constructor(message: string);
 }

package/dist/errors/BadUsernameError.js

@@ -1,11 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BadUsernameError = void 0;
-class BadUsernameError extends Error {
+import { HttpError } from '@nymphjs/server';
+export class BadUsernameError extends HttpError {
     constructor(message) {
-        super(message);
+        super(message, 400);
         this.name = 'BadUsernameError';
     }
 }
-exports.BadUsernameError = BadUsernameError;
 //# sourceMappingURL=BadUsernameError.js.map

package/dist/errors/BadUsernameError.js.map

@@ -1 +1 @@
-{"version":3,"file":"BadUsernameError.js","sourceRoot":"","sources":["../../src/errors/BadUsernameError.ts"],"names":[],"mappings":";;;AAAA,MAAa,gBAAiB,SAAQ,KAAK;IACzC,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,kBAAkB,CAAC;IACjC,CAAC;CACF;AALD,4CAKC"}
+{"version":3,"file":"BadUsernameError.js","sourceRoot":"","sources":["../../src/errors/BadUsernameError.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,MAAM,OAAO,gBAAiB,SAAQ,SAAS;IAC7C,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;QACpB,IAAI,CAAC,IAAI,GAAG,kBAAkB,CAAC;IACjC,CAAC;CACF"}

package/dist/errors/CouldNotChangeDefaultPrimaryGroupError.js

@@ -1,11 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CouldNotChangeDefaultPrimaryGroupError = void 0;
-class CouldNotChangeDefaultPrimaryGroupError extends Error {
+export class CouldNotChangeDefaultPrimaryGroupError extends Error {
     constructor(message) {
         super(message);
         this.name = 'CouldNotChangeDefaultPrimaryGroupError';
     }
 }
-exports.CouldNotChangeDefaultPrimaryGroupError = CouldNotChangeDefaultPrimaryGroupError;
 //# sourceMappingURL=CouldNotChangeDefaultPrimaryGroupError.js.map

package/dist/errors/CouldNotChangeDefaultPrimaryGroupError.js.map

@@ -1 +1 @@
-{"version":3,"file":"CouldNotChangeDefaultPrimaryGroupError.js","sourceRoot":"","sources":["../../src/errors/CouldNotChangeDefaultPrimaryGroupError.ts"],"names":[],"mappings":";;;AAAA,MAAa,sCAAuC,SAAQ,KAAK;IAC/D,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,wCAAwC,CAAC;IACvD,CAAC;CACF;AALD,wFAKC"}
+{"version":3,"file":"CouldNotChangeDefaultPrimaryGroupError.js","sourceRoot":"","sources":["../../src/errors/CouldNotChangeDefaultPrimaryGroupError.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,sCAAuC,SAAQ,KAAK;IAC/D,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,wCAAwC,CAAC;IACvD,CAAC;CACF"}

package/dist/errors/EmailChangeRateLimitExceededError.js

@@ -1,11 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.EmailChangeRateLimitExceededError = void 0;
-class EmailChangeRateLimitExceededError extends Error {
+export class EmailChangeRateLimitExceededError extends Error {
     constructor(message) {
         super(message);
         this.name = 'EmailChangeRateLimitExceededError';
     }
 }
-exports.EmailChangeRateLimitExceededError = EmailChangeRateLimitExceededError;
 //# sourceMappingURL=EmailChangeRateLimitExceededError.js.map

package/dist/errors/EmailChangeRateLimitExceededError.js.map

@@ -1 +1 @@
-{"version":3,"file":"EmailChangeRateLimitExceededError.js","sourceRoot":"","sources":["../../src/errors/EmailChangeRateLimitExceededError.ts"],"names":[],"mappings":";;;AAAA,MAAa,iCAAkC,SAAQ,KAAK;IAC1D,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,mCAAmC,CAAC;IAClD,CAAC;CACF;AALD,8EAKC"}
+{"version":3,"file":"EmailChangeRateLimitExceededError.js","sourceRoot":"","sources":["../../src/errors/EmailChangeRateLimitExceededError.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,iCAAkC,SAAQ,KAAK;IAC1D,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,mCAAmC,CAAC;IAClD,CAAC;CACF"}

package/dist/errors/index.d.ts

@@ -1,6 +1,6 @@
-export * from './AccessControlError';
-export * from './BadDataError';
-export * from './BadEmailError';
-export * from './BadUsernameError';
-export * from './CouldNotChangeDefaultPrimaryGroupError';
-export * from './EmailChangeRateLimitExceededError';
+export * from './AccessControlError.js';
+export * from './BadDataError.js';
+export * from './BadEmailError.js';
+export * from './BadUsernameError.js';
+export * from './CouldNotChangeDefaultPrimaryGroupError.js';
+export * from './EmailChangeRateLimitExceededError.js';

package/dist/errors/index.js

@@ -1,23 +1,7 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./AccessControlError"), exports);
-__exportStar(require("./BadDataError"), exports);
-__exportStar(require("./BadEmailError"), exports);
-__exportStar(require("./BadUsernameError"), exports);
-__exportStar(require("./CouldNotChangeDefaultPrimaryGroupError"), exports);
-__exportStar(require("./EmailChangeRateLimitExceededError"), exports);
+export * from './AccessControlError.js';
+export * from './BadDataError.js';
+export * from './BadEmailError.js';
+export * from './BadUsernameError.js';
+export * from './CouldNotChangeDefaultPrimaryGroupError.js';
+export * from './EmailChangeRateLimitExceededError.js';
 //# sourceMappingURL=index.js.map

package/dist/errors/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/errors/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,uDAAqC;AAErC,iDAA+B;AAE/B,kDAAgC;AAEhC,qDAAmC;AAEnC,2EAAyD;AAEzD,sEAAoD"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/errors/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAC;AAExC,cAAc,mBAAmB,CAAC;AAElC,cAAc,oBAAoB,CAAC;AAEnC,cAAc,uBAAuB,CAAC;AAEtC,cAAc,6CAA6C,CAAC;AAE5D,cAAc,wCAAwC,CAAC"}

package/dist/index.d.ts

@@ -1,15 +1,16 @@
-export * from './conf';
-export * from './errors';
-import AbleObject from './AbleObject';
+export * from './conf/index.js';
+export * from './enforceTilmeld.js';
+export * from './errors/index.js';
+import AbleObject from './AbleObject.js';
 export { AbleObject };
-export * from './Group';
-import Group from './Group';
+export * from './Group.js';
+import Group from './Group.js';
 export { Group };
-import Tilmeld from './Tilmeld';
+import Tilmeld from './Tilmeld.js';
 export { Tilmeld };
-export * from './Tilmeld.types';
-import tilmeldJoiProps from './tilmeldJoiProps';
+export * from './Tilmeld.types.js';
+import tilmeldJoiProps from './tilmeldJoiProps.js';
 export { tilmeldJoiProps };
-export * from './User';
-import User from './User';
+export * from './User.js';
+import User from './User.js';
 export { User };

package/dist/index.js

@@ -1,36 +1,17 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.User = exports.tilmeldJoiProps = exports.Tilmeld = exports.Group = exports.AbleObject = void 0;
-__exportStar(require("./conf"), exports);
-__exportStar(require("./errors"), exports);
-const AbleObject_1 = __importDefault(require("./AbleObject"));
-exports.AbleObject = AbleObject_1.default;
-__exportStar(require("./Group"), exports);
-const Group_1 = __importDefault(require("./Group"));
-exports.Group = Group_1.default;
-const Tilmeld_1 = __importDefault(require("./Tilmeld"));
-exports.Tilmeld = Tilmeld_1.default;
-__exportStar(require("./Tilmeld.types"), exports);
-const tilmeldJoiProps_1 = __importDefault(require("./tilmeldJoiProps"));
-exports.tilmeldJoiProps = tilmeldJoiProps_1.default;
-__exportStar(require("./User"), exports);
-const User_1 = __importDefault(require("./User"));
-exports.User = User_1.default;
+export * from './conf/index.js';
+export * from './enforceTilmeld.js';
+export * from './errors/index.js';
+import AbleObject from './AbleObject.js';
+export { AbleObject };
+export * from './Group.js';
+import Group from './Group.js';
+export { Group };
+import Tilmeld from './Tilmeld.js';
+export { Tilmeld };
+export * from './Tilmeld.types.js';
+import tilmeldJoiProps from './tilmeldJoiProps.js';
+export { tilmeldJoiProps };
+export * from './User.js';
+import User from './User.js';
+export { User };
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,yCAAuB;AAEvB,2CAAyB;AAEzB,8DAAsC;AAC7B,qBADF,oBAAU,CACE;AAEnB,0CAAwB;AACxB,oDAA4B;AACnB,gBADF,eAAK,CACE;AAEd,wDAAgC;AACvB,kBADF,iBAAO,CACE;AAEhB,kDAAgC;AAEhC,wEAAgD;AACvC,0BADF,yBAAe,CACE;AAExB,yCAAuB;AACvB,kDAA0B;AACjB,eADF,cAAI,CACE"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAEhC,cAAc,qBAAqB,CAAC;AAEpC,cAAc,mBAAmB,CAAC;AAElC,OAAO,UAAU,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,CAAC;AAEtB,cAAc,YAAY,CAAC;AAC3B,OAAO,KAAK,MAAM,YAAY,CAAC;AAC/B,OAAO,EAAE,KAAK,EAAE,CAAC;AAEjB,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,OAAO,EAAE,CAAC;AAEnB,cAAc,oBAAoB,CAAC;AAEnC,OAAO,eAAe,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,CAAC;AAE3B,cAAc,WAAW,CAAC;AAC1B,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,IAAI,EAAE,CAAC"}

package/dist/tilmeldJoiProps.js

@@ -1,20 +1,15 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const nymph_1 = require("@nymphjs/nymph");
-const joi_1 = __importDefault(require("joi"));
-const User_1 = __importDefault(require("./User"));
-const Group_1 = __importDefault(require("./Group"));
-exports.default = {
-    user: joi_1.default.object().instance(User_1.default),
-    group: joi_1.default.object().instance(Group_1.default),
-    acUser: joi_1.default.number().valid(nymph_1.TilmeldAccessLevels.NO_ACCESS, nymph_1.TilmeldAccessLevels.READ_ACCESS, nymph_1.TilmeldAccessLevels.WRITE_ACCESS, nymph_1.TilmeldAccessLevels.FULL_ACCESS),
-    acGroup: joi_1.default.number().valid(nymph_1.TilmeldAccessLevels.NO_ACCESS, nymph_1.TilmeldAccessLevels.READ_ACCESS, nymph_1.TilmeldAccessLevels.WRITE_ACCESS, nymph_1.TilmeldAccessLevels.FULL_ACCESS),
-    acOther: joi_1.default.number().valid(nymph_1.TilmeldAccessLevels.NO_ACCESS, nymph_1.TilmeldAccessLevels.READ_ACCESS, nymph_1.TilmeldAccessLevels.WRITE_ACCESS, nymph_1.TilmeldAccessLevels.FULL_ACCESS),
-    acRead: joi_1.default.array().items(joi_1.default.alternatives().try(joi_1.default.object().instance(User_1.default), joi_1.default.object().instance(Group_1.default))),
-    acWrite: joi_1.default.array().items(joi_1.default.alternatives().try(joi_1.default.object().instance(User_1.default), joi_1.default.object().instance(Group_1.default))),
-    acFull: joi_1.default.array().items(joi_1.default.alternatives().try(joi_1.default.object().instance(User_1.default), joi_1.default.object().instance(Group_1.default))),
+import { TilmeldAccessLevels } from '@nymphjs/nymph';
+import Joi from 'joi';
+import User from './User.js';
+import Group from './Group.js';
+export default {
+    user: Joi.object().instance(User),
+    group: Joi.object().instance(Group),
+    acUser: Joi.number().valid(TilmeldAccessLevels.NO_ACCESS, TilmeldAccessLevels.READ_ACCESS, TilmeldAccessLevels.WRITE_ACCESS, TilmeldAccessLevels.FULL_ACCESS),
+    acGroup: Joi.number().valid(TilmeldAccessLevels.NO_ACCESS, TilmeldAccessLevels.READ_ACCESS, TilmeldAccessLevels.WRITE_ACCESS, TilmeldAccessLevels.FULL_ACCESS),
+    acOther: Joi.number().valid(TilmeldAccessLevels.NO_ACCESS, TilmeldAccessLevels.READ_ACCESS, TilmeldAccessLevels.WRITE_ACCESS, TilmeldAccessLevels.FULL_ACCESS),
+    acRead: Joi.array().items(Joi.alternatives().try(Joi.object().instance(User), Joi.object().instance(Group))),
+    acWrite: Joi.array().items(Joi.alternatives().try(Joi.object().instance(User), Joi.object().instance(Group))),
+    acFull: Joi.array().items(Joi.alternatives().try(Joi.object().instance(User), Joi.object().instance(Group))),
 };
 //# sourceMappingURL=tilmeldJoiProps.js.map

package/dist/tilmeldJoiProps.js.map

@@ -1 +1 @@
-{"version":3,"file":"tilmeldJoiProps.js","sourceRoot":"","sources":["../src/tilmeldJoiProps.ts"],"names":[],"mappings":";;;;;AAAA,0CAAqD;AACrD,8CAAsB;AAEtB,kDAA0B;AAC1B,oDAA4B;AAE5B,kBAAe;IACb,IAAI,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,cAAI,CAAC;IACjC,KAAK,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,eAAK,CAAC;IACnC,MAAM,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CACxB,2BAAmB,CAAC,SAAS,EAC7B,2BAAmB,CAAC,WAAW,EAC/B,2BAAmB,CAAC,YAAY,EAChC,2BAAmB,CAAC,WAAW,CAChC;IACD,OAAO,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CACzB,2BAAmB,CAAC,SAAS,EAC7B,2BAAmB,CAAC,WAAW,EAC/B,2BAAmB,CAAC,YAAY,EAChC,2BAAmB,CAAC,WAAW,CAChC;IACD,OAAO,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CACzB,2BAAmB,CAAC,SAAS,EAC7B,2BAAmB,CAAC,WAAW,EAC/B,2BAAmB,CAAC,YAAY,EAChC,2BAAmB,CAAC,WAAW,CAChC;IACD,MAAM,EAAE,aAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CACvB,aAAG,CAAC,YAAY,EAAE,CAAC,GAAG,CACpB,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,cAAI,CAAC,EAC3B,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,eAAK,CAAC,CAC7B,CACF;IACD,OAAO,EAAE,aAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CACxB,aAAG,CAAC,YAAY,EAAE,CAAC,GAAG,CACpB,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,cAAI,CAAC,EAC3B,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,eAAK,CAAC,CAC7B,CACF;IACD,MAAM,EAAE,aAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CACvB,aAAG,CAAC,YAAY,EAAE,CAAC,GAAG,CACpB,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,cAAI,CAAC,EAC3B,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,eAAK,CAAC,CAC7B,CACF;CACF,CAAC"}
+{"version":3,"file":"tilmeldJoiProps.js","sourceRoot":"","sources":["../src/tilmeldJoiProps.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,GAAG,MAAM,KAAK,CAAC;AAEtB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,KAAK,MAAM,YAAY,CAAC;AAE/B,eAAe;IACb,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC;IACjC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC;IACnC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CACxB,mBAAmB,CAAC,SAAS,EAC7B,mBAAmB,CAAC,WAAW,EAC/B,mBAAmB,CAAC,YAAY,EAChC,mBAAmB,CAAC,WAAW,CAChC;IACD,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CACzB,mBAAmB,CAAC,SAAS,EAC7B,mBAAmB,CAAC,WAAW,EAC/B,mBAAmB,CAAC,YAAY,EAChC,mBAAmB,CAAC,WAAW,CAChC;IACD,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CACzB,mBAAmB,CAAC,SAAS,EAC7B,mBAAmB,CAAC,WAAW,EAC/B,mBAAmB,CAAC,YAAY,EAChC,mBAAmB,CAAC,WAAW,CAChC;IACD,MAAM,EAAE,GAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CACvB,GAAG,CAAC,YAAY,EAAE,CAAC,GAAG,CACpB,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,EAC3B,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAC7B,CACF;IACD,OAAO,EAAE,GAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CACxB,GAAG,CAAC,YAAY,EAAE,CAAC,GAAG,CACpB,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,EAC3B,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAC7B,CACF;IACD,MAAM,EAAE,GAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CACvB,GAAG,CAAC,YAAY,EAAE,CAAC,GAAG,CACpB,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,EAC3B,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAC7B,CACF;CACF,CAAC"}

package/jest.config.js

@@ -1,6 +1,15 @@
+import { createDefaultEsmPreset } from 'ts-jest';
+
+const presetConfig = createDefaultEsmPreset();
+
 /** @type {import('ts-jest').JestConfigWithTsJest} */
-module.exports = {
-  preset: 'ts-jest',
+const jestConfig = {
+  ...presetConfig,
   testEnvironment: 'node',
   rootDir: 'src/',
+  moduleNameMapper: {
+    '^(\\.|\\.\\.)\\/(.+)\\.js': '$1/$2',
+  },
 };
+
+export default jestConfig;

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@nymphjs/tilmeld",
-  "version": "1.0.0-beta.1",
-  "description": "NymphJS - Tilmeld User and Group System",
-  "type": "commonjs",
+  "version": "1.0.0-beta.100",
+  "description": "Nymph.js - Tilmeld User and Group System",
+  "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "keywords": [
@@ -14,9 +14,9 @@
     "clean": "test -d dist && rm -r dist || true",
     "build": "tsc",
     "watch": "tsc --watch",
-    "prepare": "npm run clean && npm run build",
-    "test": "jest",
-    "test:watch": "jest --watch"
+    "prepublish": "npm run clean && npm run build",
+    "test": "NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules\" npx jest",
+    "test:watch": "NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules\" npx jest --watch"
   },
   "publishConfig": {
     "access": "public"
@@ -31,32 +31,35 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@nymphjs/guid": "^1.0.0-beta.1",
-    "@nymphjs/nymph": "^1.0.0-beta.1",
-    "crypto-js": "^4.1.1",
-    "email-templates": "^10.0.1",
-    "express": "^4.18.2",
-    "joi": "^17.7.0",
-    "jsonwebtoken": "^8.5.1",
-    "locutus": "^2.0.16",
-    "lodash": "^4.17.21",
-    "pug": "^3.0.2"
+    "@nymphjs/guid": "^1.0.0-beta.100",
+    "@nymphjs/nymph": "^1.0.0-beta.100",
+    "@nymphjs/server": "^1.0.0-beta.100",
+    "@sciactive/splitn": "^3.1.0",
+    "email-templates": "^12.0.1",
+    "express": "^4.21.2",
+    "joi": "^17.13.3",
+    "jsonwebtoken": "^9.0.2",
+    "locutus": "^2.0.32",
+    "lodash-es": "^4.17.21",
+    "otpauth": "^9.3.5",
+    "pug": "^3.0.3",
+    "qrcode": "^1.5.4"
   },
   "devDependencies": {
-    "@nymphjs/client": "^1.0.0-beta.1",
-    "@nymphjs/client-node": "^1.0.0-beta.1",
-    "@nymphjs/driver-sqlite3": "^1.0.0-beta.1",
-    "@tsconfig/recommended": "^1.0.1",
-    "@types/crypto-js": "^4.1.1",
-    "@types/email-templates": "^10.0.1",
-    "@types/express": "^4.17.14",
-    "@types/jest": "^29.2.3",
-    "@types/jsonwebtoken": "^8.5.9",
-    "@types/locutus": "^0.0.6",
-    "@types/lodash": "^4.14.189",
-    "jest": "^29.3.1",
-    "ts-jest": "^29.0.3",
-    "typescript": "^4.9.3"
+    "@nymphjs/client": "^1.0.0-beta.100",
+    "@nymphjs/driver-sqlite3": "^1.0.0-beta.100",
+    "@tsconfig/recommended": "^1.0.8",
+    "@types/email-templates": "^10.0.4",
+    "@types/express": "^5.0.0",
+    "@types/jest": "^29.5.14",
+    "@types/jsonwebtoken": "^9.0.7",
+    "@types/locutus": "^0.0.8",
+    "@types/lodash-es": "^4.17.12",
+    "@types/qrcode": "^1.5.5",
+    "jest": "^29.7.0",
+    "ts-jest": "^29.2.5",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.7.2"
   },
-  "gitHead": "648d901c504d57f2d439cd751b60af0ebd4d63b8"
+  "gitHead": "254b2ccd1cc7838dcbf08e860d2833475a15b244"
 }

package/src/AbleObject.ts

@@ -6,7 +6,7 @@ import { Entity } from '@nymphjs/nymph';
  * Used in entities which support abilities, such as users and groups.
  */
 export default abstract class AbleObject<
-  T extends { abilities?: string[] }
+  T extends { abilities?: string[] },
 > extends Entity<T> {
   /**
    * Grant an ability.
@@ -17,7 +17,7 @@ export default abstract class AbleObject<
     if (!Array.isArray(this.$data.abilities)) {
       this.$data.abilities = [];
     }
-    if (this.$data.abilities.indexOf(ability) === -1) {
+    if (!this.$data.abilities.includes(ability)) {
       this.$data.abilities.push(ability);
     }
   }

package/src/Group.test.ts

@@ -1,8 +1,8 @@
 import { SQLite3Driver } from '@nymphjs/driver-sqlite3';
-import { Nymph } from '@nymphjs/nymph';
+import { Nymph, EntityUniqueConstraintError } from '@nymphjs/nymph';
 
-import Tilmeld from './Tilmeld';
-import defaults from './conf/defaults';
+import Tilmeld from './Tilmeld.js';
+import defaults from './conf/defaults.js';
 
 const tilmeld = new Tilmeld({
   appName: 'My App',
@@ -21,7 +21,7 @@ const _nymph = new Nymph(
   new SQLite3Driver({
     filename: ':memory:',
   }),
-  tilmeld
+  tilmeld,
 );
 
 const Group = tilmeld.Group;
@@ -41,7 +41,7 @@ describe('Group', () => {
     const validGroup = await makeNewGroup();
 
     expect(() => {
-      defaults.validatorGroup(validGroup);
+      defaults.validatorGroup({ config: defaults } as Tilmeld, validGroup);
     }).not.toThrow();
   });
 
@@ -52,7 +52,105 @@ describe('Group', () => {
     invalidGroup.unknown = 'I should cause an error.';
 
     expect(() => {
-      defaults.validatorGroup(invalidGroup);
+      defaults.validatorGroup({ config: defaults } as Tilmeld, invalidGroup);
     }).toThrow('Invalid Group:  "unknown" is not allowed');
   });
+
+  it("doesn't allow duplicate groupnames", async () => {
+    const newGroupA = await Group.factory();
+
+    newGroupA.groupname = 'new-group';
+    newGroupA.email = 'newgroupa@localhost';
+    newGroupA.name = 'New Group';
+
+    const newGroupB = await Group.factory();
+
+    newGroupB.groupname = 'new-group';
+    newGroupB.email = 'newgroupb@localhost';
+    newGroupB.name = 'New Group';
+
+    const promises = [newGroupA.$saveSkipAC(), newGroupB.$saveSkipAC()];
+
+    try {
+      await Promise.all(promises);
+
+      throw new Error("Shouldn't get here because of unique constraint.");
+    } catch (e: any) {
+      expect(e).toBeInstanceOf(EntityUniqueConstraintError);
+    }
+
+    await Promise.allSettled(promises);
+
+    for (const group of [newGroupA, newGroupB]) {
+      if (group.guid != null) {
+        expect(await group.$deleteSkipAC()).toEqual(true);
+      }
+    }
+  });
+
+  it("doesn't allow duplicate emails", async () => {
+    const newGroupA = await Group.factory();
+
+    newGroupA.groupname = 'new-group-a';
+    newGroupA.email = 'newgroup@localhost';
+    newGroupA.name = 'New Group';
+
+    const newGroupB = await Group.factory();
+
+    newGroupB.groupname = 'new-group-b';
+    newGroupB.email = 'newgroup@localhost';
+    newGroupB.name = 'New Group';
+
+    const promises = [newGroupA.$saveSkipAC(), newGroupB.$saveSkipAC()];
+
+    try {
+      await Promise.all(promises);
+
+      throw new Error("Shouldn't get here because of unique constraint.");
+    } catch (e: any) {
+      expect(e).toBeInstanceOf(EntityUniqueConstraintError);
+    }
+
+    await Promise.allSettled(promises);
+
+    for (const group of [newGroupA, newGroupB]) {
+      if (group.guid != null) {
+        expect(await group.$deleteSkipAC()).toEqual(true);
+      }
+    }
+  });
+
+  it("doesn't allow two default primary groups", async () => {
+    const newGroupA = await Group.factory();
+
+    newGroupA.groupname = 'new-group-a';
+    newGroupA.email = 'newgroupa@localhost';
+    newGroupA.name = 'New Group';
+    newGroupA.defaultPrimary = true;
+
+    const newGroupB = await Group.factory();
+
+    newGroupB.groupname = 'new-group-b';
+    newGroupB.email = 'newgroupb@localhost';
+    newGroupB.name = 'New Group';
+    newGroupB.defaultPrimary = true;
+
+    const promises = [newGroupA.$saveSkipAC(), newGroupB.$saveSkipAC()];
+
+    try {
+      await Promise.all(promises);
+
+      throw new Error("Shouldn't get here because of unique constraint.");
+    } catch (e: any) {
+      expect(e).toBeInstanceOf(EntityUniqueConstraintError);
+    }
+
+    await Promise.allSettled(promises);
+
+    for (const group of [newGroupA, newGroupB]) {
+      if (group.guid != null) {
+        expect(await group.$deleteSkipAC()).toEqual(true);
+      }
+    }
+  });
 });