External/portabase
1
0
Fork 0
mirror of https://github.com/Portabase/portabase.git synced 2026-07-14 11:16:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: endpoints

Browse Source
This commit is contained in:
charles-gauthereau
2026-05-25 18:31:00 +02:00
parent 337d270ba6
commit 56517226b6
17 changed files with 310 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/api/v1/databases/[id]/backup/[backupId]/route.ts
+4 -3
View File
@@ -1,10 +1,11 @@
import { NextResponse } from "next/server";
import { withApiKey, ApiKeyContext } from "@/lib/api-v1/middleware";
import { getAccessibleDatabaseIds } from "@/lib/api-v1/acl";
import { withApiKey } from "@/lib/api-v1/middleware";
import { db } from "@/db";
import * as drizzleDb from "@/db";
import { eq, and, isNull } from "drizzle-orm";
import { logger } from "@/lib/logger";
import {getAccessibleDatabaseIds} from "@/lib/api-v1/services/databases";
import {ApiKeyContext} from "@/lib/api-v1/types";
const log = logger.child({ module: "api/v1/databases/[id]/backup/[backupId]" });
@@ -14,7 +15,7 @@ export const GET = withApiKey(
const { id, backupId } = params ?? {};
if (!id || !backupId) return NextResponse.json({ error: "Not found" }, { status: 404 });
const accessibleIds = await getAccessibleDatabaseIds(ctx.userId);
const accessibleIds = await getAccessibleDatabaseIds(ctx.user);
if (!accessibleIds.includes(id)) {
const exists = await db.query.database.findFirst({
where: eq(drizzleDb.schemas.database.id, id),
app/api/v1/databases/[id]/backup/route.ts
+8 -6
View File
@@ -1,15 +1,16 @@
import { NextResponse } from "next/server";
import { withApiKey, ApiKeyContext } from "@/lib/api-v1/middleware";
import { getAccessibleDatabaseIds } from "@/lib/api-v1/acl";
import { withApiKey } from "@/lib/api-v1/middleware";
import { db } from "@/db";
import * as drizzleDb from "@/db";
import { eq, desc, isNull, and } from "drizzle-orm";
import { logger } from "@/lib/logger";
import {getAccessibleDatabaseIds} from "@/lib/api-v1/services/databases";
import {ApiKeyContext, ApiKeyContextUser} from "@/lib/api-v1/types";
const log = logger.child({ module: "api/v1/databases/[id]/backup" });
async function resolveDatabaseAccess(id: string, userId: string) {
const accessibleIds = await getAccessibleDatabaseIds(userId);
async function resolveDatabaseAccess(id: string, user: ApiKeyContextUser) {
const accessibleIds = await getAccessibleDatabaseIds(user);
if (accessibleIds.includes(id)) return "ok";
const exists = await db.query.database.findFirst({
where: eq(drizzleDb.schemas.database.id, id),
@@ -22,9 +23,10 @@ export const GET = withApiKey(
async (_req: Request, ctx: ApiKeyContext, params?: Record<string, string>) => {
try {
const id = params?.id;
if (!id) return NextResponse.json({ error: "Not found" }, { status: 404 });
const access = await resolveDatabaseAccess(id, ctx.userId);
const access = await resolveDatabaseAccess(id, ctx.user);
if (access === "forbidden") return NextResponse.json({ error: "Forbidden" }, { status: 403 });
if (access === "not_found") return NextResponse.json({ error: "Not found" }, { status: 404 });
@@ -50,7 +52,7 @@ export const POST = withApiKey(
const id = params?.id;
if (!id) return NextResponse.json({ error: "Not found" }, { status: 404 });
const access = await resolveDatabaseAccess(id, ctx.userId);
const access = await resolveDatabaseAccess(id, ctx.user);
if (access === "forbidden") return NextResponse.json({ error: "Forbidden" }, { status: 403 });
if (access === "not_found") return NextResponse.json({ error: "Not found" }, { status: 404 });
app/api/v1/databases/[id]/restore/route.ts
+4 -4
View File
@@ -1,11 +1,12 @@
import { NextResponse } from "next/server";
import { withApiKey, ApiKeyContext } from "@/lib/api-v1/middleware";
import { getAccessibleDatabaseIds } from "@/lib/api-v1/acl";
import { withApiKey } from "@/lib/api-v1/middleware";
import { db } from "@/db";
import * as drizzleDb from "@/db";
import { eq, and, isNull } from "drizzle-orm";
import { z } from "zod";
import { logger } from "@/lib/logger";
import {ApiKeyContext} from "@/lib/api-v1/types";
import {getAccessibleDatabaseIds} from "@/lib/api-v1/services/databases";
const log = logger.child({ module: "api/v1/databases/[id]/restore" });
@@ -20,7 +21,7 @@ export const POST = withApiKey(
const id = params?.id;
if (!id) return NextResponse.json({ error: "Not found" }, { status: 404 });
const accessibleIds = await getAccessibleDatabaseIds(ctx.userId);
const accessibleIds = await getAccessibleDatabaseIds(ctx.user);
if (!accessibleIds.includes(id)) {
const exists = await db.query.database.findFirst({
where: eq(drizzleDb.schemas.database.id, id),
@@ -63,7 +64,6 @@ export const POST = withApiKey(
return NextResponse.json({ error: "Backup not found for this database" }, { status: 404 });
}
// Validate backupStorage belongs to backup and is successful
const backupStorage = await db.query.backupStorage.findFirst({
where: and(
eq(drizzleDb.schemas.backupStorage.id, backupStorageId),
app/api/v1/databases/[id]/route.ts
+4 -3
View File
@@ -1,10 +1,11 @@
import { NextResponse } from "next/server";
import { withApiKey, ApiKeyContext } from "@/lib/api-v1/middleware";
import { getAccessibleDatabaseIds } from "@/lib/api-v1/acl";
import { withApiKey } from "@/lib/api-v1/middleware";
import { db } from "@/db";
import * as drizzleDb from "@/db";
import { eq } from "drizzle-orm";
import { logger } from "@/lib/logger";
import {getAccessibleDatabaseIds} from "@/lib/api-v1/services/databases";
import {ApiKeyContext} from "@/lib/api-v1/types";
const log = logger.child({ module: "api/v1/databases/[id]" });
@@ -14,7 +15,7 @@ export const GET = withApiKey(
const id = params?.id;
if (!id) return NextResponse.json({ error: "Not found" }, { status: 404 });
const accessibleIds = await getAccessibleDatabaseIds(ctx.userId);
const accessibleIds = await getAccessibleDatabaseIds(ctx.user);
if (!accessibleIds.includes(id)) {
const exists = await db.query.database.findFirst({
where: eq(drizzleDb.schemas.database.id, id),
app/api/v1/databases/[id]/status/route.ts
+17 -4
View File
@@ -1,10 +1,11 @@
import { NextResponse } from "next/server";
import { withApiKey, ApiKeyContext } from "@/lib/api-v1/middleware";
import { getAccessibleDatabaseIds } from "@/lib/api-v1/acl";
import { withApiKey } from "@/lib/api-v1/middleware";
import { db } from "@/db";
import * as drizzleDb from "@/db";
import { eq, desc, and, isNull } from "drizzle-orm";
import { logger } from "@/lib/logger";
import {ApiKeyContext} from "@/lib/api-v1/types";
import {getAccessibleDatabaseIds} from "@/lib/api-v1/services/databases";
const log = logger.child({ module: "api/v1/databases/[id]/status" });
@@ -14,7 +15,7 @@ export const GET = withApiKey(
const id = params?.id;
if (!id) return NextResponse.json({ error: "Not found" }, { status: 404 });
const accessibleIds = await getAccessibleDatabaseIds(ctx.userId);
const accessibleIds = await getAccessibleDatabaseIds(ctx.user);
if (!accessibleIds.includes(id)) {
const exists = await db.query.database.findFirst({
where: eq(drizzleDb.schemas.database.id, id),
@@ -26,7 +27,13 @@ export const GET = withApiKey(
);
}
const [latestBackup, latestRestoration] = await Promise.all([
const [database, latestBackup, latestRestoration] = await Promise.all([
db.query.database.findFirst({
where: and(
eq(drizzleDb.schemas.database.id, id),
isNull(drizzleDb.schemas.database.deletedAt)
)
}),
db.query.backup.findFirst({
where: and(
eq(drizzleDb.schemas.backup.databaseId, id),
@@ -43,8 +50,14 @@ export const GET = withApiKey(
}),
]);
if (!database){
return NextResponse.json({ error: "Database not found" });
}
return NextResponse.json({
data: {
isWaitingForBackup: database.isWaitingForBackup,
lastContact: database.lastContact,
latestBackup: latestBackup ?? null,
latestRestoration: latestRestoration ?? null,
},