@nymphjs/tilmeld 1.0.0-beta.40 → 1.0.0-beta.41

package/src/User.ts

@@ -312,21 +312,19 @@ export default class User extends AbleObject<UserData> {
     return entity;
   }
 
-  static factorySync(guid?: string): User & UserData {
-    return super.factorySync(guid) as User & UserData;
+  static factorySync(): User & UserData {
+    return super.factorySync() as User & UserData;
   }
 
-  constructor(guid?: string) {
-    super(guid);
+  constructor() {
+    super();
 
-    if (this.guid == null) {
-      // Defaults.
-      this.$data.enabled = true;
-      this.$data.abilities = [];
-      this.$data.groups = [];
-      this.$data.inheritAbilities = true;
-      this.$updateDataProtection();
-    }
+    // Defaults.
+    this.$data.enabled = true;
+    this.$data.abilities = [];
+    this.$data.groups = [];
+    this.$data.inheritAbilities = true;
+    this.$updateDataProtection();
   }
 
   public static current(returnObjectIfNotExist: true): User & UserData;
@@ -544,7 +542,7 @@ export default class User extends AbleObject<UserData> {
     if (!this.$data.enabled) {
       return { result: false, message: 'This user is disabled.' };
     }
-    if (this.$gatekeeper()) {
+    if (await this.$gatekeeper()) {
       return { result: true, message: 'You are already logged in.' };
     }
     if (!this.$checkPassword(data.password)) {
@@ -692,7 +690,7 @@ export default class User extends AbleObject<UserData> {
       };
     }
 
-    tilmeld.logout();
+    await tilmeld.logout();
 
     for (let callback of (this.constructor as typeof User)
       .afterLogoutCallbacks) {
@@ -718,36 +716,36 @@ export default class User extends AbleObject<UserData> {
     );
   }
 
-  /**
-   * Get the user's group descendants.
-   */
-  public async $getDescendantGroups(): Promise<(Group & GroupData)[]> {
-    if (this.$descendantGroups == null) {
-      this.$descendantGroups = [];
-      if (this.$data.group != null) {
-        this.$descendantGroups = await this.$data.group.$getDescendants();
-      }
-      for (let curGroup of this.$data.groups ?? []) {
-        this.$descendantGroups = this.$descendantGroups?.concat(
-          await curGroup.$getDescendants()
-        );
-      }
+  public $getGid() {
+    if (this.$data.group) {
+      return this.$data.group.guid;
     }
-    return this.$descendantGroups;
+    return null;
+  }
+
+  public $getGids() {
+    if (this.$data.groups) {
+      return this.$data.groups
+        .map((group) => group.guid)
+        .filter((guid) => guid != null) as string[];
+    }
+    return null;
   }
 
   /**
    * Get the user's group descendants.
    */
-  public $getDescendantGroupsSync(): (Group & GroupData)[] {
+  public async $getDescendantGroups(): Promise<(Group & GroupData)[]> {
     if (this.$descendantGroups == null) {
       this.$descendantGroups = [];
       if (this.$data.group != null) {
-        this.$descendantGroups = this.$data.group.$getDescendantsSync();
+        await this.$data.group.$wake();
+        this.$descendantGroups = await this.$data.group.$getDescendants();
       }
+      await Promise.all(this.$data.groups?.map((e) => e.$wake()) || []);
       for (let curGroup of this.$data.groups ?? []) {
         this.$descendantGroups = this.$descendantGroups?.concat(
-          curGroup.$getDescendantsSync()
+          await curGroup.$getDescendants()
         );
       }
     }
@@ -756,13 +754,14 @@ export default class User extends AbleObject<UserData> {
 
   public $jsonAcceptData(input: EntityJson, allowConflict = false) {
     const tilmeld = enforceTilmeld(this);
-    this.$referenceWake();
+    this.$check();
 
     if (
       'abilities' in input.data &&
       input.data.abilities?.includes('system/admin') !==
         this.$data.abilities?.includes('system/admin') &&
-      !tilmeld.gatekeeper('system/admin')
+      (!tilmeld.currentUser ||
+        !tilmeld.currentUser.abilities?.includes('system/admin'))
     ) {
       throw new BadDataError(
         "You don't have the authority to grant or revoke system/admin."
@@ -773,7 +772,8 @@ export default class User extends AbleObject<UserData> {
       'abilities' in input.data &&
       input.data.abilities?.includes('tilmeld/admin') !==
         this.$data.abilities?.includes('tilmeld/admin') &&
-      !tilmeld.gatekeeper('system/admin')
+      (!tilmeld.currentUser ||
+        !tilmeld.currentUser.abilities?.includes('system/admin'))
     ) {
       throw new BadDataError(
         "You don't have the authority to grant or revoke tilmeld/admin."
@@ -784,7 +784,8 @@ export default class User extends AbleObject<UserData> {
       'abilities' in input.data &&
       input.data.abilities?.includes('tilmeld/switch') !==
         this.$data.abilities?.includes('tilmeld/switch') &&
-      !tilmeld.gatekeeper('system/admin')
+      (!tilmeld.currentUser ||
+        !tilmeld.currentUser.abilities?.includes('system/admin'))
     ) {
       throw new BadDataError(
         "You don't have the authority to grant or revoke tilmeld/switch."
@@ -797,13 +798,14 @@ export default class User extends AbleObject<UserData> {
 
   public $jsonAcceptPatch(patch: EntityPatch, allowConflict = false) {
     const tilmeld = enforceTilmeld(this);
-    this.$referenceWake();
+    this.$check();
 
     if (
       'abilities' in patch.set &&
       patch.set.abilities?.includes('system/admin') !==
         this.$data.abilities?.includes('system/admin') &&
-      !tilmeld.gatekeeper('system/admin')
+      (!tilmeld.currentUser ||
+        !tilmeld.currentUser.abilities?.includes('system/admin'))
     ) {
       throw new BadDataError(
         "You don't have the authority to grant or revoke system/admin."
@@ -814,7 +816,8 @@ export default class User extends AbleObject<UserData> {
       'abilities' in patch.set &&
       patch.set.abilities?.includes('tilmeld/admin') !==
         this.$data.abilities?.includes('tilmeld/admin') &&
-      !tilmeld.gatekeeper('system/admin')
+      (!tilmeld.currentUser ||
+        !tilmeld.currentUser.abilities?.includes('system/admin'))
     ) {
       throw new BadDataError(
         "You don't have the authority to grant or revoke tilmeld/admin."
@@ -825,7 +828,8 @@ export default class User extends AbleObject<UserData> {
       'abilities' in patch.set &&
       patch.set.abilities?.includes('tilmeld/switch') !==
         this.$data.abilities?.includes('tilmeld/switch') &&
-      !tilmeld.gatekeeper('system/admin')
+      (!tilmeld.currentUser ||
+        !tilmeld.currentUser.abilities?.includes('system/admin'))
     ) {
       throw new BadDataError(
         "You don't have the authority to grant or revoke tilmeld/switch."
@@ -948,6 +952,17 @@ export default class User extends AbleObject<UserData> {
     }
   }
 
+  public $updateGroupDataProtection() {
+    if (this.$data.group != null && !this.$data.group.$asleep()) {
+      this.$data.group.$updateDataProtection();
+    }
+    for (let group of this.$data.groups ?? []) {
+      if (!group.$asleep()) {
+        group.$updateDataProtection();
+      }
+    }
+  }
+
   /**
    * Check to see if a user has an ability.
    *
@@ -962,7 +977,7 @@ export default class User extends AbleObject<UserData> {
    * @param ability The ability.
    * @returns True or false.
    */
-  public $gatekeeper(ability?: string): boolean {
+  public async $gatekeeper(ability?: string): Promise<boolean> {
     const tilmeld = enforceTilmeld(this);
     if (ability == null) {
       return tilmeld.User.current()?.$is(this) ?? false;
@@ -971,17 +986,16 @@ export default class User extends AbleObject<UserData> {
     if (this.$gatekeeperCache == null) {
       let abilities = this.$data.abilities ?? [];
       if (this.$data.inheritAbilities) {
+        await Promise.all(this.$data.groups?.map((e) => e.$wake()) || []);
         for (let curGroup of this.$data.groups ?? []) {
           if (curGroup.enabled) {
             abilities = abilities.concat(curGroup.abilities ?? []);
           }
         }
-        if (
-          this.$data.group != null &&
-          this.$data.group.cdate != null &&
-          this.$data.group.enabled
-        ) {
-          abilities = abilities.concat(this.$data.group.abilities ?? []);
+        await this.$data.group?.$wake();
+        const group = this.$data.group;
+        if (group != null && group.cdate != null && group.enabled) {
+          abilities = abilities.concat(group.abilities ?? []);
         }
       }
       this.$gatekeeperCache = Object.fromEntries(
@@ -1102,13 +1116,16 @@ export default class User extends AbleObject<UserData> {
    * @param group The group.
    * @returns True if the user is already in the group. The resulting array of groups if the user was not.
    */
-  public $addGroup(group: Group & GroupData) {
-    if (this.$data.groups == null) {
-      this.$data.groups = [];
+  public async $addGroup(group: Group & GroupData) {
+    await Promise.all(this.$data.groups?.map((e) => e.$wake()) || []);
+    let groups = this.$data.groups;
+    if (groups == null) {
+      groups = [];
     }
-    if (!group.$inArray(this.$data.groups)) {
-      this.$data.groups.push(group);
-      return this.$data.groups;
+    if (!group.$inArray(groups)) {
+      groups.push(group);
+      this.$data.groups = groups;
+      return groups;
     }
     return true;
   }
@@ -1141,10 +1158,12 @@ export default class User extends AbleObject<UserData> {
    * @param group The group.
    * @returns True if the user wasn't in the group. The resulting array of groups if the user was.
    */
-  public $delGroup(group: Group & GroupData) {
-    if (this.$data.groups != null && group.$inArray(this.$data.groups)) {
+  public async $delGroup(group: Group & GroupData) {
+    await Promise.all(this.$data.groups?.map((e) => e.$wake()) || []);
+    let groups = this.$data.groups || [];
+    if (this.$data.groups != null && group.$inArray(groups)) {
       const newGroups: (Group & GroupData)[] = [];
-      for (let curGroup of this.$data.groups) {
+      for (let curGroup of groups) {
         if (!group.$is(curGroup)) {
           newGroups.push(curGroup);
         }
@@ -1161,7 +1180,7 @@ export default class User extends AbleObject<UserData> {
    * @param group The group, or the group's GUID.
    * @returns True or false.
    */
-  public $inGroup(group: (Group & GroupData) | string) {
+  public async $inGroup(group: (Group & GroupData) | string) {
     if (typeof group === 'string') {
       if (this.$data.group?.guid === group) {
         return true;
@@ -1184,16 +1203,19 @@ export default class User extends AbleObject<UserData> {
    * @param group The group, or the group's GUID.
    * @returns True or false.
    */
-  public $isDescendant(group: (Group & GroupData) | string) {
+  public async $isDescendant(group: (Group & GroupData) | string) {
     // Check to see if the user is in a descendant group of the given group.
+    await this.$data.group?.$wake();
     if (
+      this.$data.group != null &&
       this.$data.group?.cdate != null &&
-      this.$data.group.$isDescendant(group)
+      (await this.$data.group?.$isDescendant(group))
     ) {
       return true;
     }
+    await Promise.all(this.$data.groups?.map((e) => e.$wake()) || []);
     for (let curGroup of this.$data.groups ?? []) {
-      if (curGroup.$isDescendant(group)) {
+      if (await curGroup.$isDescendant(group)) {
         return true;
       }
     }
@@ -1925,8 +1947,8 @@ export default class User extends AbleObject<UserData> {
     }
 
     if (
-      tilmeld.gatekeeper('tilmeld/admin') &&
-      !tilmeld.gatekeeper('system/admin') &&
+      (await tilmeld.gatekeeper('tilmeld/admin')) &&
+      !(await tilmeld.gatekeeper('system/admin')) &&
       this.$data.abilities?.includes('system/admin')
     ) {
       throw new BadDataError(
@@ -2020,7 +2042,7 @@ export default class User extends AbleObject<UserData> {
     }
 
     // Email changes.
-    if (!tilmeld.gatekeeper('tilmeld/admin')) {
+    if (!(await tilmeld.gatekeeper('tilmeld/admin'))) {
       // The user isn't an admin, so email address changes should contain some
       // security measures.
       if (tilmeld.config.verifyEmail) {
@@ -2119,19 +2141,18 @@ export default class User extends AbleObject<UserData> {
     this.$nymph = tnymph;
     tilmeld = enforceTilmeld(this);
 
-    if (
-      this.$data.group != null &&
-      this.$data.group.user != null &&
-      this.$is(this.$data.group.user)
-    ) {
+    const group = this.$data.group;
+    await group?.$wake();
+    if (group != null && group.user != null && this.$is(group.user)) {
       try {
         // Update the user's generated primary group.
-        this.$data.group.groupname = this.$data.username;
-        this.$data.group.avatar = this.$data.avatar;
-        this.$data.group.email = this.$data.email;
-        this.$data.group.name = this.$data.name;
-        this.$data.group.phone = this.$data.phone;
-        await this.$data.group.$saveSkipAC();
+        group.groupname = this.$data.username;
+        group.avatar = this.$data.avatar;
+        group.email = this.$data.email;
+        group.name = this.$data.name;
+        group.phone = this.$data.phone;
+        await group.$saveSkipAC();
+        this.$data.group = group;
       } catch (e: any) {
         await tnymph.rollback(transaction);
         this.$nymph = nymph;
@@ -2197,11 +2218,11 @@ export default class User extends AbleObject<UserData> {
 
   public async $delete() {
     const tilmeld = enforceTilmeld(this);
-    if (!tilmeld.gatekeeper('tilmeld/admin')) {
+    if (!(await tilmeld.gatekeeper('tilmeld/admin'))) {
       throw new BadDataError("You don't have the authority to delete users.");
     }
     if (
-      !tilmeld.gatekeeper('system/admin') &&
+      !(await tilmeld.gatekeeper('system/admin')) &&
       this.$data.abilities?.includes('system/admin')
     ) {
       throw new BadDataError(