Change Database
This commit is contained in:
@@ -1,10 +1,9 @@
|
||||
import { NextResponse } from 'next/server';
|
||||
import { cookies } from 'next/headers';
|
||||
import { jwtVerify } from 'jose';
|
||||
import pool from '@/lib/db';
|
||||
import supabase from '@/lib/db';
|
||||
|
||||
export async function GET() {
|
||||
let connection;
|
||||
try {
|
||||
const token = (await (await cookies()).get('token'))?.value;
|
||||
|
||||
@@ -21,39 +20,29 @@ export async function GET() {
|
||||
new TextEncoder().encode(process.env.JWT_SECRET || 'your-secret-key')
|
||||
);
|
||||
|
||||
// Get connection from pool
|
||||
connection = await pool.getConnection();
|
||||
// Get user data from user_app table
|
||||
const { data: users, error } = await supabase
|
||||
.from('user_app')
|
||||
.select('id_user, nim, username, role')
|
||||
.eq('id_user', payload.id)
|
||||
.single();
|
||||
|
||||
// Get user data
|
||||
const [users]: any = await connection.execute(
|
||||
'SELECT id_user, nim, username, role FROM user WHERE id_user = ?',
|
||||
[payload.id]
|
||||
);
|
||||
|
||||
if (users.length === 0) {
|
||||
connection.release();
|
||||
if (error || !users) {
|
||||
return NextResponse.json(
|
||||
{ error: 'User not found' },
|
||||
{ status: 404 }
|
||||
);
|
||||
}
|
||||
|
||||
const user = users[0];
|
||||
connection.release();
|
||||
|
||||
return NextResponse.json({
|
||||
user: {
|
||||
id: user.id_user,
|
||||
nim: user.nim,
|
||||
username: user.username,
|
||||
role: user.role
|
||||
id: users.id_user,
|
||||
nim: users.nim,
|
||||
username: users.username,
|
||||
role: users.role
|
||||
}
|
||||
});
|
||||
} catch (error) {
|
||||
if (connection) {
|
||||
connection.release();
|
||||
}
|
||||
|
||||
console.error('Auth check error:', error);
|
||||
return NextResponse.json(
|
||||
{ error: 'Unauthorized' },
|
||||
|
||||
@@ -1,10 +1,9 @@
|
||||
import { NextResponse } from 'next/server';
|
||||
import pool from '@/lib/db';
|
||||
import supabase from '@/lib/db';
|
||||
import bcrypt from 'bcryptjs';
|
||||
import { SignJWT } from 'jose';
|
||||
import { RowDataPacket } from 'mysql2';
|
||||
|
||||
interface User extends RowDataPacket {
|
||||
interface User {
|
||||
id_user: number;
|
||||
nim: string;
|
||||
username: string;
|
||||
@@ -13,13 +12,23 @@ interface User extends RowDataPacket {
|
||||
}
|
||||
|
||||
export async function POST(request: Request) {
|
||||
let connection;
|
||||
try {
|
||||
console.log('Login request received');
|
||||
|
||||
// Test database connection first
|
||||
try {
|
||||
connection = await pool.getConnection();
|
||||
const { data: testData, error: testError } = await supabase
|
||||
.from('user_app')
|
||||
.select('count')
|
||||
.limit(1);
|
||||
|
||||
if (testError) {
|
||||
console.error('Database connection error:', testError);
|
||||
return NextResponse.json(
|
||||
{ error: 'Tidak dapat terhubung ke database' },
|
||||
{ status: 500 }
|
||||
);
|
||||
}
|
||||
console.log('Database connection successful');
|
||||
} catch (dbError) {
|
||||
console.error('Database connection error:', dbError);
|
||||
@@ -48,11 +57,20 @@ export async function POST(request: Request) {
|
||||
console.log('Querying user with NIM:', nim);
|
||||
let users: User[];
|
||||
try {
|
||||
const [rows] = await connection.execute<User[]>(
|
||||
'SELECT * FROM user WHERE nim = ?',
|
||||
[nim]
|
||||
);
|
||||
users = rows;
|
||||
const { data, error } = await supabase
|
||||
.from('user_app')
|
||||
.select('*')
|
||||
.eq('nim', nim);
|
||||
|
||||
if (error) {
|
||||
console.error('Database query error:', error);
|
||||
return NextResponse.json(
|
||||
{ error: 'Terjadi kesalahan saat memeriksa data pengguna' },
|
||||
{ status: 500 }
|
||||
);
|
||||
}
|
||||
|
||||
users = data || [];
|
||||
console.log('Query result:', users.length > 0 ? 'User found' : 'User not found');
|
||||
} catch (queryError) {
|
||||
console.error('Database query error:', queryError);
|
||||
@@ -64,7 +82,6 @@ export async function POST(request: Request) {
|
||||
|
||||
if (users.length === 0) {
|
||||
console.log('No user found with NIM:', nim);
|
||||
connection.release();
|
||||
return NextResponse.json(
|
||||
{ error: 'NIM atau password salah' },
|
||||
{ status: 401 }
|
||||
@@ -95,7 +112,6 @@ export async function POST(request: Request) {
|
||||
|
||||
if (!isPasswordValid) {
|
||||
console.log('Invalid password for user:', nim);
|
||||
connection.release();
|
||||
return NextResponse.json(
|
||||
{ error: 'NIM atau password salah' },
|
||||
{ status: 401 }
|
||||
@@ -142,14 +158,9 @@ export async function POST(request: Request) {
|
||||
});
|
||||
console.log('Cookie set');
|
||||
|
||||
connection.release();
|
||||
console.log('Login process completed successfully');
|
||||
return response;
|
||||
} catch (error) {
|
||||
if (connection) {
|
||||
connection.release();
|
||||
}
|
||||
|
||||
console.error('Login error details:', error);
|
||||
if (error instanceof Error) {
|
||||
console.error('Error message:', error.message);
|
||||
|
||||
@@ -1,9 +1,8 @@
|
||||
import { NextResponse } from 'next/server';
|
||||
import pool from '@/lib/db';
|
||||
import supabase from '@/lib/db';
|
||||
import bcrypt from 'bcryptjs';
|
||||
|
||||
export async function POST(request: Request) {
|
||||
let connection;
|
||||
try {
|
||||
const { username, nim, password } = await request.json();
|
||||
|
||||
@@ -23,31 +22,28 @@ export async function POST(request: Request) {
|
||||
);
|
||||
}
|
||||
|
||||
// Get connection from pool
|
||||
connection = await pool.getConnection();
|
||||
|
||||
// Check if NIM exists in mahasiswa table
|
||||
const [mahasiswa]: any = await connection.execute(
|
||||
'SELECT * FROM mahasiswa WHERE nim = ?',
|
||||
[nim]
|
||||
);
|
||||
const { data: mahasiswa, error: mahasiswaError } = await supabase
|
||||
.from('mahasiswa')
|
||||
.select('nim')
|
||||
.eq('nim', nim)
|
||||
.single();
|
||||
|
||||
if (mahasiswa.length === 0) {
|
||||
connection.release();
|
||||
if (mahasiswaError || !mahasiswa) {
|
||||
return NextResponse.json(
|
||||
{ error: 'NIM tidak terdaftar sebagai mahasiswa' },
|
||||
{ status: 400 }
|
||||
);
|
||||
}
|
||||
|
||||
// Check if NIM already exists in user table
|
||||
const [existingUsers]: any = await connection.execute(
|
||||
'SELECT * FROM user WHERE nim = ?',
|
||||
[nim]
|
||||
);
|
||||
// Check if NIM already exists in user_app table
|
||||
const { data: existingUsers, error: userError } = await supabase
|
||||
.from('user_app')
|
||||
.select('nim')
|
||||
.eq('nim', nim)
|
||||
.single();
|
||||
|
||||
if (existingUsers.length > 0) {
|
||||
connection.release();
|
||||
if (!userError && existingUsers) {
|
||||
return NextResponse.json(
|
||||
{ error: 'NIM sudah terdaftar sebagai pengguna' },
|
||||
{ status: 400 }
|
||||
@@ -58,22 +54,30 @@ export async function POST(request: Request) {
|
||||
const hashedPassword = await bcrypt.hash(password, 10);
|
||||
|
||||
// Insert new user
|
||||
await connection.execute(
|
||||
'INSERT INTO user (nim, username, password, role, created_at, updated_at) VALUES (?, ?, ?, ?, NOW(), NOW())',
|
||||
[nim, username, hashedPassword, 'mahasiswa']
|
||||
);
|
||||
const { data: newUser, error: insertError } = await supabase
|
||||
.from('user_app')
|
||||
.insert({
|
||||
nim: nim,
|
||||
username: username,
|
||||
password: hashedPassword,
|
||||
role: 'mahasiswa'
|
||||
})
|
||||
.select()
|
||||
.single();
|
||||
|
||||
connection.release();
|
||||
if (insertError) {
|
||||
console.error('Insert error:', insertError);
|
||||
return NextResponse.json(
|
||||
{ error: 'Terjadi kesalahan saat registrasi' },
|
||||
{ status: 500 }
|
||||
);
|
||||
}
|
||||
|
||||
return NextResponse.json(
|
||||
{ message: 'Registrasi berhasil' },
|
||||
{ status: 201 }
|
||||
);
|
||||
} catch (error) {
|
||||
if (connection) {
|
||||
connection.release();
|
||||
}
|
||||
|
||||
console.error('Registration error:', error);
|
||||
return NextResponse.json(
|
||||
{ error: 'Terjadi kesalahan saat registrasi' },
|
||||
|
||||
Reference in New Issue
Block a user