@authhero/drizzle 0.56.3 → 0.57.0

package/drizzle/0000_init.sql

@@ -136,9 +136,6 @@ CREATE TABLE `users` (
 	`created_at` text(35) NOT NULL,
 	`updated_at` text(35) NOT NULL,
 	`linked_to` text(255),
-	`last_ip` text(255),
-	`login_count` integer NOT NULL,
-	`last_login` text(255),
 	`registration_completed_at` text(35),
 	`provider` text(255) NOT NULL,
 	`connection` text(255),
@@ -167,6 +164,18 @@ CREATE INDEX `users_email_index` ON `users` (`email`);--> statement-breakpoint
 CREATE INDEX `users_linked_to_index` ON `users` (`linked_to`);--> statement-breakpoint
 CREATE INDEX `users_name_index` ON `users` (`name`);--> statement-breakpoint
 CREATE INDEX `users_phone_tenant_provider_index` ON `users` (`tenant_id`,`phone_number`,`provider`);--> statement-breakpoint
+CREATE TABLE `user_activity` (
+	`tenant_id` text(255) NOT NULL,
+	`user_id` text(255) NOT NULL,
+	`last_login` text(35),
+	`last_ip` text(45),
+	`login_count` integer DEFAULT 0 NOT NULL,
+	`failed_logins` text,
+	`last_password_reset` text(35),
+	PRIMARY KEY(`tenant_id`, `user_id`),
+	FOREIGN KEY (`user_id`,`tenant_id`) REFERENCES `users`(`user_id`,`tenant_id`) ON UPDATE no action ON DELETE cascade
+);
+--> statement-breakpoint
 CREATE TABLE `authentication_codes` (
 	`tenant_id` text(191) NOT NULL,
 	`code` text(255) PRIMARY KEY NOT NULL,

package/drizzle/meta/0000_snapshot.json

@@ -1,7 +1,7 @@
 {
   "version": "6",
   "dialect": "sqlite",
-  "id": "aa362ef7-2aa5-43c2-822c-5e9ffd5ec7e5",
+  "id": "f5a5b35e-cf8e-4fe4-afe9-ec2d33b03c33",
   "prevId": "00000000-0000-0000-0000-000000000000",
   "tables": {
     "tenants": {
@@ -952,27 +952,6 @@
           "notNull": false,
           "autoincrement": false
         },
-        "last_ip": {
-          "name": "last_ip",
-          "type": "text(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "login_count": {
-          "name": "login_count",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "last_login": {
-          "name": "last_login",
-          "type": "text(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
         "registration_completed_at": {
           "name": "registration_completed_at",
           "type": "text(35)",
@@ -1181,6 +1160,90 @@
       "uniqueConstraints": {},
       "checkConstraints": {}
     },
+    "user_activity": {
+      "name": "user_activity",
+      "columns": {
+        "tenant_id": {
+          "name": "tenant_id",
+          "type": "text(255)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text(255)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "last_login": {
+          "name": "last_login",
+          "type": "text(35)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_ip": {
+          "name": "last_ip",
+          "type": "text(45)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "login_count": {
+          "name": "login_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "failed_logins": {
+          "name": "failed_logins",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_password_reset": {
+          "name": "last_password_reset",
+          "type": "text(35)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "user_activity_user_id_constraint": {
+          "name": "user_activity_user_id_constraint",
+          "tableFrom": "user_activity",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id",
+            "tenant_id"
+          ],
+          "columnsTo": [
+            "user_id",
+            "tenant_id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "user_activity_pkey": {
+          "columns": [
+            "tenant_id",
+            "user_id"
+          ],
+          "name": "user_activity_pkey"
+        }
+      },
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
     "authentication_codes": {
       "name": "authentication_codes",
       "columns": {

package/drizzle/meta/_journal.json

@@ -5,7 +5,7 @@
     {
       "idx": 0,
       "version": "6",
-      "when": 1781946733503,
+      "when": 1783004771436,
       "tag": "0000_init",
       "breakpoints": true
     }

package/package.json

@@ -11,7 +11,7 @@
     "type": "git",
     "url": "https://github.com/markusahlstrand/authhero"
   },
-  "version": "0.56.3",
+  "version": "0.57.0",
   "files": [
     "dist",
     "src/schema",

package/src/schema/sqlite/index.ts

@@ -16,6 +16,7 @@ export * from "./actions";
 
 // Users & Authentication
 export * from "./users";
+export * from "./userActivity";
 export * from "./sessions";
 
 // Clients & Grants

package/src/schema/sqlite/userActivity.ts

@@ -0,0 +1,38 @@
+import {
+  sqliteTable,
+  text,
+  integer,
+  primaryKey,
+  foreignKey,
+} from "drizzle-orm/sqlite-core";
+import { users } from "./users";
+
+/**
+ * Write-often per-user counters split out of the `users` row (issue #1003) so
+ * the profile row isn't rewritten on every login / failed password attempt.
+ * 1:1 with a user; a missing row means the user never logged in. Mirrors the
+ * kysely adapter's `user_activity` table.
+ */
+export const userActivity = sqliteTable(
+  "user_activity",
+  {
+    tenant_id: text("tenant_id", { length: 255 }).notNull(),
+    user_id: text("user_id", { length: 255 }).notNull(),
+    last_login: text("last_login", { length: 35 }),
+    last_ip: text("last_ip", { length: 45 }), // right-sized for IPv6
+    login_count: integer("login_count").notNull().default(0),
+    failed_logins: text("failed_logins"), // JSON array of lockout timestamps
+    last_password_reset: text("last_password_reset", { length: 35 }),
+  },
+  (table) => [
+    primaryKey({
+      columns: [table.tenant_id, table.user_id],
+      name: "user_activity_pkey",
+    }),
+    foreignKey({
+      columns: [table.user_id, table.tenant_id],
+      foreignColumns: [users.user_id, users.tenant_id],
+      name: "user_activity_user_id_constraint",
+    }).onDelete("cascade"),
+  ],
+);

package/src/schema/sqlite/users.ts

@@ -28,9 +28,8 @@ export const users = sqliteTable(
     created_at: text("created_at", { length: 35 }).notNull(),
     updated_at: text("updated_at", { length: 35 }).notNull(),
     linked_to: text("linked_to", { length: 255 }),
-    last_ip: text("last_ip", { length: 255 }),
-    login_count: integer("login_count").notNull(),
-    last_login: text("last_login", { length: 255 }),
+    // last_login/last_ip/login_count live in the user_activity table
+    // (issue #1003), not on the users row.
     registration_completed_at: text("registration_completed_at", {
       length: 35,
     }),