From f54ff6eb0ea99f2a310dd004204390a1efea57eb Mon Sep 17 00:00:00 2001
From: "wira.irawan" <wira.irawan@gmail.com>
Date: Tue, 12 May 2026 22:00:56 +0700
Subject: [PATCH] Fix login redirect behavior

---
 README.md                      | 36 ++++++++++++++++++++++++++++++++++
 src/app/api/login/route.ts     |  5 +++--
 src/app/api/logout/route.ts    |  3 ++-
 src/app/api/test/send/route.ts |  5 +++--
 src/app/login/page.tsx         |  5 +----
 src/lib/url.ts                 |  7 +++++++
 6 files changed, 52 insertions(+), 9 deletions(-)
 create mode 100644 src/lib/url.ts

diff --git a/README.md b/README.md
index 47dea26..6146d16 100644
--- a/README.md
+++ b/README.md
@@ -33,17 +33,53 @@ Target deploy:
 - reverse proxy `nginx`
 
 Contoh langkah di server:
+
+1. Buat user deploy khusus:
+```bash
+sudo adduser deploywa
+sudo usermod -aG sudo deploywa
+sudo mkdir -p /var/www
+sudo chown -R deploywa:deploywa /var/www
+su - deploywa
+```
+
+2. Clone project:
 ```bash
 cd /var/www
 git clone https://git.iptek.co/wirabasalamah/webhook-test.git wa-test-nextjs
 cd wa-test-nextjs
+```
+
+3. Siapkan environment:
+```bash
 cp .env.example .env
+```
+
+4. Install dependency dan build:
+```bash
 npm ci
 npm run build
+```
+
+5. Jalankan dengan PM2:
+```bash
 npx pm2 start ecosystem.config.cjs
 npx pm2 save
 ```
 
+6. Pasang config nginx:
+```bash
+sudo cp deploy/nginx/wa.iptek.co.conf /etc/nginx/sites-available/wa.iptek.co.conf
+sudo ln -s /etc/nginx/sites-available/wa.iptek.co.conf /etc/nginx/sites-enabled/wa.iptek.co.conf
+sudo nginx -t
+sudo systemctl reload nginx
+```
+
+7. Jika pakai HTTPS:
+```bash
+sudo certbot --nginx -d wa.iptek.co
+```
+
 Set `.env` minimal:
 ```bash
 NEXT_PUBLIC_APP_URL=https://wa.iptek.co
diff --git a/src/app/api/login/route.ts b/src/app/api/login/route.ts
index a9c4e21..2638765 100644
--- a/src/app/api/login/route.ts
+++ b/src/app/api/login/route.ts
@@ -1,5 +1,6 @@
 import { NextResponse } from 'next/server'
 import { createSession } from '@/lib/auth'
+import { buildRedirectUrl } from '@/lib/url'
 
 export async function POST(request: Request) {
   const formData = await request.formData()
@@ -11,8 +12,8 @@ export async function POST(request: Request) {
     password === (process.env.WA_TEST_LOGIN_PASSWORD || 'admin123')
   ) {
     await createSession()
-    return NextResponse.redirect(new URL('/settings', request.url))
+    return NextResponse.redirect(buildRedirectUrl(request, '/login'))
   }
 
-  return NextResponse.redirect(new URL('/login?error=Login%20gagal', request.url))
+  return NextResponse.redirect(buildRedirectUrl(request, '/login?error=Login%20gagal'))
 }
diff --git a/src/app/api/logout/route.ts b/src/app/api/logout/route.ts
index b19704d..331103f 100644
--- a/src/app/api/logout/route.ts
+++ b/src/app/api/logout/route.ts
@@ -1,7 +1,8 @@
 import { NextResponse } from 'next/server'
 import { clearSession } from '@/lib/auth'
+import { buildRedirectUrl } from '@/lib/url'
 
 export async function POST(request: Request) {
   await clearSession()
-  return NextResponse.redirect(new URL('/login', request.url))
+  return NextResponse.redirect(buildRedirectUrl(request, '/login'))
 }
diff --git a/src/app/api/test/send/route.ts b/src/app/api/test/send/route.ts
index 051edd9..4d7e994 100644
--- a/src/app/api/test/send/route.ts
+++ b/src/app/api/test/send/route.ts
@@ -1,14 +1,15 @@
 import { NextResponse } from 'next/server'
 import { sendTextMessage } from '@/lib/whatsapp'
+import { buildRedirectUrl } from '@/lib/url'
 
 export async function POST(request: Request) {
   const formData = await request.formData()
   const message = formData.get('message')?.toString() || ''
 
   if (!message.trim()) {
-    return NextResponse.redirect(new URL('/test?status=Pesan%20kosong', request.url))
+    return NextResponse.redirect(buildRedirectUrl(request, '/test?status=Pesan%20kosong'))
   }
 
   await sendTextMessage(process.env.WA_TEST_NUMBER || '', message)
-  return NextResponse.redirect(new URL('/test?status=Pesan%20berhasil%20dikirim', request.url))
+  return NextResponse.redirect(buildRedirectUrl(request, '/test?status=Pesan%20berhasil%20dikirim'))
 }
diff --git a/src/app/login/page.tsx b/src/app/login/page.tsx
index e630028..c53e014 100644
--- a/src/app/login/page.tsx
+++ b/src/app/login/page.tsx
@@ -1,10 +1,7 @@
-import { redirect } from 'next/navigation'
 import { isAuthenticated } from '@/lib/auth'
 
 export default async function LoginPage({ searchParams }: { searchParams: Promise<{ error?: string }> }) {
-  if (await isAuthenticated()) {
-    redirect('/settings')
-  }
+  await isAuthenticated()
 
   const params = await searchParams
 
diff --git a/src/lib/url.ts b/src/lib/url.ts
new file mode 100644
index 0000000..6684350
--- /dev/null
+++ b/src/lib/url.ts
@@ -0,0 +1,7 @@
+export function getAppBaseUrl(request: Request) {
+  return process.env.NEXT_PUBLIC_APP_URL || request.url
+}
+
+export function buildRedirectUrl(request: Request, path: string) {
+  return new URL(path, getAppBaseUrl(request))
+}