diff --git a/app/(dashboard)/payments/[paymentId]/page.tsx b/app/(dashboard)/payments/[paymentId]/page.tsx
index 2661af0..198d2cd 100644
--- a/app/(dashboard)/payments/[paymentId]/page.tsx
+++ b/app/(dashboard)/payments/[paymentId]/page.tsx
@@ -1,51 +1,53 @@
import DevicesToPay from "@/components/devices-to-pay";
-import { auth } from "@/lib/auth";
+import { auth } from "@/app/auth";
import prisma from "@/lib/db";
import { cn } from "@/lib/utils";
import { headers } from "next/headers";
import React from "react";
export default async function PaymentPage({
- params,
+ params,
}: {
- params: Promise<{ paymentId: string }>;
+ params: Promise<{ paymentId: string }>;
}) {
- const session = await auth.api.getSession({
- headers: await headers()
- })
- const user = await prisma.user.findUnique({
- where: {
- id: session?.session.userId
- }
- })
- const paymentId = (await params).paymentId;
- const payment = await prisma.payment.findUnique({
- where: {
- id: paymentId,
- },
- include: {
- devices: true,
- },
- });
- return (
-
-
-
- Payment
-
-
- {payment?.paid ? "Paid" : "Pending"}
-
-
+ const session = await auth.api.getSession({
+ headers: await headers(),
+ });
+ const user = await prisma.user.findUnique({
+ where: {
+ id: session?.session.userId,
+ },
+ });
+ const paymentId = (await params).paymentId;
+ const payment = await prisma.payment.findUnique({
+ where: {
+ id: paymentId,
+ },
+ include: {
+ devices: true,
+ },
+ });
+ return (
+
+
+
Payment
+
+ {payment?.paid ? "Paid" : "Pending"}
+
+
-
-
-
-
- );
+
+
+
+
+ );
}
diff --git a/app/api/auth/[...all]/route.ts b/app/api/auth/[...all]/route.ts
index e11351a..24c5477 100644
--- a/app/api/auth/[...all]/route.ts
+++ b/app/api/auth/[...all]/route.ts
@@ -1,4 +1,4 @@
-import { auth } from "@/lib/auth";
+import { auth } from "@/app/auth";
import { toNextJsHandler } from "better-auth/next-js";
export const { GET, POST } = toNextJsHandler(auth.handler);
diff --git a/app/auth.ts b/app/auth.ts
new file mode 100644
index 0000000..4cde7a7
--- /dev/null
+++ b/app/auth.ts
@@ -0,0 +1,108 @@
+import { logout } from "@/queries/authentication";
+import type { NextAuthOptions } from "next-auth";
+import type { JWT } from "next-auth/jwt";
+import CredentialsProvider from "next-auth/providers/credentials";
+
+export const authOptions: NextAuthOptions = {
+ pages: {
+ signIn: "/auth/signin",
+ },
+ session: {
+ strategy: "jwt",
+ maxAge: 30 * 60, // 30 mins
+ },
+ events: {
+ signOut({ token }) {
+ const apitoken = token.apiToken;
+ console.log("apitoken", apitoken);
+ logout({ token: apitoken as string });
+ },
+ },
+ providers: [
+ CredentialsProvider({
+ name: "Credentials",
+ credentials: {
+ email: { label: "Email", type: "text", placeholder: "jsmith" },
+ password: { label: "Password", type: "password" },
+ },
+ async authorize(credentials) {
+ const { email, password } = credentials as {
+ email: string;
+ password: string;
+ };
+ console.log("email and password", email, password);
+ const res = await fetch(
+ `${process.env.NEXT_PUBLIC_API_URL}/auth/login/`,
+ {
+ method: "POST",
+ headers: {
+ "Content-Type": "application/json",
+ },
+ body: JSON.stringify({
+ username: email,
+ password: password,
+ }),
+ },
+ );
+ console.log("status", res.status);
+
+ const data = await res.json();
+ console.log({ data });
+ switch (res.status) {
+ case 200:
+ return { ...data.user, apiToken: data.token, expiry: data.expiry };
+ case 400:
+ throw new Error(
+ JSON.stringify({ message: data.message, status: res.status }),
+ );
+ case 429:
+ throw new Error(
+ JSON.stringify({ message: data.message, status: res.status }),
+ );
+ case 403:
+ throw new Error(
+ JSON.stringify({ message: data.error, status: res.status }),
+ );
+ default:
+ throw new Error(
+ JSON.stringify({
+ message: "FATAL: Unexprted Error occured!",
+ status: res.status,
+ }),
+ );
+ }
+ },
+ }),
+ ],
+ callbacks: {
+ redirect: async ({ url, baseUrl }) => {
+ // Allows relative callback URLs
+ if (url.startsWith("/")) return `${baseUrl}${url}`;
+ return baseUrl;
+ },
+ session: async ({ session, token }) => {
+ const sanitizedToken = Object.keys(token).reduce((p, c) => {
+ // strip unnecessary properties
+ if (c !== "iat" && c !== "exp" && c !== "jti" && c !== "apiToken") {
+ Object.assign(p, { [c]: token[c] });
+ }
+ return p;
+ }, {});
+ // session.expires = token.expiry
+ return {
+ ...session,
+ user: sanitizedToken,
+ apiToken: token.apiToken,
+ // expires: token.expiry,
+ };
+ },
+ jwt: ({ token, user }) => {
+ if (typeof user !== "undefined") {
+ // user has just signed in so the user object is populated
+ return user as unknown as JWT;
+ }
+ return token;
+ },
+ },
+ secret: process.env.NEXTAUTH_SECRET,
+};
diff --git a/components/admin/admin-devices-table.tsx b/components/admin/admin-devices-table.tsx
index 570fe81..ea6b3f1 100644
--- a/components/admin/admin-devices-table.tsx
+++ b/components/admin/admin-devices-table.tsx
@@ -1,14 +1,14 @@
import {
- Table,
- TableBody,
- TableCaption,
- TableCell,
- TableFooter,
- TableHead,
- TableHeader,
- TableRow,
+ Table,
+ TableBody,
+ TableCaption,
+ TableCell,
+ TableFooter,
+ TableHead,
+ TableHeader,
+ TableRow,
} from "@/components/ui/table";
-import { auth } from "@/lib/auth";
+import { auth } from "@/app/auth";
import prisma from "@/lib/db";
import { headers } from "next/headers";
import Link from "next/link";
@@ -17,180 +17,188 @@ import DeviceCard from "../device-card";
import Pagination from "../pagination";
export async function AdminDevicesTable({
- searchParams,
- parentalControl,
+ searchParams,
+ parentalControl,
}: {
- searchParams: Promise<{
- query: string;
- page: number;
- sortBy: string;
- }>;
- parentalControl?: boolean;
+ searchParams: Promise<{
+ query: string;
+ page: number;
+ sortBy: string;
+ }>;
+ parentalControl?: boolean;
}) {
- const session = await auth.api.getSession({
- headers: await headers()
- })
- const isAdmin = session?.user.role === "ADMIN"
- const query = (await searchParams)?.query || "";
- const page = (await searchParams)?.page;
- const sortBy = (await searchParams)?.sortBy || "asc";
- const totalDevices = await prisma.device.count({
- where: {
- OR: [
- {
- name: {
- contains: query || "",
- mode: "insensitive",
- },
- },
- {
- mac: {
- contains: query || "",
- mode: "insensitive",
- },
- },
- ],
- },
- });
+ const session = await auth.api.getSession({
+ headers: await headers(),
+ });
+ const isAdmin = session?.user.role === "ADMIN";
+ const query = (await searchParams)?.query || "";
+ const page = (await searchParams)?.page;
+ const sortBy = (await searchParams)?.sortBy || "asc";
+ const totalDevices = await prisma.device.count({
+ where: {
+ OR: [
+ {
+ name: {
+ contains: query || "",
+ mode: "insensitive",
+ },
+ },
+ {
+ mac: {
+ contains: query || "",
+ mode: "insensitive",
+ },
+ },
+ ],
+ },
+ });
- const totalPages = Math.ceil(totalDevices / 10);
- const limit = 10;
- const offset = (Number(page) - 1) * limit || 0;
+ const totalPages = Math.ceil(totalDevices / 10);
+ const limit = 10;
+ const offset = (Number(page) - 1) * limit || 0;
- const devices = await prisma.device.findMany({
- where: {
- OR: [
- {
- name: {
- contains: query || "",
- mode: "insensitive",
- },
- },
- {
- mac: {
- contains: query || "",
- mode: "insensitive",
- },
- },
- ],
- },
- include: {
- User: true,
- payments: true,
- },
- skip: offset,
- take: limit,
- orderBy: {
- name: `${sortBy}` as "asc" | "desc",
- },
- });
+ const devices = await prisma.device.findMany({
+ where: {
+ OR: [
+ {
+ name: {
+ contains: query || "",
+ mode: "insensitive",
+ },
+ },
+ {
+ mac: {
+ contains: query || "",
+ mode: "insensitive",
+ },
+ },
+ ],
+ },
+ include: {
+ User: true,
+ payments: true,
+ },
+ skip: offset,
+ take: limit,
+ orderBy: {
+ name: `${sortBy}` as "asc" | "desc",
+ },
+ });
- return (
-
- {devices.length === 0 ? (
-
-
No devices yet.
-
- ) : (
- <>
-
-
- Table of all devices.
-
-
- Device Name
- User
- MAC Address
- isActive
- blocked
- blockedBy
- expiryDate
-
-
-
- {devices.map((device) => (
-
-
-
-
- {device.name}
-
- {device.isActive && (
+ return (
+
+ {devices.length === 0 ? (
+
+
No devices yet.
+
+ ) : (
+ <>
+
+
+ Table of all devices.
+
+
+ Device Name
+ User
+ MAC Address
+ isActive
+ blocked
+ blockedBy
+ expiryDate
+
+
+
+ {devices.map((device) => (
+
+
+
+
+ {device.name}
+
+ {device.isActive && (
+
+ Active until{" "}
+ {new Date().toLocaleDateString("en-US", {
+ month: "short",
+ day: "2-digit",
+ year: "numeric",
+ })}
+
+ )}
-
- Active until{" "}
- {new Date().toLocaleDateString("en-US", {
- month: "short",
- day: "2-digit",
- year: "numeric",
- })}
-
- )}
+ {device.blocked && (
+
+
Comment:
+
+ blocked because he was watching youtube
+
+
+ )}
+
-
Comment:
-
- blocked because he was watching youtube
-
-
- Showing {devices.length} locations for "{query}
- "
-
- )}
-
-
- {totalDevices} devices
-
-
-
-
-
-
-
- {devices.map((device) => (
-
- ))}
-
-
- )}
-
- );
+
{device.mac}
+
+ {device.isActive ? "Active" : "Inactive"}
+
+
+ {device.blocked ? "Blocked" : "Not Blocked"}
+
+
+ {device.blocked ? device.blockedBy : ""}
+
+
+ {new Date().toLocaleDateString("en-US", {
+ month: "short",
+ day: "2-digit",
+ year: "numeric",
+ })}
+
+
+
+
+
+ ))}
+
+
+
+
+ {query.length > 0 && (
+
+ Showing {devices.length} locations for "{query}
+ "
+
+ )}
+
+
+ {totalDevices} devices
+
+
+
+
+
+
+
+ {devices.map((device) => (
+
+ ))}
+
+
+ )}
+
+ );
}
diff --git a/components/auth/application-layout.tsx b/components/auth/application-layout.tsx
index c31313c..f4bf083 100644
--- a/components/auth/application-layout.tsx
+++ b/components/auth/application-layout.tsx
@@ -10,7 +10,7 @@ import {
SidebarProvider,
SidebarTrigger,
} from "@/components/ui/sidebar";
-import { auth } from "@/lib/auth";
+import { auth } from "@/app/auth";
import prisma from "@/lib/db";
import { headers } from "next/headers";
import { AccountPopover } from "./account-popver";
@@ -19,7 +19,7 @@ export async function ApplicationLayout({
children,
}: { children: React.ReactNode }) {
const session = await auth.api.getSession({
- headers: await headers()
+ headers: await headers(),
});
const billFormula = await prisma.billFormula.findFirst();
const user = await prisma.user.findFirst({
diff --git a/components/auth/login-form.tsx b/components/auth/login-form.tsx
index 834250a..9062dc7 100644
--- a/components/auth/login-form.tsx
+++ b/components/auth/login-form.tsx
@@ -23,6 +23,7 @@ export default function LoginForm() {
{state.message}
)}
-
diff --git a/components/devices-table.tsx b/components/devices-table.tsx
index a8f4434..a93682f 100644
--- a/components/devices-table.tsx
+++ b/components/devices-table.tsx
@@ -8,7 +8,7 @@ import {
TableHeader,
TableRow,
} from "@/components/ui/table";
-import { auth } from "@/lib/auth";
+import { auth } from "@/app/auth";
import prisma from "@/lib/db";
import { headers } from "next/headers";
import ClickableRow from "./clickable-row";
@@ -27,9 +27,9 @@ export async function DevicesTable({
parentalControl?: boolean;
}) {
const session = await auth.api.getSession({
- headers: await headers()
- })
- const isAdmin = session?.user.role === "ADMIN"
+ headers: await headers(),
+ });
+ const isAdmin = session?.user.role === "ADMIN";
const query = (await searchParams)?.query || "";
const page = (await searchParams)?.page;
const sortBy = (await searchParams)?.sortBy || "asc";
@@ -53,12 +53,16 @@ export async function DevicesTable({
NOT: {
payments: {
some: {
- paid: false
- }
- }
+ paid: false,
+ },
+ },
},
isActive: isAdmin ? undefined : parentalControl,
- blocked: isAdmin ? undefined : parentalControl !== undefined ? undefined : false,
+ blocked: isAdmin
+ ? undefined
+ : parentalControl !== undefined
+ ? undefined
+ : false,
},
});
@@ -86,8 +90,8 @@ export async function DevicesTable({
NOT: {
payments: {
some: {
- paid: false
- }
+ paid: false,
+ },
},
},
isActive: parentalControl,
@@ -158,7 +162,12 @@ export async function DevicesTable({
// )}
//
//
-