feat: implement identity and security features
- Added account types and privileged account types constants. - Created admin user controller for updating user security fields. - Developed role assignment controller for managing user roles. - Implemented validation middleware for request schemas. - Defined user role and auth session models for database interactions. - Created services for authentication, email notifications, and OTP handling. - Developed OAuth service for Google and Apple authentication. - Added JWT utility functions for token generation and verification. - Implemented comprehensive tests for authentication, session management, and password policies. - Created migration for updating user schema and adding new tables for auth sessions and user identities.
This commit is contained in:
@@ -39,6 +39,8 @@ db.sequelize = sequelize;
|
||||
db.User = require("./user/user.model")(sequelize, DataTypes);
|
||||
db.Customer = require("./user/customer.model")(sequelize, DataTypes);
|
||||
db.BusinessCustomer = require("./user/businessCustomer.model")(sequelize, DataTypes);
|
||||
db.AuthSession = require("./user/authSession.model")(sequelize, DataTypes);
|
||||
db.UserIdentity = require("./user/userIdentity.model")(sequelize, DataTypes);
|
||||
db.UserActivity = require("./activities/userActivities.model")(sequelize, DataTypes);
|
||||
db.Profile = require("./user/profile.model")(sequelize, DataTypes);
|
||||
|
||||
@@ -50,6 +52,7 @@ db.roles = require("./permission/role.model")(sequelize, DataTypes);
|
||||
db.permission = require("./permission/permission.model")(sequelize, DataTypes);
|
||||
db.rolePermission = require("./permission/rolePermission.model")(sequelize, DataTypes);
|
||||
db.userPermission = require("./permission/userPermission.model")(sequelize, DataTypes);
|
||||
db.UserRole = require("./permission/userRole.model")(sequelize, DataTypes);
|
||||
|
||||
// Document Management
|
||||
db.Document = require("./document/document.model")(sequelize, DataTypes);
|
||||
|
||||
@@ -19,7 +19,8 @@ module.exports = (sequelize, DataTypes) => {
|
||||
},
|
||||
roleName: {
|
||||
type: DataTypes.STRING,
|
||||
allowNull: false
|
||||
allowNull: false,
|
||||
unique: true
|
||||
},
|
||||
roleDescription: {
|
||||
type: DataTypes.TEXT,
|
||||
@@ -37,6 +38,7 @@ module.exports = (sequelize, DataTypes) => {
|
||||
foreignKey: "role_id",
|
||||
as: "rolePermissions"
|
||||
});
|
||||
roles.hasMany(db.UserRole, { foreignKey: "role_id", as: "userRoles" });
|
||||
};
|
||||
|
||||
return roles;
|
||||
|
||||
@@ -28,7 +28,27 @@ module.exports = (sequelize, DataTypes) => {
|
||||
},
|
||||
{
|
||||
tableName: "rolePermission",
|
||||
timestamps: true
|
||||
timestamps: true,
|
||||
indexes: [{ unique: true, fields: ["role_id", "permission_id"] }],
|
||||
hooks: {
|
||||
afterCreate: async (record) => {
|
||||
const users = await sequelize.models.UserRole.findAll({ where: { role_id: record.role_id } });
|
||||
await Promise.all(users.map((item) => require("../../utils/cache.util").clearPermissionCache(item.user_id)));
|
||||
},
|
||||
afterDestroy: async (record) => {
|
||||
const users = await sequelize.models.UserRole.findAll({ where: { role_id: record.role_id } });
|
||||
await Promise.all(users.map((item) => require("../../utils/cache.util").clearPermissionCache(item.user_id)));
|
||||
},
|
||||
afterUpdate: async (record) => {
|
||||
const users = await sequelize.models.UserRole.findAll({ where: { role_id: record.role_id } });
|
||||
await Promise.all(users.map((item) => require("../../utils/cache.util").clearPermissionCache(item.user_id)));
|
||||
},
|
||||
afterBulkCreate: async (records) => {
|
||||
const roleIds = [...new Set(records.map((record) => record.role_id))];
|
||||
const users = await sequelize.models.UserRole.findAll({ where: { role_id: roleIds } });
|
||||
await Promise.all(users.map((item) => require("../../utils/cache.util").clearPermissionCache(item.user_id)));
|
||||
}
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
|
||||
@@ -29,7 +29,14 @@ module.exports = (sequelize, DataTypes) => {
|
||||
},
|
||||
{
|
||||
tableName: "userPermission",
|
||||
timestamps: true
|
||||
timestamps: true,
|
||||
indexes: [{ unique: true, fields: ["user_id", "permission_id"] }],
|
||||
hooks: {
|
||||
afterCreate: (record) => require("../../utils/cache.util").clearPermissionCache(record.user_id),
|
||||
afterUpdate: (record) => require("../../utils/cache.util").clearPermissionCache(record.user_id),
|
||||
afterDestroy: (record) => require("../../utils/cache.util").clearPermissionCache(record.user_id)
|
||||
,afterBulkCreate: (records) => Promise.all(records.map((record) => require("../../utils/cache.util").clearPermissionCache(record.user_id)))
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
module.exports = (sequelize, DataTypes) => {
|
||||
const UserRole = sequelize.define("UserRole", {
|
||||
id: { type: DataTypes.INTEGER, primaryKey: true, autoIncrement: true },
|
||||
user_id: { type: DataTypes.STRING, allowNull: false },
|
||||
role_id: { type: DataTypes.STRING, allowNull: false },
|
||||
}, { tableName: "user_roles", timestamps: true, indexes: [{ unique: true, fields: ["user_id", "role_id"] }], hooks: {
|
||||
afterCreate: (record) => require("../../utils/cache.util").clearPermissionCache(record.user_id),
|
||||
afterDestroy: (record) => require("../../utils/cache.util").clearPermissionCache(record.user_id),
|
||||
} });
|
||||
UserRole.associate = (db) => {
|
||||
UserRole.belongsTo(db.User, { foreignKey: "user_id", as: "user" });
|
||||
UserRole.belongsTo(db.roles, { foreignKey: "role_id", as: "role" });
|
||||
};
|
||||
return UserRole;
|
||||
};
|
||||
@@ -0,0 +1,22 @@
|
||||
module.exports = (sequelize, DataTypes) => {
|
||||
const AuthSession = sequelize.define("AuthSession", {
|
||||
id: { type: DataTypes.UUID, primaryKey: true },
|
||||
user_id: { type: DataTypes.STRING, allowNull: false },
|
||||
token_family_id: { type: DataTypes.UUID, allowNull: false },
|
||||
refresh_token_hash: { type: DataTypes.STRING(64), allowNull: false },
|
||||
device_name: DataTypes.STRING,
|
||||
user_agent: DataTypes.STRING(500),
|
||||
ip_address: DataTypes.STRING(64),
|
||||
remember_me: { type: DataTypes.BOOLEAN, allowNull: false, defaultValue: false },
|
||||
token_version: { type: DataTypes.INTEGER, allowNull: false },
|
||||
last_used_at: DataTypes.DATE,
|
||||
expires_at: { type: DataTypes.DATE, allowNull: false },
|
||||
revoked_at: DataTypes.DATE,
|
||||
revoked_reason: DataTypes.STRING,
|
||||
replaced_by_session_id: DataTypes.UUID,
|
||||
}, { tableName: "auth_sessions", timestamps: true, indexes: [
|
||||
{ fields: ["user_id"] }, { fields: ["token_family_id"] }, { fields: ["expires_at"] },
|
||||
] });
|
||||
AuthSession.associate = (db) => AuthSession.belongsTo(db.User, { foreignKey: "user_id", as: "user" });
|
||||
return AuthSession;
|
||||
};
|
||||
@@ -33,10 +33,10 @@ module.exports = (sequelize, DataTypes) => {
|
||||
},
|
||||
password: {
|
||||
type: DataTypes.STRING,
|
||||
allowNull: false,
|
||||
allowNull: true,
|
||||
},
|
||||
accountType: {
|
||||
type: DataTypes.ENUM("business_customer", "customer"),
|
||||
type: DataTypes.ENUM("superadmin", "admin", "manager", "business_customer", "rider", "customer", "support_agent"),
|
||||
defaultValue: "customer",
|
||||
},
|
||||
accountStatus: {
|
||||
@@ -59,6 +59,8 @@ module.exports = (sequelize, DataTypes) => {
|
||||
allowNull: true,
|
||||
defaultValue: null,
|
||||
},
|
||||
tokenVersion: { type: DataTypes.INTEGER, allowNull: false, defaultValue: 0 },
|
||||
lastLoginAt: { type: DataTypes.DATE, allowNull: true },
|
||||
},
|
||||
{
|
||||
tableName: "users",
|
||||
@@ -83,6 +85,9 @@ module.exports = (sequelize, DataTypes) => {
|
||||
foreignKey: "user_id",
|
||||
as: "businessCustomer",
|
||||
});
|
||||
User.hasMany(db.AuthSession, { foreignKey: "user_id", as: "authSessions" });
|
||||
User.hasMany(db.UserIdentity, { foreignKey: "user_id", as: "identities" });
|
||||
User.hasMany(db.UserRole, { foreignKey: "user_id", as: "userRoles" });
|
||||
};
|
||||
|
||||
return User;
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
module.exports = (sequelize, DataTypes) => {
|
||||
const UserIdentity = sequelize.define("UserIdentity", {
|
||||
id: { type: DataTypes.UUID, primaryKey: true },
|
||||
user_id: { type: DataTypes.STRING, allowNull: false },
|
||||
provider: { type: DataTypes.ENUM("google", "apple"), allowNull: false },
|
||||
provider_subject: { type: DataTypes.STRING, allowNull: false },
|
||||
provider_email: DataTypes.STRING,
|
||||
}, { tableName: "user_identities", timestamps: true, indexes: [
|
||||
{ unique: true, fields: ["provider", "provider_subject"] }, { fields: ["user_id"] },
|
||||
] });
|
||||
UserIdentity.associate = (db) => UserIdentity.belongsTo(db.User, { foreignKey: "user_id", as: "user" });
|
||||
return UserIdentity;
|
||||
};
|
||||
Reference in New Issue
Block a user