Convert booleans to integeres for prompt settings

packages/kysely/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @authhero/kysely-adapter
 
+## 0.9.6
+
+### Patch Changes
+
+- Convert booleans to integers
+
 ## 0.9.5
 
 ### Patch Changes

packages/kysely/package.json

@@ -11,7 +11,7 @@
     "type": "git",
     "url": "https://github.com/markusahlstrand/authhero"
   },
-  "version": "0.9.5",
+  "version": "0.9.6",
   "files": [
     "dist"
   ],

packages/kysely/src/connections/create.ts

@@ -2,7 +2,7 @@ import { nanoid } from "nanoid";
 import { Kysely } from "kysely";
 import { Connection, ConnectionInsert } from "@authhero/adapter-interfaces";
 import { Database } from "../db";
-import { flattenObject } from "../flatten";
+import { flattenObject } from "../utils/flatten";
 
 export function create(db: Kysely<Database>) {
   return async (

packages/kysely/src/connections/get.ts

@@ -2,7 +2,7 @@ import { Kysely } from "kysely";
 import { removeNullProperties } from "../helpers/remove-nulls";
 import { Connection } from "@authhero/adapter-interfaces";
 import { Database } from "../db";
-import { unflattenObject } from "../flatten";
+import { unflattenObject } from "../utils/flatten";
 
 export function get(db: Kysely<Database>) {
   return async (

packages/kysely/src/connections/list.ts

@@ -7,7 +7,7 @@ import {
 } from "@authhero/adapter-interfaces";
 import { Database } from "../db";
 import getCountAsInt from "../utils/getCountAsInt";
-import { unflattenObject } from "../flatten";
+import { unflattenObject } from "../utils/flatten";
 
 export function list(db: Kysely<Database>) {
   return async (

packages/kysely/src/connections/update.ts

@@ -1,7 +1,7 @@
 import { Kysely } from "kysely";
 import { ConnectionInsert } from "@authhero/adapter-interfaces";
 import { Database } from "../db";
-import { flattenObject } from "../flatten";
+import { flattenObject } from "../utils/flatten";
 
 export function update(db: Kysely<Database>) {
   return async (

packages/kysely/src/db.ts

@@ -9,15 +9,15 @@ import {
   Hook,
   loginSchema,
   Password,
-  PromptSetting,
+  promptSettingSchema,
   Session,
   SigningKey,
   Tenant,
   themeSchema,
 } from "@authhero/adapter-interfaces";
 import { SqlTicket } from "./tickets/Ticket";
 import { SqlLog } from "./logs/Log";
-import { flattenSchema } from "./flatten";
+import { flattenSchema } from "./utils/flatten";
 
 const sqlThemeSchema = flattenSchema(themeSchema).extend({
   tenant_id: z.string(),
@@ -47,6 +47,14 @@ const sqlApplicationSchema = z.object({
   allowed_logout_urls: z.string(),
 });
 
+const sqlPromptSettingSchema = z.object({
+  ...promptSettingSchema.shape,
+  identifier_first: z.number(),
+  password_first: z.number(),
+  webauthn_platform_first_factor: z.number(),
+  tenant_id: z.string(),
+});
+
 export interface Database {
   applications: z.infer<typeof sqlApplicationSchema>;
   branding: SqlBranding;
@@ -58,7 +66,7 @@ export interface Database {
   logins: SqlLogin;
   logs: SqlLog;
   passwords: Password & { tenant_id: string };
-  prompt_settings: PromptSetting & { tenant_id: string };
+  prompt_settings: z.infer<typeof sqlPromptSettingSchema>;
   users: SqlUser;
   sessions: Session & { tenant_id: string };
   tenants: Tenant;

packages/kysely/src/logins/create.ts

@@ -2,7 +2,7 @@ import { Login, LoginInsert } from "@authhero/adapter-interfaces";
 import { Kysely } from "kysely";
 import { nanoid } from "nanoid";
 import { Database } from "../db";
-import { flattenObject } from "../flatten";
+import { flattenObject } from "../utils/flatten";
 
 export function create(db: Kysely<Database>) {
   return async (tenant_id: string, login: LoginInsert) => {

packages/kysely/src/logins/get.ts

@@ -1,7 +1,7 @@
 import { Kysely } from "kysely";
 import { Login, loginSchema } from "@authhero/adapter-interfaces";
 import { Database } from "../db";
-import { unflattenObject } from "../flatten";
+import { unflattenObject } from "../utils/flatten";
 import { removeNullProperties } from "../helpers/remove-nulls";
 
 export function get(db: Kysely<Database>) {

packages/kysely/src/logins/update.ts

@@ -1,7 +1,7 @@
 import { LoginInsert } from "@authhero/adapter-interfaces";
 import { Kysely } from "kysely";
 import { Database } from "../db";
-import { flattenObject } from "../flatten";
+import { flattenObject } from "../utils/flatten";
 
 export function update(db: Kysely<Database>) {
   return async (

packages/kysely/src/promptSettings/set.ts

@@ -4,6 +4,23 @@ import {
 } from "@authhero/adapter-interfaces";
 import { Kysely } from "kysely";
 import { Database } from "../db";
+import { removeNullProperties } from "../helpers/remove-nulls";
+
+function convertToBooleans(promptSetting: Partial<PromptSetting>) {
+  return removeNullProperties({
+    ...promptSetting,
+    webauthn_platform_first_factor: promptSetting.webauthn_platform_first_factor
+      ? !!promptSetting.webauthn_platform_first_factor
+      : undefined,
+    identifier_first: promptSetting.identifier_first
+      ? !!promptSetting.identifier_first
+      : undefined,
+    password_first: promptSetting.password_first
+      ? !!promptSetting.password_first
+      : undefined,
+    universal_login_experience: promptSetting.universal_login_experience,
+  });
+}
 
 export function set(db: Kysely<Database>) {
   return async (tenant_id: string, promptSetting: Partial<PromptSetting>) => {
@@ -13,14 +30,14 @@ export function set(db: Kysely<Database>) {
       await db
         .insertInto("prompt_settings")
         .values({
-          ...promptSettingsWithDefaults,
+          ...convertToBooleans(promptSettingsWithDefaults),
           tenant_id,
         })
         .execute();
     } catch (error) {
       await db
         .updateTable("prompt_settings")
-        .set(promptSetting)
+        .set(convertToBooleans(promptSetting))
         .where("tenant_id", "=", tenant_id)
         .execute();
     }

packages/kysely/src/themes/create.ts

@@ -2,7 +2,7 @@ import { nanoid } from "nanoid";
 import { Kysely } from "kysely";
 import { Theme, ThemeInsert } from "@authhero/adapter-interfaces";
 import { Database } from "../db";
-import { flattenObject } from "../flatten";
+import { flattenObject } from "../utils/flatten";
 
 export function create(db: Kysely<Database>) {
   return async (tenant_id: string, theme: ThemeInsert): Promise<Theme> => {

packages/kysely/src/themes/update.ts

@@ -1,7 +1,7 @@
 import { Kysely } from "kysely";
 import { ThemeInsert } from "@authhero/adapter-interfaces";
 import { Database } from "../db";
-import { flattenObject } from "../flatten";
+import { flattenObject } from "../utils/flatten";
 
 export function update(db: Kysely<Database>) {
   return async (