@nymphjs/tilmeld 1.0.0-alpha.2 → 1.0.0-alpha.23

package/dist/index.js

@@ -13,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.User = exports.Tilmeld = exports.Group = exports.AbleObject = void 0;
+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"));
@@ -23,8 +23,9 @@ const Group_1 = __importDefault(require("./Group"));
 exports.Group = Group_1.default;
 const Tilmeld_1 = __importDefault(require("./Tilmeld"));
 exports.Tilmeld = Tilmeld_1.default;
-exports.default = 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;

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;AAChB,kBAAe,iBAAO,CAAC;AAEvB,kDAAgC;AAEhC,yCAAuB;AACvB,kDAA0B;AACjB,eADF,cAAI,CACE"}
+{"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"}

package/dist/tilmeldJoiProps.d.ts

@@ -0,0 +1,12 @@
+import Joi from 'joi';
+declare const _default: {
+    user: Joi.ObjectSchema<any>;
+    group: Joi.ObjectSchema<any>;
+    acUser: Joi.NumberSchema;
+    acGroup: Joi.NumberSchema;
+    acOther: Joi.NumberSchema;
+    acRead: Joi.ArraySchema;
+    acWrite: Joi.ArraySchema;
+    acFull: Joi.ArraySchema;
+};
+export default _default;

package/dist/tilmeldJoiProps.js

@@ -0,0 +1,20 @@
+"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))),
+};
+//# sourceMappingURL=tilmeldJoiProps.js.map

package/dist/tilmeldJoiProps.js.map

@@ -0,0 +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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nymphjs/tilmeld",
-  "version": "1.0.0-alpha.2",
+  "version": "1.0.0-alpha.23",
   "description": "NymphJS - Tilmeld User and Group System",
   "type": "commonjs",
   "main": "dist/index.js",
@@ -31,34 +31,34 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@nymphjs/nymph": "^1.0.0-alpha.2",
+    "@nymphjs/nymph": "^1.0.0-alpha.23",
     "crypto-js": "^4.1.1",
     "email-templates": "^8.0.8",
     "express": "^4.17.1",
-    "joi": "^17.4.2",
+    "joi": "^17.5.0",
     "jsonwebtoken": "^8.5.1",
     "locutus": "^2.0.15",
     "lodash": "^4.17.21",
-    "nanoid": "^3.1.25",
+    "nanoid": "^3.1.30",
     "nanoid-dictionary": "^4.3.0",
     "pug": "^3.0.2"
   },
   "devDependencies": {
-    "@nymphjs/client": "^1.0.0-alpha.2",
-    "@nymphjs/client-node": "^1.0.0-alpha.2",
-    "@nymphjs/driver-sqlite3": "^1.0.0-alpha.2",
+    "@nymphjs/client": "^1.0.0-alpha.23",
+    "@nymphjs/client-node": "^1.0.0-alpha.23",
+    "@nymphjs/driver-sqlite3": "^1.0.0-alpha.23",
     "@tsconfig/recommended": "^1.0.1",
     "@types/crypto-js": "^4.0.2",
     "@types/email-templates": "^8.0.4",
     "@types/express": "^4.17.13",
-    "@types/jest": "^27.0.1",
-    "@types/jsonwebtoken": "^8.5.5",
+    "@types/jest": "^27.0.3",
+    "@types/jsonwebtoken": "^8.5.6",
     "@types/locutus": "^0.0.6",
-    "@types/lodash": "^4.14.172",
+    "@types/lodash": "^4.14.178",
     "@types/nanoid-dictionary": "^4.2.0",
-    "jest": "^27.0.6",
-    "ts-jest": "^27.0.5",
-    "typescript": "^4.3.5"
+    "jest": "^27.4.5",
+    "ts-jest": "^27.1.1",
+    "typescript": "^4.5.4"
   },
-  "gitHead": "9596354bffaa484f3002f3063f0963f6261040be"
+  "gitHead": "4d0ec97a49f09228581fbc3773d5709531ccab73"
 }

package/src/Group.test.ts

@@ -1,5 +1,5 @@
 import { SQLite3Driver } from '@nymphjs/driver-sqlite3';
-import nymph from '@nymphjs/nymph';
+import { Nymph } from '@nymphjs/nymph';
 
 import Tilmeld from './Tilmeld';
 import defaults from './conf/defaults';
@@ -16,7 +16,7 @@ const tilmeld = new Tilmeld({
   cancelChangeRedirect: 'http://localhost:8080',
   jwtSecret: 'shhhhh',
 });
-nymph.init(
+const _nymph = new Nymph(
   {},
   new SQLite3Driver({
     filename: ':memory:',
@@ -37,6 +37,14 @@ describe('Group', () => {
     return newGroup;
   }
 
+  it('new group passes validation', async () => {
+    const validGroup = await makeNewGroup();
+
+    expect(() => {
+      defaults.validatorGroup(validGroup);
+    }).not.toThrow();
+  });
+
   it("doesn't allow unknown keys", async () => {
     const invalidGroup = await makeNewGroup();
 

package/src/Group.ts

@@ -10,6 +10,7 @@ import {
 import md5 from 'crypto-js/md5';
 import { difference } from 'lodash';
 
+import type Tilmeld from './Tilmeld';
 import AbleObject from './AbleObject';
 import {
   BadDataError,
@@ -17,7 +18,6 @@ import {
   BadUsernameError,
   CouldNotChangeDefaultPrimaryGroupError,
 } from './errors';
-import Tilmeld from './Tilmeld';
 import User, { UserData } from './User';
 
 export type GroupData = {
@@ -72,11 +72,20 @@ export type GroupData = {
   unverifiedSecondary?: boolean;
 };
 
+/**
+ * A user group data model.
+ *
+ * Written by Hunter Perrin for SciActive.
+ *
+ * @author Hunter Perrin <hperrin@gmail.com>
+ * @copyright SciActive Inc
+ * @see http://nymph.io/
+ */
 export default class Group extends AbleObject<GroupData> {
   /**
    * The instance of Tilmeld to use for queries.
    */
-  public static tilmeld: Tilmeld;
+  static tilmeld: Tilmeld;
   static ETYPE = 'tilmeld_group';
   static class = 'Group';
 
@@ -97,9 +106,9 @@ export default class Group extends AbleObject<GroupData> {
     'getPrimaryGroups',
     'getSecondaryGroups',
   ];
-  protected $privateData = Group.DEFAULT_PRIVATE_DATA;
-  public static searchRestrictedData = Group.DEFAULT_PRIVATE_DATA;
-  protected $allowlistData? = Group.DEFAULT_ALLOWLIST_DATA;
+  protected $privateData = [...Group.DEFAULT_PRIVATE_DATA];
+  public static searchRestrictedData = [...Group.DEFAULT_PRIVATE_DATA];
+  protected $allowlistData? = [...Group.DEFAULT_ALLOWLIST_DATA];
   protected $allowlistTags?: string[] = [];
 
   /**
@@ -285,8 +294,8 @@ export default class Group extends AbleObject<GroupData> {
     const tilmeld = this.$nymph.tilmeld as Tilmeld;
     let user = givenUser ?? tilmeld.User.current();
 
-    this.$privateData = Group.DEFAULT_PRIVATE_DATA;
-    this.$allowlistData = Group.DEFAULT_ALLOWLIST_DATA;
+    this.$privateData = [...Group.DEFAULT_PRIVATE_DATA];
+    this.$allowlistData = [...Group.DEFAULT_ALLOWLIST_DATA];
 
     if (tilmeld.config.emailUsernames) {
       this.$privateData.push('groupname');
@@ -743,7 +752,9 @@ export default class Group extends AbleObject<GroupData> {
     }
 
     const transaction = 'tilmeld-delete-' + this.guid;
-    const tnymph = await this.$nymph.startTransaction(transaction);
+    const nymph = this.$nymph;
+    const tnymph = await nymph.startTransaction(transaction);
+    this.$nymph = tnymph;
 
     // Delete descendants.
     const descendants = await this.$getDescendants();
@@ -751,6 +762,7 @@ export default class Group extends AbleObject<GroupData> {
       for (let curGroup of descendants) {
         if (!(await curGroup.$delete())) {
           await tnymph.rollback(transaction);
+          this.$nymph = nymph;
           return false;
         }
       }
@@ -771,6 +783,7 @@ export default class Group extends AbleObject<GroupData> {
       delete user.group;
       if (!(await user.$save())) {
         await tnymph.rollback(transaction);
+        this.$nymph = nymph;
         return false;
       }
     }
@@ -801,6 +814,7 @@ export default class Group extends AbleObject<GroupData> {
     } else {
       await tnymph.rollback(transaction);
     }
+    this.$nymph = nymph;
     return success;
   }
 }