@absolutejs/auth 0.57.5 → 0.57.7

package/dist/index.d.ts

@@ -3588,7 +3588,7 @@ export { createInMemoryWarrantStore, warrantKey } from './fga/inMemoryStores';
 export { createRedisFgaCache, type RedisFgaCacheClient } from './fga/redisCheckCache';
 export { initTracing, withSpan, type TracingConfig } from './telemetry/tracing';
 export { blockMigrations, runMigrations, type BlockMigrations, type BlockName, type Migration } from './migrations';
-export type { MigrationRunResult, RunMigrationsOptions } from './migrations/runner';
+export type { MigrationClient, MigrationQueryResult, MigrationRunResult, RunMigrationsOptions } from './migrations/runner';
 export { createNeonWarrantStore, createPostgresWarrantStore, warrantsTable } from './fga/postgresStores';
 export { ssoDiscoveryRoute } from './sso/discoveryRoute';
 export { oidcSsoRoutes } from './sso/oidcRoutes';

package/dist/index.js

@@ -35715,13 +35715,16 @@ var toSamlConfig = (value) => {
     idpX509Cert
   };
 };
-var toConnection = (row) => {
+var toConnection = async (row, cipher) => {
   if (row.type === "oidc") {
     const config2 = toOidcConfig(row.config);
     if (config2 === undefined)
       return;
     const connection2 = {
-      config: config2,
+      config: {
+        ...config2,
+        clientSecret: cipher ? await cipher.decrypt(config2.clientSecret) : config2.clientSecret
+      },
       connectionId: row.connection_id,
       createdAt: row.created_at_ms,
       enabled: row.enabled,
@@ -35745,8 +35748,11 @@ var toConnection = (row) => {
   };
   return connection;
 };
-var toValues3 = (connection) => ({
-  config: connection.config,
+var toValues3 = async (connection, cipher) => ({
+  config: connection.type === "oidc" && cipher ? {
+    ...connection.config,
+    clientSecret: await cipher.encrypt(connection.config.clientSecret)
+  } : connection.config,
   connection_id: connection.connectionId,
   created_at_ms: connection.createdAt,
   enabled: connection.enabled,
@@ -35755,27 +35761,25 @@ var toValues3 = (connection) => ({
   updated_at_ms: connection.updatedAt
 });
 var createNeonSsoConnectionStore = (databaseUrl) => createPostgresSsoConnectionStore(createNeonDatabase(databaseUrl));
-var createPostgresSsoConnectionStore = (db) => ({
+var createPostgresSsoConnectionStore = (db, cipher) => ({
   deleteConnection: async (connectionId) => {
     await db.delete(ssoConnectionsTable).where(eq(ssoConnectionsTable.connection_id, connectionId));
   },
   getConnection: async (connectionId) => {
     const [row] = await db.select().from(ssoConnectionsTable).where(eq(ssoConnectionsTable.connection_id, connectionId)).limit(1);
-    return row ? toConnection(row) : undefined;
+    return row ? toConnection(row, cipher) : undefined;
   },
   getConnectionByOrganization: async (organizationId, type) => {
     const [row] = await db.select().from(ssoConnectionsTable).where(and(eq(ssoConnectionsTable.organization_id, organizationId), eq(ssoConnectionsTable.enabled, true), type === undefined ? undefined : eq(ssoConnectionsTable.type, type))).orderBy(desc(ssoConnectionsTable.updated_at_ms)).limit(1);
-    return row ? toConnection(row) : undefined;
+    return row ? toConnection(row, cipher) : undefined;
   },
   listConnectionsByOrganization: async (organizationId) => {
     const rows = await db.select().from(ssoConnectionsTable).where(eq(ssoConnectionsTable.organization_id, organizationId)).orderBy(desc(ssoConnectionsTable.updated_at_ms));
-    return rows.flatMap((row) => {
-      const connection = toConnection(row);
-      return connection === undefined ? [] : [connection];
-    });
+    const connections = await Promise.all(rows.map((row) => toConnection(row, cipher)));
+    return connections.filter((connection) => connection !== undefined);
   },
   saveConnection: async (connection) => {
-    const values = toValues3(connection);
+    const values = await toValues3(connection, cipher);
     await db.insert(ssoConnectionsTable).values(values).onConflictDoUpdate({
       set: values,
       target: ssoConnectionsTable.connection_id
@@ -35948,30 +35952,40 @@ var JOURNAL_DDL = `CREATE TABLE IF NOT EXISTS "auth_migrations" (
 var isJournalRow = (value) => typeof value === "object" && value !== null && typeof Reflect.get(value, "id") === "string";
 var isBlockName = (value) => Object.hasOwn(blockMigrations, value);
 var allBlockNames = () => Object.keys(blockMigrations).filter(isBlockName);
-var applyOne = async (pool, id, sql2, log) => {
-  await pool.query(sql2);
-  await pool.query(`INSERT INTO "auth_migrations" ("id", "applied_at_ms") VALUES ($1, $2)`, [id, Date.now()]);
+var applyOne = async (client, id, sql2, log) => {
+  await client.query(sql2);
+  await client.query(`INSERT INTO "auth_migrations" ("id", "applied_at_ms") VALUES ($1, $2)`, [id, Date.now()]);
   log(`apply  ${id}`);
 };
-var runOne = async (pool, id, sql2, applied, result, log) => {
+var runOne = async (client, id, sql2, applied, result, log) => {
   if (applied.has(id)) {
     result.skipped.push(id);
     log(`skip   ${id}`);
     return;
   }
-  await applyOne(pool, id, sql2, log);
+  await applyOne(client, id, sql2, log);
   result.applied.push(id);
 };
 var runMigrations = async ({
   blocks,
+  client,
   databaseUrl,
   log = console.log
 }) => {
-  const pool = new Ln({ connectionString: databaseUrl });
+  let ownedPool;
+  let migrationClient;
+  if (client !== undefined) {
+    migrationClient = client;
+  } else {
+    if (databaseUrl === undefined)
+      throw new Error("runMigrations requires databaseUrl or client");
+    ownedPool = new Ln({ connectionString: databaseUrl });
+    migrationClient = ownedPool;
+  }
   const result = { applied: [], skipped: [] };
   try {
-    await pool.query(JOURNAL_DDL);
-    const journal = await pool.query(`SELECT "id" FROM "auth_migrations"`);
+    await migrationClient.query(JOURNAL_DDL);
+    const journal = await migrationClient.query(`SELECT "id" FROM "auth_migrations"`);
     const applied = new Set(journal.rows.filter(isJournalRow).map((row) => row.id));
     const selected = blocks ?? allBlockNames();
     const flat = selected.flatMap((block) => blockMigrations[block].migrations.map((migration) => ({
@@ -35980,10 +35994,10 @@ var runMigrations = async ({
     })));
     await flat.reduce(async (prior, item) => {
       await prior;
-      return runOne(pool, item.id, item.sql, applied, result, log);
+      return runOne(migrationClient, item.id, item.sql, applied, result, log);
     }, Promise.resolve());
   } finally {
-    await pool.end();
+    await ownedPool?.end();
   }
   return result;
 };
@@ -37362,5 +37376,5 @@ export {
   AGENT_CLAIM_GRANT_TYPE
 };
 
-//# debugId=3DFEF144F31E171764756E2164756E21
+//# debugId=F857B4607106B28664756E2164756E21
 //# sourceMappingURL=index.js.map