@nymphjs/tilmeld 1.0.0-beta.3 → 1.0.0-beta.31

package/src/Group.ts

@@ -10,7 +10,7 @@ import {
 import md5 from 'crypto-js/md5';
 import { difference } from 'lodash';
 
-import type Tilmeld from './Tilmeld';
+import { enforceTilmeld } from './enforceTilmeld';
 import AbleObject from './AbleObject';
 import {
   BadDataError,
@@ -85,7 +85,6 @@ export default class Group extends AbleObject<GroupData> {
   /**
    * The instance of Tilmeld to use for queries.
    */
-  static tilmeld: Tilmeld;
   static ETYPE = 'tilmeld_group';
   static class = 'Group';
 
@@ -167,13 +166,14 @@ export default class Group extends AbleObject<GroupData> {
     options?: Options,
     selectors?: Selector[]
   ) {
-    if (!this.tilmeld.gatekeeper('tilmeld/admin')) {
+    const tilmeld = enforceTilmeld(this);
+    if (!tilmeld.gatekeeper('tilmeld/admin')) {
       throw new Error("You don't have permission to do that.");
     }
 
     return await this.getAssignableGroups(
-      this.tilmeld.config.highestPrimary,
-      { ...options, class: this.tilmeld.Group, return: 'entity' },
+      tilmeld.config.highestPrimary,
+      { ...options, class: tilmeld.Group, return: 'entity' },
       [...(selectors ?? [])]
     );
   }
@@ -189,13 +189,14 @@ export default class Group extends AbleObject<GroupData> {
     options?: Options,
     selectors?: Selector[]
   ) {
-    if (!this.tilmeld.gatekeeper('tilmeld/admin')) {
+    const tilmeld = enforceTilmeld(this);
+    if (!tilmeld.gatekeeper('tilmeld/admin')) {
       throw new Error("You don't have permission to do that.");
     }
 
     return await this.getAssignableGroups(
-      this.tilmeld.config.highestSecondary,
-      { ...options, class: this.tilmeld.Group, return: 'entity' },
+      tilmeld.config.highestSecondary,
+      { ...options, class: tilmeld.Group, return: 'entity' },
       [...(selectors ?? [])]
     );
   }
@@ -205,6 +206,7 @@ export default class Group extends AbleObject<GroupData> {
     options: Options<typeof Group>,
     selectors: Selector[]
   ) {
+    const tilmeld = enforceTilmeld(this);
     let assignableGroups: (Group & GroupData)[] = [];
 
     if (highestParent === false) {
@@ -212,7 +214,7 @@ export default class Group extends AbleObject<GroupData> {
     }
 
     assignableGroups = await this.nymph.getEntities(
-      { ...options, class: this.tilmeld.Group },
+      { ...options, class: tilmeld.Group },
       ...selectors
     );
     if (highestParent !== true) {
@@ -245,17 +247,39 @@ export default class Group extends AbleObject<GroupData> {
   }
 
   public $jsonAcceptData(input: EntityJson, allowConflict = false) {
-    const tilmeld = this.$nymph.tilmeld as Tilmeld;
+    const tilmeld = enforceTilmeld(this);
     this.$referenceWake();
 
     if (
-      input.data.abilities?.indexOf('system/admin') !== -1 &&
-      this.$data.abilities?.indexOf('system/admin') === -1 &&
-      tilmeld.gatekeeper('tilmeld/admin') &&
+      'abilities' in input.data &&
+      input.data.abilities?.includes('system/admin') !==
+        this.$data.abilities?.includes('system/admin') &&
+      !tilmeld.gatekeeper('system/admin')
+    ) {
+      throw new BadDataError(
+        "You don't have the authority to grant or revoke system/admin."
+      );
+    }
+
+    if (
+      'abilities' in input.data &&
+      input.data.abilities?.includes('tilmeld/admin') !==
+        this.$data.abilities?.includes('tilmeld/admin') &&
+      !tilmeld.gatekeeper('system/admin')
+    ) {
+      throw new BadDataError(
+        "You don't have the authority to grant or revoke tilmeld/admin."
+      );
+    }
+
+    if (
+      'abilities' in input.data &&
+      input.data.abilities?.includes('tilmeld/switch') !==
+        this.$data.abilities?.includes('tilmeld/switch') &&
       !tilmeld.gatekeeper('system/admin')
     ) {
       throw new BadDataError(
-        "You don't have the authority to make this group a system admin."
+        "You don't have the authority to grant or revoke tilmeld/switch."
       );
     }
 
@@ -263,17 +287,39 @@ export default class Group extends AbleObject<GroupData> {
   }
 
   public $jsonAcceptPatch(patch: EntityPatch, allowConflict = false) {
-    const tilmeld = this.$nymph.tilmeld as Tilmeld;
+    const tilmeld = enforceTilmeld(this);
     this.$referenceWake();
 
     if (
-      patch.set.abilities?.indexOf('system/admin') !== -1 &&
-      this.$data.abilities?.indexOf('system/admin') === -1 &&
-      tilmeld.gatekeeper('tilmeld/admin') &&
+      'abilities' in patch.set &&
+      patch.set.abilities?.includes('system/admin') !==
+        this.$data.abilities?.includes('system/admin') &&
+      !tilmeld.gatekeeper('system/admin')
+    ) {
+      throw new BadDataError(
+        "You don't have the authority to grant or revoke system/admin."
+      );
+    }
+
+    if (
+      'abilities' in patch.set &&
+      patch.set.abilities?.includes('tilmeld/admin') !==
+        this.$data.abilities?.includes('tilmeld/admin') &&
+      !tilmeld.gatekeeper('system/admin')
+    ) {
+      throw new BadDataError(
+        "You don't have the authority to grant or revoke tilmeld/admin."
+      );
+    }
+
+    if (
+      'abilities' in patch.set &&
+      patch.set.abilities?.includes('tilmeld/switch') !==
+        this.$data.abilities?.includes('tilmeld/switch') &&
       !tilmeld.gatekeeper('system/admin')
     ) {
       throw new BadDataError(
-        "You don't have the authority to make this group a system admin."
+        "You don't have the authority to grant or revoke tilmeld/switch."
       );
     }
 
@@ -291,7 +337,7 @@ export default class Group extends AbleObject<GroupData> {
    * @param givenUser User to update protection for. If undefined, will use the currently logged in user.
    */
   public $updateDataProtection(givenUser?: User & UserData) {
-    const tilmeld = this.$nymph.tilmeld as Tilmeld;
+    const tilmeld = enforceTilmeld(this);
     let user = givenUser ?? tilmeld.User.current();
 
     this.$privateData = [...Group.DEFAULT_PRIVATE_DATA];
@@ -326,7 +372,7 @@ export default class Group extends AbleObject<GroupData> {
    * @returns True or false.
    */
   public $isDescendant(givenGroup: (Group & GroupData) | string): boolean {
-    const tilmeld = this.$nymph.tilmeld as Tilmeld;
+    const tilmeld = enforceTilmeld(this);
     let group: Group & GroupData;
     if (typeof givenGroup === 'string') {
       group = tilmeld.Group.factorySync(givenGroup);
@@ -355,7 +401,7 @@ export default class Group extends AbleObject<GroupData> {
    * @returns An array of groups.
    */
   public async $getChildren() {
-    const tilmeld = this.$nymph.tilmeld as Tilmeld;
+    const tilmeld = enforceTilmeld(this);
     return await this.$nymph.getEntities(
       { class: tilmeld.Group },
       {
@@ -375,7 +421,7 @@ export default class Group extends AbleObject<GroupData> {
   public async $getDescendants(
     andSelf = false
   ): Promise<(Group & GroupData)[]> {
-    const tilmeld = this.$nymph.tilmeld as Tilmeld;
+    const tilmeld = enforceTilmeld(this);
     let groups: (Group & GroupData)[] = [];
     const entities = await this.$nymph.getEntities(
       { class: tilmeld.Group },
@@ -401,7 +447,7 @@ export default class Group extends AbleObject<GroupData> {
    * @returns An array of groups.
    */
   public $getDescendantsSync(andSelf = false): (Group & GroupData)[] {
-    const tilmeld = this.$nymph.tilmeld as Tilmeld;
+    const tilmeld = enforceTilmeld(this);
     let groups: (Group & GroupData)[] = [];
     let entity: EntityInterface | null;
     let offset = 0;
@@ -437,7 +483,7 @@ export default class Group extends AbleObject<GroupData> {
    * @returns The level of the group.
    */
   public $getLevel() {
-    const tilmeld = this.$nymph.tilmeld as Tilmeld;
+    const tilmeld = enforceTilmeld(this);
     let group = tilmeld.Group.factorySync(this.guid ?? undefined);
     let level = 0;
     while (group.parent != null && group.parent.cdate != null && level < 1024) {
@@ -460,7 +506,7 @@ export default class Group extends AbleObject<GroupData> {
     limit?: number,
     offset?: number
   ): Promise<(User & UserData)[]> {
-    const tilmeld = this.$nymph.tilmeld as Tilmeld;
+    const tilmeld = enforceTilmeld(this);
     let groups: (Group & GroupData)[] = [];
     if (descendants) {
       groups = await this.$getDescendants();
@@ -502,7 +548,7 @@ export default class Group extends AbleObject<GroupData> {
     result: boolean;
     message: string;
   }> {
-    const tilmeld = this.$nymph.tilmeld as Tilmeld;
+    const tilmeld = enforceTilmeld(this);
     if (!tilmeld.config.emailUsernames) {
       if (this.$data.groupname == null || !this.$data.groupname.length) {
         return { result: false, message: 'Please specify a groupname.' };
@@ -588,7 +634,7 @@ export default class Group extends AbleObject<GroupData> {
    * @returns An object with a boolean 'result' entry and a 'message' entry.
    */
   public async $checkEmail(): Promise<{ result: boolean; message: string }> {
-    const tilmeld = this.$nymph.tilmeld as Tilmeld;
+    const tilmeld = enforceTilmeld(this);
     if (this.$data.email === '') {
       return { result: true, message: '' };
     }
@@ -627,7 +673,7 @@ export default class Group extends AbleObject<GroupData> {
   }
 
   public async $save() {
-    const tilmeld = this.$nymph.tilmeld as Tilmeld;
+    const tilmeld = enforceTilmeld(this);
     if (this.$data.groupname == null || !this.$data.groupname.trim().length) {
       return false;
     }
@@ -671,10 +717,12 @@ export default class Group extends AbleObject<GroupData> {
       delete this.$data.unverifiedSecondary;
     }
 
-    // Groups should never have 'system/admin' or 'tilmeld/admin' abilities.
+    // Groups should never have 'system/admin', 'tilmeld/admin', or
+    // 'tilmeld/switch' abilities.
     this.$data.abilities = difference(this.$data.abilities ?? [], [
       'system/admin',
       'tilmeld/admin',
+      'tilmeld/switch',
       null,
       undefined,
     ]) as string[];
@@ -746,7 +794,7 @@ export default class Group extends AbleObject<GroupData> {
   }
 
   public async $delete() {
-    let tilmeld = this.$nymph.tilmeld as Tilmeld;
+    let tilmeld = enforceTilmeld(this);
     if (!tilmeld.gatekeeper('tilmeld/admin')) {
       throw new BadDataError("You don't have the authority to delete groups.");
     }
@@ -755,7 +803,7 @@ export default class Group extends AbleObject<GroupData> {
     const nymph = this.$nymph;
     const tnymph = await nymph.startTransaction(transaction);
     this.$nymph = tnymph;
-    tilmeld = this.$nymph.tilmeld as Tilmeld;
+    tilmeld = enforceTilmeld(this);
 
     // Delete descendants.
     const descendants = await this.$getDescendants();