@tmlmobilidade/interfaces 20251211.1246.9 → 20251218.110.37

package/dist/interfaces/auth/users.d.ts

@@ -1,8 +1,11 @@
 import { MongoCollectionClass } from '../../common/mongo-collection.js';
-import { type CreateUserDto, type UpdateUserDto, type User } from '@tmlmobilidade/types';
-import { type Filter, type FindOptions, type IndexDescription } from 'mongodb';
+import { type CreateUserDto, type UpdateUserDto, type User, type User_UNSAFE } from '@tmlmobilidade/types';
+import { type Filter, type FindOptions, type IndexDescription, type WithId } from 'mongodb';
 import { z } from 'zod';
-declare class UsersClass extends MongoCollectionClass<User, CreateUserDto, UpdateUserDto> {
+interface SafeUserOptions {
+    includeUnsafeProperties: boolean;
+}
+declare class UsersClass extends MongoCollectionClass<User_UNSAFE, CreateUserDto, UpdateUserDto> {
     private static _instance;
     protected createSchema: z.ZodSchema;
     protected updateSchema: z.ZodSchema;
@@ -11,188 +14,40 @@ declare class UsersClass extends MongoCollectionClass<User, CreateUserDto, Updat
     /**
      * Finds a user document by its email.
      * @param email The email of the user to find.
-     * @param includePasswordHash - Whether to include the password hash in the result.
+     * @param options.includeUnsafeProperties Whether to include the password hash in the result.
      * @returns A promise that resolves to the matching user document or null if not found.
      */
-    findByEmail(email: string, includePasswordHash?: boolean): Promise<{
-        password_hash: any;
-        permissions: ({
-            scope: "agencies";
-            action: "create" | "update" | "delete" | "read" | "toggle_lock";
-        } | {
-            scope: "alerts_scheduled";
-            action: "create" | "update" | "delete" | "read" | "toggle_lock";
-        } | {
-            scope: "alerts_realtime";
-            action: "create" | "update" | "delete" | "read" | "toggle_lock";
-            resources: {
-                agency_ids: string[];
-            };
-        } | {
-            scope: "rides";
-            action: "acceptance_change_status" | "acceptance_justify" | "acceptance_lock" | "acceptance_read" | "analsys_lock" | "analysis_lock" | "analysis_read" | "analysis_reprocess" | "analysis_update" | "audit_lock" | "audit_read" | "audit_update";
-            resources: {
-                agency_ids: string[];
-            };
-        } | {
-            scope: "sams";
-            action: "read";
-        } | {
-            scope: "gtfs_validations";
-            action: "create" | "read" | "request_approval";
-            resources: {
-                agency_ids: string[];
-            };
-        } | {
-            scope: "home";
-            action: "read_links" | "read_wiki";
-        } | {
-            scope: "organizations";
-            action: "create" | "update" | "delete" | "read";
-        } | {
-            scope: "performance";
-            action: "read";
-        } | {
-            scope: "plans";
-            action: "create" | "update" | "delete" | "read" | "toggle_lock" | "read_controller" | "read_pcgi_legacy" | "update_controller" | "update_feed_info_dates" | "update_gtfs_plan" | "update_pcgi_legacy";
-            resources: {
-                agency_ids: string[];
-            };
-        } | {
-            scope: "roles";
-            action: "create" | "update" | "delete" | "read";
-        } | {
-            scope: "stops";
-            action: "create" | "update" | "delete" | "read" | "toggle_lock";
-            resources: {
-                municipality_ids: string[];
-                agency_ids: string[];
-            };
-        } | {
-            scope: "users";
-            action: "create" | "update" | "delete" | "read";
-        })[];
-        created_at: number & {
-            __brand: "UnixTimestamp";
-        };
-        created_by?: string | undefined;
-        updated_at: number & {
-            __brand: "UnixTimestamp";
-        };
-        updated_by?: string | undefined;
-        email: string;
-        email_verified: import("@tmlmobilidade/types").UnixTimestamp | null;
-        first_name: string;
-        last_name: string;
-        organization_id: string | null;
-        phone: string | null;
-        preferences: Record<string, Record<string, string | number | boolean | string[] | number[]>> | null;
-        role_ids: string[];
-        session_ids: string[];
-        verification_token_ids: string[];
-        _id: string;
-    }>;
+    findByEmail(email: string, options: SafeUserOptions & {
+        includeUnsafeProperties: true;
+    }): Promise<null | WithId<User_UNSAFE>>;
+    findByEmail(email: string, options?: SafeUserOptions): Promise<null | WithId<User>>;
     /**
      * Finds a user document by its ID.
      * @param id The ID of the user document to find
-     * @param includePasswordHash Whether to include the password hash in the result
+     * @param includeUnsafeProperties Whether to include the password hash in the result
      * @returns A promise that resolves to the matching user document or null if not found
      */
-    findById(id: string, options?: FindOptions, includePasswordHash?: boolean): Promise<{
-        password_hash: any;
-        permissions: ({
-            scope: "agencies";
-            action: "create" | "update" | "delete" | "read" | "toggle_lock";
-        } | {
-            scope: "alerts_scheduled";
-            action: "create" | "update" | "delete" | "read" | "toggle_lock";
-        } | {
-            scope: "alerts_realtime";
-            action: "create" | "update" | "delete" | "read" | "toggle_lock";
-            resources: {
-                agency_ids: string[];
-            };
-        } | {
-            scope: "rides";
-            action: "acceptance_change_status" | "acceptance_justify" | "acceptance_lock" | "acceptance_read" | "analsys_lock" | "analysis_lock" | "analysis_read" | "analysis_reprocess" | "analysis_update" | "audit_lock" | "audit_read" | "audit_update";
-            resources: {
-                agency_ids: string[];
-            };
-        } | {
-            scope: "sams";
-            action: "read";
-        } | {
-            scope: "gtfs_validations";
-            action: "create" | "read" | "request_approval";
-            resources: {
-                agency_ids: string[];
-            };
-        } | {
-            scope: "home";
-            action: "read_links" | "read_wiki";
-        } | {
-            scope: "organizations";
-            action: "create" | "update" | "delete" | "read";
-        } | {
-            scope: "performance";
-            action: "read";
-        } | {
-            scope: "plans";
-            action: "create" | "update" | "delete" | "read" | "toggle_lock" | "read_controller" | "read_pcgi_legacy" | "update_controller" | "update_feed_info_dates" | "update_gtfs_plan" | "update_pcgi_legacy";
-            resources: {
-                agency_ids: string[];
-            };
-        } | {
-            scope: "roles";
-            action: "create" | "update" | "delete" | "read";
-        } | {
-            scope: "stops";
-            action: "create" | "update" | "delete" | "read" | "toggle_lock";
-            resources: {
-                municipality_ids: string[];
-                agency_ids: string[];
-            };
-        } | {
-            scope: "users";
-            action: "create" | "update" | "delete" | "read";
-        })[];
-        created_at: number & {
-            __brand: "UnixTimestamp";
-        };
-        created_by?: string | undefined;
-        updated_at: number & {
-            __brand: "UnixTimestamp";
-        };
-        updated_by?: string | undefined;
-        email: string;
-        email_verified: import("@tmlmobilidade/types").UnixTimestamp | null;
-        first_name: string;
-        last_name: string;
-        organization_id: string | null;
-        phone: string | null;
-        preferences: Record<string, Record<string, string | number | boolean | string[] | number[]>> | null;
-        role_ids: string[];
-        session_ids: string[];
-        verification_token_ids: string[];
-        _id: string;
-    }>;
+    findById(id: string, options: FindOptions & {
+        includeUnsafeProperties: true;
+    }): Promise<null | WithId<User_UNSAFE>>;
+    findById(id: string): Promise<null | WithId<User>>;
     /**
      * Finds users by their organization code.
      * @param code The code of the organization to find users for.
-     * @param includePasswordHash Whether to include the password hash in the result.
+     * @param includeUnsafeProperties Whether to include the password hash in the result.
      * @returns A promise that resolves to the matching user documents or null if not found.
      */
-    findByOrganization(id: string, includePasswordHash?: boolean): Promise<{
+    findByOrganization(id: string): Promise<{
         password_hash: any;
         permissions: ({
             scope: "agencies";
-            action: "create" | "update" | "delete" | "read" | "toggle_lock";
+            action: "create" | "update" | "delete" | "read" | "lock";
         } | {
             scope: "alerts_scheduled";
-            action: "create" | "update" | "delete" | "read" | "toggle_lock";
+            action: "create" | "update" | "delete" | "read" | "lock";
         } | {
             scope: "alerts_realtime";
-            action: "create" | "update" | "delete" | "read" | "toggle_lock";
+            action: "create" | "update" | "delete" | "read" | "lock";
             resources: {
                 agency_ids: string[];
             };
@@ -207,7 +62,7 @@ declare class UsersClass extends MongoCollectionClass<User, CreateUserDto, Updat
             action: "read";
         } | {
             scope: "gtfs_validations";
-            action: "create" | "read" | "request_approval";
+            action: "create" | "read" | "lock" | "request_approval";
             resources: {
                 agency_ids: string[];
             };
@@ -216,30 +71,38 @@ declare class UsersClass extends MongoCollectionClass<User, CreateUserDto, Updat
             action: "read_links" | "read_wiki";
         } | {
             scope: "organizations";
-            action: "create" | "update" | "delete" | "read";
+            action: "create" | "update" | "delete" | "read" | "lock";
         } | {
             scope: "performance";
             action: "read";
         } | {
             scope: "plans";
-            action: "create" | "update" | "delete" | "read" | "toggle_lock" | "read_controller" | "read_pcgi_legacy" | "update_controller" | "update_feed_info_dates" | "update_gtfs_plan" | "update_pcgi_legacy";
+            action: "create" | "update" | "delete" | "read" | "lock" | "read_controller" | "read_pcgi_legacy" | "update_controller" | "update_feed_info_dates" | "update_gtfs_plan" | "update_pcgi_legacy";
             resources: {
                 agency_ids: string[];
             };
         } | {
             scope: "roles";
-            action: "create" | "update" | "delete" | "read";
+            action: "create" | "update" | "delete" | "read" | "lock";
         } | {
             scope: "stops";
-            action: "create" | "update" | "delete" | "read" | "toggle_lock";
+            action: "create" | "update" | "delete" | "read" | "lock";
             resources: {
                 municipality_ids: string[];
                 agency_ids: string[];
             };
         } | {
             scope: "users";
-            action: "create" | "update" | "delete" | "read";
+            action: "create" | "update" | "delete" | "read" | "lock";
+        } | {
+            scope: "dates";
+            action: "create_annotations" | "delete_annotations" | "read_annotations" | "update_annotations" | "lock_annotations";
+            resources: {
+                agency_ids: string[];
+            };
         })[];
+        session_ids: any;
+        verification_token_ids: any;
         created_at: number & {
             __brand: "UnixTimestamp";
         };
@@ -248,16 +111,16 @@ declare class UsersClass extends MongoCollectionClass<User, CreateUserDto, Updat
             __brand: "UnixTimestamp";
         };
         updated_by?: string | undefined;
+        is_locked: boolean;
         email: string;
         email_verified: import("@tmlmobilidade/types").UnixTimestamp | null;
         first_name: string;
         last_name: string;
-        organization_id: string | null;
+        organization_id: string;
         phone: string | null;
         preferences: Record<string, Record<string, string | number | boolean | string[] | number[]>> | null;
         role_ids: string[];
-        session_ids: string[];
-        verification_token_ids: string[];
+        seen_last_at: import("@tmlmobilidade/types").UnixTimestamp | null;
         _id: string;
     }[]>;
     /**
@@ -265,17 +128,17 @@ declare class UsersClass extends MongoCollectionClass<User, CreateUserDto, Updat
      * @param role The role of the user to find.
      * @returns A promise that resolves to the matching user document or null if not found.
      */
-    findByRole(role: string, includePasswordHash?: boolean): Promise<{
+    findByRole(role: string): Promise<{
         password_hash: any;
         permissions: ({
             scope: "agencies";
-            action: "create" | "update" | "delete" | "read" | "toggle_lock";
+            action: "create" | "update" | "delete" | "read" | "lock";
         } | {
             scope: "alerts_scheduled";
-            action: "create" | "update" | "delete" | "read" | "toggle_lock";
+            action: "create" | "update" | "delete" | "read" | "lock";
         } | {
             scope: "alerts_realtime";
-            action: "create" | "update" | "delete" | "read" | "toggle_lock";
+            action: "create" | "update" | "delete" | "read" | "lock";
             resources: {
                 agency_ids: string[];
             };
@@ -290,7 +153,7 @@ declare class UsersClass extends MongoCollectionClass<User, CreateUserDto, Updat
             action: "read";
         } | {
             scope: "gtfs_validations";
-            action: "create" | "read" | "request_approval";
+            action: "create" | "read" | "lock" | "request_approval";
             resources: {
                 agency_ids: string[];
             };
@@ -299,30 +162,38 @@ declare class UsersClass extends MongoCollectionClass<User, CreateUserDto, Updat
             action: "read_links" | "read_wiki";
         } | {
             scope: "organizations";
-            action: "create" | "update" | "delete" | "read";
+            action: "create" | "update" | "delete" | "read" | "lock";
         } | {
             scope: "performance";
             action: "read";
         } | {
             scope: "plans";
-            action: "create" | "update" | "delete" | "read" | "toggle_lock" | "read_controller" | "read_pcgi_legacy" | "update_controller" | "update_feed_info_dates" | "update_gtfs_plan" | "update_pcgi_legacy";
+            action: "create" | "update" | "delete" | "read" | "lock" | "read_controller" | "read_pcgi_legacy" | "update_controller" | "update_feed_info_dates" | "update_gtfs_plan" | "update_pcgi_legacy";
             resources: {
                 agency_ids: string[];
             };
         } | {
             scope: "roles";
-            action: "create" | "update" | "delete" | "read";
+            action: "create" | "update" | "delete" | "read" | "lock";
         } | {
             scope: "stops";
-            action: "create" | "update" | "delete" | "read" | "toggle_lock";
+            action: "create" | "update" | "delete" | "read" | "lock";
             resources: {
                 municipality_ids: string[];
                 agency_ids: string[];
             };
         } | {
             scope: "users";
-            action: "create" | "update" | "delete" | "read";
+            action: "create" | "update" | "delete" | "read" | "lock";
+        } | {
+            scope: "dates";
+            action: "create_annotations" | "delete_annotations" | "read_annotations" | "update_annotations" | "lock_annotations";
+            resources: {
+                agency_ids: string[];
+            };
         })[];
+        session_ids: any;
+        verification_token_ids: any;
         created_at: number & {
             __brand: "UnixTimestamp";
         };
@@ -331,16 +202,16 @@ declare class UsersClass extends MongoCollectionClass<User, CreateUserDto, Updat
             __brand: "UnixTimestamp";
         };
         updated_by?: string | undefined;
+        is_locked: boolean;
         email: string;
         email_verified: import("@tmlmobilidade/types").UnixTimestamp | null;
         first_name: string;
         last_name: string;
-        organization_id: string | null;
+        organization_id: string;
         phone: string | null;
         preferences: Record<string, Record<string, string | number | boolean | string[] | number[]>> | null;
         role_ids: string[];
-        session_ids: string[];
-        verification_token_ids: string[];
+        seen_last_at: import("@tmlmobilidade/types").UnixTimestamp | null;
         _id: string;
     }[]>;
     /**
@@ -356,13 +227,13 @@ declare class UsersClass extends MongoCollectionClass<User, CreateUserDto, Updat
         password_hash: any;
         permissions: ({
             scope: "agencies";
-            action: "create" | "update" | "delete" | "read" | "toggle_lock";
+            action: "create" | "update" | "delete" | "read" | "lock";
         } | {
             scope: "alerts_scheduled";
-            action: "create" | "update" | "delete" | "read" | "toggle_lock";
+            action: "create" | "update" | "delete" | "read" | "lock";
         } | {
             scope: "alerts_realtime";
-            action: "create" | "update" | "delete" | "read" | "toggle_lock";
+            action: "create" | "update" | "delete" | "read" | "lock";
             resources: {
                 agency_ids: string[];
             };
@@ -377,7 +248,7 @@ declare class UsersClass extends MongoCollectionClass<User, CreateUserDto, Updat
             action: "read";
         } | {
             scope: "gtfs_validations";
-            action: "create" | "read" | "request_approval";
+            action: "create" | "read" | "lock" | "request_approval";
             resources: {
                 agency_ids: string[];
             };
@@ -386,30 +257,38 @@ declare class UsersClass extends MongoCollectionClass<User, CreateUserDto, Updat
             action: "read_links" | "read_wiki";
         } | {
             scope: "organizations";
-            action: "create" | "update" | "delete" | "read";
+            action: "create" | "update" | "delete" | "read" | "lock";
         } | {
             scope: "performance";
             action: "read";
         } | {
             scope: "plans";
-            action: "create" | "update" | "delete" | "read" | "toggle_lock" | "read_controller" | "read_pcgi_legacy" | "update_controller" | "update_feed_info_dates" | "update_gtfs_plan" | "update_pcgi_legacy";
+            action: "create" | "update" | "delete" | "read" | "lock" | "read_controller" | "read_pcgi_legacy" | "update_controller" | "update_feed_info_dates" | "update_gtfs_plan" | "update_pcgi_legacy";
             resources: {
                 agency_ids: string[];
             };
         } | {
             scope: "roles";
-            action: "create" | "update" | "delete" | "read";
+            action: "create" | "update" | "delete" | "read" | "lock";
         } | {
             scope: "stops";
-            action: "create" | "update" | "delete" | "read" | "toggle_lock";
+            action: "create" | "update" | "delete" | "read" | "lock";
             resources: {
                 municipality_ids: string[];
                 agency_ids: string[];
             };
         } | {
             scope: "users";
-            action: "create" | "update" | "delete" | "read";
+            action: "create" | "update" | "delete" | "read" | "lock";
+        } | {
+            scope: "dates";
+            action: "create_annotations" | "delete_annotations" | "read_annotations" | "update_annotations" | "lock_annotations";
+            resources: {
+                agency_ids: string[];
+            };
         })[];
+        session_ids: any;
+        verification_token_ids: any;
         created_at: number & {
             __brand: "UnixTimestamp";
         };
@@ -418,16 +297,16 @@ declare class UsersClass extends MongoCollectionClass<User, CreateUserDto, Updat
             __brand: "UnixTimestamp";
         };
         updated_by?: string | undefined;
+        is_locked: boolean;
         email: string;
         email_verified: import("@tmlmobilidade/types").UnixTimestamp | null;
         first_name: string;
         last_name: string;
-        organization_id: string | null;
+        organization_id: string;
         phone: string | null;
         preferences: Record<string, Record<string, string | number | boolean | string[] | number[]>> | null;
         role_ids: string[];
-        session_ids: string[];
-        verification_token_ids: string[];
+        seen_last_at: import("@tmlmobilidade/types").UnixTimestamp | null;
         _id: string;
     }[]>;
     /**
@@ -439,13 +318,13 @@ declare class UsersClass extends MongoCollectionClass<User, CreateUserDto, Updat
         password_hash: any;
         permissions: ({
             scope: "agencies";
-            action: "create" | "update" | "delete" | "read" | "toggle_lock";
+            action: "create" | "update" | "delete" | "read" | "lock";
         } | {
             scope: "alerts_scheduled";
-            action: "create" | "update" | "delete" | "read" | "toggle_lock";
+            action: "create" | "update" | "delete" | "read" | "lock";
         } | {
             scope: "alerts_realtime";
-            action: "create" | "update" | "delete" | "read" | "toggle_lock";
+            action: "create" | "update" | "delete" | "read" | "lock";
             resources: {
                 agency_ids: string[];
             };
@@ -460,7 +339,7 @@ declare class UsersClass extends MongoCollectionClass<User, CreateUserDto, Updat
             action: "read";
         } | {
             scope: "gtfs_validations";
-            action: "create" | "read" | "request_approval";
+            action: "create" | "read" | "lock" | "request_approval";
             resources: {
                 agency_ids: string[];
             };
@@ -469,30 +348,38 @@ declare class UsersClass extends MongoCollectionClass<User, CreateUserDto, Updat
             action: "read_links" | "read_wiki";
         } | {
             scope: "organizations";
-            action: "create" | "update" | "delete" | "read";
+            action: "create" | "update" | "delete" | "read" | "lock";
         } | {
             scope: "performance";
             action: "read";
         } | {
             scope: "plans";
-            action: "create" | "update" | "delete" | "read" | "toggle_lock" | "read_controller" | "read_pcgi_legacy" | "update_controller" | "update_feed_info_dates" | "update_gtfs_plan" | "update_pcgi_legacy";
+            action: "create" | "update" | "delete" | "read" | "lock" | "read_controller" | "read_pcgi_legacy" | "update_controller" | "update_feed_info_dates" | "update_gtfs_plan" | "update_pcgi_legacy";
             resources: {
                 agency_ids: string[];
             };
         } | {
             scope: "roles";
-            action: "create" | "update" | "delete" | "read";
+            action: "create" | "update" | "delete" | "read" | "lock";
         } | {
             scope: "stops";
-            action: "create" | "update" | "delete" | "read" | "toggle_lock";
+            action: "create" | "update" | "delete" | "read" | "lock";
             resources: {
                 municipality_ids: string[];
                 agency_ids: string[];
             };
         } | {
             scope: "users";
-            action: "create" | "update" | "delete" | "read";
+            action: "create" | "update" | "delete" | "read" | "lock";
+        } | {
+            scope: "dates";
+            action: "create_annotations" | "delete_annotations" | "read_annotations" | "update_annotations" | "lock_annotations";
+            resources: {
+                agency_ids: string[];
+            };
         })[];
+        session_ids: any;
+        verification_token_ids: any;
         created_at: number & {
             __brand: "UnixTimestamp";
         };
@@ -501,16 +388,16 @@ declare class UsersClass extends MongoCollectionClass<User, CreateUserDto, Updat
             __brand: "UnixTimestamp";
         };
         updated_by?: string | undefined;
+        is_locked: boolean;
         email: string;
         email_verified: import("@tmlmobilidade/types").UnixTimestamp | null;
         first_name: string;
         last_name: string;
-        organization_id: string | null;
+        organization_id: string;
         phone: string | null;
         preferences: Record<string, Record<string, string | number | boolean | string[] | number[]>> | null;
         role_ids: string[];
-        session_ids: string[];
-        verification_token_ids: string[];
+        seen_last_at: import("@tmlmobilidade/types").UnixTimestamp | null;
         _id: string;
     }>;
     protected getCollectionIndexes(): IndexDescription[];

package/dist/interfaces/auth/users.js

@@ -1,11 +1,11 @@
 /* * */
 import { MongoCollectionClass } from '../../common/mongo-collection.js';
-import { PermissionCatalog, UpdateUserSchema, UserSchema } from '@tmlmobilidade/types';
+import { CreateUserSchema, PermissionCatalog, UpdateUserSchema } from '@tmlmobilidade/types';
 import { AsyncSingletonProxy } from '@tmlmobilidade/utils';
 /* * */
 class UsersClass extends MongoCollectionClass {
     static _instance;
-    createSchema = UserSchema;
+    createSchema = CreateUserSchema;
     updateSchema = UpdateUserSchema;
     constructor() {
         super();
@@ -18,44 +18,30 @@ class UsersClass extends MongoCollectionClass {
         }
         return UsersClass._instance;
     }
-    /**
-     * Finds a user document by its email.
-     * @param email The email of the user to find.
-     * @param includePasswordHash - Whether to include the password hash in the result.
-     * @returns A promise that resolves to the matching user document or null if not found.
-     */
-    async findByEmail(email, includePasswordHash = false) {
+    async findByEmail(email, options) {
         const foundUser = await this.mongoCollection.findOne({ email: { $eq: email } });
         if (!foundUser)
             return null;
-        if (includePasswordHash)
+        if (options?.includeUnsafeProperties)
             return foundUser;
         return this.sanitizeUser(foundUser);
     }
-    /**
-     * Finds a user document by its ID.
-     * @param id The ID of the user document to find
-     * @param includePasswordHash Whether to include the password hash in the result
-     * @returns A promise that resolves to the matching user document or null if not found
-     */
-    async findById(id, options, includePasswordHash = false) {
+    async findById(id, options) {
         const foundUser = await this.mongoCollection.findOne({ _id: id }, options);
         if (!foundUser)
             return null;
-        if (includePasswordHash)
+        if (options?.includeUnsafeProperties)
             return foundUser;
         return this.sanitizeUser(foundUser);
     }
     /**
      * Finds users by their organization code.
      * @param code The code of the organization to find users for.
-     * @param includePasswordHash Whether to include the password hash in the result.
+     * @param includeUnsafeProperties Whether to include the password hash in the result.
      * @returns A promise that resolves to the matching user documents or null if not found.
      */
-    async findByOrganization(id, includePasswordHash = false) {
+    async findByOrganization(id) {
         const foundUsers = await this.mongoCollection.find({ organization_id: { $in: [id] } }).toArray();
-        if (includePasswordHash)
-            return foundUsers;
         return foundUsers.map(item => this.sanitizeUser(item));
     }
     /**
@@ -63,10 +49,8 @@ class UsersClass extends MongoCollectionClass {
      * @param role The role of the user to find.
      * @returns A promise that resolves to the matching user document or null if not found.
      */
-    async findByRole(role, includePasswordHash = false) {
+    async findByRole(role) {
         const foundUsers = await this.mongoCollection.find({ role_ids: { $in: [role] } }).toArray();
-        if (includePasswordHash)
-            return foundUsers;
         return foundUsers.map(item => this.sanitizeUser(item));
     }
     /**
@@ -112,6 +96,8 @@ class UsersClass extends MongoCollectionClass {
             ...user,
             password_hash: null,
             permissions: PermissionCatalog.sanitize(user.permissions),
+            session_ids: null,
+            verification_token_ids: null,
         };
     }
 }