Merge pull request #14 from markusahlstrand/ma/missing-dependencies

added missing dependencies and moved migrations folder

packages/adapter-interfaces/package.json

@@ -39,5 +39,8 @@
   },
   "peerDependencies": {
     "@hono/zod-openapi": "^0.16.4"
+  },
+  "dependencies": {
+    "nanoid": "^5.0.8"
   }
 }

packages/authhero/package.json

@@ -27,6 +27,7 @@
     "better-sqlite3": "^11.5.0",
     "dts-bundle-generator": "^9.5.1",
     "hono": "^4.6.11",
+    "kysely": "^0.27.4",
     "typescript": "^5.6.3",
     "vite": "^5.4.11",
     "vite-plugin-dts": "^4.3.0",
@@ -37,6 +38,7 @@
     "@peculiar/x509": "^1.12.3",
     "bcrypt": "^5.1.1",
     "bcryptjs": "^2.4.3",
+    "nanoid": "^5.0.8",
     "oslo": "^1.2.1",
     "zxcvbn": "^4.4.2"
   },

packages/authhero/src/helpers/client.ts

@@ -1,5 +1,5 @@
 import { HTTPException } from "hono/http-exception";
-import { Client, connectionSchema } from "authhero";
+import { Client, connectionSchema } from "@authhero/adapter-interfaces";
 import { Bindings } from "../types";
 
 export async function getClient(

packages/authhero/src/types/auth0/Totals.ts

@@ -1,4 +1,4 @@
-import { z } from "zod";
+import { z } from "@hono/zod-openapi";
 
 export const totalsSchema = z.object({
   start: z.number(),

packages/authhero/src/types/auth0/UserResponse.ts

@@ -1,5 +1,5 @@
 import { BaseUser, baseUserSchema } from "@authhero/adapter-interfaces";
-import { z } from "zod";
+import { z } from "@hono/zod-openapi";
 
 export interface PostUsersBody extends BaseUser {
   password?: string;

packages/authhero/test/routes/auth-api/dbconnections.spec.ts

@@ -37,7 +37,7 @@ describe("dbconnections", () => {
         {
           json: {
             email: "[email protected]",
-            password: "Password1!",
+            password: "fG%D0MV4bjb%xI",
             connection: "Username-Password-Authentication",
             client_id: "clientId",
           },
@@ -160,7 +160,7 @@ describe("dbconnections", () => {
 
       expect(response.status).toBe(400);
       const message = await response.text();
-      expect(message).toBe("Invalid sign up");
+      expect(message).toBe("Password does not meet the requirements");
     });
   });
 
@@ -199,7 +199,7 @@ describe("dbconnections", () => {
         {
           json: {
             email: "[email protected]",
-            password: "Password1!",
+            password: "fG%D0MV4bjb%xI",
             connection: "Username-Password-Authentication",
             client_id: "clientId",
           },

packages/kysely/src/migrate/migrate.ts → packages/kysely/migrate/migrate.ts

@@ -2,7 +2,7 @@ import { Kysely, Migrator } from "kysely";
 
 import ReferenceMigrationProvider from "./ReferenceMigrationProvider";
 import migrations from "./migrations";
-import { Database } from "@authhero/kysely-adapter";
+import { Database } from "../src/db";
 
 export async function migrateToLatest(db: Kysely<Database>, debug = false) {
   if (debug) {

packages/kysely/src/migrate/migrations/2022-12-11T09:17:35_init.ts → packages/kysely/migrate/migrations/2022-12-11T09:17:35_init.ts

@@ -1,4 +1,4 @@
-import { Database } from "@authhero/kysely-adapter";
+import { Database } from "../../src/db";
 import { Kysely } from "kysely";
 
 export async function up(db: Kysely<Database>): Promise<void> {

packages/kysely/src/migrate/migrations/2023-09-21T10:12:15_support-url.ts → packages/kysely/migrate/migrations/2023-09-21T10:12:15_support-url.ts

@@ -1,5 +1,5 @@
 import { Kysely } from "kysely";
-import { Database } from "@authhero/kysely-adapter";
+import { Database } from "../../src/db";
 
 export async function up(db: Kysely<Database>): Promise<void> {
   await db.schema

packages/kysely/src/migrate/migrations/2023-10-26T06:57:21_updated_at.ts → packages/kysely/migrate/migrations/2023-10-26T06:57:21_updated_at.ts

@@ -1,5 +1,5 @@
 import { Kysely } from "kysely";
-import { Database } from "@authhero/kysely-adapter";
+import { Database } from "../../src/db";
 
 export async function up(_: Kysely<Database>): Promise<void> {
   // await db.schema

packages/kysely/src/migrate/migrations/2023-10-26T08:14:09_log_table.ts → packages/kysely/migrate/migrations/2023-10-26T08:14:09_log_table.ts

@@ -1,5 +1,5 @@
 import { Kysely } from "kysely";
-import { Database } from "@authhero/kysely-adapter";
+import { Database } from "../../src/db";
 
 export async function up(db: Kysely<Database>): Promise<void> {
   await db.schema

packages/kysely/src/migrate/migrations/2023-10-27T16:00:11_picture-length.ts → packages/kysely/migrate/migrations/2023-10-27T16:00:11_picture-length.ts

@@ -1,5 +1,5 @@
 import { Kysely } from "kysely";
-import { Database } from "@authhero/kysely-adapter";
+import { Database } from "../../src/db";
 
 export async function up(_: Kysely<Database>): Promise<void> {
   // await db.schema

packages/kysely/src/migrate/migrations/2023-11-02T23:18:12_sessions.ts → packages/kysely/migrate/migrations/2023-11-02T23:18:12_sessions.ts

@@ -1,5 +1,5 @@
 import { Kysely } from "kysely";
-import { Database } from "@authhero/kysely-adapter";
+import { Database } from "../../src/db";
 
 export async function up(db: Kysely<Database>): Promise<void> {
   await db.schema

packages/kysely/src/migrate/migrations/2023-11-07T23:18:12_passwords.ts → packages/kysely/migrate/migrations/2023-11-07T23:18:12_passwords.ts

@@ -1,5 +1,5 @@
 import { Kysely } from "kysely";
-import { Database } from "@authhero/kysely-adapter";
+import { Database } from "../../src/db";
 
 export async function up(db: Kysely<Database>): Promise<void> {
   await db.schema

packages/kysely/src/migrate/migrations/2023-11-08T17:12:09_logs-table-new-fields.ts → packages/kysely/migrate/migrations/2023-11-08T17:12:09_logs-table-new-fields.ts

@@ -1,5 +1,5 @@
 import { Kysely } from "kysely";
-import { Database } from "@authhero/kysely-adapter";
+import { Database } from "../../src/db";
 
 export async function up(_: Kysely<Database>): Promise<void> {
   // await db.schema

packages/kysely/src/migrate/migrations/2023-11-16T14:27:00_passwords-table-password.ts → packages/kysely/migrate/migrations/2023-11-16T14:27:00_passwords-table-password.ts

@@ -1,5 +1,5 @@
 import { Kysely } from "kysely";
-import { Database } from "@authhero/kysely-adapter";
+import { Database } from "../../src/db";
 
 export async function up(db: Kysely<Database>): Promise<void> {
   await db.schema

packages/kysely/src/migrate/migrations/2023-11-17T10:34:00_codes-fields.ts → packages/kysely/migrate/migrations/2023-11-17T10:34:00_codes-fields.ts

@@ -1,5 +1,5 @@
 import { Kysely } from "kysely";
-import { Database } from "@authhero/kysely-adapter";
+import { Database } from "../../src/db";
 
 export async function up(_: Kysely<Database>): Promise<void> {
   // This table is recreated in a later migration

packages/kysely/src/migrate/migrations/2023-11-19T20:53:00_univeral-login-session.ts → packages/kysely/migrate/migrations/2023-11-19T20:53:00_univeral-login-session.ts

@@ -1,5 +1,5 @@
 import { Kysely } from "kysely";
-import { Database } from "@authhero/kysely-adapter";
+import { Database } from "../../src/db";
 
 export async function up(_: Kysely<Database>): Promise<void> {
   // await db.schema

packages/kysely/src/migrate/migrations/2023-11-21T12:30:00_user-fields.ts → packages/kysely/migrate/migrations/2023-11-21T12:30:00_user-fields.ts

@@ -1,5 +1,5 @@
 import { Kysely } from "kysely";
-import { Database } from "@authhero/kysely-adapter";
+import { Database } from "../../src/db";
 
 export async function up(_: Kysely<Database>): Promise<void> {
   // await db.schema.alterTable("users").dropColumn("linked_to").execute();

packages/kysely/src/migrate/migrations/2023-11-21T15:57:00_user-indexes.ts → packages/kysely/migrate/migrations/2023-11-21T15:57:00_user-indexes.ts

@@ -1,5 +1,5 @@
 import { Kysely } from "kysely";
-import { Database } from "@authhero/kysely-adapter";
+import { Database } from "../../src/db";
 
 export async function up(db: Kysely<Database>): Promise<void> {
   await db.schema

packages/kysely/src/migrate/migrations/2023-11-23T17:44:00_profile-data-field.ts → packages/kysely/migrate/migrations/2023-11-23T17:44:00_profile-data-field.ts

@@ -1,5 +1,5 @@
 import { Kysely } from "kysely";
-import { Database } from "@authhero/kysely-adapter";
+import { Database } from "../../src/db";
 
 export async function up(db: Kysely<Database>): Promise<void> {
   await db.schema

packages/kysely/src/migrate/migrations/2023-12-08T15:59:00_user-linked-to-index.ts → packages/kysely/migrate/migrations/2023-12-08T15:59:00_user-linked-to-index.ts

@@ -1,5 +1,5 @@
 import { Kysely } from "kysely";
-import { Database } from "@authhero/kysely-adapter";
+import { Database } from "../../src/db";
 
 export async function up(db: Kysely<Database>): Promise<void> {
   await db.schema

packages/kysely/src/migrate/migrations/2023-12-21T15:05:00_user-locale.ts → packages/kysely/migrate/migrations/2023-12-21T15:05:00_user-locale.ts

@@ -1,5 +1,5 @@
 import { Kysely } from "kysely";
-import { Database } from "@authhero/kysely-adapter";
+import { Database } from "../../src/db";
 
 export async function up(db: Kysely<Database>): Promise<void> {
   await db.schema

packages/kysely/src/migrate/migrations/2023-12-26T10:58:00_signing-keys.ts → packages/kysely/migrate/migrations/2023-12-26T10:58:00_signing-keys.ts

@@ -1,5 +1,5 @@
 import { Kysely } from "kysely";
-import { Database } from "@authhero/kysely-adapter";
+import { Database } from "../../src/db";
 
 export async function up(db: Kysely<Database>): Promise<void> {
   await db.schema

packages/kysely/src/migrate/migrations/2024-01-06T16:23:00_logs-fields.ts → packages/kysely/migrate/migrations/2024-01-06T16:23:00_logs-fields.ts

@@ -1,5 +1,5 @@
 import { Kysely } from "kysely";
-import { Database } from "@authhero/kysely-adapter";
+import { Database } from "../../src/db";
 
 export async function up(_: Kysely<Database>): Promise<void> {
   // await db.schema

packages/kysely/src/migrate/migrations/2024-01-10T23:19:00_connections-userinfo.ts → packages/kysely/migrate/migrations/2024-01-10T23:19:00_connections-userinfo.ts

@@ -1,5 +1,5 @@
 import { Kysely } from "kysely";
-import { Database } from "@authhero/kysely-adapter";
+import { Database } from "../../src/db";
 
 export async function up(_: Kysely<Database>): Promise<void> {
   // await db.schema

packages/kysely/src/migrate/migrations/2024-01-11T10:58:00_missing-fields.ts → packages/kysely/migrate/migrations/2024-01-11T10:58:00_missing-fields.ts

@@ -1,5 +1,5 @@
 import { Kysely } from "kysely";
-import { Database } from "@authhero/kysely-adapter";
+import { Database } from "../../src/db";
 
 export async function up(db: Kysely<Database>): Promise<void> {
   await db.schema

packages/kysely/src/migrate/migrations/2024-01-17T10:51:00_session-deleted-at.ts → packages/kysely/migrate/migrations/2024-01-17T10:51:00_session-deleted-at.ts

@@ -1,5 +1,5 @@
 import { Kysely } from "kysely";
-import { Database } from "@authhero/kysely-adapter";
+import { Database } from "../../src/db";
 
 export async function up(_: Kysely<Database>): Promise<void> {
   // await db.schema

packages/kysely/src/migrate/migrations/2024-01-31T09:00:00_drop-logs-fields.ts → packages/kysely/migrate/migrations/2024-01-31T09:00:00_drop-logs-fields.ts

@@ -1,5 +1,5 @@
 import { Kysely } from "kysely";
-import { Database } from "@authhero/kysely-adapter";
+import { Database } from "../../src/db";
 
 export async function up(db: Kysely<Database>): Promise<void> {
   await db.schema.alterTable("logs").dropColumn("category").execute();

packages/kysely/src/migrate/migrations/2024-02-02T15:55:00_drop-users-fields.ts → packages/kysely/migrate/migrations/2024-02-02T15:55:00_drop-users-fields.ts

@@ -1,5 +1,5 @@
 import { Kysely } from "kysely";
-import { Database } from "@authhero/kysely-adapter";
+import { Database } from "../../src/db";
 
 export async function up(db: Kysely<Database>): Promise<void> {
   await db.schema.alterTable("users").dropColumn("tags").execute();

packages/kysely/src/migrate/migrations/2024-02-02T16:55:00_logs-indexes.ts → packages/kysely/migrate/migrations/2024-02-02T16:55:00_logs-indexes.ts

@@ -1,5 +1,5 @@
 import { Kysely } from "kysely";
-import { Database } from "@authhero/kysely-adapter";
+import { Database } from "../../src/db";
 
 export async function up(db: Kysely<Database>): Promise<void> {
   await db.schema

packages/kysely/src/migrate/migrations/2024-02-05T18:35:00_log-desc-max-length.ts → packages/kysely/migrate/migrations/2024-02-05T18:35:00_log-desc-max-length.ts

@@ -1,5 +1,5 @@
 import { Kysely } from "kysely";
-import { Database } from "@authhero/kysely-adapter";
+import { Database } from "../../src/db";
 
 export async function up(db: Kysely<Database>): Promise<void> {
   // This does not work

packages/kysely/src/migrate/migrations/2024-02-08T12:45:00_logs-table-extra-fields.ts → packages/kysely/migrate/migrations/2024-02-08T12:45:00_logs-table-extra-fields.ts

@@ -1,5 +1,5 @@
 import { Kysely } from "kysely";
-import { Database } from "@authhero/kysely-adapter";
+import { Database } from "../../src/db";
 
 export async function up(db: Kysely<Database>): Promise<void> {
   await db.schema

packages/kysely/src/migrate/migrations/2024-02-13T11:25:00_users-table-name-index.ts → packages/kysely/migrate/migrations/2024-02-13T11:25:00_users-table-name-index.ts

@@ -1,5 +1,5 @@
 import { Kysely } from "kysely";
-import { Database } from "@authhero/kysely-adapter";
+import { Database } from "../../src/db";
 
 export async function up(db: Kysely<Database>): Promise<void> {
   await db.schema

packages/kysely/src/migrate/migrations/2024-02-19T20:14:00_users-email-constrain.ts → packages/kysely/migrate/migrations/2024-02-19T20:14:00_users-email-constrain.ts

@@ -1,5 +1,5 @@
 import { Kysely } from "kysely";
-import { Database } from "@authhero/kysely-adapter";
+import { Database } from "../../src/db";
 
 export async function up(_: Kysely<Database>): Promise<void> {
   // Sqlite does not support altering tables to add unique constraints

packages/kysely/src/migrate/migrations/2024-03-11T12:45:00_increase-otp-state-length.ts → packages/kysely/migrate/migrations/2024-03-11T12:45:00_increase-otp-state-length.ts

@@ -1,5 +1,5 @@
 import { Kysely } from "kysely";
-import { Database } from "@authhero/kysely-adapter";
+import { Database } from "../../src/db";
 
 export async function up(db: Kysely<Database>): Promise<void> {
   // Uncomment this for planetscale migration

packages/kysely/src/migrate/migrations/2024-04-22T14:48:00_increase-ticket-state-length.ts → packages/kysely/migrate/migrations/2024-04-22T14:48:00_increase-ticket-state-length.ts

@@ -1,5 +1,5 @@
 import { Kysely } from "kysely";
-import { Database } from "@authhero/kysely-adapter";
+import { Database } from "../../src/db";
 
 export async function up(db: Kysely<Database>): Promise<void> {
   // Uncomment this for planetscale migration

packages/kysely/src/migrate/migrations/2024-05-09T08:50:00_branding.ts → packages/kysely/migrate/migrations/2024-05-09T08:50:00_branding.ts

@@ -1,5 +1,5 @@
 import { Kysely } from "kysely";
-import { Database } from "@authhero/kysely-adapter";
+import { Database } from "../../src/db";
 
 export async function up(db: Kysely<Database>): Promise<void> {
   await db.schema

packages/kysely/src/migrate/migrations/2024-05-14T07:53:00_indexes_and_not_null.ts → packages/kysely/migrate/migrations/2024-05-14T07:53:00_indexes_and_not_null.ts

@@ -1,5 +1,5 @@
 import { Kysely } from "kysely";
-import { Database } from "@authhero/kysely-adapter";
+import { Database } from "../../src/db";
 
 export async function up(_: Kysely<Database>): Promise<void> {
   // await db.schema

packages/kysely/src/migrate/migrations/2024-05-16T10:45:00_vendor_id_in_universal_login_session.ts → packages/kysely/migrate/migrations/2024-05-16T10:45:00_vendor_id_in_universal_login_session.ts

@@ -1,5 +1,5 @@
 import { Kysely } from "kysely";
-import { Database } from "@authhero/kysely-adapter";
+import { Database } from "../../src/db";
 
 export async function up(_: Kysely<Database>): Promise<void> {
   // await db.schema

packages/kysely/src/migrate/migrations/2024-05-23T15:53:00_auth0client_in_universal_login_session.ts → packages/kysely/migrate/migrations/2024-05-23T15:53:00_auth0client_in_universal_login_session.ts

@@ -1,5 +1,5 @@
 import { Kysely } from "kysely";
-import { Database } from "@authhero/kysely-adapter";
+import { Database } from "../../src/db";
 
 export async function up(_: Kysely<Database>): Promise<void> {
   // await db.schema

packages/kysely/src/migrate/migrations/2024-05-24T16:25:00_increase-universal-auth-state-length.ts → packages/kysely/migrate/migrations/2024-05-24T16:25:00_increase-universal-auth-state-length.ts

@@ -1,5 +1,5 @@
 import { Kysely } from "kysely";
-import { Database } from "@authhero/kysely-adapter";
+import { Database } from "../../src/db";
 
 export async function up(_: Kysely<Database>): Promise<void> {
   // Uncomment this for planetscale migration

packages/kysely/src/migrate/migrations/2024-05-27T23:50:00_authentication_codes.ts → packages/kysely/migrate/migrations/2024-05-27T23:50:00_authentication_codes.ts

@@ -1,5 +1,5 @@
 import { Kysely } from "kysely";
-import { Database } from "@authhero/kysely-adapter";
+import { Database } from "../../src/db";
 
 export async function up(db: Kysely<Database>): Promise<void> {
   await db.schema

packages/kysely/src/migrate/migrations/2024-06-03T10:00:00_disable-sign-ups.ts → packages/kysely/migrate/migrations/2024-06-03T10:00:00_disable-sign-ups.ts

@@ -1,5 +1,5 @@
 import { Kysely } from "kysely";
-import { Database } from "@authhero/kysely-adapter";
+import { Database } from "../../src/db";
 
 export async function up(_: Kysely<Database>): Promise<void> {
   // await db.schema

packages/kysely/src/migrate/migrations/2024-06-05T10:00:00_otp-ip-address.ts → packages/kysely/migrate/migrations/2024-06-05T10:00:00_otp-ip-address.ts

@@ -1,5 +1,5 @@
 import { Kysely } from "kysely";
-import { Database } from "@authhero/kysely-adapter";
+import { Database } from "../../src/db";
 
 export async function up(db: Kysely<Database>): Promise<void> {
   await db.schema.alterTable("otps").addColumn("ip", "varchar(64)").execute();

packages/kysely/src/migrate/migrations/2024-06-19T10:00:00_increase-user-agent-length.ts → packages/kysely/migrate/migrations/2024-06-19T10:00:00_increase-user-agent-length.ts

@@ -1,5 +1,5 @@
 import { Kysely } from "kysely";
-import { Database } from "@authhero/kysely-adapter";
+import { Database } from "../../src/db";
 
 export async function up(db: Kysely<Database>): Promise<void> {
   // Uncomment this for planetscale migration

packages/kysely/src/migrate/migrations/2024-07-15T10:00:00_user_id.ts → packages/kysely/migrate/migrations/2024-07-15T10:00:00_user_id.ts

@@ -1,5 +1,5 @@
 import { Kysely } from "kysely";
-import { Database } from "@authhero/kysely-adapter";
+import { Database } from "../../src/db";
 
 export async function up(_: Kysely<Database>): Promise<void> {
   // await db.schema

packages/kysely/src/migrate/migrations/2024-07-15T12:52:00_hooks.ts → packages/kysely/migrate/migrations/2024-07-15T12:52:00_hooks.ts

@@ -1,5 +1,5 @@
 import { Kysely } from "kysely";
-import { Database } from "@authhero/kysely-adapter";
+import { Database } from "../../src/db";
 
 export async function up(db: Kysely<Database>): Promise<void> {
   await db.schema

packages/kysely/src/migrate/migrations/2024-07-22T12:52:00_user-indexes.ts → packages/kysely/migrate/migrations/2024-07-22T12:52:00_user-indexes.ts

@@ -1,5 +1,5 @@
 import { Kysely } from "kysely";
-import { Database } from "@authhero/kysely-adapter";
+import { Database } from "../../src/db";
 
 export async function up(_: Kysely<Database>): Promise<void> {
   // Run this is the console to update the user indexes

packages/kysely/src/migrate/migrations/2024-07-25T12:19:00_session_id.ts → packages/kysely/migrate/migrations/2024-07-25T12:19:00_session_id.ts

@@ -1,5 +1,5 @@
 import { Kysely } from "kysely";
-import { Database } from "@authhero/kysely-adapter";
+import { Database } from "../../src/db";
 
 export async function up(_: Kysely<Database>): Promise<void> {
   // So far we don't really care about the existing sessions

packages/kysely/src/migrate/migrations/2024-07-26T10:18:00_codes.ts → packages/kysely/migrate/migrations/2024-07-26T10:18:00_codes.ts

@@ -1,5 +1,5 @@
 import { Kysely } from "kysely";
-import { Database } from "@authhero/kysely-adapter";
+import { Database } from "../../src/db";
 
 export async function up(db: Kysely<Database>): Promise<void> {
   await db.schema

packages/kysely/src/migrate/migrations/2024-07-26T14:18:00_hook-properties.ts → packages/kysely/migrate/migrations/2024-07-26T14:18:00_hook-properties.ts

@@ -1,5 +1,5 @@
 import { Kysely } from "kysely";
-import { Database } from "@authhero/kysely-adapter";
+import { Database } from "../../src/db";
 
 export async function up(_: Kysely<Database>): Promise<void> {
   // Sqlite does not like this