Skip to content

Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.

refactor: move trpc-interface to postgrest (#3874)

Bogdan Chadkin214a1d5e3981
diff --git a/apps/builder/package.json b/apps/builder/package.json
index 48745e96a0..8a10afc690 100644
--- a/apps/builder/package.json
+++ b/apps/builder/package.json
@@ -45,8 +45,8 @@
"@remix-run/react": "^2.10.3",
"@remix-run/serve": "^2.10.3",
"@remix-run/server-runtime": "^2.10.3",
- "@trpc/client": "^10.38.1",
- "@trpc/server": "^10.38.1",
+ "@trpc/client": "^10.45.2",
+ "@trpc/server": "^10.45.2",
"@vercel/remix": "2.10.2",
"@webstudio-is/ai": "workspace:*",
"@webstudio-is/asset-uploader": "workspace:*",
diff --git a/packages/project/package.json b/packages/project/package.json
index eac64d96e3..794c614894 100644
--- a/packages/project/package.json
+++ b/packages/project/package.json
@@ -9,7 +9,7 @@
"typecheck": "tsc"
},
"dependencies": {
- "@trpc/server": "^10.38.1",
+ "@trpc/server": "^10.45.2",
"@webstudio-is/asset-uploader": "workspace:*",
"@webstudio-is/prisma-client": "workspace:*",
"@webstudio-is/project-build": "workspace:*",
diff --git a/packages/trpc-interface/package.json b/packages/trpc-interface/package.json
index 72ff5281c1..c00fab4805 100644
--- a/packages/trpc-interface/package.json
+++ b/packages/trpc-interface/package.json
@@ -10,9 +10,8 @@
"test": "NODE_OPTIONS=--experimental-vm-modules jest"
},
"dependencies": {
- "@trpc/client": "^10.38.1",
- "@trpc/server": "^10.38.1",
- "@webstudio-is/prisma-client": "workspace:*",
+ "@trpc/client": "^10.45.2",
+ "@trpc/server": "^10.45.2",
"memoize": "^10.0.0",
"ts-custom-error": "^3.3.1",
"zod": "^3.22.4"
@@ -21,8 +20,8 @@
"@jest/globals": "^29.7.0",
"@types/node": "^20.12.7",
"@webstudio-is/jest-config": "workspace:*",
- "@webstudio-is/tsconfig": "workspace:*",
"@webstudio-is/postrest": "workspace:*",
+ "@webstudio-is/tsconfig": "workspace:*",
"typescript": "5.5.2"
},
"exports": {
diff --git a/packages/trpc-interface/src/authorize/project.server.ts b/packages/trpc-interface/src/authorize/project.server.ts
index 6c271907b6..153283217f 100644
--- a/packages/trpc-interface/src/authorize/project.server.ts
+++ b/packages/trpc-interface/src/authorize/project.server.ts
@@ -1,6 +1,4 @@
-import type { Project } from "@webstudio-is/prisma-client";
import type { AppContext } from "../context/context.server";
-import { prisma } from "@webstudio-is/prisma-client";
import memoize from "memoize";
export type AuthPermit = "view" | "edit" | "build" | "admin" | "own";
@@ -17,22 +15,22 @@ type CheckInput = {
};
};
-const check = async (input: CheckInput) => {
+const check = async (context: AppContext, input: CheckInput) => {
const { subjectSet } = input;
if (subjectSet.namespace === "User") {
// We check only if the user is the owner of the project
- const row = await prisma.project.findFirst({
- where: {
- id: input.id,
- userId: subjectSet.id,
- },
- select: {
- id: true,
- },
- });
-
- return { allowed: row !== null };
+ const row = await context.postgrest.client
+ .from("Project")
+ .select("id")
+ .eq("id", input.id)
+ .eq("userId", subjectSet.id)
+ .maybeSingle();
+ if (row.error) {
+ throw row.error;
+ }
+
+ return { allowed: row.data !== null };
}
const permitToRelationRewrite = {
@@ -43,31 +41,32 @@ const check = async (input: CheckInput) => {
} as const;
if (subjectSet.namespace === "Token" && input.permit !== "own") {
- const row = await prisma.authorizationToken.findFirst({
- where: {
- token: subjectSet.id,
- relation: {
- in: [...permitToRelationRewrite[input.permit]],
- },
- },
- select: { token: true },
- });
-
- return { allowed: row !== null };
+ const row = await context.postgrest.client
+ .from("AuthorizationToken")
+ .select("token")
+ .eq("token", subjectSet.id)
+ .in("relation", [...permitToRelationRewrite[input.permit]])
+ .maybeSingle();
+ if (row.error) {
+ throw row.error;
+ }
+
+ return { allowed: row.data !== null };
}
return { allowed: false };
};
+// doesn't work in cloudflare workers
const memoizedCheck = memoize(check, {
// 1 minute
maxAge: 60 * 1000,
- cacheKey: JSON.stringify,
+ cacheKey: ([_context, input]) => JSON.stringify(input),
});
export const hasProjectPermit = async (
props: {
- projectId: Project["id"];
+ projectId: string;
permit: AuthPermit;
},
context: AppContext
@@ -105,7 +104,7 @@ export const hasProjectPermit = async (
// Check if the user is allowed to access the project
if (authorization.userId !== undefined) {
checks.push(
- memoizedCheck({
+ memoizedCheck(context, {
subjectSet: {
namespace: "User",
id: authorization.userId,
@@ -121,7 +120,7 @@ export const hasProjectPermit = async (
// Token doesn't have own permit, do not check it
if (authorization.authToken !== undefined && props.permit !== "own") {
checks.push(
- memoizedCheck({
+ memoizedCheck(context, {
namespace,
id: props.projectId,
subjectSet: {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a32b02871b..8de788c1c5 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -191,11 +191,11 @@ importers:
specifier: ^2.10.3
version: 2.10.3([email protected])
'@trpc/client':
- specifier: ^10.38.1
- version: 10.38.1(@trpc/[email protected])
+ specifier: ^10.45.2
+ version: 10.45.2(@trpc/[email protected])
'@trpc/server':
- specifier: ^10.38.1
- version: 10.38.1
+ specifier: ^10.45.2
+ version: 10.45.2
'@vercel/remix':
specifier: 2.10.2
@@ -1653,8 +1653,8 @@ importers:
packages/project:
dependencies:
'@trpc/server':
- specifier: ^10.38.1
- version: 10.38.1
+ specifier: ^10.45.2
+ version: 10.45.2
'@webstudio-is/asset-uploader':
specifier: workspace:*
version: link:../asset-uploader
@@ -2024,14 +2024,11 @@ importers:
packages/trpc-interface:
dependencies:
'@trpc/client':
- specifier: ^10.38.1
- version: 10.38.1(@trpc/[email protected])
+ specifier: ^10.45.2
+ version: 10.45.2(@trpc/[email protected])
'@trpc/server':
- specifier: ^10.38.1
- version: 10.38.1
- '@webstudio-is/prisma-client':
- specifier: workspace:*
- version: link:../prisma-client
+ specifier: ^10.45.2
+ version: 10.45.2
memoize:
specifier: ^10.0.0
version: 10.0.0
@@ -5323,13 +5320,13 @@ packages:
resolution: {integrity: sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==}
engines: {node: '>= 10'}
- resolution: {integrity: sha512-kY7ZV7Eco5SeFIGJX6OBg7AAKkiMt5+1N+GC7N1lTZszrw95ZiNgtkZ5TI6+Un4O+RqrOcqqast6MeExCoyZhQ==}
+ resolution: {integrity: sha512-ykALM5kYWTLn1zYuUOZ2cPWlVfrXhc18HzBDyRhoPYN0jey4iQHEFSEowfnhg1RvYnrAVjNBgHNeSAXjrDbGwg==}
peerDependencies:
- '@trpc/server': 10.38.1
+ '@trpc/server': 10.45.2
- resolution: {integrity: sha512-59mM0Jk3cnWBExSv4Z4cw/776MPwa+rcVNywnV5gyHyK/p5qHtis1b1JPYdTEQZ0zhR+6zeto14rTR51hg+Nuw==}
+ resolution: {integrity: sha512-wOrSThNNE4HUnuhJG6PfDRp4L2009KDVxsd+2VYH8ro6o/7/jwYZ8Uu5j+VaW+mOmc8EHerHzGcdbGNQSAUPgg==}
'@trysound/[email protected]':
resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
@@ -13607,11 +13604,11 @@ snapshots:
'@tootallnate/[email protected]': {}
dependencies:
- '@trpc/server': 10.38.1
+ '@trpc/server': 10.45.2
- '@trpc/[email protected]': {}
+ '@trpc/[email protected]': {}
'@trysound/[email protected]': {}