small clients ui tweaks

server/auth/sessions/olm.ts

@@ -2,7 +2,7 @@ import {
     encodeHexLowerCase,
 } from "@oslojs/encoding";
 import { sha256 } from "@oslojs/crypto/sha2";
-import { Olm, olms, olmSessions, OlmSession } from "@server/db/schema";
+import { Olm, olms, olmSessions, OlmSession } from "@server/db/schemas";
 import db from "@server/db";
 import { eq } from "drizzle-orm";
 

server/lib/ip.ts

@@ -1,5 +1,5 @@
 import db from "@server/db";
-import { clients, orgs, sites } from "@server/db/schema";
+import { clients, orgs, sites } from "@server/db/schemas";
 import { and, eq, isNotNull } from "drizzle-orm";
 import config from "@server/lib/config";
 

server/middlewares/verifyClientAccess.ts

@@ -1,6 +1,6 @@
 import { Request, Response, NextFunction } from "express";
 import { db } from "@server/db";
-import { userOrgs, clients, roleClients, userClients } from "@server/db/schema";
+import { userOrgs, clients, roleClients, userClients } from "@server/db/schemas";
 import { and, eq } from "drizzle-orm";
 import createHttpError from "http-errors";
 import HttpCode from "@server/types/HttpCode";

server/routers/client/createClient.ts

@@ -12,7 +12,7 @@ import {
     exitNodes,
     orgs,
     sites
-} from "@server/db/schema";
+} from "@server/db/schemas";
 import response from "@server/lib/response";
 import HttpCode from "@server/types/HttpCode";
 import createHttpError from "http-errors";

server/routers/client/deleteClient.ts

@@ -1,7 +1,7 @@
 import { Request, Response, NextFunction } from "express";
 import { z } from "zod";
 import { db } from "@server/db";
-import { clients, clientSites } from "@server/db/schema";
+import { clients, clientSites } from "@server/db/schemas";
 import { eq } from "drizzle-orm";
 import response from "@server/lib/response";
 import HttpCode from "@server/types/HttpCode";

server/routers/client/getClient.ts

@@ -1,7 +1,7 @@
 import { Request, Response, NextFunction } from "express";
 import { z } from "zod";
 import { db } from "@server/db";
-import { clients } from "@server/db/schema";
+import { clients } from "@server/db/schemas";
 import { eq, and } from "drizzle-orm";
 import response from "@server/lib/response";
 import HttpCode from "@server/types/HttpCode";

server/routers/client/listClients.ts

@@ -6,7 +6,7 @@ import {
     sites,
     userClients,
     clientSites
-} from "@server/db/schema";
+} from "@server/db/schemas";
 import logger from "@server/logger";
 import HttpCode from "@server/types/HttpCode";
 import response from "@server/lib/response";
@@ -53,6 +53,7 @@ function queryClients(orgId: string, accessibleClientIds: number[]) {
         })
         .from(clients)
         .leftJoin(orgs, eq(clients.orgId, orgs.orgId))
+        .leftJoin(orgs, eq(clients.orgId, orgs.orgId))
         .where(
             and(
                 inArray(clients.clientId, accessibleClientIds),
@@ -63,7 +64,7 @@ function queryClients(orgId: string, accessibleClientIds: number[]) {
 
 async function getSiteAssociations(clientIds: number[]) {
     if (clientIds.length === 0) return [];
-    
+
     return db
         .select({
             clientId: clientSites.clientId,
@@ -205,4 +206,4 @@ export async function listClients(
             createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred")
         );
     }
-}
+}

server/routers/client/updateClient.ts

@@ -4,7 +4,7 @@ import { db } from "@server/db";
 import {
     clients,
     clientSites
-} from "@server/db/schema";
+} from "@server/db/schemas";
 import response from "@server/lib/response";
 import HttpCode from "@server/types/HttpCode";
 import createHttpError from "http-errors";

server/routers/gerbil/getAllRelays.ts

@@ -1,6 +1,6 @@
 import { Request, Response, NextFunction } from "express";
 import { z } from "zod";
-import { clients, exitNodes, newts, olms, Site, sites, clientSites } from "@server/db/schema";
+import { clients, exitNodes, newts, olms, Site, sites, clientSites } from "@server/db/schemas";
 import { db } from "@server/db";
 import { eq } from "drizzle-orm";
 import HttpCode from "@server/types/HttpCode";

server/routers/gerbil/updateHolePunch.ts

@@ -1,6 +1,6 @@
 import { Request, Response, NextFunction } from "express";
 import { z } from "zod";
-import { clients, newts, olms, Site, sites, clientSites } from "@server/db/schema";
+import { clients, newts, olms, Site, sites, clientSites } from "@server/db/schemas";
 import { db } from "@server/db";
 import { eq } from "drizzle-orm";
 import HttpCode from "@server/types/HttpCode";

server/routers/newt/handleGetConfigMessage.ts

@@ -3,7 +3,7 @@ import { MessageHandler } from "../ws";
 import logger from "@server/logger";
 import { fromError } from "zod-validation-error";
 import db from "@server/db";
-import { clients, clientSites, Newt, sites } from "@server/db/schema";
+import { clients, clientSites, Newt, sites } from "@server/db/schemas";
 import { eq } from "drizzle-orm";
 import { updatePeer } from "../olm/peers";
 

server/routers/newt/handleReceiveBandwidthMessage.ts

@@ -1,6 +1,6 @@
 import db from "@server/db";
 import { MessageHandler } from "../ws";
-import { clients, Newt } from "@server/db/schema";
+import { clients, Newt } from "@server/db/schemas";
 import { eq } from "drizzle-orm";
 import logger from "@server/logger";
 

server/routers/newt/peers.ts

@@ -1,28 +1,38 @@
-import db from '@server/db';
-import { newts, sites } from '@server/db/schema';
-import { eq } from 'drizzle-orm';
-import { sendToClient } from '../ws';
-import logger from '@server/logger';
+import db from "@server/db";
+import { newts, sites } from "@server/db/schemas";
+import { eq } from "drizzle-orm";
+import { sendToClient } from "../ws";
+import logger from "@server/logger";
 
-export async function addPeer(siteId: number, peer: {
-    publicKey: string;
-    allowedIps: string[];
-    endpoint: string;
-}) {
-
-    const [site] = await db.select().from(sites).where(eq(sites.siteId, siteId)).limit(1);
+export async function addPeer(
+    siteId: number,
+    peer: {
+        publicKey: string;
+        allowedIps: string[];
+        endpoint: string;
+    }
+) {
+    const [site] = await db
+        .select()
+        .from(sites)
+        .where(eq(sites.siteId, siteId))
+        .limit(1);
     if (!site) {
         throw new Error(`Exit node with ID ${siteId} not found`);
     }
 
     // get the newt on the site
-    const [newt] = await db.select().from(newts).where(eq(newts.siteId, siteId)).limit(1);
+    const [newt] = await db
+        .select()
+        .from(newts)
+        .where(eq(newts.siteId, siteId))
+        .limit(1);
     if (!newt) {
         throw new Error(`Site found for site ${siteId}`);
     }
 
     sendToClient(newt.newtId, {
-        type: 'newt/wg/peer/add',    
+        type: "newt/wg/peer/add",
         data: peer
     });
 
@@ -30,19 +40,27 @@ export async function addPeer(siteId: number, peer: {
 }
 
 export async function deletePeer(siteId: number, publicKey: string) {
-    const [site] = await db.select().from(sites).where(eq(sites.siteId, siteId)).limit(1);
+    const [site] = await db
+        .select()
+        .from(sites)
+        .where(eq(sites.siteId, siteId))
+        .limit(1);
     if (!site) {
         throw new Error(`Site with ID ${siteId} not found`);
     }
 
     // get the newt on the site
-    const [newt] = await db.select().from(newts).where(eq(newts.siteId, siteId)).limit(1);
+    const [newt] = await db
+        .select()
+        .from(newts)
+        .where(eq(newts.siteId, siteId))
+        .limit(1);
     if (!newt) {
         throw new Error(`Newt not found for site ${siteId}`);
     }
 
     sendToClient(newt.newtId, {
-        type: 'newt/wg/peer/remove',
+        type: "newt/wg/peer/remove",
         data: {
             publicKey
         }
@@ -51,23 +69,35 @@ export async function deletePeer(siteId: number, publicKey: string) {
     logger.info(`Deleted peer ${publicKey} from newt ${newt.newtId}`);
 }
 
-export async function updatePeer(siteId: number, publicKey: string, peer: {
-    allowedIps?: string[];
-    endpoint?: string;
-}) {
-    const [site] = await db.select().from(sites).where(eq(sites.siteId, siteId)).limit(1);
+export async function updatePeer(
+    siteId: number,
+    publicKey: string,
+    peer: {
+        allowedIps?: string[];
+        endpoint?: string;
+    }
+) {
+    const [site] = await db
+        .select()
+        .from(sites)
+        .where(eq(sites.siteId, siteId))
+        .limit(1);
     if (!site) {
         throw new Error(`Site with ID ${siteId} not found`);
     }
 
     // get the newt on the site
-    const [newt] = await db.select().from(newts).where(eq(newts.siteId, siteId)).limit(1);
+    const [newt] = await db
+        .select()
+        .from(newts)
+        .where(eq(newts.siteId, siteId))
+        .limit(1);
     if (!newt) {
         throw new Error(`Newt not found for site ${siteId}`);
     }
 
     sendToClient(newt.newtId, {
-        type: 'newt/wg/peer/update',
+        type: "newt/wg/peer/update",
         data: {
             publicKey,
             ...peer
@@ -75,4 +105,4 @@ export async function updatePeer(siteId: number, publicKey: string, peer: {
     });
 
     logger.info(`Updated peer ${publicKey} on newt ${newt.newtId}`);
-}
+}

server/routers/olm/createOlm.ts

@@ -3,7 +3,7 @@ import db from "@server/db";
 import { hash } from "@node-rs/argon2";
 import HttpCode from "@server/types/HttpCode";
 import { z } from "zod";
-import { newts } from "@server/db/schema";
+import { newts } from "@server/db/schemas";
 import createHttpError from "http-errors";
 import response from "@server/lib/response";
 import { SqliteError } from "better-sqlite3";

server/routers/olm/getOlmToken.ts

@@ -1,6 +1,6 @@
 import { generateSessionToken } from "@server/auth/sessions/app";
 import db from "@server/db";
-import { olms } from "@server/db/schema";
+import { olms } from "@server/db/schemas";
 import HttpCode from "@server/types/HttpCode";
 import response from "@server/lib/response";
 import { eq } from "drizzle-orm";

server/routers/olm/handleOlmPingMessage.ts

@@ -1,6 +1,6 @@
 import db from "@server/db";
 import { MessageHandler } from "../ws";
-import { clients, Olm } from "@server/db/schema";
+import { clients, Olm } from "@server/db/schemas";
 import { eq, lt, isNull } from "drizzle-orm";
 import logger from "@server/logger";
 

server/routers/olm/handleOlmRegisterMessage.ts

@@ -7,7 +7,7 @@ import {
     Olm,
     olms,
     sites
-} from "@server/db/schema";
+} from "@server/db/schemas";
 import { eq, inArray } from "drizzle-orm";
 import { addPeer, deletePeer } from "../newt/peers";
 import logger from "@server/logger";

server/routers/olm/handleOlmRelayMessage.ts

@@ -1,6 +1,6 @@
 import db from "@server/db";
 import { MessageHandler } from "../ws";
-import { clients, clientSites, Olm } from "@server/db/schema";
+import { clients, clientSites, Olm } from "@server/db/schemas";
 import { eq } from "drizzle-orm";
 import { updatePeer } from "../newt/peers";
 import logger from "@server/logger";

server/routers/olm/peers.ts

@@ -1,23 +1,30 @@
-import db from '@server/db';
-import { clients, olms, newts } from '@server/db/schema';
-import { eq } from 'drizzle-orm';
-import { sendToClient } from '../ws';
-import logger from '@server/logger';
+import db from "@server/db";
+import { clients, olms, newts } from "@server/db/schemas";
+import { eq } from "drizzle-orm";
+import { sendToClient } from "../ws";
+import logger from "@server/logger";
 
-export async function addPeer(clientId: number, peer: {
-    siteId: number,
-    publicKey: string;
-    endpoint: string;
-    serverIP: string | null;
-    serverPort: number | null;
-}) {
-    const [olm] = await db.select().from(olms).where(eq(olms.clientId, clientId)).limit(1);
+export async function addPeer(
+    clientId: number,
+    peer: {
+        siteId: number;
+        publicKey: string;
+        endpoint: string;
+        serverIP: string | null;
+        serverPort: number | null;
+    }
+) {
+    const [olm] = await db
+        .select()
+        .from(olms)
+        .where(eq(olms.clientId, clientId))
+        .limit(1);
     if (!olm) {
         throw new Error(`Olm with ID ${clientId} not found`);
     }
 
     sendToClient(olm.olmId, {
-        type: 'olm/wg/peer/add',    
+        type: "olm/wg/peer/add",
         data: {
             siteId: peer.siteId,
             publicKey: peer.publicKey,
@@ -31,13 +38,17 @@ export async function addPeer(clientId: number, peer: {
 }
 
 export async function deletePeer(clientId: number, publicKey: string) {
-    const [olm] = await db.select().from(olms).where(eq(olms.clientId, clientId)).limit(1);
+    const [olm] = await db
+        .select()
+        .from(olms)
+        .where(eq(olms.clientId, clientId))
+        .limit(1);
     if (!olm) {
         throw new Error(`Olm with ID ${clientId} not found`);
     }
 
     sendToClient(olm.olmId, {
-        type: 'olm/wg/peer/remove',
+        type: "olm/wg/peer/remove",
         data: {
             publicKey
         }
@@ -46,20 +57,27 @@ export async function deletePeer(clientId: number, publicKey: string) {
     logger.info(`Deleted peer ${publicKey} from olm ${olm.olmId}`);
 }
 
-export async function updatePeer(clientId: number, peer: {
-    siteId: number,
-    publicKey: string;
-    endpoint: string;
-    serverIP: string | null;
-    serverPort: number | null;
-}) {
-    const [olm] = await db.select().from(olms).where(eq(olms.clientId, clientId)).limit(1);
+export async function updatePeer(
+    clientId: number,
+    peer: {
+        siteId: number;
+        publicKey: string;
+        endpoint: string;
+        serverIP: string | null;
+        serverPort: number | null;
+    }
+) {
+    const [olm] = await db
+        .select()
+        .from(olms)
+        .where(eq(olms.clientId, clientId))
+        .limit(1);
     if (!olm) {
         throw new Error(`Olm with ID ${clientId} not found`);
     }
 
     sendToClient(olm.olmId, {
-        type: 'olm/wg/peer/update',    
+        type: "olm/wg/peer/update",
         data: {
             siteId: peer.siteId,
             publicKey: peer.publicKey,
@@ -70,4 +88,4 @@ export async function updatePeer(clientId: number, peer: {
     });
 
     logger.info(`Added peer ${peer.publicKey} to olm ${olm.olmId}`);
-}
+}