auto commit

This commit is contained in:
bangdk 2024-11-15 16:49:04 +09:00
parent f03a9209ea
commit c3c6cf4c6d
3 changed files with 14 additions and 13 deletions

View File

@ -37,18 +37,15 @@ router.post("/logout", authMiddleware, async (req, res, next) => {
router.post(
"/edge-login",
[
body("username").notEmpty().withMessage("Username is required"),
body("password").notEmpty().withMessage("Password is required"),
body("businessNumber")
.notEmpty()
.withMessage("Business number is required")
.matches(/^[0-9-]{10,20}$/)
.withMessage("Invalid business number format"),
body("username").notEmpty(),
body("password").notEmpty(),
body("businessNumber").notEmpty(),
validate,
],
async (req, res, next) => {
try {
const { username, password, businessNumber } = req.body;
// console.log("edge", username, businessNumber);
const result = await authService.edgeLogin(
username,
password,

View File

@ -37,7 +37,7 @@ class AuthService {
include: [
{
model: Company,
attributes: ["id", "name", "businessNumber"],
attributes: ["id", "name", "businessNumber", "contractEndDate"],
},
{
model: Branch,
@ -80,11 +80,12 @@ class AuthService {
}
async edgeLogin(username, password, businessNumber, ipAddress, userAgent) {
console.log("edge", username, businessNumber);
// 1. 먼저 회사 검증
const company = await Company.findOne({
where: {
businessNumber,
isActive: true,
// isActive: true,
},
});
@ -132,8 +133,8 @@ class AuthService {
include: [
{
model: Company,
attributes: ["id", "name", "businessNumber"],
where: { isActive: true }, // 활성화된 회사만
attributes: ["id", "name", "businessNumber", "contractEndDate"],
where: { id: company.id, isActive: true }, // 활성화된 회사만
},
{
model: Branch,
@ -173,7 +174,7 @@ class AuthService {
const userInfo = {
...userData,
permissions,
isEdgeLogin: true, // Edge 로그인 여부 표시
// isEdgeLogin: true, // Edge 로그인 여부 표시
};
const token = this._generateToken(userInfo);
@ -231,6 +232,9 @@ class AuthService {
id: user.id,
role: user.role,
companyId: user.companyId,
companyName: user?.Company?.name, // 회사명 추가
businessNumber: user?.Company?.businessNumber, // 사업자번호 추가
contractEndDate: user?.Company?.contractEndDate, //
branchId: user.branchId,
permissions: user.permissions,
},

View File

@ -21,7 +21,7 @@ async function createInitialAdmin() {
if (!adminCompany) {
adminCompany = await Company.create({
name: "FEMS 관리자",
businessNumber: "000-00-00000",
businessNumber: "439-78-02852",
address: "서울시 강남구",
tel: "02-0000-0000",
email: "admin@fems.com",