From d7252b9fb375d47400771e3f2d6ea47587a117c9 Mon Sep 17 00:00:00 2001 From: Bagasbanuna02 Date: Wed, 5 Feb 2025 15:34:06 +0800 Subject: [PATCH] fix folder deskripsi: - ganti nama folder (user) ke (auth) - hapus folder auth --- logs/backend/combined-2025-02-05.log | 1 + logs/backend/error-2025-02-05.log | 1 + src/app/{auth => (auth)}/_lib/decrypt.ts | 0 src/app/{auth => (auth)}/_lib/encrypt.ts | 0 .../{auth => (auth)}/_lib/session_create.ts | 0 src/app/{(user) => (auth)}/login/page.tsx | 0 src/app/{(user) => (auth)}/register/page.tsx | 0 src/app/{(user) => (auth)}/splash/page.tsx | 0 src/app/{(user) => (auth)}/validasi/page.tsx | 0 .../{(user) => (auth)}/waiting-room/page.tsx | 0 src/app/api/auth/register/route.ts | 2 +- src/app/api/auth/validasi/route.ts | 2 +- src/app/api/user-validate/route.ts | 2 +- src/app/api/user/get-cookies/route.ts | 2 +- src/app/api/user/route.ts | 2 +- src/app/auth/api/login/route.ts | 25 ------------ src/app/auth/api/logout/route.ts | 8 ---- src/app/auth/login/page.tsx | 39 ------------------- .../fun/get/fun_get_user_id_by_token.ts | 2 +- src/app_modules/auth/register/view.tsx | 18 +++------ src/app_modules/auth/validasi/view.tsx | 28 +++++++------ 21 files changed, 30 insertions(+), 102 deletions(-) rename src/app/{auth => (auth)}/_lib/decrypt.ts (100%) rename src/app/{auth => (auth)}/_lib/encrypt.ts (100%) rename src/app/{auth => (auth)}/_lib/session_create.ts (100%) rename src/app/{(user) => (auth)}/login/page.tsx (100%) rename src/app/{(user) => (auth)}/register/page.tsx (100%) rename src/app/{(user) => (auth)}/splash/page.tsx (100%) rename src/app/{(user) => (auth)}/validasi/page.tsx (100%) rename src/app/{(user) => (auth)}/waiting-room/page.tsx (100%) delete mode 100644 src/app/auth/api/login/route.ts delete mode 100644 src/app/auth/api/logout/route.ts delete mode 100644 src/app/auth/login/page.tsx diff --git a/logs/backend/combined-2025-02-05.log b/logs/backend/combined-2025-02-05.log index b799e57a..7d880846 100644 --- a/logs/backend/combined-2025-02-05.log +++ b/logs/backend/combined-2025-02-05.log @@ -21,3 +21,4 @@ {"clientVersion":"6.3.0","code":"UND_ERR_SOCKET","level":"error","message":"Error deleting OTP: \nInvalid `prisma.kodeOtp.delete()` invocation:\n\n\nother side closed","meta":{"modelName":"KodeOtp"},"name":"PrismaClientKnownRequestError","stack":"PrismaClientKnownRequestError: \nInvalid `prisma.kodeOtp.delete()` invocation:\n\n\nother side closed\n at new PrismaClientKnownRequestError (/Users/bagasbanuna/Documents/BIP/hipmi/node_modules/@prisma/client/runtime/binary.js:148:1500)\n at handleRequestError (/Users/bagasbanuna/Documents/BIP/hipmi/node_modules/@prisma/client/runtime/binary.js:258:7367)\n at handleAndLogRequestError (/Users/bagasbanuna/Documents/BIP/hipmi/node_modules/@prisma/client/runtime/binary.js:258:6687)\n at (/Users/bagasbanuna/Documents/BIP/hipmi/node_modules/@prisma/client/runtime/binary.js:258:6394)\n at processTicksAndRejections (native:7:39)","timestamp":"2025-02-05T06:35:53.417Z"} {"id":"c65237f0-e0cf-4961-9454-2405c4f4fe05","level":"info","message":"Success send message","status":"success","timestamp":"2025-02-05T06:41:30.785Z"} {"clientVersion":"6.3.0","code":"UND_ERR_SOCKET","level":"error","message":"Error deleting OTP: \nInvalid `prisma.kodeOtp.delete()` invocation:\n\n\nother side closed","meta":{"modelName":"KodeOtp"},"name":"PrismaClientKnownRequestError","stack":"PrismaClientKnownRequestError: \nInvalid `prisma.kodeOtp.delete()` invocation:\n\n\nother side closed\n at new PrismaClientKnownRequestError (webpack-internal:///(ssr)/./node_modules/@prisma/client/runtime/binary.js:148:1505)\n at handleRequestError (webpack-internal:///(ssr)/./node_modules/@prisma/client/runtime/binary.js:258:7369)\n at handleAndLogRequestError (webpack-internal:///(ssr)/./node_modules/@prisma/client/runtime/binary.js:258:6705)\n at (webpack-internal:///(ssr)/./node_modules/@prisma/client/runtime/binary.js:258:6418)\n at processTicksAndRejections (native:7:39)","timestamp":"2025-02-05T06:53:59.012Z"} +{"digest":"DYNAMIC_SERVER_USAGE","level":"error","message":"Error get data detail event: Dynamic server usage: Page couldn't be rendered statically because it used `request.url`. See more info here: https://nextjs.org/docs/messages/dynamic-server-error","stack":"Error: Dynamic server usage: Page couldn't be rendered statically because it used `request.url`. See more info here: https://nextjs.org/docs/messages/dynamic-server-error\n at Object.e_ [as staticGenerationBailout] (/Users/bagasbanuna/Documents/BIP/hipmi/node_modules/next/dist/compiled/next-server/app-route.runtime.prod.js:14:27571)\n at i (/Users/bagasbanuna/Documents/BIP/hipmi/node_modules/next/dist/compiled/next-server/app-route.runtime.prod.js:14:32508)\n at Object.get (/Users/bagasbanuna/Documents/BIP/hipmi/node_modules/next/dist/compiled/next-server/app-route.runtime.prod.js:14:32604)\n at GET (/Users/bagasbanuna/Documents/BIP/hipmi/.next/server/app/api/event/check-peserta/route.js:1:1219)\n at /Users/bagasbanuna/Documents/BIP/hipmi/node_modules/next/dist/compiled/next-server/app-route.runtime.prod.js:14:39715\n at /Users/bagasbanuna/Documents/BIP/hipmi/node_modules/next/dist/server/lib/trace/tracer.js:121:36\n at NoopContextManager.with (/Users/bagasbanuna/Documents/BIP/hipmi/node_modules/next/dist/compiled/@opentelemetry/api/index.js:1:7057)\n at ContextAPI.with (/Users/bagasbanuna/Documents/BIP/hipmi/node_modules/next/dist/compiled/@opentelemetry/api/index.js:1:516)\n at NoopTracer.startActiveSpan (/Users/bagasbanuna/Documents/BIP/hipmi/node_modules/next/dist/compiled/@opentelemetry/api/index.js:1:18086)\n at ProxyTracer.startActiveSpan (/Users/bagasbanuna/Documents/BIP/hipmi/node_modules/next/dist/compiled/@opentelemetry/api/index.js:1:18847)","timestamp":"2025-02-05T07:23:58.983Z"} diff --git a/logs/backend/error-2025-02-05.log b/logs/backend/error-2025-02-05.log index b845dbdd..c2b2edfd 100644 --- a/logs/backend/error-2025-02-05.log +++ b/logs/backend/error-2025-02-05.log @@ -20,3 +20,4 @@ {"clientVersion":"6.3.0","code":"P2025","level":"error","message":"Error deleting OTP: \nInvalid `prisma.kodeOtp.delete()` invocation:\n\n\nAn operation failed because it depends on one or more records that were required but not found. Record to delete does not exist.","meta":{"cause":"Record to delete does not exist.","modelName":"KodeOtp"},"name":"PrismaClientKnownRequestError","stack":"PrismaClientKnownRequestError: \nInvalid `prisma.kodeOtp.delete()` invocation:\n\n\nAn operation failed because it depends on one or more records that were required but not found. Record to delete does not exist.\n at new PrismaClientKnownRequestError (webpack-internal:///(ssr)/./node_modules/@prisma/client/runtime/binary.js:148:1505)\n at handleRequestError (webpack-internal:///(ssr)/./node_modules/@prisma/client/runtime/binary.js:258:7369)\n at handleAndLogRequestError (webpack-internal:///(ssr)/./node_modules/@prisma/client/runtime/binary.js:258:6705)\n at (webpack-internal:///(ssr)/./node_modules/@prisma/client/runtime/binary.js:258:6418)\n at processTicksAndRejections (native:7:39)","timestamp":"2025-02-05T06:25:00.029Z"} {"clientVersion":"6.3.0","code":"UND_ERR_SOCKET","level":"error","message":"Error deleting OTP: \nInvalid `prisma.kodeOtp.delete()` invocation:\n\n\nother side closed","meta":{"modelName":"KodeOtp"},"name":"PrismaClientKnownRequestError","stack":"PrismaClientKnownRequestError: \nInvalid `prisma.kodeOtp.delete()` invocation:\n\n\nother side closed\n at new PrismaClientKnownRequestError (/Users/bagasbanuna/Documents/BIP/hipmi/node_modules/@prisma/client/runtime/binary.js:148:1500)\n at handleRequestError (/Users/bagasbanuna/Documents/BIP/hipmi/node_modules/@prisma/client/runtime/binary.js:258:7367)\n at handleAndLogRequestError (/Users/bagasbanuna/Documents/BIP/hipmi/node_modules/@prisma/client/runtime/binary.js:258:6687)\n at (/Users/bagasbanuna/Documents/BIP/hipmi/node_modules/@prisma/client/runtime/binary.js:258:6394)\n at processTicksAndRejections (native:7:39)","timestamp":"2025-02-05T06:35:53.417Z"} {"clientVersion":"6.3.0","code":"UND_ERR_SOCKET","level":"error","message":"Error deleting OTP: \nInvalid `prisma.kodeOtp.delete()` invocation:\n\n\nother side closed","meta":{"modelName":"KodeOtp"},"name":"PrismaClientKnownRequestError","stack":"PrismaClientKnownRequestError: \nInvalid `prisma.kodeOtp.delete()` invocation:\n\n\nother side closed\n at new PrismaClientKnownRequestError (webpack-internal:///(ssr)/./node_modules/@prisma/client/runtime/binary.js:148:1505)\n at handleRequestError (webpack-internal:///(ssr)/./node_modules/@prisma/client/runtime/binary.js:258:7369)\n at handleAndLogRequestError (webpack-internal:///(ssr)/./node_modules/@prisma/client/runtime/binary.js:258:6705)\n at (webpack-internal:///(ssr)/./node_modules/@prisma/client/runtime/binary.js:258:6418)\n at processTicksAndRejections (native:7:39)","timestamp":"2025-02-05T06:53:59.012Z"} +{"digest":"DYNAMIC_SERVER_USAGE","level":"error","message":"Error get data detail event: Dynamic server usage: Page couldn't be rendered statically because it used `request.url`. See more info here: https://nextjs.org/docs/messages/dynamic-server-error","stack":"Error: Dynamic server usage: Page couldn't be rendered statically because it used `request.url`. See more info here: https://nextjs.org/docs/messages/dynamic-server-error\n at Object.e_ [as staticGenerationBailout] (/Users/bagasbanuna/Documents/BIP/hipmi/node_modules/next/dist/compiled/next-server/app-route.runtime.prod.js:14:27571)\n at i (/Users/bagasbanuna/Documents/BIP/hipmi/node_modules/next/dist/compiled/next-server/app-route.runtime.prod.js:14:32508)\n at Object.get (/Users/bagasbanuna/Documents/BIP/hipmi/node_modules/next/dist/compiled/next-server/app-route.runtime.prod.js:14:32604)\n at GET (/Users/bagasbanuna/Documents/BIP/hipmi/.next/server/app/api/event/check-peserta/route.js:1:1219)\n at /Users/bagasbanuna/Documents/BIP/hipmi/node_modules/next/dist/compiled/next-server/app-route.runtime.prod.js:14:39715\n at /Users/bagasbanuna/Documents/BIP/hipmi/node_modules/next/dist/server/lib/trace/tracer.js:121:36\n at NoopContextManager.with (/Users/bagasbanuna/Documents/BIP/hipmi/node_modules/next/dist/compiled/@opentelemetry/api/index.js:1:7057)\n at ContextAPI.with (/Users/bagasbanuna/Documents/BIP/hipmi/node_modules/next/dist/compiled/@opentelemetry/api/index.js:1:516)\n at NoopTracer.startActiveSpan (/Users/bagasbanuna/Documents/BIP/hipmi/node_modules/next/dist/compiled/@opentelemetry/api/index.js:1:18086)\n at ProxyTracer.startActiveSpan (/Users/bagasbanuna/Documents/BIP/hipmi/node_modules/next/dist/compiled/@opentelemetry/api/index.js:1:18847)","timestamp":"2025-02-05T07:23:58.983Z"} diff --git a/src/app/auth/_lib/decrypt.ts b/src/app/(auth)/_lib/decrypt.ts similarity index 100% rename from src/app/auth/_lib/decrypt.ts rename to src/app/(auth)/_lib/decrypt.ts diff --git a/src/app/auth/_lib/encrypt.ts b/src/app/(auth)/_lib/encrypt.ts similarity index 100% rename from src/app/auth/_lib/encrypt.ts rename to src/app/(auth)/_lib/encrypt.ts diff --git a/src/app/auth/_lib/session_create.ts b/src/app/(auth)/_lib/session_create.ts similarity index 100% rename from src/app/auth/_lib/session_create.ts rename to src/app/(auth)/_lib/session_create.ts diff --git a/src/app/(user)/login/page.tsx b/src/app/(auth)/login/page.tsx similarity index 100% rename from src/app/(user)/login/page.tsx rename to src/app/(auth)/login/page.tsx diff --git a/src/app/(user)/register/page.tsx b/src/app/(auth)/register/page.tsx similarity index 100% rename from src/app/(user)/register/page.tsx rename to src/app/(auth)/register/page.tsx diff --git a/src/app/(user)/splash/page.tsx b/src/app/(auth)/splash/page.tsx similarity index 100% rename from src/app/(user)/splash/page.tsx rename to src/app/(auth)/splash/page.tsx diff --git a/src/app/(user)/validasi/page.tsx b/src/app/(auth)/validasi/page.tsx similarity index 100% rename from src/app/(user)/validasi/page.tsx rename to src/app/(auth)/validasi/page.tsx diff --git a/src/app/(user)/waiting-room/page.tsx b/src/app/(auth)/waiting-room/page.tsx similarity index 100% rename from src/app/(user)/waiting-room/page.tsx rename to src/app/(auth)/waiting-room/page.tsx diff --git a/src/app/api/auth/register/route.ts b/src/app/api/auth/register/route.ts index 53f83014..7a4ddb85 100644 --- a/src/app/api/auth/register/route.ts +++ b/src/app/api/auth/register/route.ts @@ -1,4 +1,4 @@ -import { sessionCreate } from "@/app/auth/_lib/session_create"; +import { sessionCreate } from "@/app/(auth)/_lib/session_create"; import prisma from "@/app/lib/prisma"; import backendLogger from "@/util/backendLogger"; import { NextResponse } from "next/server"; diff --git a/src/app/api/auth/validasi/route.ts b/src/app/api/auth/validasi/route.ts index c13633fd..d485c054 100644 --- a/src/app/api/auth/validasi/route.ts +++ b/src/app/api/auth/validasi/route.ts @@ -1,4 +1,4 @@ -import { sessionCreate } from "@/app/auth/_lib/session_create"; +import { sessionCreate } from "@/app/(auth)/_lib/session_create"; import prisma from "@/app/lib/prisma"; import backendLogger from "@/util/backendLogger"; import { NextResponse } from "next/server"; diff --git a/src/app/api/user-validate/route.ts b/src/app/api/user-validate/route.ts index 8b881bb3..505c65ae 100644 --- a/src/app/api/user-validate/route.ts +++ b/src/app/api/user-validate/route.ts @@ -1,4 +1,4 @@ -import { decrypt } from "@/app/auth/_lib/decrypt"; +import { decrypt } from "@/app/(auth)/_lib/decrypt"; import { prisma } from "@/app/lib"; import { cookies } from "next/headers"; import { NextRequest, NextResponse } from "next/server"; diff --git a/src/app/api/user/get-cookies/route.ts b/src/app/api/user/get-cookies/route.ts index f59b5fe8..812242cb 100644 --- a/src/app/api/user/get-cookies/route.ts +++ b/src/app/api/user/get-cookies/route.ts @@ -1,4 +1,4 @@ -import { decrypt } from "@/app/auth/_lib/decrypt"; +import { decrypt } from "@/app/(auth)/_lib/decrypt"; import _ from "lodash"; import { cookies } from "next/headers"; import { NextResponse } from "next/server"; diff --git a/src/app/api/user/route.ts b/src/app/api/user/route.ts index 1ae5f208..06f4d909 100644 --- a/src/app/api/user/route.ts +++ b/src/app/api/user/route.ts @@ -1,5 +1,5 @@ -import { decrypt } from "@/app/auth/_lib/decrypt"; +import { decrypt } from "@/app/(auth)/_lib/decrypt"; import _ from "lodash"; import { cookies } from "next/headers"; import { NextResponse } from "next/server"; diff --git a/src/app/auth/api/login/route.ts b/src/app/auth/api/login/route.ts deleted file mode 100644 index eb59a9f0..00000000 --- a/src/app/auth/api/login/route.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { prisma } from "@/app/lib"; -import { sessionCreate } from "../../_lib/session_create"; -import { NextResponse } from "next/server"; - -export async function POST(req: Request) { - const user = await prisma.user.findUnique({ - where: { - nomor: "6281339158911", - }, - select: { - id: true, - nomor: true, - }, - }); - - if (!user) return NextResponse.json({ success: false }, { status: 404 }); - - const token = await sessionCreate({ - sessionKey: process.env.NEXT_PUBLIC_BASE_SESSION_KEY!, - encodedKey: process.env.NEXT_PUBLIC_BASE_TOKEN_KEY!, - user: user as any, - }); - - return NextResponse.json({ success: true, token }); -} diff --git a/src/app/auth/api/logout/route.ts b/src/app/auth/api/logout/route.ts deleted file mode 100644 index 25aab3db..00000000 --- a/src/app/auth/api/logout/route.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { cookies } from "next/headers"; -import { NextResponse } from "next/server"; - -export async function GET() { - const del = cookies().delete(process.env.NEXT_PUBLIC_BASE_SESSION_KEY!); - - return NextResponse.json({ success: true, message: "Logout Berhasil" }); -} diff --git a/src/app/auth/login/page.tsx b/src/app/auth/login/page.tsx deleted file mode 100644 index 7fe848b8..00000000 --- a/src/app/auth/login/page.tsx +++ /dev/null @@ -1,39 +0,0 @@ -"use client"; -import { Button } from "@mantine/core"; -import { useState } from "react"; - -export default function Page() { - const [loading, setLoading] = useState(false); - - - async function login() { - setLoading(true); - try { - const res = await fetch("/auth/api/login", { - method: "POST", - }); - - const dataText = await res.text(); - - if (!res.ok) { - console.error(dataText); - throw new Error(res.statusText); - } - - const dataJson = JSON.parse(dataText); - console.log(dataJson); - // window.location.replace("/dev/home"); - } catch (error) { - console.error(error); - } finally { - setLoading(false); - } - } - return ( - <> - - - ); -} diff --git a/src/app_modules/_global/fun/get/fun_get_user_id_by_token.ts b/src/app_modules/_global/fun/get/fun_get_user_id_by_token.ts index cfbdb1e2..3164efdf 100644 --- a/src/app_modules/_global/fun/get/fun_get_user_id_by_token.ts +++ b/src/app_modules/_global/fun/get/fun_get_user_id_by_token.ts @@ -1,7 +1,7 @@ "use server"; import { cookies } from "next/headers"; -import { decrypt } from "../../../../app/auth/_lib/decrypt"; +import { decrypt } from "../../../../app/(auth)/_lib/decrypt"; export async function funGetUserIdByToken() { const SESSION_KEY = process.env.NEXT_PUBLIC_BASE_SESSION_KEY!; diff --git a/src/app_modules/auth/register/view.tsx b/src/app_modules/auth/register/view.tsx index 0aab82e8..6c38ec7c 100644 --- a/src/app_modules/auth/register/view.tsx +++ b/src/app_modules/auth/register/view.tsx @@ -24,33 +24,27 @@ export default function Register() { const [isValue, setIsValue] = useState(false); const focusTrapRef = useFocusTrap(); const [loading, setLoading] = useState(false); + const [idCode, setIdCode] = useState(""); useShallowEffect(() => { const kodeId = localStorage.getItem("hipmi_auth_code_id"); if (kodeId != null) { - onCheckAuthCode({ kodeId: kodeId as string, onSetData: setNomor }); + onCheckAuthCode({ kodeId: kodeId as string }); } else { console.log("code id not found"); } - }, [setNomor]); + }, []); - async function onCheckAuthCode({ - kodeId, - onSetData, - }: { - kodeId: string; - onSetData: any; - }) { + async function onCheckAuthCode({ kodeId }: { kodeId: string }) { try { const respone = await apiGetCheckCodeOtp({ id: kodeId }); if (respone) { - onSetData(respone.nomor); + setIdCode(kodeId); + setNomor(respone.nomor); } } catch (error) { clientLogger.error("Error onCheckAuthCode:", error); } - // const res = await fetch(`/api/auth/check?id=${kodeId}`); - // const result = await res.json(); } async function onRegistarsi() { diff --git a/src/app_modules/auth/validasi/view.tsx b/src/app_modules/auth/validasi/view.tsx index 31bad0f3..5d611a4b 100644 --- a/src/app_modules/auth/validasi/view.tsx +++ b/src/app_modules/auth/validasi/view.tsx @@ -181,18 +181,22 @@ export default function Validasi() { <> - - onBack()}> - - - + {data && data.nomor !== "" ? ( + + onBack()}> + + + + ) : ( + "" + )}