@managemint-solutions/sdk 0.52.0 → 0.54.0

package/dist/users/index.js

@@ -20,6 +20,7 @@ const working_days_1 = require("../leave/working-days");
 const audit_1 = require("../audit");
 const errors_1 = require("../errors");
 const paths_1 = require("../supporting-files/paths");
+const tenancy_1 = require("../tenancy");
 const transforms_1 = require("../transforms");
 const paths_2 = require("./paths");
 __exportStar(require("./dto"), exports);
@@ -33,10 +34,13 @@ class UsersResource {
     supabase;
     auth;
     table;
+    /** This record's history - its own rows and the rows that hang off it. */
+    audit;
     constructor(supabase, auth, audit) {
         this.supabase = supabase;
         this.auth = auth;
         this.table = (0, audit_1.auditedTable)(supabase, auth, audit, USERS_TABLE);
+        this.audit = new audit_1.EntityAuditTrail(supabase, auth, enum_1.AuditTrailEntityType.USER);
     }
     async list(query) {
         const page = query.page;
@@ -45,12 +49,14 @@ class UsersResource {
         const trimmedSearch = query.search?.trim();
         // `order`/`range` return `this`, so the builder stays a filter builder and the conditional
         // filters below can be reassigned onto it without a cast.
-        let usersQuery = this.supabase
+        let usersQuery = (0, tenancy_1.scopeToOrganization)(this.supabase
             .from('users')
-            .select(USER_LIST_SELECT, { count: 'estimated' })
-            .eq('organization_id', this.auth.organization_id)
+            .select((0, tenancy_1.withOrganization)(USER_LIST_SELECT, this.auth), { count: 'estimated' }), this.auth)
             .order('created_at', { ascending: false })
             .range(offset, offset + pageSize - 1);
+        if (query.organization_id) {
+            usersQuery = usersQuery.eq('organization_id', query.organization_id);
+        }
         // No filter shows everyone: inactive users must stay reachable so they can
         // be reactivated from their detail page.
         if (query.active_in && query.active_in.length > 0) {
@@ -69,12 +75,7 @@ class UsersResource {
         return (0, transforms_1.toMmsList)(data, page, pageSize, count);
     }
     async getRow(userId) {
-        const { data, error } = await this.supabase
-            .from('users')
-            .select('*')
-            .eq('mms_id', userId)
-            .eq('organization_id', this.auth.organization_id)
-            .single();
+        const { data, error } = await (0, tenancy_1.scopeToOrganization)(this.supabase.from('users').select('*').eq('mms_id', userId), this.auth).single();
         if (error)
             throw (0, errors_1.mapPostgrestError)(error);
         return (0, audit_1.withoutInternalId)(data);
@@ -103,11 +104,7 @@ class UsersResource {
      * `active` is not consulted: a deactivated report's history stays visible to their manager.
      */
     async idsManagedBy(managerId) {
-        const { data, error } = await this.supabase
-            .from('users')
-            .select('mms_id')
-            .eq('organization_id', this.auth.organization_id)
-            .or(`manager_id.eq.${managerId},secondary_manager_id.eq.${managerId}`);
+        const { data, error } = await (0, tenancy_1.scopeToOrganization)(this.supabase.from('users').select('mms_id'), this.auth).or(`manager_id.eq.${managerId},secondary_manager_id.eq.${managerId}`);
         if (error)
             throw (0, errors_1.mapPostgrestError)(error);
         return (data ?? []).map((row) => row.mms_id);
@@ -117,10 +114,9 @@ class UsersResource {
      * are timestamps), and the working week. Everyone in the organization, or just `userIds`.
      */
     async employment(userIds) {
-        let employmentQuery = this.supabase
+        let employmentQuery = (0, tenancy_1.scopeToOrganization)(this.supabase
             .from('users')
-            .select('mms_id, name, surname, email, profile_image, active, start_date, end_date, working_days')
-            .eq('organization_id', this.auth.organization_id);
+            .select('mms_id, name, surname, email, profile_image, active, start_date, end_date, working_days'), this.auth);
         if (userIds) {
             employmentQuery = employmentQuery.in('mms_id', userIds);
         }
@@ -135,22 +131,13 @@ class UsersResource {
     }
     /** Seats in use. Counts rows rather than fetching them. */
     async activeCount() {
-        const { count, error } = await this.supabase
-            .from('users')
-            .select('mms_id', { count: 'exact', head: true })
-            .eq('organization_id', this.auth.organization_id)
-            .eq('active', true);
+        const { count, error } = await (0, tenancy_1.scopeToOrganization)(this.supabase.from('users').select('mms_id', { count: 'exact', head: true }), this.auth).eq('active', true);
         if (error)
             throw (0, errors_1.mapPostgrestError)(error);
         return count ?? 0;
     }
     async isActive(userId) {
-        const { data, error } = await this.supabase
-            .from('users')
-            .select('active')
-            .eq('mms_id', userId)
-            .eq('organization_id', this.auth.organization_id)
-            .single();
+        const { data, error } = await (0, tenancy_1.scopeToOrganization)(this.supabase.from('users').select('active').eq('mms_id', userId), this.auth).single();
         if (error)
             throw (0, errors_1.mapPostgrestError)(error);
         return data.active;
@@ -176,7 +163,7 @@ class UsersResource {
      */
     async setProfileImage(userId, file) {
         const { name, extension } = (0, paths_1.splitFileName)((0, paths_1.sanitizeFileName)(file.name));
-        const path = (0, paths_2.profileImagePath)(this.auth.organization_id, userId, name, extension);
+        const path = (0, paths_2.profileImagePath)((0, tenancy_1.requireOrganization)(this.auth), userId, name, extension);
         const previous = (0, paths_2.profileImageObjectPath)((await this.getRow(userId)).profile_image);
         const { error } = await this.supabase.storage
             .from(paths_2.PROFILE_PICTURES_BUCKET)

package/dist/validators.d.ts

@@ -17,6 +17,8 @@ export declare const isClockTime: (value: unknown, allowEndOfDay?: boolean) => v
 export declare const IsClockTime: ({ allowEndOfDay, ...options }?: ValidationOptions & {
     allowEndOfDay?: boolean;
 }) => PropertyDecorator;
+/** The password rules every GoTrue account is held to: a tenant user's and a staff member's. */
+export declare const MatchesPasswordRules: () => PropertyDecorator;
 export declare function IsNullable(validationOptions?: ValidationOptions): PropertyDecorator;
 /**
  * An empty string from a cleared form field means "none". It becomes null before validation,

package/dist/validators.js

@@ -6,7 +6,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IsClockTime = exports.isClockTime = exports.IsCalendarDate = exports.isCalendarDate = void 0;
+exports.MatchesPasswordRules = exports.IsClockTime = exports.isClockTime = exports.IsCalendarDate = exports.isCalendarDate = void 0;
 exports.IsNullable = IsNullable;
 exports.EmptyToNull = EmptyToNull;
 const class_validator_1 = require("class-validator");
@@ -56,6 +56,11 @@ ClockTimeConstraint = __decorate([
  */
 const IsClockTime = ({ allowEndOfDay = false, ...options } = {}) => (0, class_validator_1.Validate)(ClockTimeConstraint, [allowEndOfDay], options);
 exports.IsClockTime = IsClockTime;
+/** The password rules every GoTrue account is held to: a tenant user's and a staff member's. */
+const MatchesPasswordRules = () => (0, class_validator_1.Matches)(/^(?=.*[A-Z])(?=.*[a-z])(?=.*\d)(?=.*[!@#$%^&*])/, {
+    message: 'Password must contain at least 1 uppercase letter, 1 lowercase letter, 1 number, and 1 special character (!@#$%^&*)',
+});
+exports.MatchesPasswordRules = MatchesPasswordRules;
 function IsNullable(validationOptions) {
     return (0, class_validator_1.ValidateIf)((_object, value) => value !== null, validationOptions);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@managemint-solutions/sdk",
-  "version": "0.52.0",
+  "version": "0.54.0",
   "description": "Typed Supabase data-access SDK for ManageMint Solutions",
   "license": "UNLICENSED",
   "author": "Scott Bebington <scottbebington@gmail.com>",
@@ -51,7 +51,7 @@
     "testEnvironment": "node"
   },
   "dependencies": {
-    "@managemint-solutions/entities": "^1.34.0"
+    "@managemint-solutions/entities": "^1.36.0"
   },
   "peerDependencies": {
     "@nestjs/common": "^11.0.0",