add docs link

README.md

@@ -18,12 +18,12 @@ _Your own self-hosted zero trust tunnel._
 
 <div align="center">
   <h5>
-      <a href="https://docs.fossorial.io/Getting%20Started/quick-install">
-        Install Guide
+      <a href="https://fossorial.io">
+        Website
       </a>
       <span> | </span>
-      <a href="https://docs.fossorial.io">
-        Full Documentation
+      <a href="https://docs.fossorial.io/Getting%20Started/quick-install">
+        Install Guide
       </a>
       <span> | </span>
       <a href="mailto:numbat@fossorial.io">
@@ -136,7 +136,7 @@ View the [project board](https://github.com/orgs/fosrl/projects/1) for more deta
 
 ## Licensing
 
-Pangolin is dual licensed under the AGPLv3 and the Fossorial Commercial license. For inquiries about commercial licensing, please contact us at [numbat@fossorial.io](mailto:numbat@fossorial.io).
+Pangolin is dual licensed under the AGPL-3 and the Fossorial Commercial license. To see our commercial offerings, please see our [website](https://fossorial.io) for details. For inquiries about commercial licensing, please contact us at [numbat@fossorial.io](mailto:numbat@fossorial.io).
 
 ## Contributions
 

bruno/Clients/createClient.bru

@@ -1,22 +0,0 @@
-meta {
-  name: createClient
-  type: http
-  seq: 1
-}
-
-put {
-  url: http://localhost:3000/api/v1/site/1/client
-  body: json
-  auth: none
-}
-
-body:json {
-  {
-      "siteId": 1,
-      "name": "test",
-      "type": "olm",
-      "subnet": "100.90.129.4/30",
-      "olmId": "029yzunhx6nh3y5",
-      "secret": "l0ymp075y3d4rccb25l6sqpgar52k09etunui970qq5gj7x6"
-  }
-}

bruno/Clients/pickClientDefaults.bru

@@ -1,11 +0,0 @@
-meta {
-  name: pickClientDefaults
-  type: http
-  seq: 2
-}
-
-get {
-  url: http://localhost:3000/api/v1/site/1/pick-client-defaults
-  body: none
-  auth: none
-}

install/config/config.yml

@@ -38,12 +38,6 @@ gerbil:
     site_block_size: 30
     subnet_group: 100.89.137.0/20
 
-newt:
-    start_port: 51820
-    block_size: 24
-    subnet_group: 100.89.138.0/20
-    site_block_size: 30
-
 rate_limits:
     global:
         window_minutes: 1

server/auth/actions.ts

@@ -62,9 +62,6 @@ export enum ActionsEnum {
     deleteResourceRule = "deleteResourceRule",
     listResourceRules = "listResourceRules",
     updateResourceRule = "updateResourceRule",
-    createClient = "createClient",
-    deleteClient = "deleteClient",
-    listClients = "listClients",
     listOrgDomains = "listOrgDomains",
 }
 

server/auth/sessions/olm.ts

@@ -1,72 +0,0 @@
-import {
-    encodeHexLowerCase,
-} from "@oslojs/encoding";
-import { sha256 } from "@oslojs/crypto/sha2";
-import { Olm, olms, olmSessions, OlmSession } from "@server/db/schema";
-import db from "@server/db";
-import { eq } from "drizzle-orm";
-
-export const EXPIRES = 1000 * 60 * 60 * 24 * 30;
-
-export async function createOlmSession(
-    token: string,
-    olmId: string,
-): Promise<OlmSession> {
-    const sessionId = encodeHexLowerCase(
-        sha256(new TextEncoder().encode(token)),
-    );
-    const session: OlmSession = {
-        sessionId: sessionId,
-        olmId,
-        expiresAt: new Date(Date.now() + EXPIRES).getTime(),
-    };
-    await db.insert(olmSessions).values(session);
-    return session;
-}
-
-export async function validateOlmSessionToken(
-    token: string,
-): Promise<SessionValidationResult> {
-    const sessionId = encodeHexLowerCase(
-        sha256(new TextEncoder().encode(token)),
-    );
-    const result = await db
-        .select({ olm: olms, session: olmSessions })
-        .from(olmSessions)
-        .innerJoin(olms, eq(olmSessions.olmId, olms.olmId))
-        .where(eq(olmSessions.sessionId, sessionId));
-    if (result.length < 1) {
-        return { session: null, olm: null };
-    }
-    const { olm, session } = result[0];
-    if (Date.now() >= session.expiresAt) {
-        await db
-            .delete(olmSessions)
-            .where(eq(olmSessions.sessionId, session.sessionId));
-        return { session: null, olm: null };
-    }
-    if (Date.now() >= session.expiresAt - (EXPIRES / 2)) {
-        session.expiresAt = new Date(
-            Date.now() + EXPIRES,
-        ).getTime();
-        await db
-            .update(olmSessions)
-            .set({
-                expiresAt: session.expiresAt,
-            })
-            .where(eq(olmSessions.sessionId, session.sessionId));
-    }
-    return { session, olm };
-}
-
-export async function invalidateOlmSession(sessionId: string): Promise<void> {
-    await db.delete(olmSessions).where(eq(olmSessions.sessionId, sessionId));
-}
-
-export async function invalidateAllOlmSessions(olmId: string): Promise<void> {
-    await db.delete(olmSessions).where(eq(olmSessions.olmId, olmId));
-}
-
-export type SessionValidationResult =
-    | { session: OlmSession; olm: Olm }
-    | { session: null; olm: null };

server/auth/sessions/resource.ts

@@ -170,16 +170,17 @@ export function serializeResourceSessionCookie(
     isHttp: boolean = false,
     expiresAt?: Date
 ): string {
+    const now = new Date().getTime();
     if (!isHttp) {
         if (expiresAt === undefined) {
-            return `${cookieName}_s=${token}; HttpOnly; SameSite=Lax; Path=/; Secure; Domain=${"." + domain}`;
+            return `${cookieName}_s.${now}=${token}; HttpOnly; SameSite=Lax; Path=/; Secure; Domain=${"." + domain}`;
         }
-        return `${cookieName}_s=${token}; HttpOnly; SameSite=Lax; Expires=${expiresAt.toUTCString()}; Path=/; Secure; Domain=${"." + domain}`;
+        return `${cookieName}_s.${now}=${token}; HttpOnly; SameSite=Lax; Expires=${expiresAt.toUTCString()}; Path=/; Secure; Domain=${"." + domain}`;
     } else {
         if (expiresAt === undefined) {
-            return `${cookieName}=${token}; HttpOnly; SameSite=Lax; Path=/; Domain=${"." + domain}`;
+            return `${cookieName}.${now}=${token}; HttpOnly; SameSite=Lax; Path=/; Domain=${"." + domain}`;
         }
-        return `${cookieName}=${token}; HttpOnly; SameSite=Lax; Expires=${expiresAt.toUTCString()}; Path=/; Domain=${"." + domain}`;
+        return `${cookieName}.${now}=${token}; HttpOnly; SameSite=Lax; Expires=${expiresAt.toUTCString()}; Path=/; Domain=${"." + domain}`;
     }
 }
 

server/db/schema.ts

@@ -41,14 +41,7 @@ export const sites = sqliteTable("sites", {
     megabytesOut: integer("bytesOut"),
     lastBandwidthUpdate: text("lastBandwidthUpdate"),
     type: text("type").notNull(), // "newt" or "wireguard"
-    online: integer("online", { mode: "boolean" }).notNull().default(false),
-
-    // exit node stuff that is how to connect to the site when it has a gerbil
-    address: text("address"), // this is the address of the wireguard interface in gerbil
-    endpoint: text("endpoint"), // this is how to reach gerbil externally - gets put into the wireguard config
-    publicKey: text("pubicKey"),
-    listenPort: integer("listenPort"),
-    lastHolePunch: integer("lastHolePunch"), 
+    online: integer("online", { mode: "boolean" }).notNull().default(false)
 });
 
 export const resources = sqliteTable("resources", {
@@ -136,39 +129,6 @@ export const newts = sqliteTable("newt", {
     })
 });
 
-export const clients = sqliteTable("clients", {
-    clientId: integer("id").primaryKey({ autoIncrement: true }),
-    siteId: integer("siteId")
-        .references(() => sites.siteId, {
-            onDelete: "cascade"
-        })
-        .notNull(),
-    orgId: text("orgId")
-        .references(() => orgs.orgId, {
-            onDelete: "cascade"
-        })
-        .notNull(),
-    name: text("name").notNull(),
-    pubKey: text("pubKey"),
-    subnet: text("subnet").notNull(),
-    megabytesIn: integer("bytesIn"),
-    megabytesOut: integer("bytesOut"),
-    lastBandwidthUpdate: text("lastBandwidthUpdate"),
-    type: text("type").notNull(), // "olm"
-    online: integer("online", { mode: "boolean" }).notNull().default(false),
-    endpoint: text("endpoint"),
-    lastHolePunch: integer("lastHolePunch"),
-});
-
-export const olms = sqliteTable("olms", {
-    olmId: text("id").primaryKey(),
-    secretHash: text("secretHash").notNull(),
-    dateCreated: text("dateCreated").notNull(),
-    clientId: integer("clientId").references(() => clients.clientId, {
-        onDelete: "cascade"
-    })
-});
-
 export const twoFactorBackupCodes = sqliteTable("twoFactorBackupCodes", {
     codeId: integer("id").primaryKey({ autoIncrement: true }),
     userId: text("userId")
@@ -193,14 +153,6 @@ export const newtSessions = sqliteTable("newtSession", {
     expiresAt: integer("expiresAt").notNull()
 });
 
-export const olmSessions = sqliteTable("clientSession", {
-    sessionId: text("id").primaryKey(),
-    olmId: text("olmId")
-        .notNull()
-        .references(() => olms.olmId, { onDelete: "cascade" }),
-    expiresAt: integer("expiresAt").notNull()
-});
-
 export const userOrgs = sqliteTable("userOrgs", {
     userId: text("userId")
         .notNull()
@@ -296,24 +248,6 @@ export const userSites = sqliteTable("userSites", {
         .references(() => sites.siteId, { onDelete: "cascade" })
 });
 
-export const userClients = sqliteTable("userClients", {
-    userId: text("userId")
-        .notNull()
-        .references(() => users.userId, { onDelete: "cascade" }),
-    clientId: integer("clientId")
-        .notNull()
-        .references(() => clients.clientId, { onDelete: "cascade" })
-});
-
-export const roleClients = sqliteTable("roleClients", {
-    roleId: integer("roleId")
-        .notNull()
-        .references(() => roles.roleId, { onDelete: "cascade" }),
-    clientId: integer("clientId")
-        .notNull()
-        .references(() => clients.clientId, { onDelete: "cascade" })
-});
-
 export const roleResources = sqliteTable("roleResources", {
     roleId: integer("roleId")
         .notNull()
@@ -489,8 +423,6 @@ export type Target = InferSelectModel<typeof targets>;
 export type Session = InferSelectModel<typeof sessions>;
 export type Newt = InferSelectModel<typeof newts>;
 export type NewtSession = InferSelectModel<typeof newtSessions>;
-export type Olm = InferSelectModel<typeof olms>;
-export type OlmSession = InferSelectModel<typeof olmSessions>;
 export type EmailVerificationCode = InferSelectModel<
     typeof emailVerificationCodes
 >;
@@ -515,8 +447,5 @@ export type ResourceAccessToken = InferSelectModel<typeof resourceAccessToken>;
 export type ResourceWhitelist = InferSelectModel<typeof resourceWhitelist>;
 export type VersionMigration = InferSelectModel<typeof versionMigrations>;
 export type ResourceRule = InferSelectModel<typeof resourceRules>;
-export type Client = InferSelectModel<typeof clients>;
-export type RoleClient = InferSelectModel<typeof roleClients>;
-export type UserClient = InferSelectModel<typeof userClients>;
 export type Domain = InferSelectModel<typeof domains>;
 export type SupporterKey = InferSelectModel<typeof supporterKey>;

server/lib/config.ts

@@ -12,6 +12,7 @@ import { passwordSchema } from "@server/auth/passwordSchema";
 import stoi from "./stoi";
 import db from "@server/db";
 import { SupporterKey, supporterKey } from "@server/db/schema";
+import { suppressDeprecationWarnings } from "moment";
 import { eq } from "drizzle-orm";
 
 const portSchema = z.number().positive().gt(0).lte(65535);
@@ -105,12 +106,6 @@ const configSchema = z.object({
         block_size: z.number().positive().gt(0),
         site_block_size: z.number().positive().gt(0)
     }),
-    newt: z.object({
-        block_size: z.number().positive().gt(0),
-        subnet_group: z.string(),
-        start_port: portSchema,
-        site_block_size: z.number().positive().gt(0)
-    }),
     rate_limits: z.object({
         global: z.object({
             window_minutes: z.number().positive().gt(0),
@@ -250,13 +245,7 @@ export class Config {
             : "false";
         process.env.DASHBOARD_URL = parsedConfig.data.app.dashboard_url;
 
-        this.checkSupporterKey()
-            .then(() => {
-                console.log("Supporter key checked");
-            })
-            .catch((error) => {
-                console.error("Error checking supporter key:", error);
-            });
+        this.checkSupporterKey();
 
         this.rawConfig = parsedConfig.data;
     }
@@ -304,43 +293,44 @@ export class Config {
 
         const { key: licenseKey, githubUsername } = key;
 
-        const response = await fetch(
-            "https://api.dev.fossorial.io/api/v1/license/validate",
-            {
-                method: "POST",
-                headers: {
-                    "Content-Type": "application/json"
-                },
-                body: JSON.stringify({
-                    licenseKey,
-                    githubUsername
-                })
+        try {
+            const response = await fetch(
+                "https://api.dev.fossorial.io/api/v1/license/validate",
+                {
+                    method: "POST",
+                    headers: {
+                        "Content-Type": "application/json"
+                    },
+                    body: JSON.stringify({
+                        licenseKey,
+                        githubUsername
+                    })
+                }
+            );
+
+            if (!response.ok) {
+                this.supporterData = key;
+                return;
             }
-        );
 
-        if (!response.ok) {
-            this.supporterData = key;
-            return;
-        }
+            const data = await response.json();
 
-        const data = await response.json();
+            if (!data.data.valid) {
+                this.supporterData = {
+                    ...key,
+                    valid: false
+                };
+                return;
+            }
 
-        if (!data.data.valid) {
             this.supporterData = {
                 ...key,
-                valid: false
+                tier: data.data.tier,
+                valid: true
             };
-            return;
-        }
 
-        this.supporterData = {
-            ...key,
-            tier: data.data.tier,
-            valid: true
-        };
-
-        // update the supporter key in the database
-        await db
+            // update the supporter key in the database
+            await db
             .update(supporterKey)
             .set({
                 tier: data.data.tier || null,
@@ -348,6 +338,10 @@ export class Config {
                 valid: true
             })
             .where(eq(supporterKey.keyId, key.keyId));
+        } catch (e) {
+            this.supporterData = key;
+            console.error("Failed to validate supporter key", e);
+        }
     }
 
     public getSupporterData() {

server/lib/ip.test.ts

@@ -4,14 +4,7 @@ import { assertEquals } from "@test/assert";
 // Test cases
 function testFindNextAvailableCidr() {
     console.log("Running findNextAvailableCidr tests...");
-  
-    // Test 0: Basic IPv4 allocation with a subnet in the wrong range
-    {
-        const existing = ["100.90.130.1/30", "100.90.128.4/30"];
-        const result = findNextAvailableCidr(existing, 30, "100.90.130.1/24");
-        assertEquals(result, "100.90.130.4/30", "Basic IPv4 allocation failed");
-    }
-
+    
     // Test 1: Basic IPv4 allocation
     {
         const existing = ["10.0.0.0/16", "10.1.0.0/16"];
@@ -33,12 +26,6 @@ function testFindNextAvailableCidr() {
         assertEquals(result, null, "No available space test failed");
     }
 
-    // Test 4: Empty existing 
-    {
-        const existing: string[] = [];
-        const result = findNextAvailableCidr(existing, 30, "10.0.0.0/8");
-        assertEquals(result, "10.0.0.0/30", "Empty existing test failed");
-    }
     // // Test 4: IPv6 allocation
     // {
     //     const existing = ["2001:db8::/32", "2001:db8:1::/32"];

server/lib/ip.ts

@@ -132,6 +132,7 @@ export function findNextAvailableCidr(
     blockSize: number,
     startCidr?: string
 ): string | null {
+
     if (!startCidr && existingCidrs.length === 0) {
         return null;
     }
@@ -149,47 +150,40 @@ export function findNextAvailableCidr(
         existingCidrs.some(cidr => detectIpVersion(cidr.split('/')[0]) !== version)) {
         throw new Error('All CIDRs must be of the same IP version');
     }
-    
-    // Extract the network part from startCidr to ensure we stay in the right subnet
-    const startCidrRange = cidrToRange(startCidr);
-    
+
     // Convert existing CIDRs to ranges and sort them
     const existingRanges = existingCidrs
         .map(cidr => cidrToRange(cidr))
         .sort((a, b) => (a.start < b.start ? -1 : 1));
-    
+
     // Calculate block size
     const maxPrefix = version === 4 ? 32 : 128;
     const blockSizeBigInt = BigInt(1) << BigInt(maxPrefix - blockSize);
-    
+
     // Start from the beginning of the given CIDR
-    let current = startCidrRange.start;
-    const maxIp = startCidrRange.end;
-    
+    let current = cidrToRange(startCidr).start;
+    const maxIp = cidrToRange(startCidr).end;
+
     // Iterate through existing ranges
     for (let i = 0; i <= existingRanges.length; i++) {
         const nextRange = existingRanges[i];
-        
         // Align current to block size
         const alignedCurrent = current + ((blockSizeBigInt - (current % blockSizeBigInt)) % blockSizeBigInt);
-        
+
         // Check if we've gone beyond the maximum allowed IP
         if (alignedCurrent + blockSizeBigInt - BigInt(1) > maxIp) {
             return null;
         }
-        
+
         // If we're at the end of existing ranges or found a gap
         if (!nextRange || alignedCurrent + blockSizeBigInt - BigInt(1) < nextRange.start) {
             return `${bigIntToIp(alignedCurrent, version)}/${blockSize}`;
         }
-        
-        // If next range overlaps with our search space, move past it
-        if (nextRange.end >= startCidrRange.start && nextRange.start <= maxIp) {
-            // Move current pointer to after the current range
-            current = nextRange.end + BigInt(1);
-        }
+
+        // Move current pointer to after the current range
+        current = nextRange.end + BigInt(1);
     }
-    
+
     return null;
 }
 

server/middlewares/index.ts

@@ -14,5 +14,4 @@ export * from "./verifyAdmin";
 export * from "./verifySetResourceUsers";
 export * from "./verifyUserInRole";
 export * from "./verifyAccessTokenAccess";
-export * from "./verifyClientAccess";
-export * from "./verifyUserIsServerAdmin";
+export * from "./verifyUserIsServerAdmin";

server/middlewares/verifyClientAccess.ts

@@ -1,131 +0,0 @@
-import { Request, Response, NextFunction } from "express";
-import { db } from "@server/db";
-import { userOrgs, clients, roleClients, userClients } from "@server/db/schema";
-import { and, eq } from "drizzle-orm";
-import createHttpError from "http-errors";
-import HttpCode from "@server/types/HttpCode";
-
-export async function verifyClientAccess(
-    req: Request,
-    res: Response,
-    next: NextFunction
-) {
-    const userId = req.user!.userId; // Assuming you have user information in the request
-    const clientId = parseInt(
-        req.params.clientId || req.body.clientId || req.query.clientId
-    );
-
-    if (!userId) {
-        return next(
-            createHttpError(HttpCode.UNAUTHORIZED, "User not authenticated")
-        );
-    }
-
-    if (isNaN(clientId)) {
-        return next(createHttpError(HttpCode.BAD_REQUEST, "Invalid client ID"));
-    }
-
-    try {
-        // Get the client
-        const [client] = await db
-            .select()
-            .from(clients)
-            .where(eq(clients.clientId, clientId))
-            .limit(1);
-
-        if (!client) {
-            return next(
-                createHttpError(
-                    HttpCode.NOT_FOUND,
-                    `Client with ID ${clientId} not found`
-                )
-            );
-        }
-
-        if (!client.orgId) {
-            return next(
-                createHttpError(
-                    HttpCode.INTERNAL_SERVER_ERROR,
-                    `Client with ID ${clientId} does not have an organization ID`
-                )
-            );
-        }
-
-        if (!req.userOrg) {
-            // Get user's role ID in the organization
-            const userOrgRole = await db
-                .select()
-                .from(userOrgs)
-                .where(
-                    and(
-                        eq(userOrgs.userId, userId),
-                        eq(userOrgs.orgId, client.orgId)
-                    )
-                )
-                .limit(1);
-            req.userOrg = userOrgRole[0];
-        }
-
-        if (!req.userOrg) {
-            return next(
-                createHttpError(
-                    HttpCode.FORBIDDEN,
-                    "User does not have access to this organization"
-                )
-            );
-        }
-
-        const userOrgRoleId = req.userOrg.roleId;
-        req.userOrgRoleId = userOrgRoleId;
-        req.userOrgId = client.orgId;
-
-        // Check role-based site access first
-        const [roleClientAccess] = await db
-            .select()
-            .from(roleClients)
-            .where(
-                and(
-                    eq(roleClients.clientId, clientId),
-                    eq(roleClients.roleId, userOrgRoleId)
-                )
-            )
-            .limit(1);
-
-        if (roleClientAccess) {
-            // User has access to the site through their role
-            return next();
-        }
-
-        // If role doesn't have access, check user-specific site access
-        const [userClientAccess] = await db
-            .select()
-            .from(userClients)
-            .where(
-                and(
-                    eq(userClients.userId, userId),
-                    eq(userClients.clientId, clientId)
-                )
-            )
-            .limit(1);
-
-        if (userClientAccess) {
-            // User has direct access to the site
-            return next();
-        }
-
-        // If we reach here, the user doesn't have access to the site
-        return next(
-            createHttpError(
-                HttpCode.FORBIDDEN,
-                "User does not have access to this client"
-            )
-        );
-    } catch (error) {
-        return next(
-            createHttpError(
-                HttpCode.INTERNAL_SERVER_ERROR,
-                "Error verifying site access"
-            )
-        );
-    }
-}

server/middlewares/verifyUserIsServerAdmin.ts

@@ -14,7 +14,7 @@ export async function verifyUserIsServerAdmin(
             createHttpError(HttpCode.UNAUTHORIZED, "User not authenticated")
         );
     }
-    
+
     try {
         if (!req.user?.serverAdmin) {
             return next(
@@ -24,7 +24,7 @@ export async function verifyUserIsServerAdmin(
                 )
             );
         }
-        
+
         return next();
     } catch (e) {
         return next(

server/routers/badger/verifySession.ts

@@ -229,12 +229,10 @@ export async function verifyResourceSession(
             return notAllowed(res);
         }
 
-        const resourceSessionToken =
-            sessions[
-                `${config.getRawConfig().server.session_cookie_name}${
-                    resource.ssl ? "_s" : ""
-                }`
-            ];
+        const resourceSessionToken = extractResourceSessionToken(
+            sessions,
+            resource.ssl
+        );
 
         if (resourceSessionToken) {
             const sessionCacheKey = `session:${resourceSessionToken}`;
@@ -354,6 +352,50 @@ export async function verifyResourceSession(
     }
 }
 
+function extractResourceSessionToken(
+    sessions: Record<string, string>,
+    ssl: boolean
+) {
+    const prefix = `${config.getRawConfig().server.session_cookie_name}${
+        ssl ? "_s" : ""
+    }`;
+
+    const all: { cookieName: string; token: string; priority: number }[] =
+        [];
+
+    for (const [key, value] of Object.entries(sessions)) {
+        const parts = key.split(".");
+        const timestamp = parts[parts.length - 1];
+
+        // check if string is only numbers
+        if (!/^\d+$/.test(timestamp)) {
+            continue;
+        }
+
+        // cookie name is the key without the timestamp
+        const cookieName = key.slice(0, -timestamp.length - 1);
+
+        if (cookieName === prefix) {
+            all.push({
+                cookieName,
+                token: value,
+                priority: parseInt(timestamp)
+            });
+        }
+    }
+
+    // sort by priority in desc order
+    all.sort((a, b) => b.priority - a.priority);
+
+    const latest = all[0];
+
+    if (!latest) {
+        return;
+    }
+
+    return latest.token;
+}
+
 function notAllowed(res: Response, redirectUrl?: string) {
     const data = {
         data: { valid: false, redirectUrl },
@@ -612,21 +654,21 @@ export function isPathAllowed(pattern: string, path: string): boolean {
             logger.debug(
                 `${indent}Found in-segment wildcard in "${currentPatternPart}"`
             );
-            
+
             // Convert the pattern segment to a regex pattern
             const regexPattern = currentPatternPart
                 .replace(/\*/g, ".*") // Replace * with .* for regex wildcard
                 .replace(/\?/g, "."); // Replace ? with . for single character wildcard if needed
-            
+
             const regex = new RegExp(`^${regexPattern}$`);
-            
+
             if (regex.test(currentPathPart)) {
                 logger.debug(
                     `${indent}Segment with wildcard matches: "${currentPatternPart}" matches "${currentPathPart}"`
                 );
                 return matchSegments(patternIndex + 1, pathIndex + 1);
             }
-            
+
             logger.debug(
                 `${indent}Segment with wildcard mismatch: "${currentPatternPart}" doesn't match "${currentPathPart}"`
             );
@@ -651,4 +693,4 @@ export function isPathAllowed(pattern: string, path: string): boolean {
     const result = matchSegments(0, 0);
     logger.debug(`Final result: ${result}`);
     return result;
-}
+}

server/routers/client/createClient.ts

@@ -1,169 +0,0 @@
-import { Request, Response, NextFunction } from "express";
-import { z } from "zod";
-import { db } from "@server/db";
-import {
-    roles,
-    userSites,
-    sites,
-    roleSites,
-    Site,
-    Client,
-    clients,
-    roleClients,
-    userClients,
-    olms
-} from "@server/db/schema";
-import response from "@server/lib/response";
-import HttpCode from "@server/types/HttpCode";
-import createHttpError from "http-errors";
-import logger from "@server/logger";
-import { eq, and } from "drizzle-orm";
-import { addPeer } from "../newt/peers";
-import { fromError } from "zod-validation-error";
-import { newts } from "@server/db/schema";
-import moment from "moment";
-import { hashPassword } from "@server/auth/password";
-
-const createClientParamsSchema = z
-    .object({
-        siteId: z
-            .string()
-            .transform((val) => parseInt(val))
-            .pipe(z.number())
-    })
-    .strict();
-
-const createClientSchema = z
-    .object({
-        name: z.string().min(1).max(255),
-        siteId: z.number().int().positive(),
-        subnet: z.string(),
-        olmId: z.string(),
-        secret: z.string(),
-        type: z.enum(["olm"])
-    })
-    .strict();
-
-export type CreateClientBody = z.infer<typeof createClientSchema>;
-
-export type CreateClientResponse = Client;
-
-export async function createClient(
-    req: Request,
-    res: Response,
-    next: NextFunction
-): Promise<any> {
-    try {
-        const parsedBody = createClientSchema.safeParse(req.body);
-        if (!parsedBody.success) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    fromError(parsedBody.error).toString()
-                )
-            );
-        }
-
-        const { name, type, siteId, subnet, olmId, secret } =
-            parsedBody.data;
-
-        const parsedParams = createClientParamsSchema.safeParse(req.params);
-        if (!parsedParams.success) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    fromError(parsedParams.error).toString()
-                )
-            );
-        }
-
-        const { siteId: paramSiteId } = parsedParams.data;
-
-        if (siteId != paramSiteId) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    "Site ID in body does not match site ID in URL"
-                )
-            );
-        }
-
-        if (!req.userOrgRoleId) {
-            return next(
-                createHttpError(HttpCode.FORBIDDEN, "User does not have a role")
-            );
-        }
-
-        const [site] = await db
-            .select()
-            .from(sites)
-            .where(eq(sites.siteId, siteId));
-
-        if (!site) {
-            return next(createHttpError(HttpCode.NOT_FOUND, "Site not found"));
-        }
-
-        await db.transaction(async (trx) => {
-            const adminRole = await trx
-                .select()
-                .from(roles)
-                .where(
-                    and(eq(roles.isAdmin, true), eq(roles.orgId, site.orgId))
-                )
-                .limit(1);
-
-            if (adminRole.length === 0) {
-                trx.rollback();
-                return next(
-                    createHttpError(HttpCode.NOT_FOUND, `Admin role not found`)
-                );
-            }
-
-            const [newClient] = await trx
-                .insert(clients)
-                .values({
-                    siteId,
-                    orgId: site.orgId,
-                    name,
-                    subnet,
-                    type
-                })
-                .returning();
-
-            await trx.insert(roleClients).values({
-                roleId: adminRole[0].roleId,
-                clientId: newClient.clientId
-            });
-
-            if (req.userOrgRoleId != adminRole[0].roleId) {
-                // make sure the user can access the site
-                trx.insert(userClients).values({
-                    userId: req.user?.userId!,
-                    clientId: newClient.clientId
-                });
-            }
-
-            const secretHash = await hashPassword(secret);
-
-            await trx.insert(olms).values({
-                olmId,
-                secretHash,
-                clientId: newClient.clientId,
-                dateCreated: moment().toISOString()
-            });
-
-            return response<CreateClientResponse>(res, {
-                data: newClient,
-                success: true,
-                error: false,
-                message: "Site created successfully",
-                status: HttpCode.CREATED
-            });
-        });
-    } catch (error) {
-        logger.error(error);
-        return next(
-            createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred")
-        );
-    }
-}

server/routers/client/deleteClient.ts

@@ -1,66 +0,0 @@
-import { Request, Response, NextFunction } from "express";
-import { z } from "zod";
-import { db } from "@server/db";
-import { clients, sites } from "@server/db/schema";
-import { eq } from "drizzle-orm";
-import response from "@server/lib/response";
-import HttpCode from "@server/types/HttpCode";
-import createHttpError from "http-errors";
-import logger from "@server/logger";
-import { fromError } from "zod-validation-error";
-
-const deleteClientSchema = z
-    .object({
-        clientId: z.string().transform(Number).pipe(z.number().int().positive())
-    })
-    .strict();
-
-export async function deleteClient(
-    req: Request,
-    res: Response,
-    next: NextFunction
-): Promise<any> {
-    try {
-        const parsedParams = deleteClientSchema.safeParse(req.params);
-        if (!parsedParams.success) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    fromError(parsedParams.error).toString()
-                )
-            );
-        }
-
-        const { clientId } = parsedParams.data;
-
-        const [client] = await db
-            .select()
-            .from(clients)
-            .where(eq(clients.clientId, clientId))
-            .limit(1);
-
-        if (!client) {
-            return next(
-                createHttpError(
-                    HttpCode.NOT_FOUND,
-                    `Client with ID ${clientId} not found`
-                )
-            );
-        }
-
-        await db.delete(clients).where(eq(clients.clientId, clientId));
-
-        return response(res, {
-            data: null,
-            success: true,
-            error: false,
-            message: "Client deleted successfully",
-            status: HttpCode.OK
-        });
-    } catch (error) {
-        logger.error(error);
-        return next(
-            createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred")
-        );
-    }
-}

server/routers/client/index.ts

@@ -1,4 +0,0 @@
-export * from "./pickClientDefaults";
-export * from "./createClient";
-export * from "./deleteClient";
-export * from "./listClients";

server/routers/client/listClients.ts

@@ -1,164 +0,0 @@
-import { db } from "@server/db";
-import {
-    clients,
-    orgs,
-    roleClients,
-    sites,
-    userClients,
-} from "@server/db/schema";
-import logger from "@server/logger";
-import HttpCode from "@server/types/HttpCode";
-import response from "@server/lib/response";
-import { and, count, eq, inArray, or, sql } from "drizzle-orm";
-import { NextFunction, Request, Response } from "express";
-import createHttpError from "http-errors";
-import { z } from "zod";
-import { fromError } from "zod-validation-error";
-
-const listClientsParamsSchema = z
-    .object({
-        orgId: z.string()
-    })
-    .strict();
-
-const listClientsSchema = z.object({
-    limit: z
-        .string()
-        .optional()
-        .default("1000")
-        .transform(Number)
-        .pipe(z.number().int().positive()),
-    offset: z
-        .string()
-        .optional()
-        .default("0")
-        .transform(Number)
-        .pipe(z.number().int().nonnegative())
-});
-
-function queryClients(orgId: string, accessibleClientIds: number[]) {
-    return db
-        .select({
-            clientId: clients.clientId,
-            orgId: clients.orgId,
-            siteId: clients.siteId,
-            siteNiceId: sites.niceId,
-            name: clients.name,
-            pubKey: clients.pubKey,
-            subnet: clients.subnet,
-            megabytesIn: clients.megabytesIn,
-            megabytesOut: clients.megabytesOut,
-            orgName: orgs.name,
-            type: clients.type,
-            online: clients.online,
-            siteName: sites.name
-        })
-        .from(clients)
-        .leftJoin(orgs, eq(clients.orgId, orgs.orgId))
-        .innerJoin(sites, eq(clients.siteId, sites.siteId))
-        .where(
-            and(
-                inArray(clients.clientId, accessibleClientIds),
-                eq(clients.orgId, orgId)
-            )
-        );
-}
-
-export type ListClientsResponse = {
-    clients: Awaited<ReturnType<typeof queryClients>>;
-    pagination: { total: number; limit: number; offset: number };
-};
-
-export async function listClients(
-    req: Request,
-    res: Response,
-    next: NextFunction
-): Promise<any> {
-    try {
-        const parsedQuery = listClientsSchema.safeParse(req.query);
-        if (!parsedQuery.success) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    fromError(parsedQuery.error)
-                )
-            );
-        }
-        const { limit, offset } = parsedQuery.data;
-
-        const parsedParams = listClientsParamsSchema.safeParse(req.params);
-        if (!parsedParams.success) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    fromError(parsedParams.error)
-                )
-            );
-        }
-        const { orgId } = parsedParams.data;
-
-        if (orgId && orgId !== req.userOrgId) {
-            return next(
-                createHttpError(
-                    HttpCode.FORBIDDEN,
-                    "User does not have access to this organization"
-                )
-            );
-        }
-
-        const accessibleClients = await db
-            .select({
-                clientId: sql<number>`COALESCE(${userClients.clientId}, ${roleClients.clientId})`
-            })
-            .from(userClients)
-            .fullJoin(
-                roleClients,
-                eq(userClients.clientId, roleClients.clientId)
-            )
-            .where(
-                or(
-                    eq(userClients.userId, req.user!.userId),
-                    eq(roleClients.roleId, req.userOrgRoleId!)
-                )
-            );
-
-        const accessibleClientIds = accessibleClients.map(
-            (site) => site.clientId
-        );
-        const baseQuery = queryClients(orgId, accessibleClientIds);
-
-        let countQuery = db
-            .select({ count: count() })
-            .from(sites)
-            .where(
-                and(
-                    inArray(sites.siteId, accessibleClientIds),
-                    eq(sites.orgId, orgId)
-                )
-            );
-
-        const clientsList = await baseQuery.limit(limit).offset(offset);
-        const totalCountResult = await countQuery;
-        const totalCount = totalCountResult[0].count;
-
-        return response<ListClientsResponse>(res, {
-            data: {
-                clients: clientsList,
-                pagination: {
-                    total: totalCount,
-                    limit,
-                    offset
-                }
-            },
-            success: true,
-            error: false,
-            message: "Clients retrieved successfully",
-            status: HttpCode.OK
-        });
-    } catch (error) {
-        logger.error(error);
-        return next(
-            createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred")
-        );
-    }
-}

server/routers/client/pickClientDefaults.ts

@@ -1,149 +0,0 @@
-import { Request, Response, NextFunction } from "express";
-import { db } from "@server/db";
-import { clients, olms, sites } from "@server/db/schema";
-import { eq } from "drizzle-orm";
-import response from "@server/lib/response";
-import HttpCode from "@server/types/HttpCode";
-import createHttpError from "http-errors";
-import logger from "@server/logger";
-import { findNextAvailableCidr } from "@server/lib/ip";
-import { generateId } from "@server/auth/sessions/app";
-import config from "@server/lib/config";
-import { z } from "zod";
-import { fromError } from "zod-validation-error";
-
-const getSiteSchema = z
-    .object({
-        siteId: z.string().transform(Number).pipe(z.number())
-    })
-    .strict();
-
-export type PickClientDefaultsResponse = {
-    siteId: number;
-    address: string;
-    publicKey: string;
-    name: string;
-    listenPort: number;
-    endpoint: string;
-    subnet: string;
-    olmId: string;
-    olmSecret: string;
-};
-
-export async function pickClientDefaults(
-    req: Request,
-    res: Response,
-    next: NextFunction
-): Promise<any> {
-    try {
-        const parsedParams = getSiteSchema.safeParse(req.params);
-        if (!parsedParams.success) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    fromError(parsedParams.error).toString()
-                )
-            );
-        }
-
-        const { siteId } = parsedParams.data;
-
-        const [site] = await db
-            .select()
-            .from(sites)
-            .where(eq(sites.siteId, siteId));
-
-        if (!site) {
-            return next(createHttpError(HttpCode.NOT_FOUND, "Site not found"));
-        }
-
-        if (site.type !== "newt") {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    "Site is not a newt site"
-                )
-            );
-        }
-
-        // make sure all the required fields are present
-
-        const sitesRequiredFields = z.object({
-            address: z.string(),
-            publicKey: z.string(),
-            listenPort: z.number(),
-            endpoint: z.string()
-        });
-
-        const parsedSite = sitesRequiredFields.safeParse(site);
-        if (!parsedSite.success) {
-            logger.error("Unable to pick client defaults because: " + fromError(parsedSite.error).toString());
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    "Site is not configured to accept client connectivity"
-                )
-            );
-        }
-
-        const { address, publicKey, listenPort, endpoint } = parsedSite.data;
-
-        const clientsQuery = await db
-            .select({
-                subnet: clients.subnet
-            })
-            .from(clients)
-            .where(eq(clients.siteId, site.siteId));
-
-        let subnets = clientsQuery.map((client) => client.subnet);
-
-        // exclude the newt address by replacing after the / with a site block size
-        subnets.push(
-            address.replace(
-                /\/\d+$/,
-                `/${config.getRawConfig().newt.site_block_size}`
-            )
-        );
-
-        const newSubnet = findNextAvailableCidr(
-            subnets,
-            config.getRawConfig().newt.site_block_size,
-            address
-        );
-        if (!newSubnet) {
-            return next(
-                createHttpError(
-                    HttpCode.INTERNAL_SERVER_ERROR,
-                    "No available subnets"
-                )
-            );
-        }
-
-        const olmId = generateId(15);
-        const secret = generateId(48);
-
-        return response<PickClientDefaultsResponse>(res, {
-            data: {
-                siteId: site.siteId,
-                address: address,
-                publicKey: publicKey,
-                name: site.name,
-                listenPort: listenPort,
-                endpoint: endpoint,
-                // subnet: `${newSubnet.split("/")[0]}/${config.getRawConfig().newt.block_size}`, // we want the block size of the whole subnet
-                subnet: newSubnet,
-                olmId: olmId,
-                olmSecret: secret
-            },
-            success: true,
-            error: false,
-            message: "Organization retrieved successfully",
-            status: HttpCode.OK
-        });
-    } catch (error) {
-        logger.error(error);
-        return next(
-            createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred")
-        );
-    }
-}

server/routers/external.ts

@@ -8,7 +8,6 @@ import * as target from "./target";
 import * as user from "./user";
 import * as auth from "./auth";
 import * as role from "./role";
-import * as client from "./client";
 import * as supporterKey from "./supporterKey";
 import * as accessToken from "./accessToken";
 import HttpCode from "@server/types/HttpCode";
@@ -25,14 +24,12 @@ import {
     verifySetResourceUsers,
     verifyUserAccess,
     getUserOrgs,
-    verifyClientAccess,
     verifyUserIsServerAdmin
 } from "@server/middlewares";
 import { verifyUserHasAction } from "../middlewares/verifyUserHasAction";
 import { ActionsEnum } from "@server/auth/actions";
 import { verifyUserIsOrgOwner } from "../middlewares/verifyUserIsOrgOwner";
-import { createNewt, getNewtToken } from "./newt";
-import { getOlmToken } from "./olm";
+import { createNewt, getToken } from "./newt";
 import rateLimit from "express-rate-limit";
 import createHttpError from "http-errors";
 
@@ -100,35 +97,6 @@ authenticated.get(
     verifyUserHasAction(ActionsEnum.getSite),
     site.getSite
 );
-
-authenticated.get(
-    "/site/:siteId/pick-client-defaults",
-    verifySiteAccess,
-    verifyUserHasAction(ActionsEnum.createClient),
-    client.pickClientDefaults
-);
-
-authenticated.get(
-    "/org/:orgId/clients",
-    verifyOrgAccess,
-    verifyUserHasAction(ActionsEnum.listClients),
-    client.listClients
-);
-
-authenticated.put(
-    "/site/:siteId/client",
-    verifySiteAccess,
-    verifyUserHasAction(ActionsEnum.createClient),
-    client.createClient
-);
-
-authenticated.delete(
-    "/client/:clientId",
-    verifyClientAccess,
-    verifyUserHasAction(ActionsEnum.deleteClient),
-    client.deleteClient
-);
-
 // authenticated.get(
 //     "/site/:siteId/roles",
 //     verifySiteAccess,
@@ -522,8 +490,7 @@ authRouter.use(
 authRouter.put("/signup", auth.signup);
 authRouter.post("/login", auth.login);
 authRouter.post("/logout", auth.logout);
-authRouter.post("/newt/get-token", getNewtToken);
-authRouter.post("/olm/get-token", getOlmToken);
+authRouter.post("/newt/get-token", getToken);
 
 authRouter.post("/2fa/enable", verifySessionUserMiddleware, auth.verifyTotp);
 authRouter.post(

server/routers/gerbil/getAllRelays.ts

@@ -1,91 +0,0 @@
-import { Request, Response, NextFunction } from "express";
-import { z } from "zod";
-import { clients, exitNodes, newts, olms, Site, sites } from "@server/db/schema";
-import { db } from "@server/db";
-import { eq } from "drizzle-orm";
-import HttpCode from "@server/types/HttpCode";
-import createHttpError from "http-errors";
-import logger from "@server/logger";
-import { fromError } from "zod-validation-error";
-
-// Define Zod schema for request validation
-const getAllRelaysSchema = z.object({
-    publicKey: z.string().optional(),
-});
-
-export async function getAllRelays(
-    req: Request,
-    res: Response,
-    next: NextFunction
-): Promise<any> {
-    try {
-        // Validate request parameters
-        const parsedParams = getAllRelaysSchema.safeParse(req.body);
-        if (!parsedParams.success) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    fromError(parsedParams.error).toString()
-                )
-            );
-        }
-
-        const { publicKey } = parsedParams.data;
-
-        if (!publicKey) {
-            return next(createHttpError(HttpCode.BAD_REQUEST, 'publicKey is required'));
-        }
-
-        // Fetch exit node
-        let [exitNode] = await db.select().from(exitNodes).where(eq(exitNodes.publicKey, publicKey));
-        if (!exitNode) {
-            return next(createHttpError(HttpCode.NOT_FOUND, "Exit node not found"));
-        }
-
-        // Fetch sites for this exit node
-        const sitesRes = await db.select().from(sites).where(eq(sites.exitNodeId, exitNode.exitNodeId));
-
-        if (sitesRes.length === 0) {
-            return {
-                mappings: {}
-            }
-        }
-        
-        // get the clients on each site and map them to the site
-        const sitesAndClients = await Promise.all(sitesRes.map(async (site) => {
-            const clientsRes = await db.select().from(clients).where(eq(clients.siteId, site.siteId));
-            return {
-                site,
-                clients: clientsRes 
-            };
-        }));
-
-        let mappings: { [key: string]: {
-            destinationIp: string;
-            destinationPort: number;
-        } } = {};
-
-        for (const siteAndClients of sitesAndClients) {
-            const { site, clients } = siteAndClients;
-            for (const client of clients) {
-                if (!client.endpoint || !site.endpoint || !site.subnet) {
-                    continue;
-                }
-                mappings[client.endpoint] = {
-                    destinationIp: site.subnet.split("/")[0],
-                    destinationPort: parseInt(site.endpoint.split(":")[1])
-                };
-            }
-        }
-
-        return res.status(HttpCode.OK).send({ mappings });
-    } catch (error) {
-        logger.error(error);
-        return next(
-            createHttpError(
-                HttpCode.INTERNAL_SERVER_ERROR,
-                "An error occurred..."
-            )
-        );
-    }
-}

server/routers/gerbil/getConfig.ts

@@ -79,12 +79,14 @@ export async function getConfig(req: Request, res: Response, next: NextFunction)
         }
 
         // Fetch sites for this exit node
-        const sitesRes = await db.select().from(sites).where(eq(sites.exitNodeId, exitNode[0].exitNodeId));
+        const sitesRes = await db.query.sites.findMany({
+            where: eq(sites.exitNodeId, exitNode[0].exitNodeId),
+        });
 
         const peers = await Promise.all(sitesRes.map(async (site) => {
             return {
                 publicKey: site.pubKey,
-                allowedIps: await getAllowedIps(site.siteId) // put 0.0.0.0/0 for now
+                allowedIps: await getAllowedIps(site.siteId)
             };
         }));
 

server/routers/gerbil/index.ts

@@ -1,4 +1,2 @@
 export * from "./getConfig";
 export * from "./receiveBandwidth";
-export * from "./updateHolePunch";
-export * from "./getAllRelays";

server/routers/gerbil/receiveBandwidth.ts

@@ -30,13 +30,12 @@ export const receiveBandwidth = async (
                 const { publicKey, bytesIn, bytesOut } = peer;
 
                 // Find the site by public key
-                const [site] = await trx
-                    .select()
-                    .from(sites)
-                    .where(eq(sites.pubKey, publicKey))
-                    .limit(1);
+                const site = await trx.query.sites.findFirst({
+                    where: eq(sites.pubKey, publicKey)
+                });
 
                 if (!site) {
+                    logger.warn(`Site not found for public key: ${publicKey}`);
                     continue;
                 }
                 let online = site.online;

server/routers/gerbil/updateHolePunch.ts

@@ -1,147 +0,0 @@
-import { Request, Response, NextFunction } from "express";
-import { z } from "zod";
-import { clients, newts, olms, Site, sites } from "@server/db/schema";
-import { db } from "@server/db";
-import { eq } from "drizzle-orm";
-import HttpCode from "@server/types/HttpCode";
-import createHttpError from "http-errors";
-import logger from "@server/logger";
-import { fromError } from "zod-validation-error";
-import { validateNewtSessionToken } from "@server/auth/sessions/newt";
-import { validateOlmSessionToken } from "@server/auth/sessions/olm";
-
-// Define Zod schema for request validation
-const updateHolePunchSchema = z.object({
-    olmId: z.string().optional(),
-    newtId: z.string().optional(),
-    token: z.string(),
-    ip: z.string(),
-    port: z.number(),
-    timestamp: z.number()
-});
-
-export async function updateHolePunch(
-    req: Request,
-    res: Response,
-    next: NextFunction
-): Promise<any> {
-    try {
-        // Validate request parameters
-        const parsedParams = updateHolePunchSchema.safeParse(req.body);
-        if (!parsedParams.success) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    fromError(parsedParams.error).toString()
-                )
-            );
-        }
-
-        const { olmId, newtId, ip, port, timestamp, token } = parsedParams.data;
-
-        // logger.debug(`Got hole punch with ip: ${ip}, port: ${port} for olmId: ${olmId} or newtId: ${newtId}`);
-
-        let site: Site | undefined;
-
-        if (olmId) {
-            const { session, olm: olmSession } =
-                await validateOlmSessionToken(token);
-            if (!session || !olmSession) {
-                return next(
-                    createHttpError(HttpCode.UNAUTHORIZED, "Unauthorized")
-                );
-            }
-
-            if (olmId !== olmSession.olmId) {
-                logger.warn(`Olm ID mismatch: ${olmId} !== ${olmSession.olmId}`);
-                return next(
-                    createHttpError(HttpCode.UNAUTHORIZED, "Unauthorized")
-                );
-            }
-
-            const [olm] = await db
-                .select()
-                .from(olms)
-                .where(eq(olms.olmId, olmId));
-
-            if (!olm || !olm.clientId) {
-                logger.warn(`Olm not found: ${olmId}`);
-                return next(
-                    createHttpError(HttpCode.NOT_FOUND, "Olm not found")
-                );
-            }
-
-            const [client] = await db
-                .update(clients)
-                .set({
-                    endpoint: `${ip}:${port}`,
-                    lastHolePunch: timestamp
-                })
-                .where(eq(clients.clientId, olm.clientId))
-                .returning();
-
-            [site] = await db
-                .select()
-                .from(sites)
-                .where(eq(sites.siteId, client.siteId));
-
-        } else if (newtId) {
-            const { session, newt: newtSession } =
-                await validateNewtSessionToken(token);
-
-            if (!session || !newtSession) {
-                return next(
-                    createHttpError(HttpCode.UNAUTHORIZED, "Unauthorized")
-                );
-            }
-
-            if (newtId !== newtSession.newtId) {
-                logger.warn(`Newt ID mismatch: ${newtId} !== ${newtSession.newtId}`);
-                return next(
-                    createHttpError(HttpCode.UNAUTHORIZED, "Unauthorized")
-                );
-            }
-
-            const [newt] = await db
-                .select()
-                .from(newts)
-                .where(eq(newts.newtId, newtId));
-
-            if (!newt || !newt.siteId) {
-                logger.warn(`Newt not found: ${newtId}`);
-                return next(
-                    createHttpError(HttpCode.NOT_FOUND, "New not found")
-                );
-            }
-
-            [site] = await db
-                .update(sites)
-                .set({
-                    endpoint: `${ip}:${port}`,
-                    lastHolePunch: timestamp
-                })
-                .where(eq(sites.siteId, newt.siteId))
-                .returning();
-        }
-
-        if (!site || !site.endpoint || !site.subnet) {
-            logger.warn(
-                `Site not found for olmId: ${olmId} or newtId: ${newtId}`
-            );
-            return next(createHttpError(HttpCode.NOT_FOUND, "Site not found"));
-        }
-
-        return res.status(HttpCode.OK).send({
-            destinationIp: site.subnet.split("/")[0],
-            destinationPort: site.listenPort
-        });
-    } catch (error) {
-        logger.error(error);
-        return next(
-            createHttpError(
-                HttpCode.INTERNAL_SERVER_ERROR,
-                "An error occurred..."
-            )
-        );
-    }
-}

server/routers/internal.ts

@@ -43,8 +43,6 @@ internalRouter.use("/gerbil", gerbilRouter);
 
 gerbilRouter.post("/get-config", gerbil.getConfig);
 gerbilRouter.post("/receive-bandwidth", gerbil.receiveBandwidth);
-gerbilRouter.post("/update-hole-punch", gerbil.updateHolePunch);
-gerbilRouter.post("/get-all-relays", gerbil.getAllRelays);
 
 // Badger routes
 const badgerRouter = Router();

server/routers/messageHandlers.ts

@@ -1,12 +1,6 @@
-import { handleNewtRegisterMessage, handleReceiveBandwidthMessage } from "./newt";
-import { handleOlmRegisterMessage, handleOlmRelayMessage } from "./olm";
-import { handleGetConfigMessage } from "./newt/handleGetConfigMessage";
+import { handleRegisterMessage } from "./newt";
 import { MessageHandler } from "./ws";
 
 export const messageHandlers: Record<string, MessageHandler> = {
-    "newt/wg/register": handleNewtRegisterMessage,
-    "olm/wg/register": handleOlmRegisterMessage,
-    "newt/wg/get-config": handleGetConfigMessage,
-    "newt/receive-bandwidth": handleReceiveBandwidthMessage,
-    "olm/wg/relay": handleOlmRelayMessage
-};
+    "newt/wg/register": handleRegisterMessage,
+};

server/routers/newt/getToken.ts

@@ -24,7 +24,7 @@ export const newtGetTokenBodySchema = z.object({
 
 export type NewtGetTokenBody = z.infer<typeof newtGetTokenBodySchema>;
 
-export async function getNewtToken(
+export async function getToken(
     req: Request,
     res: Response,
     next: NextFunction

server/routers/newt/handleGetConfigMessage.ts

@@ -1,189 +0,0 @@
-import { z } from "zod";
-import { MessageHandler } from "../ws";
-import logger from "@server/logger";
-import { fromError } from "zod-validation-error";
-import db from "@server/db";
-import { clients, Newt, Site, sites } from "@server/db/schema";
-import { eq, isNotNull } from "drizzle-orm";
-import { findNextAvailableCidr } from "@server/lib/ip";
-import config from "@server/lib/config";
-
-const inputSchema = z.object({
-    publicKey: z.string(),
-    port: z.number().int().positive(),
-});
-
-type Input = z.infer<typeof inputSchema>;
-
-export const handleGetConfigMessage: MessageHandler = async (context) => {
-    const { message, client, sendToClient } = context;
-    const newt = client as Newt;
-
-    logger.debug(JSON.stringify(message.data));
-
-    logger.debug("Handling Newt get config message!");
-
-    if (!newt) {
-        logger.warn("Newt not found");
-        return;
-    }
-
-    if (!newt.siteId) {
-        logger.warn("Newt has no site!"); // TODO: Maybe we create the site here?
-        return;
-    }
-
-    const parsed = inputSchema.safeParse(message.data);
-    if (!parsed.success) {
-        logger.error(
-            "handleGetConfigMessage: Invalid input: " +
-                fromError(parsed.error).toString()
-        );
-        return;
-    }
-
-    const { publicKey, port } = message.data as Input;
-
-    const siteId = newt.siteId;
-
-    const [siteRes] = await db
-        .select()
-        .from(sites)
-        .where(eq(sites.siteId, siteId));
-
-    if (!siteRes) {
-        logger.warn("handleGetConfigMessage: Site not found");
-        return;
-    }
-
-    let site: Site | undefined;
-    if (!siteRes.address) {
-        const address = await getNextAvailableSubnet();
-
-        // create a new exit node
-        const [updateRes] = await db
-            .update(sites)
-            .set({
-                publicKey,
-                address,
-                listenPort: port,
-            })
-            .where(eq(sites.siteId, siteId))
-            .returning();
-
-        site = updateRes;
-
-        logger.info(`Updated site ${siteId} with new WG Newt info`);
-    } else {
-        // update the endpoint and the public key
-        const [siteRes] = await db
-            .update(sites)
-            .set({
-                publicKey,
-                listenPort: port,
-            })
-            .where(eq(sites.siteId, siteId))
-            .returning();
-
-        site = siteRes;
-    }
-
-    if (!site) {
-        logger.error("handleGetConfigMessage: Failed to update site");
-        return;
-    }
-
-    const clientsRes = await db
-        .select()
-        .from(clients)
-        .where(eq(clients.siteId, siteId));
-
-    const now = new Date().getTime() / 1000;
-    const peers = await Promise.all(
-        clientsRes
-            .filter((client) => {
-                if (client.lastHolePunch && now - client.lastHolePunch > 6) {
-                    logger.warn("Client last hole punch is too old");
-                    return;
-                }
-            })
-            .map(async (client) => {
-                return {
-                    publicKey: client.pubKey,
-                    allowedIps: [client.subnet],
-                    endpoint: client.endpoint
-                };
-            })
-    );
-
-    const configResponse = {
-        ipAddress: site.address,
-        peers
-    };
-
-    logger.debug("Sending config: ", configResponse);
-
-    return {
-        message: {
-            type: "newt/wg/receive-config", // what to make the response type?
-            data: {
-                ...configResponse
-            }
-        },
-        broadcast: false, // Send to all clients
-        excludeSender: false // Include sender in broadcast
-    };
-};
-
-async function getNextAvailableSubnet(): Promise<string> {
-    const existingAddresses = await db
-        .select({
-            address: sites.address
-        })
-        .from(sites)
-        .where(isNotNull(sites.address));
-
-    const addresses = existingAddresses
-        .map((a) => a.address)
-        .filter((a) => a) as string[];
-
-    let subnet = findNextAvailableCidr(
-        addresses,
-        config.getRawConfig().newt.block_size,
-        config.getRawConfig().newt.subnet_group
-    );
-    if (!subnet) {
-        throw new Error("No available subnets remaining in space");
-    }
-
-    // replace the last octet with 1
-    subnet =
-        subnet.split(".").slice(0, 3).join(".") +
-        ".1" +
-        "/" +
-        subnet.split("/")[1];
-    return subnet;
-}
-
-async function getNextAvailablePort(): Promise<number> {
-    // Get all existing ports from exitNodes table
-    const existingPorts = await db
-        .select({
-            listenPort: sites.listenPort
-        })
-        .from(sites);
-
-    // Find the first available port between 1024 and 65535
-    let nextPort = config.getRawConfig().newt.start_port;
-    for (const port of existingPorts) {
-        if (port.listenPort && port.listenPort > nextPort) {
-            break;
-        }
-        nextPort++;
-        if (nextPort > 65535) {
-            throw new Error("No available ports remaining in space");
-        }
-    }
-
-    return nextPort;
-}

server/routers/newt/handleReceiveBandwidthMessage.ts

@@ -1,69 +0,0 @@
-import db from "@server/db";
-import { MessageHandler } from "../ws";
-import { clients, Newt } from "@server/db/schema";
-import { eq } from "drizzle-orm";
-import logger from "@server/logger";
-
-interface PeerBandwidth {
-    publicKey: string;
-    bytesIn: number;
-    bytesOut: number;
-}
-
-export const handleReceiveBandwidthMessage: MessageHandler = async (context) => {
-    const { message, client, sendToClient } = context;
-
-    if (!message.data.bandwidthData) {
-        logger.warn("No bandwidth data provided");
-    }
-
-    const bandwidthData: PeerBandwidth[] = message.data.bandwidthData;
-
-    if (!Array.isArray(bandwidthData)) {
-        throw new Error("Invalid bandwidth data");
-    }
-
-    await db.transaction(async (trx) => {
-        for (const peer of bandwidthData) {
-            const { publicKey, bytesIn, bytesOut } = peer;
-
-            // Find the client by public key
-            const [client] = await trx
-                .select()
-                .from(clients)
-                .where(eq(clients.pubKey, publicKey))
-                .limit(1);
-
-            if (!client) {
-                continue;
-            }
-            let online = client.online;
-
-            // if the bandwidth for the client is > 0 then set it to online. if it has been less than 0 (no update) for 5 minutes then set it to offline
-            if (bytesIn > 0) { // only track the bytes in because we are always sending bytes out with persistent keep alive
-                online = true;
-            } else if (client.lastBandwidthUpdate) {
-                const lastBandwidthUpdate = new Date(
-                    client.lastBandwidthUpdate
-                );
-                const currentTime = new Date();
-                const diff =
-                    currentTime.getTime() - lastBandwidthUpdate.getTime();
-                if (diff < 300000) {
-                    online = false;
-                }
-            }
-
-            // Update the client's bandwidth usage
-            await trx
-                .update(clients)
-                .set({
-                    megabytesOut: (client.megabytesIn || 0) + bytesIn,
-                    megabytesIn: (client.megabytesOut || 0) + bytesOut,
-                    lastBandwidthUpdate: new Date().toISOString(),
-                    online
-                })
-                .where(eq(clients.clientId, client.clientId));
-        }
-    });
-};

server/routers/newt/handleRegisterMessage.ts

@@ -2,7 +2,6 @@ import db from "@server/db";
 import { MessageHandler } from "../ws";
 import {
     exitNodes,
-    Newt,
     resources,
     sites,
     Target,
@@ -12,11 +11,10 @@ import { eq, and, sql, inArray } from "drizzle-orm";
 import { addPeer, deletePeer } from "../gerbil/peers";
 import logger from "@server/logger";
 
-export const handleNewtRegisterMessage: MessageHandler = async (context) => {
-    const { message, client, sendToClient } = context;
-    const newt = client as Newt;
+export const handleRegisterMessage: MessageHandler = async (context) => {
+    const { message, newt, sendToClient } = context;
 
-    logger.info("Handling register newt message!");
+    logger.info("Handling register message!");
 
     if (!newt) {
         logger.warn("Newt not found");

server/routers/newt/index.ts

@@ -1,4 +1,3 @@
 export * from "./createNewt";
-export * from "./getNewtToken";
-export * from "./handleNewtRegisterMessage";
-export* from "./handleReceiveBandwidthMessage";
+export * from "./getToken";
+export * from "./handleRegisterMessage";

server/routers/newt/peers.ts

@@ -1,52 +0,0 @@
-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';
-
-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);
-    if (!newt) {
-        throw new Error(`Newt not found for site ${siteId}`);
-    }
-
-    sendToClient(newt.newtId, {
-        type: 'newt/wg/peer/add',    
-        data: peer
-    });
-
-    logger.info(`Added peer ${peer.publicKey} to newt ${newt.newtId}`);
-}
-
-export async function deletePeer(siteId: number, publicKey: 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);
-    if (!newt) {
-        throw new Error(`Newt not found for site ${siteId}`);
-    }
-
-    sendToClient(newt.newtId, {
-        type: 'newt/wg/peer/remove',
-        data: {
-            publicKey
-        }
-    });
-
-    logger.info(`Deleted peer ${publicKey} from newt ${newt.newtId}`);
-}

server/routers/olm/createOlm.ts

@@ -1,106 +0,0 @@
-import { NextFunction, Request, Response } from "express";
-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 createHttpError from "http-errors";
-import response from "@server/lib/response";
-import { SqliteError } from "better-sqlite3";
-import moment from "moment";
-import { generateSessionToken } from "@server/auth/sessions/app";
-import { createNewtSession } from "@server/auth/sessions/newt";
-import { fromError } from "zod-validation-error";
-import { hashPassword } from "@server/auth/password";
-
-export const createNewtBodySchema = z.object({});
-
-export type CreateNewtBody = z.infer<typeof createNewtBodySchema>;
-
-export type CreateNewtResponse = {
-    token: string;
-    newtId: string;
-    secret: string;
-};
-
-const createNewtSchema = z
-    .object({
-        newtId: z.string(),
-        secret: z.string()
-    })
-    .strict();
-
-export async function createNewt(
-    req: Request,
-    res: Response,
-    next: NextFunction
-): Promise<any> {
-    try {
-
-        const parsedBody = createNewtSchema.safeParse(req.body);
-        if (!parsedBody.success) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    fromError(parsedBody.error).toString()
-                )
-            );
-        }
-
-        const { newtId, secret } = parsedBody.data;
-
-        if (!req.userOrgRoleId) {
-            return next(
-                createHttpError(HttpCode.FORBIDDEN, "User does not have a role")
-            );
-        }
-
-        const secretHash = await hashPassword(secret);
-
-        await db.insert(newts).values({
-            newtId: newtId,
-            secretHash,
-            dateCreated: moment().toISOString(),
-        });
-
-        // give the newt their default permissions:
-        // await db.insert(newtActions).values({
-        //     newtId: newtId,
-        //     actionId: ActionsEnum.createOrg,
-        //     orgId: null,
-        // });
-
-        const token = generateSessionToken();
-        await createNewtSession(token, newtId);
-
-        return response<CreateNewtResponse>(res, {
-            data: {
-                newtId,
-                secret,
-                token,
-            },
-            success: true,
-            error: false,
-            message: "Newt created successfully",
-            status: HttpCode.OK,
-        });
-    } catch (e) {
-        if (e instanceof SqliteError && e.code === "SQLITE_CONSTRAINT_UNIQUE") {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    "A newt with that email address already exists"
-                )
-            );
-        } else {
-            console.error(e);
-
-            return next(
-                createHttpError(
-                    HttpCode.INTERNAL_SERVER_ERROR,
-                    "Failed to create newt"
-                )
-            );
-        }
-    }
-}

server/routers/olm/getOlmToken.ts

@@ -1,119 +0,0 @@
-import { generateSessionToken } from "@server/auth/sessions/app";
-import db from "@server/db";
-import { olms } from "@server/db/schema";
-import HttpCode from "@server/types/HttpCode";
-import response from "@server/lib/response";
-import { eq } from "drizzle-orm";
-import { NextFunction, Request, Response } from "express";
-import createHttpError from "http-errors";
-import { z } from "zod";
-import { fromError } from "zod-validation-error";
-import {
-    createOlmSession,
-    validateOlmSessionToken
-} from "@server/auth/sessions/olm";
-import { verifyPassword } from "@server/auth/password";
-import logger from "@server/logger";
-import config from "@server/lib/config";
-
-export const olmGetTokenBodySchema = z.object({
-    olmId: z.string(),
-    secret: z.string(),
-    token: z.string().optional()
-});
-
-export type OlmGetTokenBody = z.infer<typeof olmGetTokenBodySchema>;
-
-export async function getOlmToken(
-    req: Request,
-    res: Response,
-    next: NextFunction
-): Promise<any> {
-    const parsedBody = olmGetTokenBodySchema.safeParse(req.body);
-
-    if (!parsedBody.success) {
-        return next(
-            createHttpError(
-                HttpCode.BAD_REQUEST,
-                fromError(parsedBody.error).toString()
-            )
-        );
-    }
-
-    const { olmId, secret, token } = parsedBody.data;
-
-    try {
-        if (token) {
-            const { session, olm } = await validateOlmSessionToken(token);
-            if (session) {
-                if (config.getRawConfig().app.log_failed_attempts) {
-                    logger.info(
-                        `Olm session already valid. Olm ID: ${olmId}. IP: ${req.ip}.`
-                    );
-                }
-                return response<null>(res, {
-                    data: null,
-                    success: true,
-                    error: false,
-                    message: "Token session already valid",
-                    status: HttpCode.OK
-                });
-            }
-        }
-
-        const existingOlmRes = await db
-            .select()
-            .from(olms)
-            .where(eq(olms.olmId, olmId));
-        if (!existingOlmRes || !existingOlmRes.length) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    "No olm found with that olmId"
-                )
-            );
-        }
-
-        const existingOlm = existingOlmRes[0];
-
-        const validSecret = await verifyPassword(
-            secret,
-            existingOlm.secretHash
-        );
-        if (!validSecret) {
-            if (config.getRawConfig().app.log_failed_attempts) {
-                logger.info(
-                    `Olm id or secret is incorrect. Olm: ID ${olmId}. IP: ${req.ip}.`
-                );
-            }
-            return next(
-                createHttpError(HttpCode.BAD_REQUEST, "Secret is incorrect")
-            );
-        }
-
-        logger.debug("Creating new olm session token");
-
-        const resToken = generateSessionToken();
-        await createOlmSession(resToken, existingOlm.olmId);
-
-        logger.debug("Token created successfully");
-
-        return response<{ token: string }>(res, {
-            data: {
-                token: resToken
-            },
-            success: true,
-            error: false,
-            message: "Token created successfully",
-            status: HttpCode.OK
-        });
-    } catch (error) {
-        logger.error(error);
-        return next(
-            createHttpError(
-                HttpCode.INTERNAL_SERVER_ERROR,
-                "Failed to authenticate olm"
-            )
-        );
-    }
-}

server/routers/olm/handleOlmRegisterMessage.ts

@@ -1,127 +0,0 @@
-import db from "@server/db";
-import { MessageHandler } from "../ws";
-import { clients, exitNodes, Olm, olms, sites } from "@server/db/schema";
-import { eq } from "drizzle-orm";
-import { addPeer, deletePeer } from "../newt/peers";
-import logger from "@server/logger";
-
-export const handleOlmRegisterMessage: MessageHandler = async (context) => {
-    const { message, client: c, sendToClient } = context;
-    const olm = c as Olm;
-
-    logger.info("Handling register olm message!");
-
-    if (!olm) {
-        logger.warn("Olm not found");
-        return;
-    }
-
-    if (!olm.clientId) {
-        logger.warn("Olm has no site!"); // TODO: Maybe we create the site here?
-        return;
-    }
-
-    const clientId = olm.clientId;
-
-    const { publicKey } = message.data;
-    if (!publicKey) {
-        logger.warn("Public key not provided");
-        return;
-    }
-
-    const [client] = await db
-        .select()
-        .from(clients)
-        .where(eq(clients.clientId, clientId))
-        .limit(1);
-
-    if (!client || !client.siteId) {
-        logger.warn("Site not found or does not have exit node");
-        return;
-    }
-
-    const [site] = await db
-        .select()
-        .from(sites)
-        .where(eq(sites.siteId, client.siteId))
-        .limit(1);
-
-    if (!site) {
-        logger.warn("Site not found or does not have exit node");
-        return;
-    }
-
-    if (!site.exitNodeId) {
-        logger.warn("Site does not have exit node");
-        return;
-    }
-
-    const [exitNode] = await db
-        .select()
-        .from(exitNodes)
-        .where(eq(exitNodes.exitNodeId, site.exitNodeId))
-        .limit(1);
-
-    sendToClient(olm.olmId, {
-        type: "olm/wg/holepunch",
-        data: {
-            serverPubKey: exitNode.publicKey,
-        }
-    });
-
-    // make sure we hand endpoints for both the site and the client and the lastHolePunch is not too old
-    if (!site.endpoint || !client.endpoint) {
-        logger.warn("Site or client has no endpoint or listen port");
-        return;
-    }
-
-    const now = new Date().getTime() / 1000;
-    if (site.lastHolePunch && now - site.lastHolePunch > 6) {
-        logger.warn("Site last hole punch is too old");
-        return;
-    }
-
-    if (client.lastHolePunch && now - client.lastHolePunch > 6) {
-        logger.warn("Client last hole punch is too old");
-        return;
-    }
-
-    await db
-        .update(clients)
-        .set({
-            pubKey: publicKey
-        })
-        .where(eq(clients.clientId, olm.clientId))
-        .returning();
-
-    if (client.pubKey && client.pubKey !== publicKey) {
-        logger.info("Public key mismatch. Deleting old peer...");
-        await deletePeer(site.siteId, client.pubKey);
-    }
-
-    if (!site.subnet) {
-        logger.warn("Site has no subnet");
-        return;
-    }
-
-    // add the peer to the exit node
-    await addPeer(site.siteId, {
-        publicKey: publicKey,
-        allowedIps: [client.subnet],
-        endpoint: client.endpoint
-    });
-
-    return {
-        message: {
-            type: "olm/wg/connect",
-            data: {
-                endpoint: site.endpoint,
-                publicKey: site.publicKey,
-                serverIP: site.address!.split("/")[0],
-                tunnelIP: `${client.subnet.split("/")[0]}/${site.address!.split("/")[1]}` // put the client ip in the same subnet as the site. TODO: Is this right? Maybe we need th make .subnet work properly!
-            }
-        },
-        broadcast: false, // Send to all olms
-        excludeSender: false // Include sender in broadcast
-    };
-};

server/routers/olm/handleOlmRelayMessage.ts

@@ -1,76 +0,0 @@
-import db from "@server/db";
-import { MessageHandler } from "../ws";
-import { clients, Olm, olms, sites } from "@server/db/schema";
-import { eq } from "drizzle-orm";
-import { addPeer, deletePeer } from "../newt/peers";
-import logger from "@server/logger";
-
-export const handleOlmRelayMessage: MessageHandler = async (context) => {
-    const { message, client: c, sendToClient } = context;
-    const olm = c as Olm;
-
-    logger.info("Handling relay olm message!");
-
-    if (!olm) {
-        logger.warn("Olm not found");
-        return;
-    }
-
-    if (!olm.clientId) {
-        logger.warn("Olm has no site!"); // TODO: Maybe we create the site here?
-        return;
-    }
-
-    const clientId = olm.clientId;
-
-    const [client] = await db
-        .select()
-        .from(clients)
-        .where(eq(clients.clientId, clientId))
-        .limit(1);
-
-    if (!client || !client.siteId) {
-        logger.warn("Site not found or does not have exit node");
-        return;
-    }
-
-    const [site] = await db
-        .select()
-        .from(sites)
-        .where(eq(sites.siteId, client.siteId))
-        .limit(1);
-
-    if (!client) {
-        logger.warn("Site not found or does not have exit node");
-        return;
-    }
-
-    // make sure we hand endpoints for both the site and the client and the lastHolePunch is not too old
-    if (!client.pubKey) {
-        logger.warn("Site or client has no endpoint or listen port");
-        return;
-    }
-
-    if (!site.subnet) {
-        logger.warn("Site has no subnet");
-        return;
-    }
-
-    await deletePeer(site.siteId, client.pubKey);
-
-    // add the peer to the exit node
-    await addPeer(site.siteId, {
-        publicKey: client.pubKey,
-        allowedIps: [client.subnet],
-        endpoint: "" 
-    });
-
-    return {
-        message: {
-            type: "olm/wg/relay-success",
-            data: {}
-        },
-        broadcast: false, // Send to all olms
-        excludeSender: false // Include sender in broadcast
-    };
-};

server/routers/olm/index.ts

@@ -1,4 +0,0 @@
-export * from "./handleOlmRegisterMessage";
-export * from "./getOlmToken";
-export * from "./createOlm";
-export * from "./handleOlmRelayMessage";

server/routers/site/createSite.ts

@@ -35,7 +35,7 @@ const createSiteSchema = z
         subnet: z.string().optional(),
         newtId: z.string().optional(),
         secret: z.string().optional(),
-        type: z.enum(["newt", "wireguard", "local"])
+        type: z.string()
     })
     .strict();
 

server/routers/site/pickSiteDefaults.ts

@@ -45,7 +45,7 @@ export async function pickSiteDefaults(
         // list all of the sites on that exit node
         const sitesQuery = await db
             .select({
-                subnet: sites.subnet
+                subnet: sites.subnet,
             })
             .from(sites)
             .where(eq(sites.exitNodeId, exitNode.exitNodeId));
@@ -53,17 +53,8 @@ export async function pickSiteDefaults(
         // TODO: we need to lock this subnet for some time so someone else does not take it
         let subnets = sitesQuery.map((site) => site.subnet);
         // exclude the exit node address by replacing after the / with a site block size
-        subnets.push(
-            exitNode.address.replace(
-                /\/\d+$/,
-                `/${config.getRawConfig().gerbil.site_block_size}`
-            )
-        );
-        const newSubnet = findNextAvailableCidr(
-            subnets,
-            config.getRawConfig().gerbil.site_block_size,
-            exitNode.address
-        );
+        subnets.push(exitNode.address.replace(/\/\d+$/, `/${config.getRawConfig().gerbil.site_block_size}`));
+        const newSubnet = findNextAvailableCidr(subnets, config.getRawConfig().gerbil.site_block_size, exitNode.address);
         if (!newSubnet) {
             return next(
                 createHttpError(
@@ -84,15 +75,14 @@ export async function pickSiteDefaults(
                 name: exitNode.name,
                 listenPort: exitNode.listenPort,
                 endpoint: exitNode.endpoint,
-                // subnet: `${newSubnet.split("/")[0]}/${config.getRawConfig().gerbil.block_size}`, // we want the block size of the whole subnet
                 subnet: newSubnet,
                 newtId,
-                newtSecret: secret
+                newtSecret: secret,
             },
             success: true,
             error: false,
             message: "Organization retrieved successfully",
-            status: HttpCode.OK
+            status: HttpCode.OK,
         });
     } catch (error) {
         logger.error(error);

server/routers/supporterKey/isSupporterKeyVisible.ts

@@ -10,6 +10,7 @@ import { users } from "@server/db/schema";
 
 export type IsSupporterKeyVisibleResponse = {
     visible: boolean;
+    tier?: string;
 };
 
 const USER_LIMIT = 5;
@@ -29,16 +30,17 @@ export async function isSupporterKeyVisible(
             const [numUsers] = await db.select({ count: count() }).from(users);
 
             if (numUsers.count > USER_LIMIT) {
+                logger.debug(
+                    `User count ${numUsers.count} exceeds limit ${USER_LIMIT}`
+                );
                 visible = true;
             }
         }
 
-        logger.debug(`Supporter key visible: ${visible}`);
-        logger.debug(JSON.stringify(key));
-
         return sendResponse<IsSupporterKeyVisibleResponse>(res, {
             data: {
-                visible
+                visible,
+                tier: key?.tier || undefined
             },
             success: true,
             error: false,

server/routers/user/adminListUsers.ts

@@ -31,6 +31,7 @@ async function queryUsers(limit: number, offset: number) {
             id: users.userId,
             email: users.email,
             dateCreated: users.dateCreated,
+            serverAdmin: users.serverAdmin
         })
         .from(users)
         .where(eq(users.serverAdmin, false))
@@ -60,10 +61,7 @@ export async function adminListUsers(
         }
         const { limit, offset } = parsedQuery.data;
 
-        const allUsers = await queryUsers(
-            limit,
-            offset
-        );
+        const allUsers = await queryUsers(limit, offset);
 
         const [{ count }] = await db
             .select({ count: sql<number>`count(*)` })

server/routers/user/adminRemoveUser.ts

@@ -1,8 +1,8 @@
 import { Request, Response, NextFunction } from "express";
 import { z } from "zod";
 import { db } from "@server/db";
-import { userOrgs, users } from "@server/db/schema";
-import { and, eq } from "drizzle-orm";
+import { users } from "@server/db/schema";
+import { eq } from "drizzle-orm";
 import response from "@server/lib/response";
 import HttpCode from "@server/types/HttpCode";
 import createHttpError from "http-errors";
@@ -36,13 +36,22 @@ export async function adminRemoveUser(
         // get the user first
         const user = await db
             .select()
-            .from(userOrgs)
-            .where(eq(userOrgs.userId, userId));
+            .from(users)
+            .where(eq(users.userId, userId));
 
         if (!user || user.length === 0) {
             return next(createHttpError(HttpCode.NOT_FOUND, "User not found"));
         }
 
+        if (user[0].serverAdmin) {
+            return next(
+                createHttpError(
+                    HttpCode.BAD_REQUEST,
+                    "Cannot remove server admin"
+                )
+            );
+        }
+
         await db.delete(users).where(eq(users.userId, userId));
 
         return response(res, {

server/routers/user/index.ts

@@ -6,4 +6,4 @@ export * from "./inviteUser";
 export * from "./acceptInvite";
 export * from "./getOrgUser";
 export * from "./adminListUsers";
-export * from "./adminRemoveUser";
+export * from "./adminRemoveUser";

server/routers/ws.ts

@@ -3,11 +3,10 @@ import { Server as HttpServer } from "http";
 import { WebSocket, WebSocketServer } from "ws";
 import { IncomingMessage } from "http";
 import { Socket } from "net";
-import { Newt, newts, NewtSession, Olm, olms, OlmSession } from "@server/db/schema";
+import { Newt, newts, NewtSession } from "@server/db/schema";
 import { eq } from "drizzle-orm";
 import db from "@server/db";
 import { validateNewtSessionToken } from "@server/auth/sessions/newt";
-import { validateOlmSessionToken } from "@server/auth/sessions/olm";
 import { messageHandlers } from "./messageHandlers";
 import logger from "@server/logger";
 
@@ -16,17 +15,13 @@ interface WebSocketRequest extends IncomingMessage {
     token?: string;
 }
 
-type ClientType = 'newt' | 'olm';
-
 interface AuthenticatedWebSocket extends WebSocket {
-    client?: Newt | Olm;
-    clientType?: ClientType;
+    newt?: Newt;
 }
 
 interface TokenPayload {
-    client: Newt | Olm;
-    session: NewtSession | OlmSession;
-    clientType: ClientType;
+    newt: Newt;
+    session: NewtSession;
 }
 
 interface WSMessage {
@@ -38,16 +33,15 @@ interface HandlerResponse {
     message: WSMessage;
     broadcast?: boolean;
     excludeSender?: boolean;
-    targetClientId?: string;
+    targetNewtId?: string;
 }
 
 interface HandlerContext {
     message: WSMessage;
     senderWs: WebSocket;
-    client: Newt | Olm | undefined;
-    clientType: ClientType;
-    sendToClient: (clientId: string, message: WSMessage) => boolean;
-    broadcastToAllExcept: (message: WSMessage, excludeClientId?: string) => void;
+    newt: Newt | undefined;
+    sendToClient: (newtId: string, message: WSMessage) => boolean;
+    broadcastToAllExcept: (message: WSMessage, excludeNewtId?: string) => void;
     connectedClients: Map<string, WebSocket[]>;
 }
 
@@ -60,32 +54,34 @@ const wss: WebSocketServer = new WebSocketServer({ noServer: true });
 let connectedClients: Map<string, AuthenticatedWebSocket[]> = new Map();
 
 // Helper functions for client management
-const addClient = (clientId: string, ws: AuthenticatedWebSocket, clientType: ClientType): void => {
-    const existingClients = connectedClients.get(clientId) || [];
+const addClient = (newtId: string, ws: AuthenticatedWebSocket): void => {
+    const existingClients = connectedClients.get(newtId) || [];
     existingClients.push(ws);
-    connectedClients.set(clientId, existingClients);
-    logger.info(`Client added to tracking - ${clientType.toUpperCase()} ID: ${clientId}, Total connections: ${existingClients.length}`);
+    connectedClients.set(newtId, existingClients);
+    logger.info(`Client added to tracking - Newt ID: ${newtId}, Total connections: ${existingClients.length}`);
 };
 
-const removeClient = (clientId: string, ws: AuthenticatedWebSocket, clientType: ClientType): void => {
-    const existingClients = connectedClients.get(clientId) || [];
+const removeClient = (newtId: string, ws: AuthenticatedWebSocket): void => {
+    const existingClients = connectedClients.get(newtId) || [];
     const updatedClients = existingClients.filter(client => client !== ws);
+
     if (updatedClients.length === 0) {
-        connectedClients.delete(clientId);
-        logger.info(`All connections removed for ${clientType.toUpperCase()} ID: ${clientId}`);
+        connectedClients.delete(newtId);
+        logger.info(`All connections removed for Newt ID: ${newtId}`);
     } else {
-        connectedClients.set(clientId, updatedClients);
-        logger.info(`Connection removed - ${clientType.toUpperCase()} ID: ${clientId}, Remaining connections: ${updatedClients.length}`);
+        connectedClients.set(newtId, updatedClients);
+        logger.info(`Connection removed - Newt ID: ${newtId}, Remaining connections: ${updatedClients.length}`);
     }
 };
 
 // Helper functions for sending messages
-const sendToClient = (clientId: string, message: WSMessage): boolean => {
-    const clients = connectedClients.get(clientId);
+const sendToClient = (newtId: string, message: WSMessage): boolean => {
+    const clients = connectedClients.get(newtId);
     if (!clients || clients.length === 0) {
-        logger.info(`No active connections found for Client ID: ${clientId}`);
+        logger.info(`No active connections found for Newt ID: ${newtId}`);
         return false;
     }
+
     const messageString = JSON.stringify(message);
     clients.forEach(client => {
         if (client.readyState === WebSocket.OPEN) {
@@ -95,9 +91,9 @@ const sendToClient = (clientId: string, message: WSMessage): boolean => {
     return true;
 };
 
-const broadcastToAllExcept = (message: WSMessage, excludeClientId?: string): void => {
-    connectedClients.forEach((clients, clientId) => {
-        if (clientId !== excludeClientId) {
+const broadcastToAllExcept = (message: WSMessage, excludeNewtId?: string): void => {
+    connectedClients.forEach((clients, newtId) => {
+        if (newtId !== excludeNewtId) {
             clients.forEach(client => {
                 if (client.readyState === WebSocket.OPEN) {
                     client.send(JSON.stringify(message));
@@ -107,88 +103,84 @@ const broadcastToAllExcept = (message: WSMessage, excludeClientId?: string): voi
     });
 };
 
-// Token verification middleware
-const verifyToken = async (token: string, clientType: ClientType): Promise<TokenPayload | null> => {
+// Token verification middleware (unchanged)
+const verifyToken = async (token: string): Promise<TokenPayload | null> => {
     try {
-        if (clientType === 'newt') {
-            const { session, newt } = await validateNewtSessionToken(token);
-            if (!session || !newt) {
-                return null;
-            }
-            const existingNewt = await db
-                .select()
-                .from(newts)
-                .where(eq(newts.newtId, newt.newtId));
-            if (!existingNewt || !existingNewt[0]) {
-                return null;
-            }
-            return { client: existingNewt[0], session, clientType };
-        } else {
-            const { session, olm } = await validateOlmSessionToken(token);
-            if (!session || !olm) {
-                return null;
-            }
-            const existingOlm = await db
-                .select()
-                .from(olms)
-                .where(eq(olms.olmId, olm.olmId));
-            if (!existingOlm || !existingOlm[0]) {
-                return null;
-            }
-            return { client: existingOlm[0], session, clientType };
+        const { session, newt } = await validateNewtSessionToken(token);
+
+        if (!session || !newt) {
+            return null;
         }
+
+        const existingNewt = await db
+            .select()
+            .from(newts)
+            .where(eq(newts.newtId, newt.newtId));
+
+        if (!existingNewt || !existingNewt[0]) {
+            return null;
+        }
+
+        return { newt: existingNewt[0], session };
     } catch (error) {
         logger.error("Token verification failed:", error);
         return null;
     }
 };
 
-const setupConnection = (ws: AuthenticatedWebSocket, client: Newt | Olm, clientType: ClientType): void => {
+const setupConnection = (ws: AuthenticatedWebSocket, newt: Newt): void => {
     logger.info("Establishing websocket connection");
-    if (!client) {
-        logger.error("Connection attempt without client");
+
+    if (!newt) {
+        logger.error("Connection attempt without newt");
         return ws.terminate();
     }
 
-    ws.client = client;
-    ws.clientType = clientType;
+    ws.newt = newt;
 
     // Add client to tracking
-    const clientId = clientType === 'newt' ? (client as Newt).newtId : (client as Olm).olmId;
-    addClient(clientId, ws, clientType);
+    addClient(newt.newtId, ws);
 
     ws.on("message", async (data) => {
         try {
             const message: WSMessage = JSON.parse(data.toString());
+            // logger.info(`Message received from Newt ID ${newtId}:`, message);
 
+            // Validate message format
             if (!message.type || typeof message.type !== "string") {
                 throw new Error("Invalid message format: missing or invalid type");
             }
 
+            // Get the appropriate handler for the message type
             const handler = messageHandlers[message.type];
             if (!handler) {
                 throw new Error(`Unsupported message type: ${message.type}`);
             }
 
+            // Process the message and get response
             const response = await handler({
                 message,
                 senderWs: ws,
-                client: ws.client,
-                clientType: ws.clientType!,
+                newt: ws.newt,
                 sendToClient,
                 broadcastToAllExcept,
                 connectedClients
             });
 
+            // Send response if one was returned
             if (response) {
                 if (response.broadcast) {
-                    broadcastToAllExcept(response.message, response.excludeSender ? clientId : undefined);
-                } else if (response.targetClientId) {
-                    sendToClient(response.targetClientId, response.message);
+                    // Broadcast to all clients except sender if specified
+                    broadcastToAllExcept(response.message, response.excludeSender ? newt.newtId : undefined);
+                } else if (response.targetNewtId) {
+                    // Send to specific client if targetNewtId is provided
+                    sendToClient(response.targetNewtId, response.message);
                 } else {
+                    // Send back to sender
                     ws.send(JSON.stringify(response.message));
                 }
             }
+
         } catch (error) {
             logger.error("Message handling error:", error);
             ws.send(JSON.stringify({
@@ -202,18 +194,18 @@ const setupConnection = (ws: AuthenticatedWebSocket, client: Newt | Olm, clientT
     });
 
     ws.on("close", () => {
-        removeClient(clientId, ws, clientType);
-        logger.info(`Client disconnected - ${clientType.toUpperCase()} ID: ${clientId}`);
+        removeClient(newt.newtId, ws);
+        logger.info(`Client disconnected - Newt ID: ${newt.newtId}`);
     });
 
     ws.on("error", (error: Error) => {
-        logger.error(`WebSocket error for ${clientType.toUpperCase()} ID ${clientId}:`, error);
+        logger.error(`WebSocket error for Newt ID ${newt.newtId}:`, error);
     });
 
-    logger.info(`WebSocket connection established - ${clientType.toUpperCase()} ID: ${clientId}`);
+    logger.info(`WebSocket connection established - Newt ID: ${newt.newtId}`);
 };
 
-// Router endpoint
+// Router endpoint (unchanged)
 router.get("/ws", (req: Request, res: Response) => {
     res.status(200).send("WebSocket endpoint");
 });
@@ -222,22 +214,18 @@ router.get("/ws", (req: Request, res: Response) => {
 const handleWSUpgrade = (server: HttpServer): void => {
     server.on("upgrade", async (request: WebSocketRequest, socket: Socket, head: Buffer) => {
         try {
-            const url = new URL(request.url || '', `http://${request.headers.host}`);
-            const token = url.searchParams.get('token') || request.headers["sec-websocket-protocol"] || '';
-            let clientType = url.searchParams.get('clientType') as ClientType;
+            const token = request.url?.includes("?")
+                ? new URLSearchParams(request.url.split("?")[1]).get("token") || ""
+                : request.headers["sec-websocket-protocol"];
 
-            if (!clientType) {
-                clientType = "newt";
-            }
-
-            if (!token || !clientType || !['newt', 'olm'].includes(clientType)) {
-                logger.warn("Unauthorized connection attempt: invalid token or client type...");
+            if (!token) {
+                logger.warn("Unauthorized connection attempt: no token...");
                 socket.write("HTTP/1.1 401 Unauthorized\r\n\r\n");
                 socket.destroy();
                 return;
             }
 
-            const tokenPayload = await verifyToken(token, clientType);
+            const tokenPayload = await verifyToken(token);
             if (!tokenPayload) {
                 logger.warn("Unauthorized connection attempt: invalid token...");
                 socket.write("HTTP/1.1 401 Unauthorized\r\n\r\n");
@@ -246,7 +234,7 @@ const handleWSUpgrade = (server: HttpServer): void => {
             }
 
             wss.handleUpgrade(request, socket, head, (ws: AuthenticatedWebSocket) => {
-                setupConnection(ws, tokenPayload.client, tokenPayload.clientType);
+                setupConnection(ws, tokenPayload.newt);
             });
         } catch (error) {
             logger.error("WebSocket upgrade error:", error);
@@ -262,4 +250,4 @@ export {
     sendToClient,
     broadcastToAllExcept,
     connectedClients
-};
+};

src/app/[orgId]/settings/clients/ClientsTable.tsx

@@ -1,301 +0,0 @@
-"use client";
-
-import { ColumnDef } from "@tanstack/react-table";
-import { ClientsDataTable } from "./ClientsDataTable";
-import {
-    DropdownMenu,
-    DropdownMenuContent,
-    DropdownMenuItem,
-    DropdownMenuTrigger
-} from "@app/components/ui/dropdown-menu";
-import { Button } from "@app/components/ui/button";
-import {
-    ArrowRight,
-    ArrowUpDown,
-    ArrowUpRight,
-    Check,
-    MoreHorizontal,
-    X
-} from "lucide-react";
-import Link from "next/link";
-import { useRouter } from "next/navigation";
-import { useState } from "react";
-import ConfirmDeleteDialog from "@app/components/ConfirmDeleteDialog";
-import { toast } from "@app/hooks/useToast";
-import { formatAxiosError } from "@app/lib/api";
-import { createApiClient } from "@app/lib/api";
-import { useEnvContext } from "@app/hooks/useEnvContext";
-import CreateClientFormModal from "./CreateClientsModal";
-
-export type ClientRow = {
-    id: number;
-    siteId: string;
-    siteName: string;
-    name: string;
-    mbIn: string;
-    mbOut: string;
-    orgId: string;
-    online: boolean;
-};
-
-type ClientTableProps = {
-    clients: ClientRow[];
-    orgId: string;
-};
-
-export default function ClientsTable({ clients, orgId }: ClientTableProps) {
-    const router = useRouter();
-
-    const [isCreateModalOpen, setIsCreateModalOpen] = useState(false);
-    const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
-    const [selectedClient, setSelectedClient] = useState<ClientRow | null>(
-        null
-    );
-    const [rows, setRows] = useState<ClientRow[]>(clients);
-
-    const api = createApiClient(useEnvContext());
-
-    const deleteSite = (clientId: number) => {
-        api.delete(`/client/${clientId}`)
-            .catch((e) => {
-                console.error("Error deleting client", e);
-                toast({
-                    variant: "destructive",
-                    title: "Error deleting client",
-                    description: formatAxiosError(e, "Error deleting client")
-                });
-            })
-            .then(() => {
-                router.refresh();
-                setIsDeleteModalOpen(false);
-
-                const newRows = rows.filter((row) => row.id !== clientId);
-
-                setRows(newRows);
-            });
-    };
-
-    const columns: ColumnDef<ClientRow>[] = [
-        {
-            id: "dots",
-            cell: ({ row }) => {
-                const clientRow = row.original;
-                const router = useRouter();
-
-                return (
-                    <DropdownMenu>
-                        <DropdownMenuTrigger asChild>
-                            <Button variant="ghost" className="h-8 w-8 p-0">
-                                <span className="sr-only">Open menu</span>
-                                <MoreHorizontal className="h-4 w-4" />
-                            </Button>
-                        </DropdownMenuTrigger>
-                        <DropdownMenuContent align="end">
-                            {/* <Link */}
-                            {/*     className="block w-full" */}
-                            {/*     href={`/${clientRow.orgId}/settings/sites/${clientRow.nice}`} */}
-                            {/* > */}
-                            {/*     <DropdownMenuItem> */}
-                            {/*         View settings */}
-                            {/*     </DropdownMenuItem> */}
-                            {/* </Link> */}
-                            <DropdownMenuItem
-                                onClick={() => {
-                                    setSelectedClient(clientRow);
-                                    setIsDeleteModalOpen(true);
-                                }}
-                            >
-                                <span className="text-red-500">Delete</span>
-                            </DropdownMenuItem>
-                        </DropdownMenuContent>
-                    </DropdownMenu>
-                );
-            }
-        },
-        {
-            accessorKey: "name",
-            header: ({ column }) => {
-                return (
-                    <Button
-                        variant="ghost"
-                        onClick={() =>
-                            column.toggleSorting(column.getIsSorted() === "asc")
-                        }
-                    >
-                        Name
-                        <ArrowUpDown className="ml-2 h-4 w-4" />
-                    </Button>
-                );
-            }
-        },
-        {
-            accessorKey: "siteName",
-            header: ({ column }) => {
-                return (
-                    <Button
-                        variant="ghost"
-                        onClick={() =>
-                            column.toggleSorting(column.getIsSorted() === "asc")
-                        }
-                    >
-                        Site
-                        <ArrowUpDown className="ml-2 h-4 w-4" />
-                    </Button>
-                );
-            },
-            cell: ({ row }) => {
-                const r = row.original;
-                return (
-                    <Link href={`/${r.orgId}/settings/sites/${r.siteId}`}>
-                        <Button variant="outline">
-                            {r.siteName}
-                            <ArrowUpRight className="ml-2 h-4 w-4" />
-                        </Button>
-                    </Link>
-                );
-            }
-        },
-        {
-            accessorKey: "online",
-            header: ({ column }) => {
-                return (
-                    <Button
-                        variant="ghost"
-                        onClick={() =>
-                            column.toggleSorting(column.getIsSorted() === "asc")
-                        }
-                    >
-                        Connectivity
-                        <ArrowUpDown className="ml-2 h-4 w-4" />
-                    </Button>
-                );
-            },
-            cell: ({ row }) => {
-                const originalRow = row.original;
-                if (originalRow.online) {
-                    return (
-                        <span className="text-green-500 flex items-center space-x-2">
-                            <div className="w-2 h-2 bg-green-500 rounded-full"></div>
-                            <span>Connected</span>
-                        </span>
-                    );
-                } else {
-                    return (
-                        <span className="text-neutral-500 flex items-center space-x-2">
-                            <div className="w-2 h-2 bg-gray-500 rounded-full"></div>
-                            <span>Disconnected</span>
-                        </span>
-                    );
-                }
-            }
-        },
-        {
-            accessorKey: "mbIn",
-            header: ({ column }) => {
-                return (
-                    <Button
-                        variant="ghost"
-                        onClick={() =>
-                            column.toggleSorting(column.getIsSorted() === "asc")
-                        }
-                    >
-                        Data In
-                        <ArrowUpDown className="ml-2 h-4 w-4" />
-                    </Button>
-                );
-            }
-        },
-        {
-            accessorKey: "mbOut",
-            header: ({ column }) => {
-                return (
-                    <Button
-                        variant="ghost"
-                        onClick={() =>
-                            column.toggleSorting(column.getIsSorted() === "asc")
-                        }
-                    >
-                        Data Out
-                        <ArrowUpDown className="ml-2 h-4 w-4" />
-                    </Button>
-                );
-            }
-        }
-        // {
-        //     id: "actions",
-        //     cell: ({ row }) => {
-        //         const siteRow = row.original;
-        //         return (
-        //             <div className="flex items-center justify-end">
-        //                 <Link
-        //                     href={`/${siteRow.orgId}/settings/sites/${siteRow.nice}`}
-        //                 >
-        //                     <Button variant={"outline"} className="ml-2">
-        //                         Edit
-        //                         <ArrowRight className="ml-2 w-4 h-4" />
-        //                     </Button>
-        //                 </Link>
-        //             </div>
-        //         );
-        //     }
-        // }
-    ];
-
-    return (
-        <>
-            <CreateClientFormModal
-                open={isCreateModalOpen}
-                setOpen={setIsCreateModalOpen}
-                onCreate={(val) => {
-                    setRows([val, ...rows]);
-                }}
-                orgId={orgId}
-            />
-
-            {selectedClient && (
-                <ConfirmDeleteDialog
-                    open={isDeleteModalOpen}
-                    setOpen={(val) => {
-                        setIsDeleteModalOpen(val);
-                        setSelectedClient(null);
-                    }}
-                    dialog={
-                        <div className="space-y-4">
-                            <p>
-                                Are you sure you want to remove the client{" "}
-                                <b>
-                                    {selectedClient?.name || selectedClient?.id}
-                                </b>{" "}
-                                from the site and organization?
-                            </p>
-
-                            <p>
-                                <b>
-                                    Once removed, the client will no longer be
-                                    able to connect to the site.{" "}
-                                </b>
-                            </p>
-
-                            <p>
-                                To confirm, please type the name of the client
-                                below.
-                            </p>
-                        </div>
-                    }
-                    buttonText="Confirm Delete Client"
-                    onConfirm={async () => deleteSite(selectedClient!.id)}
-                    string={selectedClient.name}
-                    title="Delete Client"
-                />
-            )}
-
-            <ClientsDataTable
-                columns={columns}
-                data={rows}
-                addClient={() => {
-                    setIsCreateModalOpen(true);
-                }}
-            />
-        </>
-    );
-}

src/app/[orgId]/settings/clients/CreateClientsForm.tsx

@@ -1,345 +0,0 @@
-"use client";
-
-import {
-    Form,
-    FormControl,
-    FormDescription,
-    FormField,
-    FormItem,
-    FormLabel,
-    FormMessage
-} from "@app/components/ui/form";
-import { Input } from "@app/components/ui/input";
-import { toast } from "@app/hooks/useToast";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useEffect, useState } from "react";
-import { useForm } from "react-hook-form";
-import { z } from "zod";
-import CopyTextBox from "@app/components/CopyTextBox";
-import { Checkbox } from "@app/components/ui/checkbox";
-import { formatAxiosError } from "@app/lib/api";
-import { createApiClient } from "@app/lib/api";
-import { useEnvContext } from "@app/hooks/useEnvContext";
-import { AxiosResponse } from "axios";
-import { Collapsible } from "@app/components/ui/collapsible";
-import { ClientRow } from "./ClientsTable";
-import {
-    CreateClientBody,
-    CreateClientResponse,
-    PickClientDefaultsResponse
-} from "@server/routers/client";
-import { ListSitesResponse } from "@server/routers/site";
-import {
-    Popover,
-    PopoverContent,
-    PopoverTrigger
-} from "@app/components/ui/popover";
-import { Button } from "@app/components/ui/button";
-import { cn } from "@app/lib/cn";
-import { CaretSortIcon, CheckIcon } from "@radix-ui/react-icons";
-import {
-    Command,
-    CommandEmpty,
-    CommandGroup,
-    CommandInput,
-    CommandItem,
-    CommandList
-} from "@app/components/ui/command";
-
-const createClientFormSchema = z.object({
-    name: z
-        .string()
-        .min(2, {
-            message: "Name must be at least 2 characters."
-        })
-        .max(30, {
-            message: "Name must not be longer than 30 characters."
-        }),
-    siteId: z.coerce.number()
-});
-
-type CreateSiteFormValues = z.infer<typeof createClientFormSchema>;
-
-const defaultValues: Partial<CreateSiteFormValues> = {
-    name: ""
-};
-
-type CreateSiteFormProps = {
-    onCreate?: (client: ClientRow) => void;
-    setLoading?: (loading: boolean) => void;
-    setChecked?: (checked: boolean) => void;
-    orgId: string;
-};
-
-export default function CreateClientForm({
-    onCreate,
-    setLoading,
-    setChecked,
-    orgId
-}: CreateSiteFormProps) {
-    const api = createApiClient(useEnvContext());
-    const { env } = useEnvContext();
-
-    const [sites, setSites] = useState<ListSitesResponse["sites"]>([]);
-    const [isLoading, setIsLoading] = useState(false);
-    const [isChecked, setIsChecked] = useState(false);
-    const [isOpen, setIsOpen] = useState(false);
-    const [clientDefaults, setClientDefaults] =
-        useState<PickClientDefaultsResponse | null>(null);
-    const [olmCommand, setOlmCommand] = useState<string | null>(null);
-
-    const handleCheckboxChange = (checked: boolean) => {
-        setIsChecked(checked);
-        if (setChecked) {
-            setChecked(checked);
-        }
-    };
-
-    const form = useForm<CreateSiteFormValues>({
-        resolver: zodResolver(createClientFormSchema),
-        defaultValues
-    });
-
-    useEffect(() => {
-        if (!open) return;
-
-        // reset all values
-        setLoading?.(false);
-        setIsLoading(false);
-        form.reset();
-        setChecked?.(false);
-        setClientDefaults(null);
-
-        const fetchSites = async () => {
-            const res = await api.get<AxiosResponse<ListSitesResponse>>(
-                `/org/${orgId}/sites/`
-            );
-            const sites = res.data.data.sites.filter(
-                (s) => s.type === "newt" && s.subnet
-            );
-            setSites(sites);
-
-            if (sites.length > 0) {
-                form.setValue("siteId", sites[0].siteId);
-            }
-        };
-
-        fetchSites();
-    }, [open]);
-
-    useEffect(() => {
-        const siteId = form.getValues("siteId");
-
-        if (siteId === undefined || siteId === null) return;
-
-        api.get(`/site/${siteId}/pick-client-defaults`)
-            .catch((e) => {
-                toast({
-                    variant: "destructive",
-                    title: `Error fetching client defaults for site ${siteId}`,
-                    description: formatAxiosError(e)
-                });
-            })
-            .then((res) => {
-                if (res && res.status === 200) {
-                    const data = res.data.data;
-                    setClientDefaults(data);
-                    const olmConfig = `olm --id ${data?.olmId} --secret ${data?.olmSecret} --endpoint ${env.app.dashboardUrl}`;
-                    setOlmCommand(olmConfig);
-                }
-            });
-    }, [form.watch("siteId")]);
-
-    async function onSubmit(data: CreateSiteFormValues) {
-        setLoading?.(true);
-        setIsLoading(true);
-
-        if (!clientDefaults) {
-            toast({
-                variant: "destructive",
-                title: "Error creating site",
-                description: "Site defaults not found"
-            });
-            setLoading?.(false);
-            setIsLoading(false);
-            return;
-        }
-
-        const payload = {
-            name: data.name,
-            siteId: data.siteId,
-            subnet: clientDefaults.subnet,
-            olmId: clientDefaults.olmId,
-            secret: clientDefaults.olmSecret,
-            type: "olm"
-        } as CreateClientBody;
-
-        const res = await api
-            .put<
-                AxiosResponse<CreateClientResponse>
-            >(`/site/${data.siteId}/client`, payload)
-            .catch((e) => {
-                toast({
-                    variant: "destructive",
-                    title: "Error creating client",
-                    description: formatAxiosError(e)
-                });
-            });
-
-        if (res && res.status === 201) {
-            const data = res.data.data;
-
-            const site = sites.find((site) => site.siteId === data.siteId);
-
-            onCreate?.({
-                name: data.name,
-                siteId: site!.niceId,
-                siteName: site!.name,
-                id: data.clientId,
-                mbIn: "0 MB",
-                mbOut: "0 MB",
-                orgId: orgId as string,
-                online: false
-            });
-        }
-
-        setLoading?.(false);
-        setIsLoading(false);
-    }
-
-    return (
-        <div className="space-y-4">
-            <Form {...form}>
-                <form
-                    onSubmit={form.handleSubmit(onSubmit)}
-                    className="space-y-4"
-                    id="create-site-form"
-                >
-                    <FormField
-                        control={form.control}
-                        name="name"
-                        render={({ field }) => (
-                            <FormItem>
-                                <FormLabel>Name</FormLabel>
-                                <FormControl>
-                                    <Input
-                                        autoComplete="off"
-                                        placeholder="Client name"
-                                        {...field}
-                                    />
-                                </FormControl>
-                                <FormMessage />
-                            </FormItem>
-                        )}
-                    />
-
-                    <FormField
-                        control={form.control}
-                        name="siteId"
-                        render={({ field }) => (
-                            <FormItem className="flex flex-col">
-                                <FormLabel>Site</FormLabel>
-                                <Popover>
-                                    <PopoverTrigger asChild>
-                                        <FormControl>
-                                            <Button
-                                                variant="outline"
-                                                role="combobox"
-                                                className={cn(
-                                                    "justify-between",
-                                                    !field.value &&
-                                                        "text-muted-foreground"
-                                                )}
-                                            >
-                                                {field.value
-                                                    ? sites.find(
-                                                          (site) =>
-                                                              site.siteId ===
-                                                              field.value
-                                                      )?.name
-                                                    : "Select site"}
-                                                <CaretSortIcon className="ml-2 h-4 w-4 shrink-0 opacity-50" />
-                                            </Button>
-                                        </FormControl>
-                                    </PopoverTrigger>
-                                    <PopoverContent className="p-0">
-                                        <Command>
-                                            <CommandInput placeholder="Search site..." />
-                                            <CommandList>
-                                                <CommandEmpty>
-                                                    No site found.
-                                                </CommandEmpty>
-                                                <CommandGroup>
-                                                    {sites.map((site) => (
-                                                        <CommandItem
-                                                            value={`${site.siteId}:${site.name}:${site.niceId}`}
-                                                            key={site.siteId}
-                                                            onSelect={() => {
-                                                                form.setValue(
-                                                                    "siteId",
-                                                                    site.siteId
-                                                                );
-                                                            }}
-                                                        >
-                                                            <CheckIcon
-                                                                className={cn(
-                                                                    "mr-2 h-4 w-4",
-                                                                    site.siteId ===
-                                                                        field.value
-                                                                        ? "opacity-100"
-                                                                        : "opacity-0"
-                                                                )}
-                                                            />
-                                                            {site.name}
-                                                        </CommandItem>
-                                                    ))}
-                                                </CommandGroup>
-                                            </CommandList>
-                                        </Command>
-                                    </PopoverContent>
-                                </Popover>
-                                <FormDescription>
-                                    The client will be have connectivity to this
-                                    site. The site must be configured to accept
-                                    client connections.
-                                </FormDescription>
-                                <FormMessage />
-                            </FormItem>
-                        )}
-                    />
-
-                    {olmCommand && (
-                        <div className="w-full">
-                            <div className="mb-2">
-                                <div className="mx-auto">
-                                    <CopyTextBox
-                                        text={olmCommand}
-                                        wrapText={false}
-                                    />
-                                </div>
-                            </div>
-                            <span className="text-sm text-muted-foreground">
-                                You will only be able to see the configuration
-                                once.
-                            </span>
-                        </div>
-                    )}
-
-                    <div className="flex items-center space-x-2">
-                        <Checkbox
-                            id="terms"
-                            checked={isChecked}
-                            onCheckedChange={handleCheckboxChange}
-                        />
-                        <label
-                            htmlFor="terms"
-                            className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
-                        >
-                            I have copied the config
-                        </label>
-                    </div>
-                </form>
-            </Form>
-        </div>
-    );
-}

src/app/[orgId]/settings/clients/CreateClientsModal.tsx

@@ -1,80 +0,0 @@
-"use client";
-
-import { Button } from "@app/components/ui/button";
-import { useState } from "react";
-import {
-    Credenza,
-    CredenzaBody,
-    CredenzaClose,
-    CredenzaContent,
-    CredenzaDescription,
-    CredenzaFooter,
-    CredenzaHeader,
-    CredenzaTitle
-} from "@app/components/Credenza";
-import CreateClientForm from "./CreateClientsForm";
-import { ClientRow } from "./ClientsTable";
-
-type CreateClientFormProps = {
-    open: boolean;
-    setOpen: (open: boolean) => void;
-    onCreate?: (client: ClientRow) => void;
-    orgId: string;
-};
-
-export default function CreateClientFormModal({
-    open,
-    setOpen,
-    onCreate,
-    orgId
-}: CreateClientFormProps) {
-    const [loading, setLoading] = useState(false);
-    const [isChecked, setIsChecked] = useState(false);
-
-    return (
-        <>
-            <Credenza
-                open={open}
-                onOpenChange={(val) => {
-                    setOpen(val);
-                    setLoading(false);
-                }}
-            >
-                <CredenzaContent>
-                    <CredenzaHeader>
-                        <CredenzaTitle>Create Client</CredenzaTitle>
-                        <CredenzaDescription>
-                            Create a new client to connect to your site
-                        </CredenzaDescription>
-                    </CredenzaHeader>
-                    <CredenzaBody>
-                        <div className="max-w-md">
-                            <CreateClientForm
-                                setLoading={(val) => setLoading(val)}
-                                setChecked={(val) => setIsChecked(val)}
-                                onCreate={onCreate}
-                                orgId={orgId}
-                            />
-                        </div>
-                    </CredenzaBody>
-                    <CredenzaFooter>
-                        <Button
-                            type="submit"
-                            form="create-site-form"
-                            loading={loading}
-                            disabled={loading || !isChecked}
-                            onClick={() => {
-                                setOpen(false);
-                            }}
-                        >
-                            Create Client
-                        </Button>
-                        <CredenzaClose asChild>
-                            <Button variant="outline">Close</Button>
-                        </CredenzaClose>
-                    </CredenzaFooter>
-                </CredenzaContent>
-            </Credenza>
-        </>
-    );
-}

src/app/[orgId]/settings/clients/page.tsx

@@ -1,59 +0,0 @@
-import { internal } from "@app/lib/api";
-import { authCookieHeader } from "@app/lib/api/cookies";
-import { AxiosResponse } from "axios";
-import { ClientRow } from "./ClientsTable";
-import SettingsSectionTitle from "@app/components/SettingsSectionTitle";
-import { ListClientsResponse } from "@server/routers/client";
-import ClientsTable from "./ClientsTable";
-
-type ClientsPageProps = {
-    params: Promise<{ orgId: string }>;
-};
-
-export const dynamic = "force-dynamic";
-
-export default async function ClientsPage(props: ClientsPageProps) {
-    const params = await props.params;
-    let clients: ListClientsResponse["clients"] = [];
-    try {
-        const res = await internal.get<AxiosResponse<ListClientsResponse>>(
-            `/org/${params.orgId}/clients`,
-            await authCookieHeader()
-        );
-        clients = res.data.data.clients;
-    } catch (e) {}
-
-    function formatSize(mb: number): string {
-        if (mb >= 1024 * 1024) {
-            return `${(mb / (1024 * 1024)).toFixed(2)} TB`;
-        } else if (mb >= 1024) {
-            return `${(mb / 1024).toFixed(2)} GB`;
-        } else {
-            return `${mb.toFixed(2)} MB`;
-        }
-    }
-
-    const clientRows: ClientRow[] = clients.map((client) => {
-        return {
-            name: client.name,
-            siteName: client.siteName,
-            siteId: client.siteNiceId,
-            id: client.clientId,
-            mbIn: formatSize(client.megabytesIn || 0),
-            mbOut: formatSize(client.megabytesOut || 0),
-            orgId: params.orgId,
-            online: client.online
-        };
-    });
-
-    return (
-        <>
-            <SettingsSectionTitle
-                title="Manage Clients"
-                description="Clients are devices that can connect to your sites"
-            />
-
-            <ClientsTable clients={clientRows} orgId={params.orgId} />
-        </>
-    );
-}

src/app/[orgId]/settings/layout.tsx

@@ -1,12 +1,12 @@
 import { Metadata } from "next";
 import { TopbarNav } from "@app/components/TopbarNav";
 import {
+    Cog,
     Combine,
     LinkIcon,
     Settings,
     Users,
-    Waypoints,
-    Workflow
+    Waypoints
 } from "lucide-react";
 import { Header } from "@app/components/Header";
 import { verifySession } from "@app/lib/auth/verifySession";
@@ -18,6 +18,14 @@ import { authCookieHeader } from "@app/lib/api/cookies";
 import { cache } from "react";
 import { GetOrgUserResponse } from "@server/routers/user";
 import UserProvider from "@app/providers/UserProvider";
+import {
+    Breadcrumb,
+    BreadcrumbItem,
+    BreadcrumbList,
+    BreadcrumbPage,
+    BreadcrumbSeparator
+} from "@app/components/ui/breadcrumb";
+import Link from "next/link";
 
 export const dynamic = "force-dynamic";
 
@@ -37,11 +45,6 @@ const topNavItems = [
         href: "/{orgId}/settings/resources",
         icon: <Waypoints className="h-4 w-4" />
     },
-    {
-        title: "Clients",
-        href: "/{orgId}/settings/clients",
-        icon: <Workflow className="h-4 w-4" />
-    },
     {
         title: "Users & Roles",
         href: "/{orgId}/settings/access",

src/app/[orgId]/settings/sites/create/page.tsx

@@ -324,7 +324,7 @@ PersistentKeepalive = 5`;
 
         let payload: CreateSiteBody = {
             name: data.name,
-            type: data.method as any,
+            type: data.method
         };
 
         if (data.method == "wireguard") {

src/app/admin/layout.tsx

@@ -0,0 +1,71 @@
+import { Metadata } from "next";
+import { TopbarNav } from "@app/components/TopbarNav";
+import { Users } from "lucide-react";
+import { Header } from "@app/components/Header";
+import { verifySession } from "@app/lib/auth/verifySession";
+import { redirect } from "next/navigation";
+import { cache } from "react";
+import UserProvider from "@app/providers/UserProvider";
+import { ListOrgsResponse } from "@server/routers/org";
+import { internal } from "@app/lib/api";
+import { AxiosResponse } from "axios";
+import { authCookieHeader } from "@app/lib/api/cookies";
+
+export const dynamic = "force-dynamic";
+
+export const metadata: Metadata = {
+    title: `Server Admin - Pangolin`,
+    description: ""
+};
+
+const topNavItems = [
+    {
+        title: "All Users",
+        href: "/admin/users",
+        icon: <Users className="h-4 w-4" />
+    }
+];
+
+interface LayoutProps {
+    children: React.ReactNode;
+}
+
+export default async function SettingsLayout(props: LayoutProps) {
+    const getUser = cache(verifySession);
+    const user = await getUser();
+
+    if (!user || !user.serverAdmin) {
+        redirect(`/`);
+    }
+
+    const cookie = await authCookieHeader();
+    let orgs: ListOrgsResponse["orgs"] = [];
+    try {
+        const getOrgs = cache(() =>
+            internal.get<AxiosResponse<ListOrgsResponse>>(`/orgs`, cookie)
+        );
+        const res = await getOrgs();
+        if (res && res.data.data.orgs) {
+            orgs = res.data.data.orgs;
+        }
+    } catch (e) {}
+
+    return (
+        <>
+            <div className="w-full bg-card sm:px-0 fixed top-0 z-10 border-b">
+                <div className="container mx-auto flex flex-col content-between">
+                    <div className="my-4 px-3 md:px-0">
+                        <UserProvider user={user}>
+                            <Header orgId={""} orgs={orgs} />
+                        </UserProvider>
+                    </div>
+                    <TopbarNav items={topNavItems} />
+                </div>
+            </div>
+
+            <div className="container mx-auto sm:px-0 px-3 pt-[155px]">
+                {props.children}
+            </div>
+        </>
+    );
+}

src/app/admin/page.tsx

@@ -0,0 +1,11 @@
+import { verifySession } from "@app/lib/auth/verifySession";
+import { cache } from "react";
+import { redirect } from "next/navigation";
+
+type AdminPageProps = {};
+
+export default async function OrgPage(props: AdminPageProps) {
+    redirect(`/admin/users`);
+
+    return <></>;
+}

src/app/admin/users/AdminUsersDataTable.tsx

@@ -21,20 +21,17 @@ import {
     TableHeader,
     TableRow
 } from "@/components/ui/table";
-import { Button } from "@app/components/ui/button";
 import { useState } from "react";
 import { Input } from "@app/components/ui/input";
 import { DataTablePagination } from "@app/components/DataTablePagination";
-import { Plus, Search } from "lucide-react";
+import { Search } from "lucide-react";
 
 interface DataTableProps<TData, TValue> {
     columns: ColumnDef<TData, TValue>[];
     data: TData[];
-    addClient?: () => void;
 }
 
-export function ClientsDataTable<TData, TValue>({
-    addClient,
+export function UsersDataTable<TData, TValue>({
     columns,
     data
 }: DataTableProps<TData, TValue>) {
@@ -67,10 +64,10 @@ export function ClientsDataTable<TData, TValue>({
             <div className="flex items-center justify-between pb-4">
                 <div className="flex items-center max-w-sm mr-2 w-full relative">
                     <Input
-                        placeholder="Search clients"
+                        placeholder="Search server users"
                         value={
                             (table
-                                .getColumn("name")
+                                .getColumn("email")
                                 ?.getFilterValue() as string) ?? ""
                         }
                         onChange={(event) =>
@@ -82,15 +79,6 @@ export function ClientsDataTable<TData, TValue>({
                     />
                     <Search className="h-4 w-4 absolute left-2 top-1/2 transform -translate-y-1/2" />
                 </div>
-                <Button
-                    onClick={() => {
-                        if (addClient) {
-                            addClient();
-                        }
-                    }}
-                >
-                    <Plus className="mr-2 h-4 w-4" /> Add Client
-                </Button>
             </div>
             <TableContainer>
                 <Table>
@@ -138,7 +126,7 @@ export function ClientsDataTable<TData, TValue>({
                                     colSpan={columns.length}
                                     className="h-24 text-center"
                                 >
-                                    No clients. Create one to get started.
+                                    This server has no users.
                                 </TableCell>
                             </TableRow>
                         )}

src/app/admin/users/AdminUsersTable.tsx

@@ -0,0 +1,151 @@
+"use client";
+
+import { ColumnDef } from "@tanstack/react-table";
+import { UsersDataTable } from "./AdminUsersDataTable";
+import { Button } from "@app/components/ui/button";
+import { ArrowRight, ArrowUpDown } from "lucide-react";
+import { useRouter } from "next/navigation";
+import { useState } from "react";
+import ConfirmDeleteDialog from "@app/components/ConfirmDeleteDialog";
+import { toast } from "@app/hooks/useToast";
+import { formatAxiosError } from "@app/lib/api";
+import { createApiClient } from "@app/lib/api";
+import { useEnvContext } from "@app/hooks/useEnvContext";
+
+export type GlobalUserRow = {
+    id: string;
+    email: string;
+    dateCreated: string;
+};
+
+type Props = {
+    users: GlobalUserRow[];
+};
+
+export default function UsersTable({ users }: Props) {
+    const router = useRouter();
+
+    const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
+    const [selected, setSelected] = useState<GlobalUserRow | null>(null);
+    const [rows, setRows] = useState<GlobalUserRow[]>(users);
+
+    const api = createApiClient(useEnvContext());
+
+    const deleteUser = (id: string) => {
+        api.delete(`/user/${id}`)
+            .catch((e) => {
+                console.error("Error deleting user", e);
+                toast({
+                    variant: "destructive",
+                    title: "Error deleting user",
+                    description: formatAxiosError(e, "Error deleting user")
+                });
+            })
+            .then(() => {
+                router.refresh();
+                setIsDeleteModalOpen(false);
+
+                const newRows = rows.filter((row) => row.id !== id);
+
+                setRows(newRows);
+            });
+    };
+
+    const columns: ColumnDef<GlobalUserRow>[] = [
+        {
+            accessorKey: "id",
+            header: ({ column }) => {
+                return (
+                    <Button
+                        variant="ghost"
+                        onClick={() =>
+                            column.toggleSorting(column.getIsSorted() === "asc")
+                        }
+                    >
+                        ID
+                    </Button>
+                );
+            }
+        },
+        {
+            accessorKey: "email",
+            header: ({ column }) => {
+                return (
+                    <Button
+                        variant="ghost"
+                        onClick={() =>
+                            column.toggleSorting(column.getIsSorted() === "asc")
+                        }
+                    >
+                        Email
+                        <ArrowUpDown className="ml-2 h-4 w-4" />
+                    </Button>
+                );
+            }
+        },
+        {
+            id: "actions",
+            cell: ({ row }) => {
+                const r = row.original;
+                return (
+                    <>
+                        <div className="flex items-center justify-end">
+                            <Button
+                                variant={"outlinePrimary"}
+                                className="ml-2"
+                                onClick={() => {
+                                    setSelected(r);
+                                    setIsDeleteModalOpen(true);
+                                }}
+                            >
+                                Delete
+                            </Button>
+                        </div>
+                    </>
+                );
+            }
+        }
+    ];
+
+    return (
+        <>
+            {selected && (
+                <ConfirmDeleteDialog
+                    open={isDeleteModalOpen}
+                    setOpen={(val) => {
+                        setIsDeleteModalOpen(val);
+                        setSelected(null);
+                    }}
+                    dialog={
+                        <div className="space-y-4">
+                            <p>
+                                Are you sure you want to permanently delete{" "}
+                                <b>{selected?.email || selected?.id}</b> from
+                                the server?
+                            </p>
+
+                            <p>
+                                <b>
+                                    The user will be removed from all
+                                    organizations and be completely removed from
+                                    the server.
+                                </b>
+                            </p>
+
+                            <p>
+                                To confirm, please type the email of the user
+                                below.
+                            </p>
+                        </div>
+                    }
+                    buttonText="Confirm Delete User"
+                    onConfirm={async () => deleteUser(selected!.id)}
+                    string={selected.email}
+                    title="Delete User from Server"
+                />
+            )}
+
+            <UsersDataTable columns={columns} data={rows} />
+        </>
+    );
+}

src/app/admin/users/page.tsx

@@ -0,0 +1,44 @@
+import { internal } from "@app/lib/api";
+import { authCookieHeader } from "@app/lib/api/cookies";
+import { AxiosResponse } from "axios";
+import SettingsSectionTitle from "@app/components/SettingsSectionTitle";
+import { AdminListUsersResponse } from "@server/routers/user/adminListUsers";
+import UsersTable, { GlobalUserRow } from "./AdminUsersTable";
+
+type PageProps = {
+    params: Promise<{ orgId: string }>;
+};
+
+export const dynamic = "force-dynamic";
+
+export default async function UsersPage(props: PageProps) {
+    let rows: AdminListUsersResponse["users"] = [];
+    try {
+        const res = await internal.get<AxiosResponse<AdminListUsersResponse>>(
+            `/users`,
+            await authCookieHeader()
+        );
+        rows = res.data.data.users;
+    } catch (e) {
+        console.error(e);
+    }
+
+    const userRows: GlobalUserRow[] = rows.map((row) => {
+        return {
+            id: row.id,
+            email: row.email,
+            dateCreated: row.dateCreated,
+            serverAdmin: row.serverAdmin
+        };
+    });
+
+    return (
+        <>
+            <SettingsSectionTitle
+                title="Manage All Users"
+                description="View and manage all users in the system"
+            />
+            <UsersTable users={userRows} />
+        </>
+    );
+}

src/app/layout.tsx

@@ -32,12 +32,13 @@ export default async function RootLayout({
 
     let supporterData = {
         visible: true
-    };
+    } as any;
 
     const res = await priv.get<
         AxiosResponse<IsSupporterKeyVisibleResponse>
     >("supporter-key/visible");
     supporterData.visible = res.data.data.visible;
+    supporterData.tier = res.data.data.tier;
 
     const version = env.app.version;
 

src/components/SupporterStatus.tsx

@@ -167,7 +167,7 @@ export default function SupporterStatus() {
                             </Link>{" "}
                             and redeem it here.{" "}
                             <Link
-                                href="https://supporters.dev.fossorial.io/"
+                                href="https://docs.fossorial.io/supporter-program"
                                 target="_blank"
                                 rel="noopener noreferrer"
                                 className="underline"
@@ -208,7 +208,7 @@ export default function SupporterStatus() {
                                 </CardContent>
                                 <CardFooter>
                                     <Link
-                                        href="https://www.google.com"
+                                        href="https://github.com/sponsors/fosrl/sponsorships?tier_id=474929"
                                         target="_blank"
                                         rel="noopener noreferrer"
                                         className="w-full"
@@ -218,7 +218,9 @@ export default function SupporterStatus() {
                                 </CardFooter>
                             </Card>
 
-                            <Card>
+                            <Card
+                                className={`${supporterStatus?.tier === "Limited Supporter" ? "opacity-50" : ""}`}
+                            >
                                 <CardHeader>
                                     <CardTitle>Limited Supporter</CardTitle>
                                 </CardHeader>
@@ -246,14 +248,29 @@ export default function SupporterStatus() {
                                     </ul>
                                 </CardContent>
                                 <CardFooter>
-                                    <Link
-                                        href="https://www.google.com"
-                                        target="_blank"
-                                        rel="noopener noreferrer"
-                                        className="w-full"
-                                    >
-                                        <Button className="w-full">Buy</Button>
-                                    </Link>
+                                    {supporterStatus?.tier !==
+                                    "Limited Supporter" ? (
+                                        <Link
+                                            href="https://github.com/sponsors/fosrl/sponsorships?tier_id=463100"
+                                            target="_blank"
+                                            rel="noopener noreferrer"
+                                            className="w-full"
+                                        >
+                                            <Button className="w-full">
+                                                Buy
+                                            </Button>
+                                        </Link>
+                                    ) : (
+                                        <Button
+                                            className="w-full"
+                                            disabled={
+                                                supporterStatus?.tier ===
+                                                "Limited Supporter"
+                                            }
+                                        >
+                                            Buy
+                                        </Button>
+                                    )}
                                 </CardFooter>
                             </Card>
                         </div>

src/contexts/supporterStatusContext.ts

@@ -2,6 +2,7 @@ import { createContext } from "react";
 
 export type SupporterStatus = {
     visible: boolean;
+    tier?: string;
 };
 
 type SupporterStatusContextType = {