Simplify the client

markusahlstrand · Aug 18, 2024 · 008068d · 008068d
1 parent ae7ae19
commit 008068d
Show file tree

Hide file tree

Showing 15 changed files with 54 additions and 36 deletions.
diff --git a/apps/demo/CHANGELOG.md b/apps/demo/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @authhero/demo
 
+## 0.0.11
+
+### Patch Changes
+
+- [email protected]
+
 ## 0.0.10
 
 ### Patch Changes

diff --git a/apps/demo/package.json b/apps/demo/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@authhero/demo",
   "private": true,
-  "version": "0.0.10",
+  "version": "0.0.11",
   "scripts": {
     "dev": "bun --watch src/bun.ts"
   },

diff --git a/packages/adapter-interfaces/CHANGELOG.md b/packages/adapter-interfaces/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @authhero/adapter-interfaces
 
+## 0.11.3
+
+### Patch Changes
+
+- Simplify client
+
 ## 0.11.2
 
 ### Patch Changes

diff --git a/packages/adapter-interfaces/package.json b/packages/adapter-interfaces/package.json
@@ -11,7 +11,7 @@
     "type": "git",
     "url": "https://github.com/markusahlstrand/authhero"
   },
-  "version": "0.11.2",
+  "version": "0.11.3",
   "files": [
     "dist"
   ],

diff --git a/packages/adapter-interfaces/src/adapters/Clients.ts b/packages/adapter-interfaces/src/adapters/Clients.ts
@@ -1,5 +1,5 @@
-import { PartialClient } from "../types";
+import { Client } from "../types";
 
 export interface ClientsAdapter {
-  get: (id: string) => Promise<PartialClient | null>;
+  get: (id: string) => Promise<Client | null>;
 }
diff --git a/packages/adapter-interfaces/src/types/Application.ts b/packages/adapter-interfaces/src/types/Application.ts
@@ -41,11 +41,10 @@ export const applicationInsertSchema = z.object({
 });
 export type ApplicationInsert = z.infer<typeof applicationInsertSchema>;
 
-export const applicationSchema = z
-  .object({
-    created_at: z.string().transform((val) => (val === null ? "" : val)),
-    updated_at: z.string().transform((val) => (val === null ? "" : val)),
-  })
-  .extend(applicationInsertSchema.shape);
+export const applicationSchema = z.object({
+  created_at: z.string().transform((val) => (val === null ? "" : val)),
+  updated_at: z.string().transform((val) => (val === null ? "" : val)),
+  ...applicationInsertSchema.shape,
+});
 
 export type Application = z.infer<typeof applicationSchema>;
diff --git a/packages/adapter-interfaces/src/types/Client.ts b/packages/adapter-interfaces/src/types/Client.ts
@@ -1,6 +1,7 @@
 import { z } from "@hono/zod-openapi";
 import { connectionSchema } from "./Connection";
 import { applicationSchema } from "./Application";
+import { tenantSchema } from "./Tenant";
 
 const ClientDomainSchema = z.object({
   domain: z.string(),
@@ -12,29 +13,11 @@ const ClientDomainSchema = z.object({
     .optional(),
 });
 
-const BaseClientSchema = z.object({
+const ClientSchema = z.object({
   ...applicationSchema.shape,
   domains: z.array(ClientDomainSchema),
-  tenant: z.object({
-    name: z.string(),
-    audience: z.string().optional(),
-    logo: z.string().optional(),
-    primary_color: z.string().optional(),
-    secondary_color: z.string().optional(),
-    sender_email: z.string(),
-    sender_name: z.string(),
-    support_url: z.string().optional(),
-    language: z.string().length(2).optional(),
-  }),
-});
-
-export const ClientSchema = BaseClientSchema.extend({
+  tenant: tenantSchema,
   connections: z.array(connectionSchema),
 });
 
-export const PartialClientSchema = BaseClientSchema.extend({
-  connections: z.array(connectionSchema.partial()),
-});
-
 export type Client = z.infer<typeof ClientSchema>;
-export type PartialClient = z.infer<typeof PartialClientSchema>;
diff --git a/packages/adapter-interfaces/src/types/Tenant.ts b/packages/adapter-interfaces/src/types/Tenant.ts
@@ -12,9 +12,11 @@ export const tenantInsertSchema = z.object({
   language: z.string().optional(),
 });
 
-export const tenantSchema = tenantInsertSchema.extend({
+export const tenantSchema = z.object({
   created_at: z.string().transform((val) => (val === null ? "" : val)),
   updated_at: z.string().transform((val) => (val === null ? "" : val)),
+  id: z.string(),
+  ...tenantInsertSchema.shape,
 });
 
 export interface Tenant {

diff --git a/packages/authhero/CHANGELOG.md b/packages/authhero/CHANGELOG.md
@@ -1,5 +1,12 @@
 # authhero
 
+## 0.2.13
+
+### Patch Changes
+
+- Updated dependencies
+  - @authhero/adapter-interfaces@0.11.3
+
 ## 0.2.12
 
 ### Patch Changes

diff --git a/packages/authhero/package.json b/packages/authhero/package.json
@@ -1,6 +1,6 @@
 {
   "name": "authhero",
-  "version": "0.2.12",
+  "version": "0.2.13",
   "files": [
     "dist"
   ],

diff --git a/packages/drizzle/CHANGELOG.md b/packages/drizzle/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @authhero/drizzle
 
+## 0.1.29
+
+### Patch Changes
+
+- Updated dependencies
+  - @authhero/adapter-interfaces@0.11.3
+
 ## 0.1.28
 
 ### Patch Changes

diff --git a/packages/drizzle/package.json b/packages/drizzle/package.json
@@ -11,7 +11,7 @@
     "type": "git",
     "url": "https://github.com/markusahlstrand/authhero"
   },
-  "version": "0.1.28",
+  "version": "0.1.29",
   "files": [
     "dist"
   ],

diff --git a/packages/kysely/CHANGELOG.md b/packages/kysely/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @authhero/kysely-adapter
 
+## 0.7.5
+
+### Patch Changes
+
+- Simplify client
+- Updated dependencies
+  - @authhero/adapter-interfaces@0.11.3
+
 ## 0.7.4
 
 ### Patch Changes

diff --git a/packages/kysely/package.json b/packages/kysely/package.json
@@ -11,7 +11,7 @@
     "type": "git",
     "url": "https://github.com/markusahlstrand/authhero"
   },
-  "version": "0.7.4",
+  "version": "0.7.5",
   "files": [
     "dist"
   ],

diff --git a/packages/kysely/src/clients/index.ts b/packages/kysely/src/clients/index.ts
@@ -1,7 +1,7 @@
 import { Kysely } from "kysely";
 import { HTTPException } from "hono/http-exception";
 import { removeNullProperties } from "../helpers/remove-nulls";
-import { PartialClient, connectionSchema } from "@authhero/adapter-interfaces";
+import { Client, connectionSchema } from "@authhero/adapter-interfaces";
 import { Database } from "../db";
 
 export function createClientsAdapter(db: Kysely<Database>) {
@@ -39,7 +39,7 @@ export function createClientsAdapter(db: Kysely<Database>) {
         .selectAll()
         .execute();
 
-      const client: PartialClient = {
+      const client: Client = {
         ...application,
         connections: connections.map((connection) =>
           connectionSchema.parse(removeNullProperties(connection)),