@nymphjs/tilmeld 1.0.0-beta.45 → 1.0.0-beta.47

package/src/Group.ts

@@ -119,7 +119,7 @@ export default class Group extends AbleObject<GroupData> {
   }
 
   static async factoryGroupname(
-    groupname?: string
+    groupname?: string,
   ): Promise<Group & GroupData> {
     const entity = new this();
     if (groupname != null) {
@@ -130,7 +130,7 @@ export default class Group extends AbleObject<GroupData> {
         {
           type: '&',
           ilike: ['groupname', groupname.replace(/([\\%_])/g, (s) => `\\${s}`)],
-        }
+        },
       );
       if (entity != null) {
         return entity;
@@ -161,7 +161,7 @@ export default class Group extends AbleObject<GroupData> {
    */
   public static async getPrimaryGroups(
     options?: Options,
-    selectors?: Selector[]
+    selectors?: Selector[],
   ) {
     const tilmeld = enforceTilmeld(this);
     if (!tilmeld.gatekeeper('tilmeld/admin')) {
@@ -171,7 +171,7 @@ export default class Group extends AbleObject<GroupData> {
     return await this.getAssignableGroups(
       tilmeld.config.highestPrimary,
       { ...options, class: tilmeld.Group, return: 'entity' },
-      [...(selectors ?? [])]
+      [...(selectors ?? [])],
     );
   }
 
@@ -184,7 +184,7 @@ export default class Group extends AbleObject<GroupData> {
    */
   public static async getSecondaryGroups(
     options?: Options,
-    selectors?: Selector[]
+    selectors?: Selector[],
   ) {
     const tilmeld = enforceTilmeld(this);
     if (!tilmeld.gatekeeper('tilmeld/admin')) {
@@ -194,14 +194,14 @@ export default class Group extends AbleObject<GroupData> {
     return await this.getAssignableGroups(
       tilmeld.config.highestSecondary,
       { ...options, class: tilmeld.Group, return: 'entity' },
-      [...(selectors ?? [])]
+      [...(selectors ?? [])],
     );
   }
 
   private static async getAssignableGroups(
     highestParent: string | boolean,
     options: Options<typeof Group>,
-    selectors: Selector[]
+    selectors: Selector[],
   ) {
     const tilmeld = enforceTilmeld(this);
     let assignableGroups: (Group & GroupData)[] = [];
@@ -212,7 +212,7 @@ export default class Group extends AbleObject<GroupData> {
 
     assignableGroups = await this.nymph.getEntities(
       { ...options, class: tilmeld.Group },
-      ...selectors
+      ...selectors,
     );
     if (highestParent !== true) {
       assignableGroups = (
@@ -230,7 +230,7 @@ export default class Group extends AbleObject<GroupData> {
               await parent?.$wake();
             }
             return null;
-          })
+          }),
         )
       ).filter((group) => group != null) as (Group & GroupData)[];
     }
@@ -263,7 +263,7 @@ export default class Group extends AbleObject<GroupData> {
         !tilmeld.currentUser.abilities?.includes('system/admin'))
     ) {
       throw new BadDataError(
-        "You don't have the authority to grant or revoke system/admin."
+        "You don't have the authority to grant or revoke system/admin.",
       );
     }
 
@@ -275,7 +275,7 @@ export default class Group extends AbleObject<GroupData> {
         !tilmeld.currentUser.abilities?.includes('system/admin'))
     ) {
       throw new BadDataError(
-        "You don't have the authority to grant or revoke tilmeld/admin."
+        "You don't have the authority to grant or revoke tilmeld/admin.",
       );
     }
 
@@ -287,7 +287,7 @@ export default class Group extends AbleObject<GroupData> {
         !tilmeld.currentUser.abilities?.includes('system/admin'))
     ) {
       throw new BadDataError(
-        "You don't have the authority to grant or revoke tilmeld/switch."
+        "You don't have the authority to grant or revoke tilmeld/switch.",
       );
     }
 
@@ -306,7 +306,7 @@ export default class Group extends AbleObject<GroupData> {
         !tilmeld.currentUser.abilities?.includes('system/admin'))
     ) {
       throw new BadDataError(
-        "You don't have the authority to grant or revoke system/admin."
+        "You don't have the authority to grant or revoke system/admin.",
       );
     }
 
@@ -318,7 +318,7 @@ export default class Group extends AbleObject<GroupData> {
         !tilmeld.currentUser.abilities?.includes('system/admin'))
     ) {
       throw new BadDataError(
-        "You don't have the authority to grant or revoke tilmeld/admin."
+        "You don't have the authority to grant or revoke tilmeld/admin.",
       );
     }
 
@@ -330,7 +330,7 @@ export default class Group extends AbleObject<GroupData> {
         !tilmeld.currentUser.abilities?.includes('system/admin'))
     ) {
       throw new BadDataError(
-        "You don't have the authority to grant or revoke tilmeld/switch."
+        "You don't have the authority to grant or revoke tilmeld/switch.",
       );
     }
 
@@ -383,7 +383,7 @@ export default class Group extends AbleObject<GroupData> {
    * @returns True or false.
    */
   public async $isDescendant(
-    givenGroup: (Group & GroupData) | string
+    givenGroup: (Group & GroupData) | string,
   ): Promise<boolean> {
     const tilmeld = enforceTilmeld(this);
     let group: Group & GroupData;
@@ -423,7 +423,7 @@ export default class Group extends AbleObject<GroupData> {
         type: '&',
         equal: ['enabled', true],
         ref: ['parent', this],
-      }
+      },
     );
   }
 
@@ -434,7 +434,7 @@ export default class Group extends AbleObject<GroupData> {
    * @returns An array of groups.
    */
   public async $getDescendants(
-    andSelf = false
+    andSelf = false,
   ): Promise<(Group & GroupData)[]> {
     const tilmeld = enforceTilmeld(this);
     let groups: (Group & GroupData)[] = [];
@@ -444,7 +444,7 @@ export default class Group extends AbleObject<GroupData> {
         type: '&',
         equal: ['enabled', true],
         ref: ['parent', this],
-      }
+      },
     );
     for (let entity of entities) {
       groups = (await entity.$getDescendants(true)).concat(groups);
@@ -492,7 +492,7 @@ export default class Group extends AbleObject<GroupData> {
   public async $getUsers(
     descendants = false,
     limit?: number,
-    offset?: number
+    offset?: number,
   ): Promise<(User & UserData)[]> {
     const tilmeld = enforceTilmeld(this);
     let groups: (Group & GroupData)[] = [];
@@ -523,7 +523,7 @@ export default class Group extends AbleObject<GroupData> {
             group,
           ]),
         ],
-      }
+      },
     );
   }
 
@@ -541,10 +541,16 @@ export default class Group extends AbleObject<GroupData> {
       if (this.$data.groupname == null || !this.$data.groupname.length) {
         return { result: false, message: 'Please specify a groupname.' };
       }
-      if (
-        tilmeld.config.maxUsernameLength > 0 &&
-        this.$data.groupname.length > tilmeld.config.maxUsernameLength
-      ) {
+      if (this.$data.groupname.length < tilmeld.config.minUsernameLength) {
+        return {
+          result: false,
+          message:
+            'Groupnames must be at least ' +
+            tilmeld.config.minUsernameLength +
+            ' characters.',
+        };
+      }
+      if (this.$data.groupname.length > tilmeld.config.maxUsernameLength) {
         return {
           result: false,
           message:
@@ -556,7 +562,7 @@ export default class Group extends AbleObject<GroupData> {
       if (
         difference(
           this.$data.groupname.split(''),
-          tilmeld.config.validChars.split('')
+          tilmeld.config.validChars.split(''),
         ).length
       ) {
         return {
@@ -583,7 +589,7 @@ export default class Group extends AbleObject<GroupData> {
       }
       const test = await this.$nymph.getEntity(
         { class: tilmeld.Group, skipAc: true },
-        selector
+        selector,
       );
       if (test != null) {
         return { result: false, message: 'That groupname is taken.' };
@@ -599,10 +605,16 @@ export default class Group extends AbleObject<GroupData> {
       if (this.$data.groupname == null || !this.$data.groupname.length) {
         return { result: false, message: 'Please specify an email.' };
       }
-      if (
-        tilmeld.config.maxUsernameLength > 0 &&
-        this.$data.groupname.length > tilmeld.config.maxUsernameLength
-      ) {
+      if (this.$data.groupname.length < tilmeld.config.minUsernameLength) {
+        return {
+          result: false,
+          message:
+            'Emails must be at least ' +
+            tilmeld.config.minUsernameLength +
+            ' characters.',
+        };
+      }
+      if (this.$data.groupname.length > tilmeld.config.maxUsernameLength) {
         return {
           result: false,
           message:
@@ -644,7 +656,7 @@ export default class Group extends AbleObject<GroupData> {
     }
     const test = await this.$nymph.getEntity(
       { class: tilmeld.Group, skipAc: true },
-      selector
+      selector,
     );
     if (test != null) {
       return {
@@ -737,7 +749,7 @@ export default class Group extends AbleObject<GroupData> {
         (await parent.$isDescendant(this)))
     ) {
       throw new BadDataError(
-        "Group parent can't be itself or descendant of itself."
+        "Group parent can't be itself or descendant of itself.",
       );
     }
 
@@ -751,14 +763,14 @@ export default class Group extends AbleObject<GroupData> {
     if (this.$data.defaultPrimary) {
       const currentPrimary = await this.$nymph.getEntity(
         { class: tilmeld.Group },
-        { type: '&', truthy: 'defaultPrimary' }
+        { type: '&', truthy: 'defaultPrimary' },
       );
       if (currentPrimary != null && !this.$is(currentPrimary)) {
         currentPrimary.defaultPrimary = false;
         if (!(await currentPrimary.$save())) {
           throw new CouldNotChangeDefaultPrimaryGroupError(
             'Could not change new user primary group from ' +
-              `${currentPrimary.groupname}.`
+              `${currentPrimary.groupname}.`,
           );
         }
       }
@@ -816,7 +828,7 @@ export default class Group extends AbleObject<GroupData> {
       {
         type: '&',
         ref: ['group', this],
-      }
+      },
     );
     for (let user of primaryUsers) {
       delete user.group;
@@ -836,7 +848,7 @@ export default class Group extends AbleObject<GroupData> {
       {
         type: '&',
         ref: ['groups', this],
-      }
+      },
     );
     for (let user of secondaryUsers) {
       user.$delGroup(this);

package/src/Tilmeld.ts

@@ -183,7 +183,7 @@ export default class Tilmeld implements TilmeldInterface {
     const handleQuery = function (
       nymph: Nymph,
       options: Options,
-      selectors: FormattedSelector[]
+      selectors: FormattedSelector[],
     ) {
       const tilmeld = enforceTilmeld(nymph);
       if (
@@ -225,7 +225,7 @@ export default class Tilmeld implements TilmeldInterface {
     // Filter entities being deleted for user permissions.
     const checkPermissionsDelete = async function (
       nymph: Nymph,
-      entity: EntityInterface
+      entity: EntityInterface,
     ) {
       const tilmeld = enforceTilmeld(nymph);
       if (
@@ -245,11 +245,11 @@ export default class Tilmeld implements TilmeldInterface {
     const checkPermissionsDeleteByID = async function (
       nymph: Nymph,
       guid: string,
-      className?: string
+      className?: string,
     ) {
       const entity = await nymph.getEntity(
         { class: nymph.getEntityClass(className ?? 'Entity') },
-        { type: '&', guid: guid }
+        { type: '&', guid: guid },
       );
       if (entity != null) {
         checkPermissionsDelete(nymph, entity);
@@ -261,7 +261,7 @@ export default class Tilmeld implements TilmeldInterface {
     // disallowed changes to AC properties.
     const checkPermissionsSaveAndFilterAcChanges = async function (
       nymph: Nymph,
-      entity: EntityInterface & AccessControlData
+      entity: EntityInterface & AccessControlData,
     ) {
       const tilmeld = enforceTilmeld(nymph);
       if (!entity) {
@@ -338,12 +338,12 @@ export default class Tilmeld implements TilmeldInterface {
               entity,
               TilmeldAccessLevels.FULL_ACCESS,
               undefined,
-              originalAc
+              originalAc,
             )
           ) {
             // Only allow changes to AC properties if the user has full access.
             throw new AccessControlError(
-              'No permission to change access control properties.'
+              'No permission to change access control properties.',
             );
           }
 
@@ -354,7 +354,7 @@ export default class Tilmeld implements TilmeldInterface {
               newAc.user !== tilmeld.currentUser)
           ) {
             throw new AccessControlError(
-              'No permission to assign to another user.'
+              'No permission to assign to another user.',
             );
           }
 
@@ -366,7 +366,7 @@ export default class Tilmeld implements TilmeldInterface {
               (tilmeld.currentUser?.$getGids() ?? []).includes(newAc.group))
           ) {
             throw new AccessControlError(
-              'No permission to assign to another group.'
+              'No permission to assign to another group.',
             );
           }
         }
@@ -397,7 +397,7 @@ export default class Tilmeld implements TilmeldInterface {
      */
     const addAccess = async function (
       nymph: Nymph,
-      entity: EntityInterface & AccessControlData
+      entity: EntityInterface & AccessControlData,
     ) {
       const tilmeld = enforceTilmeld(nymph);
       const user = tilmeld.currentUser;
@@ -440,7 +440,7 @@ export default class Tilmeld implements TilmeldInterface {
 
     const validate = async function (
       _nymph: Nymph,
-      entity: EntityInterface & AccessControlData
+      entity: EntityInterface & AccessControlData,
     ) {
       if (!(entity instanceof User) && !(entity instanceof Group)) {
         const ownershipAcPropertyValidator = (prop: any) => {
@@ -450,7 +450,7 @@ export default class Tilmeld implements TilmeldInterface {
             prop > TilmeldAccessLevels.FULL_ACCESS
           ) {
             throw new AccessControlError(
-              'Invalid access control property: ' + prop
+              'Invalid access control property: ' + prop,
             );
           }
         };
@@ -458,13 +458,13 @@ export default class Tilmeld implements TilmeldInterface {
         const accessAcPropertyValidator = (prop: any) => {
           if (!Array.isArray(prop)) {
             throw new AccessControlError(
-              'Invalid access control property: ' + prop
+              'Invalid access control property: ' + prop,
             );
           }
           prop.forEach((value) => {
             if (!(value instanceof User || value instanceof Group)) {
               throw new AccessControlError(
-                'Invalid access control property: ' + prop
+                'Invalid access control property: ' + prop,
               );
             }
           });
@@ -473,7 +473,7 @@ export default class Tilmeld implements TilmeldInterface {
         if ('user' in entity) {
           if (!(entity.user instanceof User)) {
             throw new AccessControlError(
-              'Invalid access control property: user'
+              'Invalid access control property: user',
             );
           }
         }
@@ -481,7 +481,7 @@ export default class Tilmeld implements TilmeldInterface {
         if ('group' in entity) {
           if (!(entity.group instanceof Group)) {
             throw new AccessControlError(
-              'Invalid access control property: group'
+              'Invalid access control property: group',
             );
           }
         }
@@ -526,7 +526,7 @@ export default class Tilmeld implements TilmeldInterface {
    */
   public addAccessControlSelectors(
     options: Options,
-    selectors: FormattedSelector[]
+    selectors: FormattedSelector[],
   ) {
     const user = this.currentUser;
 
@@ -691,7 +691,7 @@ export default class Tilmeld implements TilmeldInterface {
     entity: EntityInterface,
     type: TilmeldAccessLevels = TilmeldAccessLevels.READ_ACCESS,
     user?: (User & UserData) | false,
-    acProperties?: ACProperties
+    acProperties?: ACProperties,
   ) {
     if (!acProperties) {
       acProperties = entity.$getCurrentAcValues() as ACProperties;
@@ -811,7 +811,7 @@ export default class Tilmeld implements TilmeldInterface {
   public async checkClientUIDPermissions(
     name: string,
     type: TilmeldAccessLevels = TilmeldAccessLevels.READ_ACCESS,
-    user?: (User & UserData) | false
+    user?: (User & UserData) | false,
   ) {
     let userOrEmpty: User & UserData = this.User.factorySync();
     // Calculate the user.
@@ -896,7 +896,7 @@ export default class Tilmeld implements TilmeldInterface {
       {
         type: '&',
         guid: guid,
-      }
+      },
     );
     if (!user || !user.guid) {
       return null;
@@ -1050,7 +1050,7 @@ export default class Tilmeld implements TilmeldInterface {
   public async login(
     user: User & UserData,
     sendAuthHeader: boolean,
-    sendCookie = true
+    sendCookie = true,
   ) {
     if (user.guid != null && user.enabled) {
       if (this.response) {
@@ -1063,9 +1063,9 @@ export default class Tilmeld implements TilmeldInterface {
               domain: this.config.cookieDomain,
               path: this.config.cookiePath,
               maxAge: this.config.jwtExpire * 1000,
-              secure: appUrl.protocol === 'https',
+              secure: appUrl.protocol === 'https:',
               httpOnly: false, // Allow JS access (for CSRF protection).
-              sameSite: appUrl.protocol === 'https' ? 'lax' : 'strict',
+              sameSite: appUrl.protocol === 'https:' ? 'lax' : 'strict',
             });
           }
 
@@ -1096,7 +1096,7 @@ export default class Tilmeld implements TilmeldInterface {
   public async loginSwitch(
     user: User & UserData,
     sendAuthHeader: boolean,
-    sendCookie = true
+    sendCookie = true,
   ) {
     if (user.guid != null) {
       if (this.response) {
@@ -1109,9 +1109,9 @@ export default class Tilmeld implements TilmeldInterface {
               domain: this.config.cookieDomain,
               path: this.config.cookiePath,
               maxAge: this.config.jwtSwitchExpire * 1000,
-              secure: appUrl.protocol === 'https',
+              secure: appUrl.protocol === 'https:',
               httpOnly: false, // Allow JS access (for PubSub auth token).
-              sameSite: appUrl.protocol === 'https' ? 'lax' : 'strict',
+              sameSite: appUrl.protocol === 'https:' ? 'lax' : 'strict',
             });
           }
 

package/src/User.test.ts

@@ -21,7 +21,7 @@ const _nymph = new Nymph(
   new SQLite3Driver({
     filename: ':memory:',
   }),
-  tilmeld
+  tilmeld,
 );
 
 const User = tilmeld.User;