@protobase/server 0.34.2 → 0.34.3

package/dist/better-auth/auth-schema.d.ts

@@ -3,14 +3,15 @@ import { AdminAuth } from "./create-auth.js";
 /**
  * The SQL that brings the admin store up to what this version of Protobase and the project's Better Auth plugins need:
  * for a store with the camelCase names of Protobase 0.6, their rename to snake_case (`snakeCaseMigration`); otherwise
- * new tables, columns and indexes, never a drop, each skipped where it exists. `undefined` when the store is current. A
- * change Better Auth cannot make safely, such as a required column without a default on a table with rows, is an error.
+ * new tables, columns and indexes, each skipped where it exists, and never a drop but of MCP's tables once MCP is off
+ * (`dropMcpTables`). `undefined` when the store is current. A change Better Auth cannot make safely, such as a required
+ * column without a default on a table with rows, is an error.
  */
 export declare const authSchemaMigration: (auth: AdminAuth) => Promise<string | undefined>;
 /**
- * Refuses to go on while the admin store lacks a table or column Better Auth needs, or still has the camelCase names
- * of Protobase 0.6, since every sign-in would fail. The server never changes the schema itself: the project's
- * migrations do, before the new version serves.
+ * Refuses to go on while the admin store lacks a table or column Better Auth needs, still has the camelCase names of
+ * Protobase 0.6, since every sign-in would fail, or still has MCP's tables with MCP off, since their grants would come
+ * back with MCP. The server never changes the schema itself: the project's migrations do, before the new version serves.
  */
 export declare const checkAuthSchema: (auth: AdminAuth) => Promise<void>;
 //#endregion

package/dist/better-auth/auth-schema.js

@@ -1,3 +1,4 @@
+import { dropMcpTables, leftoverMcpTables, mcpTableNames, withMcpTables } from "./mcp/mcp-tables.js";
 import { snakeCaseMigration } from "./snake-case-migration.js";
 import { getMigrations } from "better-auth/db/migration";
 //#region src/better-auth/auth-schema.ts
@@ -18,28 +19,36 @@ const storeSchema = ({ options: { database } }) => database && "schemaName" in d
 /**
 * The SQL that brings the admin store up to what this version of Protobase and the project's Better Auth plugins need:
 * for a store with the camelCase names of Protobase 0.6, their rename to snake_case (`snakeCaseMigration`); otherwise
-* new tables, columns and indexes, never a drop, each skipped where it exists. `undefined` when the store is current. A
-* change Better Auth cannot make safely, such as a required column without a default on a table with rows, is an error.
+* new tables, columns and indexes, each skipped where it exists, and never a drop but of MCP's tables once MCP is off
+* (`dropMcpTables`). `undefined` when the store is current. A change Better Auth cannot make safely, such as a required
+* column without a default on a table with rows, is an error.
 */
 const authSchemaMigration = async (auth) => {
-	if (hasCamelCaseNames(await getMigrations(auth.options, { throwOnUnsafe: false }))) return snakeCaseMigration(storeSchema(auth));
+	const found = await getMigrations(withMcpTables(auth), { throwOnUnsafe: false });
+	if (hasCamelCaseNames(found)) return snakeCaseMigration(storeSchema(auth));
+	const drop = leftoverMcpTables(auth, found).length > 0 ? [dropMcpTables(storeSchema(auth))] : [];
 	const { toBeCreated, toBeAdded, toBeAddedIndexes, compileMigrations } = await getMigrations(auth.options);
-	if (toBeCreated.length === 0 && toBeAdded.length === 0 && toBeAddedIndexes.length === 0) return void 0;
-	return skipExisting(await compileMigrations());
+	const statements = [...toBeCreated.length === 0 && toBeAdded.length === 0 && toBeAddedIndexes.length === 0 ? [] : [skipExisting(await compileMigrations())], ...drop];
+	return statements.length === 0 ? void 0 : statements.join("\n\n");
 };
-/** The tables and `table.column`s the admin store lacks; an index missing is not a reason to refuse requests. */
-const missingTablesAndColumns = ({ toBeCreated, toBeAdded }) => [...toBeCreated.map(({ table }) => table), ...toBeAdded.flatMap(({ table, fields }) => Object.keys(fields).map((field) => `${table}.${field}`))];
 /**
-* Refuses to go on while the admin store lacks a table or column Better Auth needs, or still has the camelCase names
-* of Protobase 0.6, since every sign-in would fail. The server never changes the schema itself: the project's
-* migrations do, before the new version serves.
+* The tables and `table.column`s the admin store lacks; an index missing is not a reason to refuse requests. MCP's
+* tables, named with MCP off only to find them left over, are never missing then.
+*/
+const missingTablesAndColumns = (auth, { toBeCreated, toBeAdded }) => [...toBeCreated.map(({ table }) => table).filter((table) => auth.mcp || !mcpTableNames.includes(table)), ...toBeAdded.flatMap(({ table, fields }) => Object.keys(fields).map((field) => `${table}.${field}`))];
+/**
+* Refuses to go on while the admin store lacks a table or column Better Auth needs, still has the camelCase names of
+* Protobase 0.6, since every sign-in would fail, or still has MCP's tables with MCP off, since their grants would come
+* back with MCP. The server never changes the schema itself: the project's migrations do, before the new version serves.
 */
 const checkAuthSchema = async (auth) => {
-	const plan = await getMigrations(auth.options, { throwOnUnsafe: false });
+	const plan = await getMigrations(withMcpTables(auth), { throwOnUnsafe: false });
 	if (hasCamelCaseNames(plan)) throw new Error(`The auth schema still has the camelCase names of Protobase 0.6, which this version names in snake_case. Write their rename as a migration with \`${authMigrationCommand}\`, apply it with the project's migrations, then start again.`);
-	const missing = missingTablesAndColumns(plan);
-	if (missing.length === 0) return;
-	throw new Error(`The auth schema is behind this version of Protobase (missing ${missing.join(", ")}). Write the change as a migration with \`${authMigrationCommand}\`, apply it with the project's migrations, then start again.`);
+	const missing = missingTablesAndColumns(auth, plan);
+	if (missing.length > 0) throw new Error(`The auth schema is behind this version of Protobase (missing ${missing.join(", ")}). Write the change as a migration with \`${authMigrationCommand}\`, apply it with the project's migrations, then start again.`);
+	const leftovers = leftoverMcpTables(auth, plan);
+	if (leftovers.length === 0) return;
+	throw new Error(`The auth schema still has the tables of the OAuth provider for MCP (${leftovers.join(", ")}), which is off. Write their removal as a migration with \`${authMigrationCommand}\`, apply it with the project's migrations, then start again; every MCP client then has to be allowed again.`);
 };
 //#endregion
 export { authMigrationCommand, authSchemaMigration, checkAuthSchema, skipExisting };

package/dist/better-auth/mcp/mcp-tables.js

@@ -0,0 +1,32 @@
+import { pluginNames } from "../snake-case-names.js";
+//#region src/better-auth/mcp/mcp-tables.ts
+/** The database names of MCP's tables. */
+const mcpTableNames = Object.values(pluginNames.mcp).map(({ modelName }) => modelName);
+const mcpTablesPlugin = {
+	id: "protobase-mcp-tables",
+	schema: Object.fromEntries(Object.entries(pluginNames.mcp).map(([model, { modelName }]) => [model, {
+		modelName,
+		fields: {}
+	}]))
+};
+/** The auth's options, which with MCP off also name MCP's tables, for a plan that tells whether they are left over. */
+const withMcpTables = (auth) => auth.mcp ? auth.options : {
+	...auth.options,
+	plugins: [...auth.options.plugins ?? [], mcpTablesPlugin]
+};
+/** The MCP tables the store still has while MCP is off, from a plan made with `withMcpTables`; none with MCP on. */
+const leftoverMcpTables = (auth, { toBeCreated }) => {
+	if (auth.mcp) return [];
+	const missing = new Set(toBeCreated.map(({ table }) => table));
+	return mcpTableNames.filter((table) => !missing.has(table));
+};
+const schemaName = /^[a-z_][a-z0-9_]*$/;
+/** The statement that drops MCP's tables, in `schema` or the connection's current one. */
+const dropMcpTables = (schema) => {
+	if (schema !== void 0 && !schemaName.test(schema)) throw new Error(`Invalid auth schema name "${schema}"`);
+	const s = schema === void 0 ? "" : `"${schema}".`;
+	return `-- MCP is off: dropping the tables of its OAuth provider disconnects every MCP client and forgets every grant.
+drop table if exists ${mcpTableNames.map((table) => `${s}"${table}"`).join(", ")};`;
+};
+//#endregion
+export { dropMcpTables, leftoverMcpTables, mcpTableNames, withMcpTables };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@protobase/server",
-  "version": "0.34.2",
+  "version": "0.34.3",
   "description": "The Protobase REST API as a Hono app, with Better Auth sign-in.",
   "license": "Apache-2.0",
   "repository": {
@@ -35,9 +35,9 @@
     "@better-auth/oauth-provider": "^1.7.12",
     "@better-auth/passkey": "^1.7.12",
     "@better-auth/sso": "^1.7.12",
-    "@protobase/layout": "0.34.2",
-    "@protobase/query": "0.34.2",
-    "@protobase/schema": "0.34.2",
+    "@protobase/layout": "0.34.3",
+    "@protobase/query": "0.34.3",
+    "@protobase/schema": "0.34.3",
     "@react-email/render": "^2.1.0",
     "@scalar/hono-api-reference": "^0.12.10",
     "@sentry/core": "^11.7.0",