@yielded/auth-persistence-drizzle 0.1.0-beta.23 → 0.1.0-beta.25

package/src/drizzle/password-model.ts

@@ -4,9 +4,6 @@ import type { SQL, Table } from "drizzle-orm";
 import type { DrizzleTableModel } from "./table-model";
 
 export {
-  type PasswordAttemptAction,
-  type PasswordAttemptState,
-  type PasswordAttemptRecord,
   type RequiredPasswordConstraints,
   requiredPasswordConstraints,
   type PasswordConstraintClassifier,
@@ -44,11 +41,6 @@ export type PasswordCredentialTable<
   NativeSubjectId
 >;
 
-export type PasswordAttemptTable<
-  Attempt extends Table,
-  NativeSubjectId,
-> = Shared.PasswordAttemptTable<DrizzleTableModel<Attempt>, NativeSubjectId>;
-
 export type PasswordCommandTable<Command extends Table> = Shared.PasswordCommandTable<
   DrizzleTableModel<Command>
 >;
@@ -60,7 +52,6 @@ export type PasswordPersistenceMapping<
   Identifier extends Table,
   Credential extends Table,
   AuthorityCredential extends Table,
-  Attempt extends Table,
   Command extends Table,
   NativeSubjectId,
 > = Shared.PasswordPersistenceMapping<
@@ -68,7 +59,6 @@ export type PasswordPersistenceMapping<
   DrizzleTableModel<Identifier>,
   DrizzleTableModel<Credential>,
   DrizzleTableModel<AuthorityCredential>,
-  DrizzleTableModel<Attempt>,
   DrizzleTableModel<Command>,
   NativeSubjectId,
   SQL
@@ -79,7 +69,6 @@ export type D1PasswordPersistenceMapping<
   Identifier extends Table,
   Credential extends Table,
   AuthorityCredential extends Table,
-  Attempt extends Table,
   Command extends Table,
   NativeSubjectId,
 > = Shared.D1PasswordPersistenceMapping<
@@ -87,7 +76,6 @@ export type D1PasswordPersistenceMapping<
   DrizzleTableModel<Identifier>,
   DrizzleTableModel<Credential>,
   DrizzleTableModel<AuthorityCredential>,
-  DrizzleTableModel<Attempt>,
   DrizzleTableModel<Command>,
   NativeSubjectId,
   SQL
@@ -134,7 +122,6 @@ export type AnyPasswordPersistenceMapping = PasswordPersistenceMapping<
   Table,
   Table,
   Table,
-  Table,
   unknown
 >;
 

package/src/drizzle/password-prepared-model.ts

@@ -86,7 +86,6 @@ export interface PasswordPreparedPersistenceMapping<
   Identifier extends Table,
   Credential extends Table,
   AuthorityCredential extends Table,
-  Attempt extends Table,
   Command extends Table,
   Intent extends Table,
   Admission extends Table,
@@ -97,7 +96,6 @@ export interface PasswordPreparedPersistenceMapping<
     Identifier,
     Credential,
     AuthorityCredential,
-    Attempt,
     Command,
     NativeSubjectId
   >;
@@ -114,7 +112,6 @@ export type D1PasswordPreparedPersistenceMapping<
   Identifier extends Table,
   Credential extends Table,
   AuthorityCredential extends Table,
-  Attempt extends Table,
   Command extends Table,
   Intent extends Table,
   Admission extends Table,
@@ -124,7 +121,6 @@ export type D1PasswordPreparedPersistenceMapping<
   Identifier,
   Credential,
   AuthorityCredential,
-  Attempt,
   Command,
   Intent,
   Admission,
@@ -137,7 +133,6 @@ export type D1PasswordPreparedPersistenceMapping<
     Identifier,
     Credential,
     AuthorityCredential,
-    Attempt,
     Command,
     NativeSubjectId
   >;
@@ -242,6 +237,5 @@ export type AnyPasswordPreparedPersistenceMapping = PasswordPreparedPersistenceM
   Table,
   Table,
   Table,
-  Table,
   unknown
 >;

package/src/drizzle/password-prepared-sql.ts

@@ -698,7 +698,8 @@ export const makeSqlPasswordPreparedPersistence = Effect.fn("makeSqlPasswordPrep
                 input.policy.admission.identifier.windowMillis,
                 input.policy.admission.subject.windowMillis,
               ) ||
-            (input.invalidation.existingSessions === "immediate" &&
+            ((input.invalidation.existingSessions === "immediate" ||
+              input.invalidation.existingSessions === "cache-expiry") &&
               p.sessionInvalidation !== "same-authority-immediate")
           )
             return yield* unavailable();

package/src/drizzle/pg-password-prepared.ts

@@ -30,7 +30,6 @@ export const makePgPasswordPreparedPersistenceServices = <
   I extends AnyPgTable,
   C extends AnyPgTable,
   AC extends AnyPgTable,
-  A extends AnyPgTable,
   M extends AnyPgTable,
   T extends AnyPgTable,
   B extends AnyPgTable,
@@ -43,7 +42,7 @@ export const makePgPasswordPreparedPersistenceServices = <
   PCr extends AnyPgTable = AnyPgTable,
   PNativeId = unknown,
 >(
-  mapping: PasswordPreparedPersistenceMapping<S, I, C, AC, A, M, T, B, NativeId>,
+  mapping: PasswordPreparedPersistenceMapping<S, I, C, AC, M, T, B, NativeId>,
   proofMapping?: PasswordPreparedProofMapping<PS, PC, PM, PSub, PI, PCr, PNativeId>,
 ) =>
   Effect.flatMap(
@@ -62,7 +61,6 @@ export function coordinatePgPasswordPreparedPersistence<
   I extends AnyPgTable,
   C extends AnyPgTable,
   AC extends AnyPgTable,
-  A extends AnyPgTable,
   M extends AnyPgTable,
   T extends AnyPgTable,
   B extends AnyPgTable,
@@ -82,7 +80,7 @@ export function coordinatePgPasswordPreparedPersistence<
 >(
   acquire: Effect.Effect<D, DatabaseError, DatabaseRequirements>,
   options: {
-    readonly mapping: PasswordPreparedPersistenceMapping<S, I, C, AC, A, M, T, B, NativeId>;
+    readonly mapping: PasswordPreparedPersistenceMapping<S, I, C, AC, M, T, B, NativeId>;
     readonly proofMapping?:
       | PasswordPreparedProofMapping<PS, PC, PM, PSub, PI, PCr, PNativeId>
       | undefined;
@@ -103,7 +101,6 @@ export function coordinatePgPasswordPreparedPersistence<
   I extends AnyPgTable,
   C extends AnyPgTable,
   AC extends AnyPgTable,
-  A extends AnyPgTable,
   M extends AnyPgTable,
   T extends AnyPgTable,
   B extends AnyPgTable,
@@ -125,7 +122,7 @@ export function coordinatePgPasswordPreparedPersistence<
 >(
   acquire: Effect.Effect<D, DatabaseError, DatabaseRequirements>,
   options: {
-    readonly mapping: PasswordPreparedPersistenceMapping<S, I, C, AC, A, M, T, B, NativeId>;
+    readonly mapping: PasswordPreparedPersistenceMapping<S, I, C, AC, M, T, B, NativeId>;
     readonly proofMapping?:
       | PasswordPreparedProofMapping<PS, PC, PM, PSub, PI, PCr, PNativeId>
       | undefined;
@@ -146,7 +143,6 @@ export function coordinatePgPasswordPreparedPersistence<
   I extends AnyPgTable,
   C extends AnyPgTable,
   AC extends AnyPgTable,
-  A extends AnyPgTable,
   M extends AnyPgTable,
   T extends AnyPgTable,
   B extends AnyPgTable,
@@ -168,7 +164,7 @@ export function coordinatePgPasswordPreparedPersistence<
 >(
   acquire: Effect.Effect<D, DatabaseError, DatabaseRequirements>,
   options: {
-    readonly mapping: PasswordPreparedPersistenceMapping<S, I, C, AC, A, M, T, B, NativeId>;
+    readonly mapping: PasswordPreparedPersistenceMapping<S, I, C, AC, M, T, B, NativeId>;
     readonly proofMapping?:
       | PasswordPreparedProofMapping<PS, PC, PM, PSub, PI, PCr, PNativeId>
       | undefined;

package/src/drizzle/pg-passwords.ts

@@ -54,21 +54,19 @@ type PasswordMapping<
   I extends AnyPgTable,
   C extends AnyPgTable,
   AC extends AnyPgTable,
-  A extends AnyPgTable,
   M extends AnyPgTable,
   NativeId,
-> = PasswordPersistenceMapping<S, I, C, AC, A, M, NativeId>;
+> = PasswordPersistenceMapping<S, I, C, AC, M, NativeId>;
 
 export const makePgPasswordPersistenceServices = <
   S extends AnyPgTable,
   I extends AnyPgTable,
   C extends AnyPgTable,
   AC extends AnyPgTable,
-  A extends AnyPgTable,
   M extends AnyPgTable,
   NativeId,
 >(
-  mapping: PasswordMapping<S, I, C, AC, A, M, NativeId>,
+  mapping: PasswordMapping<S, I, C, AC, M, NativeId>,
   proofMapping?: ProofPersistenceMapping<
     any,
     any,
@@ -98,7 +96,6 @@ export function coordinatePgPasswordPersistence<
   I extends AnyPgTable,
   C extends AnyPgTable,
   AC extends AnyPgTable,
-  A extends AnyPgTable,
   M extends AnyPgTable,
   NativeId,
   PM extends
@@ -112,7 +109,7 @@ export function coordinatePgPasswordPersistence<
 >(
   acquire: Effect.Effect<D, DatabaseError, DatabaseRequirements>,
   options: {
-    readonly mapping: PasswordMapping<S, I, C, AC, A, M, NativeId>;
+    readonly mapping: PasswordMapping<S, I, C, AC, M, NativeId>;
     readonly proofMapping?: PM;
     readonly transaction?: never;
   },
@@ -129,7 +126,6 @@ export function coordinatePgPasswordPersistence<
   I extends AnyPgTable,
   C extends AnyPgTable,
   AC extends AnyPgTable,
-  A extends AnyPgTable,
   M extends AnyPgTable,
   NativeId,
   PM extends
@@ -145,7 +141,7 @@ export function coordinatePgPasswordPersistence<
 >(
   acquire: Effect.Effect<D, DatabaseError, DatabaseRequirements>,
   options: {
-    readonly mapping: PasswordMapping<S, I, C, AC, A, M, NativeId>;
+    readonly mapping: PasswordMapping<S, I, C, AC, M, NativeId>;
     readonly proofMapping?: PM;
     readonly transaction: SuppliedService<TxId, NoInfer<TransactionOf<D>>, TxShape>;
   },
@@ -162,7 +158,6 @@ export function coordinatePgPasswordPersistence<
   I extends AnyPgTable,
   C extends AnyPgTable,
   AC extends AnyPgTable,
-  A extends AnyPgTable,
   M extends AnyPgTable,
   NativeId,
   PM extends
@@ -178,7 +173,7 @@ export function coordinatePgPasswordPersistence<
 >(
   acquire: Effect.Effect<D, DatabaseError, DatabaseRequirements>,
   options: {
-    readonly mapping: PasswordMapping<S, I, C, AC, A, M, NativeId>;
+    readonly mapping: PasswordMapping<S, I, C, AC, M, NativeId>;
     readonly proofMapping?: PM;
     readonly transaction?: SuppliedService<TxId, NoInfer<TransactionOf<D>>, TxShape>;
   },

package/src/drizzle/query-operations.ts

@@ -6,11 +6,13 @@ import {
   asc,
   or,
   eq,
+  ne,
   gt,
   gte,
   lte,
   inArray,
   isNull,
+  isNotNull,
   notExists,
   sql,
   getTableColumns,
@@ -26,11 +28,13 @@ const operations = {
   asc,
   or,
   eq,
+  ne,
   gt,
   gte,
   lte,
   inArray,
   isNull,
+  isNotNull,
   notExists,
   sql,
   getTableColumns,

package/src/drizzle/sqlite-password-prepared.ts

@@ -54,7 +54,6 @@ export const makeSqlitePasswordPreparedTarget = <
     I extends AnySQLiteTable,
     C extends AnySQLiteTable,
     AC extends AnySQLiteTable,
-    A extends AnySQLiteTable,
     M extends AnySQLiteTable,
     T extends AnySQLiteTable,
     B extends AnySQLiteTable,
@@ -74,7 +73,7 @@ export const makeSqlitePasswordPreparedTarget = <
   >(
     acquire: Effect.Effect<Database, DatabaseError, DatabaseRequirements>,
     options: {
-      readonly mapping: PasswordPreparedPersistenceMapping<S, I, C, AC, A, M, T, B, NativeId>;
+      readonly mapping: PasswordPreparedPersistenceMapping<S, I, C, AC, M, T, B, NativeId>;
       readonly proofMapping?:
         | PasswordPreparedProofMapping<PS, PC, PM, PSub, PI, PCr, PNativeId>
         | undefined;
@@ -96,7 +95,6 @@ export const makeSqlitePasswordPreparedTarget = <
     I extends AnySQLiteTable,
     C extends AnySQLiteTable,
     AC extends AnySQLiteTable,
-    A extends AnySQLiteTable,
     M extends AnySQLiteTable,
     T extends AnySQLiteTable,
     B extends AnySQLiteTable,
@@ -118,7 +116,7 @@ export const makeSqlitePasswordPreparedTarget = <
   >(
     acquire: Effect.Effect<Database, DatabaseError, DatabaseRequirements>,
     options: {
-      readonly mapping: PasswordPreparedPersistenceMapping<S, I, C, AC, A, M, T, B, NativeId>;
+      readonly mapping: PasswordPreparedPersistenceMapping<S, I, C, AC, M, T, B, NativeId>;
       readonly proofMapping?:
         | PasswordPreparedProofMapping<PS, PC, PM, PSub, PI, PCr, PNativeId>
         | undefined;
@@ -140,7 +138,6 @@ export const makeSqlitePasswordPreparedTarget = <
     I extends AnySQLiteTable,
     C extends AnySQLiteTable,
     AC extends AnySQLiteTable,
-    A extends AnySQLiteTable,
     M extends AnySQLiteTable,
     T extends AnySQLiteTable,
     B extends AnySQLiteTable,
@@ -162,7 +159,7 @@ export const makeSqlitePasswordPreparedTarget = <
   >(
     acquire: Effect.Effect<Database, DatabaseError, DatabaseRequirements>,
     options: {
-      readonly mapping: PasswordPreparedPersistenceMapping<S, I, C, AC, A, M, T, B, NativeId>;
+      readonly mapping: PasswordPreparedPersistenceMapping<S, I, C, AC, M, T, B, NativeId>;
       readonly proofMapping?:
         | PasswordPreparedProofMapping<PS, PC, PM, PSub, PI, PCr, PNativeId>
         | undefined;
@@ -207,7 +204,6 @@ export const makeSqlitePasswordPreparedTarget = <
       I extends AnySQLiteTable,
       C extends AnySQLiteTable,
       AC extends AnySQLiteTable,
-      A extends AnySQLiteTable,
       M extends AnySQLiteTable,
       T extends AnySQLiteTable,
       B extends AnySQLiteTable,
@@ -220,7 +216,7 @@ export const makeSqlitePasswordPreparedTarget = <
       PCr extends AnySQLiteTable = AnySQLiteTable,
       PNativeId = unknown,
     >(
-      mapping: PasswordPreparedPersistenceMapping<S, I, C, AC, A, M, T, B, NativeId>,
+      mapping: PasswordPreparedPersistenceMapping<S, I, C, AC, M, T, B, NativeId>,
       proofMapping?: PasswordPreparedProofMapping<PS, PC, PM, PSub, PI, PCr, PNativeId>,
     ) =>
       Effect.flatMap(standaloneConfiguration, (configuration) =>

package/src/drizzle/sqlite-passwords.ts

@@ -69,21 +69,19 @@ type Mapping<
   I extends AnySQLiteTable,
   C extends AnySQLiteTable,
   AC extends AnySQLiteTable,
-  A extends AnySQLiteTable,
   M extends AnySQLiteTable,
   NativeId,
-> = PasswordPersistenceMapping<S, I, C, AC, A, M, NativeId>;
+> = PasswordPersistenceMapping<S, I, C, AC, M, NativeId>;
 
 export const makeSqlitePasswordPersistenceServices = <
   S extends AnySQLiteTable,
   I extends AnySQLiteTable,
   C extends AnySQLiteTable,
   AC extends AnySQLiteTable,
-  A extends AnySQLiteTable,
   M extends AnySQLiteTable,
   NativeId,
 >(
-  mapping: Mapping<S, I, C, AC, A, M, NativeId>,
+  mapping: Mapping<S, I, C, AC, M, NativeId>,
   configuration: PasswordTargetConfiguration,
   proofMapping?: ProofPersistenceMapping<
     any,
@@ -107,7 +105,6 @@ export const coordinateSqlitePasswordPersistence = <
   I extends AnySQLiteTable,
   C extends AnySQLiteTable,
   AC extends AnySQLiteTable,
-  A extends AnySQLiteTable,
   M extends AnySQLiteTable,
   NativeId,
   PM extends
@@ -118,7 +115,7 @@ export const coordinateSqlitePasswordPersistence = <
   R,
 >(
   database: D,
-  mapping: Mapping<S, I, C, AC, A, M, NativeId>,
+  mapping: Mapping<S, I, C, AC, M, NativeId>,
   configuration: PasswordTargetConfiguration,
   proofMapping: PM,
   owner: (
@@ -201,7 +198,6 @@ export const makeSqlitePasswordTarget = <
     I extends AnySQLiteTable,
     C extends AnySQLiteTable,
     AC extends AnySQLiteTable,
-    A extends AnySQLiteTable,
     M extends AnySQLiteTable,
     NativeId,
     PM extends
@@ -215,7 +211,7 @@ export const makeSqlitePasswordTarget = <
   >(
     acquire: Effect.Effect<Database, DatabaseError, DatabaseRequirements>,
     options: {
-      readonly mapping: Mapping<S, I, C, AC, A, M, NativeId>;
+      readonly mapping: Mapping<S, I, C, AC, M, NativeId>;
       readonly proofMapping?: PM;
       readonly transaction?: never;
     },
@@ -233,7 +229,6 @@ export const makeSqlitePasswordTarget = <
     I extends AnySQLiteTable,
     C extends AnySQLiteTable,
     AC extends AnySQLiteTable,
-    A extends AnySQLiteTable,
     M extends AnySQLiteTable,
     NativeId,
     PM extends
@@ -249,7 +244,7 @@ export const makeSqlitePasswordTarget = <
   >(
     acquire: Effect.Effect<Database, DatabaseError, DatabaseRequirements>,
     options: {
-      readonly mapping: Mapping<S, I, C, AC, A, M, NativeId>;
+      readonly mapping: Mapping<S, I, C, AC, M, NativeId>;
       readonly proofMapping?: PM;
       readonly transaction: SuppliedService<TxId, NoInfer<TransactionOf<Database>>, TxShape>;
     },
@@ -267,7 +262,6 @@ export const makeSqlitePasswordTarget = <
     I extends AnySQLiteTable,
     C extends AnySQLiteTable,
     AC extends AnySQLiteTable,
-    A extends AnySQLiteTable,
     M extends AnySQLiteTable,
     NativeId,
     PM extends
@@ -283,7 +277,7 @@ export const makeSqlitePasswordTarget = <
   >(
     acquire: Effect.Effect<Database, DatabaseError, DatabaseRequirements>,
     options: {
-      readonly mapping: Mapping<S, I, C, AC, A, M, NativeId>;
+      readonly mapping: Mapping<S, I, C, AC, M, NativeId>;
       readonly proofMapping?: PM;
       readonly transaction?: SuppliedService<TxId, NoInfer<TransactionOf<Database>>, TxShape>;
     },
@@ -455,11 +449,10 @@ export const makeSqlitePasswordTarget = <
       I extends AnySQLiteTable,
       C extends AnySQLiteTable,
       AC extends AnySQLiteTable,
-      A extends AnySQLiteTable,
       M extends AnySQLiteTable,
       NativeId,
     >(
-      mapping: Mapping<S, I, C, AC, A, M, NativeId>,
+      mapping: Mapping<S, I, C, AC, M, NativeId>,
       proofMapping?: ProofPersistenceMapping<
         any,
         any,