Merge remote-tracking branch 'origin/fix/per-business-identity' into fix/enforced-tenant-isolation
This commit is contained in:
@@ -10,8 +10,16 @@ export interface IUser extends Document {
|
||||
name: string;
|
||||
role: UserRole;
|
||||
branchId: Types.ObjectId | null; // null only valid for SUPER_ADMIN (business owner)
|
||||
// Email and phone are unique WITHIN a business, not across the platform,
|
||||
// so one person can work for two businesses (each account has its own
|
||||
// password and role). Login asks which business when the same email and
|
||||
// password match accounts in more than one.
|
||||
phoneNumber: string; // E.164-ish normalized Kenyan format — kept for contact/M-Pesa reference, not used for login
|
||||
email: string; // login identifier for every role, via the single /login page
|
||||
// Platform operator (cross-tenant console). Only set by `npm run seed` or
|
||||
// the identity migration, never through the app, and only honoured while
|
||||
// the email is also listed in PLATFORM_ADMIN_EMAILS.
|
||||
platformAdmin: boolean;
|
||||
passwordHash: string;
|
||||
isActive: boolean;
|
||||
failedLoginAttempts: number;
|
||||
@@ -33,8 +41,9 @@ const userSchema = new Schema<IUser>(
|
||||
name: { type: String, required: true, trim: true },
|
||||
role: { type: String, enum: USER_ROLES, required: true, default: "DELIVERY" },
|
||||
branchId: { type: Schema.Types.ObjectId, ref: "Branch", default: null },
|
||||
phoneNumber: { type: String, required: true, unique: true, index: true },
|
||||
email: { type: String, required: true, unique: true, lowercase: true, trim: true },
|
||||
phoneNumber: { type: String, required: true },
|
||||
email: { type: String, required: true, lowercase: true, trim: true },
|
||||
platformAdmin: { type: Boolean, default: false },
|
||||
passwordHash: { type: String, required: true, select: false },
|
||||
isActive: { type: Boolean, default: true },
|
||||
failedLoginAttempts: { type: Number, default: 0 },
|
||||
@@ -45,6 +54,13 @@ const userSchema = new Schema<IUser>(
|
||||
{ timestamps: true }
|
||||
);
|
||||
|
||||
userSchema.index({ businessId: 1, email: 1 }, { unique: true });
|
||||
userSchema.index({ businessId: 1, phoneNumber: 1 }, { unique: true });
|
||||
// Login looks an email up across businesses. Named so it never clashes with
|
||||
// the old platform-wide unique `email_1` index, which the identity
|
||||
// migration (npm run migrate:identity) drops.
|
||||
userSchema.index({ email: 1 }, { name: "email_lookup" });
|
||||
|
||||
// Enforce role/branch invariants at the model layer — belt-and-braces
|
||||
// alongside API-level validation. Every role authenticates the same way
|
||||
// now (email + password on the single /login page), so there is no
|
||||
|
||||
Reference in New Issue
Block a user