planpostai/canvas_backend_dev
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

all requirement added

Browse source
This commit is contained in:
Saimon8420 2025-03-01 14:15:32 +06:00
parent d304e6e69d
commit 18f1ccc8f4
2 changed files with 73 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -25,6 +25,7 @@ yarn-debug.log*
yarn-error.log* yarn-error.log*
# local env files # local env files
.env
.env.local .env.local
.env.development.local .env.development.local
.env.test.local .env.test.local

96
src/helper/auth/auth.helper.ts
View file

@ -13,50 +13,16 @@ export const checkUserInDb = async (email: string, password: string): Promise<{
email?: string; email?: string;
}> => { }> => {
try { try {
// function isAdspillarEmail(email: string) { function isAdspillarEmail(email: string) {
// const regex = /^[a-zA-Z0-9._%+-]+@adspillar\.com$/; const regex = /^[a-zA-Z0-9._%+-]+@adspillar\.com$/;
// return regex.test(email); return regex.test(email);
// } }
// if (!isAdspillarEmail(email)) { if (!isAdspillarEmail(email)) {
// return { success: false, message: "Invalid email domain", can_register: false, can_login: false }; return { success: false, message: "Invalid email domain", can_register: false, can_login: false };
// } }
// else {
// const findUser = await db.select({
// email: users.email,
// password: users.password,
// is_active: users.is_active,
// is_verified: users.is_verified,
// refresh_token: users.refresh_token,
// }).from(users).where(eq(users.email, email));
// if (!findUser[0]) {
// return { success: true, message: "User not found", can_register: true };
// }
// const hash = findUser[0].password;
// const isMatch = await Bun.password.verify(password, hash);
// if (isMatch && findUser[0].is_verified && findUser[0].is_active) {
// return {
// success: true,
// message: "User verified successfully",
// can_login: true,
// email: findUser[0].email // Ensure email is included
// };
// }
// else if (isMatch && findUser[0].is_verified === false && findUser[0].is_active) {
// return { success: false, message: "User not verified", can_login: false };
// }
// else if (isMatch && findUser[0].is_active === false && findUser[0].is_verified) {
// return { success: false, message: "User not active", can_login: false };
// }
// else {
// return { success: false, message: "Invalid password", can_login: false };
// }
// }
else {
const findUser = await db.select({ const findUser = await db.select({
email: users.email, email: users.email,
password: users.password, password: users.password,
@ -66,7 +32,7 @@ export const checkUserInDb = async (email: string, password: string): Promise<{
}).from(users).where(eq(users.email, email)); }).from(users).where(eq(users.email, email));
if (!findUser[0]) { if (!findUser[0]) {
return { success: true, message: "Wrong credentials", can_register: true }; return { success: true, message: "User not found", can_register: true };
} }
const hash = findUser[0].password; const hash = findUser[0].password;
@ -77,19 +43,53 @@ export const checkUserInDb = async (email: string, password: string): Promise<{
success: true, success: true,
message: "User verified successfully", message: "User verified successfully",
can_login: true, can_login: true,
email: findUser[0].email, // Ensure email is included email: findUser[0].email // Ensure email is included
can_register: false
}; };
} }
else if (isMatch && findUser[0].is_verified === false && findUser[0].is_active) { else if (isMatch && findUser[0].is_verified === false && findUser[0].is_active) {
return { success: false, message: "User not verified", can_login: false, can_register: false }; return { success: false, message: "User not verified", can_login: false };
} }
else if (isMatch && findUser[0].is_active === false && findUser[0].is_verified) { else if (isMatch && findUser[0].is_active === false && findUser[0].is_verified) {
return { success: false, message: "User not active", can_login: false, can_register: false }; return { success: false, message: "User not active", can_login: false };
} }
else { else {
return { success: false, message: "Invalid credentials", can_login: false, can_register: false }; return { success: false, message: "Invalid password", can_login: false };
} }
}
// const findUser = await db.select({
// email: users.email,
// password: users.password,
// is_active: users.is_active,
// is_verified: users.is_verified,
// refresh_token: users.refresh_token,
// }).from(users).where(eq(users.email, email));
// if (!findUser[0]) {
// return { success: true, message: "Wrong credentials", can_register: true };
// }
// const hash = findUser[0].password;
// const isMatch = await Bun.password.verify(password, hash);
// if (isMatch && findUser[0].is_verified && findUser[0].is_active) {
// return {
// success: true,
// message: "User verified successfully",
// can_login: true,
// email: findUser[0].email, // Ensure email is included
// can_register: false
// };
// }
// else if (isMatch && findUser[0].is_verified === false && findUser[0].is_active) {
// return { success: false, message: "User not verified", can_login: false, can_register: false };
// }
// else if (isMatch && findUser[0].is_active === false && findUser[0].is_verified) {
// return { success: false, message: "User not active", can_login: false, can_register: false };
// }
// else {
// return { success: false, message: "Invalid credentials", can_login: false, can_register: false };
// }
} catch (error: any) { } catch (error: any) {
console.log("Error verifying user:", error); console.log("Error verifying user:", error);