From d2ecdfab11b9cefa8bf2d6e7e5915e1947ca3597 Mon Sep 17 00:00:00 2001 From: abiyasa05 Date: Thu, 8 Aug 2024 14:28:24 +0700 Subject: [PATCH 1/8] create: API for register --- apps/backend/src/data/permissions.ts | 3 + apps/backend/src/data/roles.ts | 10 ++- apps/backend/src/index.ts | 2 + apps/backend/src/routes/register/route.ts | 83 +++++++++++++++++++++++ 4 files changed, 97 insertions(+), 1 deletion(-) create mode 100644 apps/backend/src/routes/register/route.ts diff --git a/apps/backend/src/data/permissions.ts b/apps/backend/src/data/permissions.ts index 1e91356..8fc61fe 100644 --- a/apps/backend/src/data/permissions.ts +++ b/apps/backend/src/data/permissions.ts @@ -32,6 +32,9 @@ const permissionsData = [ { code: "roles.delete", }, + { + code: "register.create", + }, ] as const; export type SpecificPermissionCode = (typeof permissionsData)[number]["code"]; diff --git a/apps/backend/src/data/roles.ts b/apps/backend/src/data/roles.ts index 2c42327..bc087b5 100644 --- a/apps/backend/src/data/roles.ts +++ b/apps/backend/src/data/roles.ts @@ -17,10 +17,18 @@ const roleData: RoleData[] = [ name: "Super Admin", permissions: permissionsData.map((permission) => permission.code), }, + { + code: "user", + description: + "Has full access to the system and can manage all features and settings", + isActive: true, + name: "User", + permissions: ["register.create"], + }, ]; // Manually specify the union of role codes -export type RoleCode = "super-admin" | "*"; +export type RoleCode = "super-admin" | "user" | "*"; const exportedRoleData = roleData; diff --git a/apps/backend/src/index.ts b/apps/backend/src/index.ts index c0fbe56..a8204c1 100644 --- a/apps/backend/src/index.ts +++ b/apps/backend/src/index.ts @@ -3,6 +3,7 @@ import { configDotenv } from "dotenv"; import { Hono } from "hono"; import authRoutes from "./routes/auth/route"; import usersRoute from "./routes/users/route"; +import respondentsRoute from "./routes/register/route"; import { verifyAccessToken } from "./utils/authUtils"; import permissionRoutes from "./routes/permissions/route"; import { cors } from "hono/cors"; @@ -78,6 +79,7 @@ const routes = app .route("/dashboard", dashboardRoutes) .route("/roles", rolesRoute) .route("/dev", devRoutes) + .route("/register", respondentsRoute) .onError((err, c) => { if (err instanceof DashboardError) { return c.json( diff --git a/apps/backend/src/routes/register/route.ts b/apps/backend/src/routes/register/route.ts new file mode 100644 index 0000000..9ac5706 --- /dev/null +++ b/apps/backend/src/routes/register/route.ts @@ -0,0 +1,83 @@ +import { Hono } from "hono"; +import { HTTPException } from "hono/http-exception"; +import db from "../../drizzle"; +import { respondents } from "../../drizzle/schema/respondents"; +import { users } from "../../drizzle/schema/users"; +import { hashPassword } from "../../utils/passwordUtils"; +import requestValidator from "../../utils/requestValidator"; +import authInfo from "../../middlewares/authInfo"; +import checkPermission from "../../middlewares/checkPermission"; +import { and, eq, isNull, ilike, or, sql } from "drizzle-orm"; +import { z } from "zod"; +import HonoEnv from "../../types/HonoEnv"; + +const registerFormSchema = z.object({ + name: z.string().min(1).max(255), + username: z.string().min(1).max(255), + email: z.string().email().optional(), + password: z.string().min(6), + companyName: z.string().min(1).max(255), + position: z.string().min(1).max(255), + workExperience: z.string().min(1).max(255), + address: z.string().min(1), + phoneNumber: z.string().min(1).max(13), +}); + +const respondentsRoute = new Hono() + .use(authInfo) + //create user and respondent + .post( + "/", + checkPermission("register.create"), + requestValidator("json", registerFormSchema), + async (c) => { + const formData = c.req.valid("json"); + + // Hash the password + const hashedPassword = await hashPassword(formData.password); + + // Start a transaction + try { + const result = await db.transaction(async (trx) => { + // Create user + const [newUser] = await trx + .insert(users) + .values({ + name: formData.name, + username: formData.username, + email: formData.email, + password: hashedPassword, + }) + .returning(); + + // Create respondent + await trx + .insert(respondents) + .values({ + companyName: formData.companyName, + position: formData.position, + workExperience: formData.workExperience, + address: formData.address, + phoneNumber: formData.phoneNumber, + userId: newUser.id, + }); + + return newUser; + }); + + return c.json( + { + message: "User and respondent created successfully", + }, + 201 + ); + } catch (error) { + console.error("Error creating user and respondent:", error); + throw new HTTPException(500, { + message: "Error creating user and respondent", + }); + } + } + ); + +export default respondentsRoute; \ No newline at end of file From 34abe4582dded63c139b94bfd06399eca34c7e0c Mon Sep 17 00:00:00 2001 From: abiyasa05 Date: Fri, 9 Aug 2024 09:21:27 +0700 Subject: [PATCH 2/8] add: data validation for register api --- apps/backend/src/routes/register/route.ts | 32 +++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/apps/backend/src/routes/register/route.ts b/apps/backend/src/routes/register/route.ts index 9ac5706..432637c 100644 --- a/apps/backend/src/routes/register/route.ts +++ b/apps/backend/src/routes/register/route.ts @@ -7,7 +7,7 @@ import { hashPassword } from "../../utils/passwordUtils"; import requestValidator from "../../utils/requestValidator"; import authInfo from "../../middlewares/authInfo"; import checkPermission from "../../middlewares/checkPermission"; -import { and, eq, isNull, ilike, or, sql } from "drizzle-orm"; +import { and, eq, or } from "drizzle-orm"; import { z } from "zod"; import HonoEnv from "../../types/HonoEnv"; @@ -25,7 +25,6 @@ const registerFormSchema = z.object({ const respondentsRoute = new Hono() .use(authInfo) - //create user and respondent .post( "/", checkPermission("register.create"), @@ -33,6 +32,35 @@ const respondentsRoute = new Hono() async (c) => { const formData = c.req.valid("json"); + // Build conditions based on available formData + const conditions = []; + if (formData.email) { + conditions.push(eq(users.email, formData.email)); + } + conditions.push(eq(users.username, formData.username)); + + const existingUser = await db + .select() + .from(users) + .where(or(...conditions)); + + const existingRespondent = await db + .select() + .from(respondents) + .where(eq(respondents.phoneNumber, formData.phoneNumber)); + + if (existingUser.length > 0) { + throw new HTTPException(400, { + message: "Email atau username sudah terdaftar", + }); + } + + if (existingRespondent.length > 0) { + throw new HTTPException(400, { + message: "Nomor HP sudah terdaftar", + }); + } + // Hash the password const hashedPassword = await hashPassword(formData.password); From 46e8980941438a9fb313ef26a2e2f23cf75173f7 Mon Sep 17 00:00:00 2001 From: abiyasa05 Date: Fri, 9 Aug 2024 11:03:22 +0700 Subject: [PATCH 3/8] Add a role to the register API --- apps/backend/src/routes/register/route.ts | 98 +++++++++++++++++------ 1 file changed, 72 insertions(+), 26 deletions(-) diff --git a/apps/backend/src/routes/register/route.ts b/apps/backend/src/routes/register/route.ts index 432637c..a8fae90 100644 --- a/apps/backend/src/routes/register/route.ts +++ b/apps/backend/src/routes/register/route.ts @@ -3,6 +3,7 @@ import { HTTPException } from "hono/http-exception"; import db from "../../drizzle"; import { respondents } from "../../drizzle/schema/respondents"; import { users } from "../../drizzle/schema/users"; +import { rolesToUsers } from "../../drizzle/schema/rolesToUsers"; import { hashPassword } from "../../utils/passwordUtils"; import requestValidator from "../../utils/requestValidator"; import authInfo from "../../middlewares/authInfo"; @@ -21,6 +22,23 @@ const registerFormSchema = z.object({ workExperience: z.string().min(1).max(255), address: z.string().min(1), phoneNumber: z.string().min(1).max(13), + isEnabled: z.string().default("false"), + roles: z + .string() + .refine( + (data) => { + try { + const parsed = JSON.parse(data); + return Array.isArray(parsed); + } catch { + return false; + } + }, + { + message: "Roles must be an array", + } + ) + .optional(), }); const respondentsRoute = new Hono() @@ -31,39 +49,47 @@ const respondentsRoute = new Hono() requestValidator("json", registerFormSchema), async (c) => { const formData = c.req.valid("json"); - + + console.log("Form Data:", formData); + // Build conditions based on available formData const conditions = []; if (formData.email) { conditions.push(eq(users.email, formData.email)); } conditions.push(eq(users.username, formData.username)); - + const existingUser = await db .select() .from(users) .where(or(...conditions)); - + + console.log("Existing Users:", existingUser); + const existingRespondent = await db .select() .from(respondents) .where(eq(respondents.phoneNumber, formData.phoneNumber)); - + + console.log("Existing Respondents:", existingRespondent); + if (existingUser.length > 0) { throw new HTTPException(400, { message: "Email atau username sudah terdaftar", }); } - + if (existingRespondent.length > 0) { throw new HTTPException(400, { message: "Nomor HP sudah terdaftar", }); } - + // Hash the password const hashedPassword = await hashPassword(formData.password); - + + console.log("Hashed Password:", hashedPassword); + // Start a transaction try { const result = await db.transaction(async (trx) => { @@ -75,30 +101,50 @@ const respondentsRoute = new Hono() username: formData.username, email: formData.email, password: hashedPassword, + isEnabled: formData.isEnabled?.toLowerCase() === "true" || true, }) .returning(); - + + console.log("New User:", newUser); + // Create respondent - await trx - .insert(respondents) - .values({ - companyName: formData.companyName, - position: formData.position, - workExperience: formData.workExperience, - address: formData.address, - phoneNumber: formData.phoneNumber, - userId: newUser.id, - }); - + await trx.insert(respondents).values({ + companyName: formData.companyName, + position: formData.position, + workExperience: formData.workExperience, + address: formData.address, + phoneNumber: formData.phoneNumber, + userId: newUser.id, + }); + + console.log("Respondent Created for User ID:", newUser.id); + + // If roles are included in the request, add to rolesToUsers + if (formData.roles) { + try { + const roles = JSON.parse(formData.roles) as string[]; + if (roles.length) { + await trx.insert(rolesToUsers).values( + roles.map((role) => ({ + userId: newUser.id, + roleId: role, + })) + ); + } + } catch (error) { + console.error("Error parsing roles:", error); + throw new HTTPException(400, { + message: "Invalid roles format", + }); + } + } + return newUser; }); - - return c.json( - { - message: "User and respondent created successfully", - }, - 201 - ); + + return c.json({ + message: "User and respondent created successfully", + }, 201); } catch (error) { console.error("Error creating user and respondent:", error); throw new HTTPException(500, { From 02961782e7ba8e03ac80cf6b70b6f047b4c0de7a Mon Sep 17 00:00:00 2001 From: abiyasa05 Date: Wed, 14 Aug 2024 10:36:14 +0700 Subject: [PATCH 4/8] fix: revise register --- apps/backend/src/routes/register/route.ts | 235 ++++++++++------------ 1 file changed, 105 insertions(+), 130 deletions(-) diff --git a/apps/backend/src/routes/register/route.ts b/apps/backend/src/routes/register/route.ts index a8fae90..ef6fd2a 100644 --- a/apps/backend/src/routes/register/route.ts +++ b/apps/backend/src/routes/register/route.ts @@ -3,19 +3,19 @@ import { HTTPException } from "hono/http-exception"; import db from "../../drizzle"; import { respondents } from "../../drizzle/schema/respondents"; import { users } from "../../drizzle/schema/users"; +import { rolesSchema } from "../../drizzle/schema/roles"; import { rolesToUsers } from "../../drizzle/schema/rolesToUsers"; import { hashPassword } from "../../utils/passwordUtils"; import requestValidator from "../../utils/requestValidator"; import authInfo from "../../middlewares/authInfo"; -import checkPermission from "../../middlewares/checkPermission"; -import { and, eq, or } from "drizzle-orm"; +import { or, eq } from "drizzle-orm"; import { z } from "zod"; import HonoEnv from "../../types/HonoEnv"; const registerFormSchema = z.object({ name: z.string().min(1).max(255), username: z.string().min(1).max(255), - email: z.string().email().optional(), + email: z.string().email(), password: z.string().min(6), companyName: z.string().min(1).max(255), position: z.string().min(1).max(255), @@ -23,135 +23,110 @@ const registerFormSchema = z.object({ address: z.string().min(1), phoneNumber: z.string().min(1).max(13), isEnabled: z.string().default("false"), - roles: z - .string() - .refine( - (data) => { - try { - const parsed = JSON.parse(data); - return Array.isArray(parsed); - } catch { - return false; - } - }, - { - message: "Roles must be an array", - } - ) - .optional(), }); const respondentsRoute = new Hono() .use(authInfo) - .post( - "/", - checkPermission("register.create"), - requestValidator("json", registerFormSchema), - async (c) => { - const formData = c.req.valid("json"); - - console.log("Form Data:", formData); - - // Build conditions based on available formData - const conditions = []; - if (formData.email) { - conditions.push(eq(users.email, formData.email)); - } - conditions.push(eq(users.username, formData.username)); - - const existingUser = await db - .select() - .from(users) - .where(or(...conditions)); - - console.log("Existing Users:", existingUser); - - const existingRespondent = await db - .select() - .from(respondents) - .where(eq(respondents.phoneNumber, formData.phoneNumber)); - - console.log("Existing Respondents:", existingRespondent); - - if (existingUser.length > 0) { - throw new HTTPException(400, { - message: "Email atau username sudah terdaftar", - }); - } - - if (existingRespondent.length > 0) { - throw new HTTPException(400, { - message: "Nomor HP sudah terdaftar", - }); - } - - // Hash the password - const hashedPassword = await hashPassword(formData.password); - - console.log("Hashed Password:", hashedPassword); - - // Start a transaction - try { - const result = await db.transaction(async (trx) => { - // Create user - const [newUser] = await trx - .insert(users) - .values({ - name: formData.name, - username: formData.username, - email: formData.email, - password: hashedPassword, - isEnabled: formData.isEnabled?.toLowerCase() === "true" || true, - }) - .returning(); - - console.log("New User:", newUser); - - // Create respondent - await trx.insert(respondents).values({ - companyName: formData.companyName, - position: formData.position, - workExperience: formData.workExperience, - address: formData.address, - phoneNumber: formData.phoneNumber, - userId: newUser.id, - }); - - console.log("Respondent Created for User ID:", newUser.id); - - // If roles are included in the request, add to rolesToUsers - if (formData.roles) { - try { - const roles = JSON.parse(formData.roles) as string[]; - if (roles.length) { - await trx.insert(rolesToUsers).values( - roles.map((role) => ({ - userId: newUser.id, - roleId: role, - })) - ); - } - } catch (error) { - console.error("Error parsing roles:", error); - throw new HTTPException(400, { - message: "Invalid roles format", - }); - } - } - - return newUser; - }); - - return c.json({ - message: "User and respondent created successfully", - }, 201); - } catch (error) { - console.error("Error creating user and respondent:", error); - throw new HTTPException(500, { - message: "Error creating user and respondent", - }); - } - } - ); + //post user + .post("/", requestValidator("json", registerFormSchema), async (c) => { + const formData = c.req.valid("json"); -export default respondentsRoute; \ No newline at end of file + // Check if the provided email or username is already exists in database + const conditions = []; + if (formData.email) { + conditions.push(eq(users.email, formData.email)); + } + conditions.push(eq(users.username, formData.username)); + + const existingUser = await db + .select() + .from(users) + .where( + or( + eq(users.email, formData.email), + eq(users.username, formData.username) + ) + ); + + const existingRespondent = await db + .select() + .from(respondents) + .where(eq(respondents.phoneNumber, formData.phoneNumber)); + + if (existingUser.length > 0) { + throw new HTTPException(400, { + message: "Email or username has been registered", + }); + } + + if (existingRespondent.length > 0) { + throw new HTTPException(400, { + message: "Phone number has been registered", + }); + } + + // Hash the password + const hashedPassword = await hashPassword(formData.password); + + // Start a transaction + const result = await db.transaction(async (trx) => { + // Create user + const [newUser] = await trx + .insert(users) + .values({ + name: formData.name, + username: formData.username, + email: formData.email, + password: hashedPassword, + isEnabled: formData.isEnabled?.toLowerCase() === "true" || true, + }) + .returning() + .catch(() => { + throw new HTTPException(500, { message: "Error creating user" }); + }); + + // Create respondent + await trx + .insert(respondents) + .values({ + companyName: formData.companyName, + position: formData.position, + workExperience: formData.workExperience, + address: formData.address, + phoneNumber: formData.phoneNumber, + userId: newUser.id, + }) + .catch(() => { + throw new HTTPException(500, { + message: "Error creating respondent", + }); + }); + + // Automatically assign "user" role to the new user + const [role] = await trx + .select() + .from(rolesSchema) + .where(eq(rolesSchema.code, "user")) + .limit(1); + + if (!role) { + throw new HTTPException(500, { message: "Role 'user' not found" }); + } + + await trx.insert(rolesToUsers).values({ + userId: newUser.id, + roleId: role.id, + }); + + return newUser; + }); + + return c.json( + { + message: "User created successfully", + }, + 201 + ); + }); + +export default respondentsRoute; From 38f153fe765b3c8ad1c2dfa5163501a43136e344 Mon Sep 17 00:00:00 2001 From: abiyasa05 Date: Wed, 14 Aug 2024 10:37:35 +0700 Subject: [PATCH 5/8] fx: delete register permission --- apps/backend/src/data/permissions.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/apps/backend/src/data/permissions.ts b/apps/backend/src/data/permissions.ts index 8fc61fe..1e91356 100644 --- a/apps/backend/src/data/permissions.ts +++ b/apps/backend/src/data/permissions.ts @@ -32,9 +32,6 @@ const permissionsData = [ { code: "roles.delete", }, - { - code: "register.create", - }, ] as const; export type SpecificPermissionCode = (typeof permissionsData)[number]["code"]; From c6e6ca1efe1f610cef7fc46a84f05562510957f1 Mon Sep 17 00:00:00 2001 From: abiyasa05 Date: Wed, 14 Aug 2024 10:38:51 +0700 Subject: [PATCH 6/8] update: add user roles --- apps/backend/src/data/roles.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/backend/src/data/roles.ts b/apps/backend/src/data/roles.ts index bc087b5..d1c46bb 100644 --- a/apps/backend/src/data/roles.ts +++ b/apps/backend/src/data/roles.ts @@ -20,10 +20,10 @@ const roleData: RoleData[] = [ { code: "user", description: - "Has full access to the system and can manage all features and settings", + "User with standard access rights for general usage of the application.", isActive: true, name: "User", - permissions: ["register.create"], + permissions: permissionsData.map((permission) => permission.code), }, ]; From 7daee35feedb24c12d52253ca4b7950958f32d48 Mon Sep 17 00:00:00 2001 From: abiyasa05 Date: Sun, 18 Aug 2024 19:06:22 +0700 Subject: [PATCH 7/8] fix: change to DashboardError --- apps/backend/src/routes/register/route.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/apps/backend/src/routes/register/route.ts b/apps/backend/src/routes/register/route.ts index ef6fd2a..4be7398 100644 --- a/apps/backend/src/routes/register/route.ts +++ b/apps/backend/src/routes/register/route.ts @@ -11,6 +11,7 @@ import authInfo from "../../middlewares/authInfo"; import { or, eq } from "drizzle-orm"; import { z } from "zod"; import HonoEnv from "../../types/HonoEnv"; +import { notFound } from "../../errors/DashboardError"; const registerFormSchema = z.object({ name: z.string().min(1).max(255), @@ -109,9 +110,7 @@ const respondentsRoute = new Hono() .where(eq(rolesSchema.code, "user")) .limit(1); - if (!role) { - throw new HTTPException(500, { message: "Role 'user' not found" }); - } + if (!role) throw notFound(); await trx.insert(rolesToUsers).values({ userId: newUser.id, From 19133562edb833c01131f311d749aa72a1ddcfda Mon Sep 17 00:00:00 2001 From: abiyasa05 Date: Mon, 19 Aug 2024 11:50:37 +0700 Subject: [PATCH 8/8] update: add route for register --- apps/backend/src/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/backend/src/index.ts b/apps/backend/src/index.ts index 3c714d3..704b19a 100644 --- a/apps/backend/src/index.ts +++ b/apps/backend/src/index.ts @@ -81,6 +81,7 @@ const routes = app .route("/roles", rolesRoute) .route("/dev", devRoutes) .route("/questions", questionsRoute) + .route("/register", respondentsRoute) .onError((err, c) => { if (err instanceof DashboardError) { return c.json(