@protobase/server 0.58.6 → 0.58.7

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

@@ -8819,6 +8819,10 @@ export declare const buildAppAuth: (settings: AuthSettings, input: AppAuthInput)
     column: (name: UserColumn) => string;
     fieldNames: Record<string, string>;
     metadata: string | undefined;
+    keyTable: {
+      schema: string;
+      table: string;
+    } | undefined;
   };
   socialProviders: string[];
   appName: string;

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

@@ -1,6 +1,10 @@
 import { AdminAuth } from "./create-auth.js";
 //#region src/better-auth/auth-tables.d.ts
-/** The admin store's tables, which the assistant's queries and the app's resources must never read: the user table and `storeTableNames`. */
+/**
+ * The admin store's tables, which the assistant's queries and the app's resources must never read: the user table and
+ * `storeTableNames`, and with `users.keyTable` the table under the user view too, such as Supabase's `auth.users`,
+ * whose password hashes the view leaves out but the table holds.
+ */
 export declare const authStoreTables: (auth: AdminAuth) => {
   schema: string | undefined;
   name: string;

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

@@ -1,13 +1,21 @@
 import { storeNames } from "./store/store-names.js";
 import { storeTableNames } from "./store/table-names.js";
 //#region src/better-auth/auth-tables.ts
-/** The admin store's tables, which the assistant's queries and the app's resources must never read: the user table and `storeTableNames`. */
+/**
+* The admin store's tables, which the assistant's queries and the app's resources must never read: the user table and
+* `storeTableNames`, and with `users.keyTable` the table under the user view too, such as Supabase's `auth.users`,
+* whose password hashes the view leaves out but the table holds.
+*/
 const authStoreTables = (auth) => {
 	const { schema, users } = storeNames(auth);
-	return [users.modelName, ...storeTableNames].map((name) => ({
+	const own = [users.modelName, ...storeTableNames].map((name) => ({
 		schema,
 		name
 	}));
+	return users.keyTable ? [...own, {
+		schema: users.keyTable.schema,
+		name: users.keyTable.table
+	}] : own;
 };
 //#endregion
 export { authStoreTables };

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

@@ -8958,6 +8958,10 @@ export declare const createAuth: (options: CreateAuthOptions, plugins?: AuthPlug
     column: (name: UserColumn) => string;
     fieldNames: Record<string, string>;
     metadata: string | undefined;
+    keyTable: {
+      schema: string;
+      table: string;
+    } | undefined;
   };
   socialProviders: string[];
   /** The app's name it signs in and mails as: `PROTOBASE_APP_NAME`, else `appName`, else `Protobase`. */

package/dist/better-auth/store/drift.js

@@ -1,5 +1,18 @@
+import { storeNames } from "./store-names.js";
+import { storeDb } from "./store-db.js";
+import { sql } from "kysely";
+import { getSchema } from "better-auth/db";
 import { getMigrations } from "better-auth/db/migration";
 //#region src/better-auth/store/drift.ts
+/** Each column of Better Auth's user model the view lacks, or the view itself when there is none. */
+const userViewDrift = async (auth) => {
+	const { schema, users } = storeNames(auth);
+	const { rows } = await sql`select column_name as "column" from information_schema.columns
+    where table_schema = ${schema ?? sql`current_schema()`} and table_name = ${users.modelName}`.execute(storeDb(auth));
+	if (rows.length === 0) return [`lacks the view ${users.modelName}`];
+	const found = new Set(rows.map(({ column }) => column));
+	return ["id", ...Object.keys(getSchema(auth.options)[users.modelName]?.fields ?? {})].filter((column) => !found.has(column)).map((column) => `lacks the column ${users.modelName}.${column}`);
+};
 /**
 * What Better Auth, with the features the app turns on, finds the store lacks or has otherwise: tables, `table.column`s,
 * indexes and its other findings; none when the store matches. It compares the database's tables, so only
@@ -7,12 +20,14 @@ import { getMigrations } from "better-auth/db/migration";
 */
 const authSchemaDrift = async (auth) => {
 	const { toBeCreated, toBeAdded, toBeAddedIndexes, schemaProblems } = await getMigrations(auth.options, { throwOnUnsafe: false });
-	return [
-		...toBeCreated.map(({ table }) => `lacks the table ${table}`),
-		...toBeAdded.flatMap(({ table, fields }) => Object.keys(fields).map((field) => `lacks the column ${table}.${field}`)),
-		...toBeAddedIndexes.map(({ name }) => `lacks the index ${name}`),
+	const view = auth.userTable.keyTable ? auth.userTable.modelName : void 0;
+	const tables = [
+		...toBeCreated.filter(({ table }) => table !== view).map(({ table }) => `lacks the table ${table}`),
+		...toBeAdded.filter(({ table }) => table !== view).flatMap(({ table, fields }) => Object.keys(fields).map((field) => `lacks the column ${table}.${field}`)),
+		...toBeAddedIndexes.filter(({ table }) => table !== view).map(({ name }) => `lacks the index ${name}`),
 		...schemaProblems
 	];
+	return view ? [...tables, ...await userViewDrift(auth)] : tables;
 };
 //#endregion
 export { authSchemaDrift };

package/dist/better-auth/store/migrations/001-core.js

@@ -11,9 +11,10 @@ const core = {
 		"verification",
 		"jwks"
 	],
-	statements: ({ table, user, userColumn: column, metadata, id, idRef }) => [
-		ddl`create table if not exists ${user} (id ${id} primary key)`,
-		ddl`alter table ${user}
+	statements: ({ table, user, userDdl, userColumn: column, metadata, id, idRef }) => [
+		...userDdl([
+			ddl`create table if not exists ${user} (id ${id} primary key)`,
+			ddl`alter table ${user}
   add column if not exists ${column("name")} text not null,
   add column if not exists ${column("email")} text not null unique,
   add column if not exists ${column("email_verified")} boolean not null,
@@ -26,7 +27,8 @@ const core = {
   add column if not exists ${column("ban_expires")} timestamptz,
   add column if not exists ${column("last_role")} text,
   add column if not exists ${column("email_confirmed_at")} timestamptz`,
-		...metadata ? [ddl`alter table ${user} add column if not exists ${metadata} jsonb`] : [],
+			...metadata ? [ddl`alter table ${user} add column if not exists ${metadata} jsonb`] : []
+		]),
 		ddl`create table ${table("session")} (
   id ${id} primary key,
   expires_at timestamptz not null,

package/dist/better-auth/store/migrations/002-two-factor.js

@@ -6,8 +6,8 @@ const twoFactor = {
 	name: "two_factor",
 	title: "The authenticator secrets and backup codes of two-step sign-in",
 	tables: ["two_factor"],
-	statements: ({ table, user, userColumn: column, id, idRef }) => [
-		ddl`alter table ${user} add column if not exists ${column("two_factor_enabled")} boolean`,
+	statements: ({ table, user, userDdl, userColumn: column, id, idRef }) => [
+		...userDdl([ddl`alter table ${user} add column if not exists ${column("two_factor_enabled")} boolean`]),
 		ddl`create table ${table("two_factor")} (
   id ${id} primary key,
   secret text not null,

package/dist/better-auth/store/migrations/006-organizations.js

@@ -10,8 +10,8 @@ const organizations = {
 		"member",
 		"invitation"
 	],
-	statements: ({ table, user, userColumn: column, id, idRef }) => [
-		ddl`alter table ${user} add column if not exists ${column("last_organization_id")} text`,
+	statements: ({ table, user, userDdl, userColumn: column, id, idRef }) => [
+		...userDdl([ddl`alter table ${user} add column if not exists ${column("last_organization_id")} text`]),
 		ddl`alter table ${table("session")} add column active_organization_id text`,
 		ddl`create table ${table("organization")} (
   id ${id} primary key,

package/dist/better-auth/store/migrations/migration.js

@@ -4,7 +4,8 @@ import { sql } from "kysely";
 /** The `ddl` parts of the app's names. */
 const migrationNames = (names) => ({
 	table: (name) => storeTable(names, name),
-	user: storeTable(names, names.users.modelName),
+	user: names.users.keyTable ? sql.id(names.users.keyTable.schema, names.users.keyTable.table) : storeTable(names, names.users.modelName),
+	userDdl: (statements) => names.users.keyTable ? [] : statements,
 	userColumn: names.users.column,
 	metadata: names.users.metadata,
 	id: sql.raw(names.uuidIds ? "uuid default pg_catalog.gen_random_uuid()" : "text"),

package/dist/better-auth/user-table.d.ts

@@ -28,5 +28,14 @@ export type UserTableOptions = {
   columns?: Partial<Record<UserColumn, string>>;
   /** A JSON column that holds each user's metadata, such as `raw_user_meta_data`; none by default. */
   metadata?: string;
+  /**
+   * The table that holds the user ids, when `table` is a view over another system's user table, such as
+   * `{ schema: 'auth', table: 'users' }` under a view over Supabase's `auth.users`: the store's migrations then make
+   * nothing of the user table, which the app's own migration makes, and every foreign key points at this table.
+   */
+  keyTable?: {
+    schema: string;
+    table: string;
+  };
 };
 //#endregion

package/dist/better-auth/user-table.js

@@ -17,7 +17,7 @@ const userFields = {
 	last_organization_id: "lastOrganizationId"
 };
 /** The user table's names, from `auth.users` option; unknown columns are an error. */
-const userTable = ({ table = "user", columns = {}, metadata } = {}) => {
+const userTable = ({ table = "user", columns = {}, metadata, keyTable } = {}) => {
 	const unknown = Object.keys(columns).find((name) => !(name in userFields));
 	if (unknown !== void 0) throw new Error(`users.columns names "${unknown}", which is not a column of the user table: ${Object.keys(userFields).join(", ")}`);
 	const column = (name) => columns[name] ?? name;
@@ -25,7 +25,8 @@ const userTable = ({ table = "user", columns = {}, metadata } = {}) => {
 		modelName: table,
 		column,
 		fieldNames: Object.fromEntries(Object.entries(userFields).map(([name, field]) => [field, column(name)])),
-		metadata
+		metadata,
+		keyTable
 	};
 };
 /** Better Auth's `user` option: the table and its core columns. */

package/dist/package.js

@@ -1,4 +1,4 @@
 //#region package.json
-var version = "0.58.6";
+var version = "0.58.7";
 //#endregion
 export { version };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@protobase/server",
-  "version": "0.58.6",
+  "version": "0.58.7",
   "description": "The Protobase REST API as a Hono app, with Better Auth sign-in.",
   "license": "Apache-2.0",
   "repository": {
@@ -42,9 +42,9 @@
     "@better-auth/sso": "^1.7.12",
     "@livekit/protocol": "1.53.1",
     "@modelcontextprotocol/server": "^2.3.1",
-    "@protobase/layout": "0.58.6",
-    "@protobase/query": "0.58.6",
-    "@protobase/schema": "0.58.6",
+    "@protobase/layout": "0.58.7",
+    "@protobase/query": "0.58.7",
+    "@protobase/schema": "0.58.7",
     "@react-email/render": "^2.1.0",
     "@scalar/hono-api-reference": "^0.12.10",
     "@sentry/core": "^11.7.0",