Merge pull request 'upd: add village active check on login and mobile user api' (#38) from amalia/22-apr-26 into join
Reviewed-on: #38
This commit is contained in:
@@ -7,7 +7,7 @@ export async function POST(req: NextRequest) {
|
||||
const { phone }: ILogin = await req.json();
|
||||
const user = await prisma.user.findUnique({
|
||||
where: { phone, isActive: true },
|
||||
select: { id: true, phone: true, isWithoutOTP: true },
|
||||
select: { id: true, phone: true, isWithoutOTP: true, Village: { select: { isActive: true } } },
|
||||
});
|
||||
|
||||
if (!user) {
|
||||
@@ -17,6 +17,13 @@ export async function POST(req: NextRequest) {
|
||||
});
|
||||
}
|
||||
|
||||
if (!user.Village?.isActive) {
|
||||
return Response.json({
|
||||
success: false,
|
||||
message: "Akun anda tidak aktif, silahkan hubungi admin",
|
||||
});
|
||||
}
|
||||
|
||||
return Response.json({
|
||||
success: true,
|
||||
message: "Sukses",
|
||||
|
||||
@@ -44,7 +44,8 @@ export async function GET(request: Request, context: { params: { id: string } })
|
||||
},
|
||||
Village:{
|
||||
select:{
|
||||
name:true
|
||||
name:true,
|
||||
isActive:true,
|
||||
}
|
||||
}
|
||||
},
|
||||
@@ -57,8 +58,9 @@ export async function GET(request: Request, context: { params: { id: string } })
|
||||
const phone = users?.phone.substr(2)
|
||||
const role = users?.UserRole.name
|
||||
const village = users?.Village.name
|
||||
const villageIsActive = users?.Village.isActive
|
||||
|
||||
const result = { ...userData, group, position, idUserRole, phone, role, village };
|
||||
const result = { ...userData, group, position, idUserRole, phone, role, village, villageIsActive };
|
||||
|
||||
const omitData = _.omit(result, ["Group", "Position", "UserRole", "Village"]);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user