Bump next from 15.5.9 to 15.5.12

Dependabot couldn't find the original pull request head commit, 4725007a86.

.dockerignore

@@ -32,5 +32,4 @@ migrations/
 config/
 build.ts
 tsconfig.json
-Dockerfile*
 migrations/

.github/workflows/cicd.yml

@@ -525,41 +525,10 @@ jobs:
                           VERIFIED_INDEX_KEYLESS=false
                         fi
 
-                        # If index verification fails, attempt to verify child platform manifests
-                        if [ "${VERIFIED_INDEX}" != "true" ] || [ "${VERIFIED_INDEX_KEYLESS}" != "true" ]; then
-                          echo "Index verification not available; attempting child manifest verification for ${BASE_IMAGE}:${IMAGE_TAG}"
-                          CHILD_VERIFIED=false
-
-                          for ARCH in arm64 amd64; do
-                            CHILD_TAG="${IMAGE_TAG}-${ARCH}"
-                            echo "Resolving child digest for ${BASE_IMAGE}:${CHILD_TAG}"
-                            CHILD_DIGEST="$(skopeo inspect --retry-times 3 docker://${BASE_IMAGE}:${CHILD_TAG} | jq -r '.Digest' || true)"
-                            if [ -n "${CHILD_DIGEST}" ] && [ "${CHILD_DIGEST}" != "null" ]; then
-                              CHILD_REF="${BASE_IMAGE}@${CHILD_DIGEST}"
-                              echo "==> cosign verify (public key) child ${CHILD_REF}"
-                              if retry_verify "cosign verify --key env://COSIGN_PUBLIC_KEY '${CHILD_REF}' -o text"; then
-                                CHILD_VERIFIED=true
-                                echo "Public key verification succeeded for child ${CHILD_REF}"
-                              else
-                                echo "Public key verification failed for child ${CHILD_REF}"
-                              fi
-
-                              echo "==> cosign verify (keyless policy) child ${CHILD_REF}"
-                              if retry_verify "cosign verify --certificate-oidc-issuer '${issuer}' --certificate-identity-regexp '${id_regex}' '${CHILD_REF}' -o text"; then
-                                CHILD_VERIFIED=true
-                                echo "Keyless verification succeeded for child ${CHILD_REF}"
-                              else
-                                echo "Keyless verification failed for child ${CHILD_REF}"
-                              fi
-                            else
-                              echo "No child digest found for ${BASE_IMAGE}:${CHILD_TAG}; skipping"
-                            fi
-                          done
-
-                          if [ "${CHILD_VERIFIED}" != "true" ]; then
-                            echo "Failed to verify index and no child manifests verified for ${BASE_IMAGE}:${IMAGE_TAG}"
-                            exit 1
-                          fi
+                        # Check if verification succeeded
+                        if [ "${VERIFIED_INDEX}" != "true" ] && [ "${VERIFIED_INDEX_KEYLESS}" != "true" ]; then
+                          echo "⚠️  WARNING: Verification not available for ${BASE_IMAGE}:${IMAGE_TAG}"
+                          echo "This may be due to registry propagation delays. Continuing anyway."
                         fi
                       ) || TAG_FAILED=true
 

.gitignore

@@ -53,4 +53,3 @@ tsconfig.json
 hydrateSaas.ts
 CLAUDE.md
 drizzle.config.ts
-server/setup/migrations.ts

.vscode/settings.json

@@ -10,7 +10,7 @@
         "editor.defaultFormatter": "esbenp.prettier-vscode"
     },
     "[typescript]": {
-        "editor.defaultFormatter": "esbenp.prettier-vscode"
+        "editor.defaultFormatter": "vscode.typescript-language-features"
     },
     "[typescriptreact]": {
         "editor.defaultFormatter": "esbenp.prettier-vscode"

Dockerfile

@@ -1,54 +1,33 @@
-FROM node:24-alpine AS base
+FROM node:24-alpine AS builder
 
 WORKDIR /app
 
+ARG BUILD=oss
+ARG DATABASE=sqlite
+
 RUN apk add --no-cache python3 make g++
 
+# COPY package.json package-lock.json ./
 COPY package*.json ./
-
-FROM base AS builder-dev
-
 RUN npm ci
 
 COPY . .
 
-ARG BUILD=oss
-ARG DATABASE=sqlite
-
 RUN if [ "$BUILD" = "oss" ]; then rm -rf server/private; fi && \
     npm run set:$DATABASE && \
     npm run set:$BUILD && \
     npm run db:generate && \
     npm run build && \
-    npm run build:cli && \
-    test -f dist/server.mjs
+    npm run build:cli
 
-FROM base AS builder
+# test to make sure the build output is there and error if not
+RUN test -f dist/server.mjs
 
-RUN npm ci --omit=dev
+# Prune dev dependencies and clean up to prepare for copy to runner
+RUN npm prune --omit=dev && npm cache clean --force
 
 FROM node:24-alpine AS runner
 
-WORKDIR /app
-
-RUN apk add --no-cache curl tzdata
-
-COPY --from=builder /app/node_modules ./node_modules
-COPY --from=builder /app/package.json ./package.json
-
-COPY --from=builder-dev /app/.next/standalone ./
-COPY --from=builder-dev /app/.next/static ./.next/static
-COPY --from=builder-dev /app/dist ./dist
-COPY --from=builder-dev /app/server/migrations ./dist/init
-
-COPY ./cli/wrapper.sh /usr/local/bin/pangctl
-RUN chmod +x /usr/local/bin/pangctl ./dist/cli.mjs
-
-COPY server/db/names.json ./dist/names.json
-COPY server/db/ios_models.json ./dist/ios_models.json
-COPY server/db/mac_models.json ./dist/mac_models.json
-COPY public ./public
-
 # OCI Image Labels - Build Args for dynamic values
 ARG VERSION="dev"
 ARG REVISION=""
@@ -59,6 +38,28 @@ ARG LICENSE="AGPL-3.0"
 ARG IMAGE_TITLE="Pangolin"
 ARG IMAGE_DESCRIPTION="Identity-aware VPN and proxy for remote access to anything, anywhere"
 
+WORKDIR /app
+
+# Only curl and tzdata needed at runtime - no build tools!
+RUN apk add --no-cache curl tzdata
+
+# Copy pre-built node_modules from builder (already pruned to production only)
+# This includes the compiled native modules like better-sqlite3
+COPY --from=builder /app/node_modules ./node_modules
+COPY --from=builder /app/.next/standalone ./
+COPY --from=builder /app/.next/static ./.next/static
+COPY --from=builder /app/dist ./dist
+COPY --from=builder /app/server/migrations ./dist/init
+COPY --from=builder /app/package.json ./package.json
+
+COPY ./cli/wrapper.sh /usr/local/bin/pangctl
+RUN chmod +x /usr/local/bin/pangctl ./dist/cli.mjs
+
+COPY server/db/names.json ./dist/names.json
+COPY server/db/ios_models.json ./dist/ios_models.json
+COPY server/db/mac_models.json ./dist/mac_models.json
+COPY public ./public
+
 # OCI Image Labels
 # https://github.com/opencontainers/image-spec/blob/main/annotations.md
 LABEL org.opencontainers.image.source="https://github.com/fosrl/pangolin" \

Dockerfile.dev

@@ -1,9 +1,7 @@
-FROM node:24-alpine
+FROM node:22-alpine
 
 WORKDIR /app
 
-RUN apk add --no-cache python3 make g++
-
 COPY package*.json ./
 
 # Install dependencies

esbuild.mjs

@@ -281,7 +281,7 @@ esbuild
             })
         ],
         sourcemap: "inline",
-        target: "node24"
+        target: "node22"
     })
     .then((result) => {
         // Check if there were any errors in the build result

messages/en-US.json

@@ -473,8 +473,6 @@
     "filterByApprovalState": "Filter By Approval State",
     "approvalListEmpty": "No approvals",
     "approvalState": "Approval State",
-    "approvalLoadMore": "Load more",
-    "loadingApprovals": "Loading Approvals",
     "approve": "Approve",
     "approved": "Approved",
     "denied": "Denied",
@@ -1183,8 +1181,7 @@
     "actionViewLogs": "View Logs",
     "noneSelected": "None selected",
     "orgNotFound2": "No organizations found.",
-    "searchPlaceholder": "Search...",
-    "emptySearchOptions": "No options found",
+    "searchProgress": "Search...",
     "create": "Create",
     "orgs": "Organizations",
     "loginError": "An unexpected error occurred. Please try again.",
@@ -1266,7 +1263,6 @@
     "sidebarLogAndAnalytics": "Log & Analytics",
     "sidebarBluePrints": "Blueprints",
     "sidebarOrganization": "Organization",
-    "sidebarBillingAndLicenses": "Billing & Licenses",
     "sidebarLogsAnalytics": "Analytics",
     "blueprints": "Blueprints",
     "blueprintsDescription": "Apply declarative configurations and view previous runs",
@@ -1470,7 +1466,6 @@
     "failed": "Failed",
     "createNewOrgDescription": "Create a new organization",
     "organization": "Organization",
-    "primary": "Primary",
     "port": "Port",
     "securityKeyManage": "Manage Security Keys",
     "securityKeyDescription": "Add or remove security keys for passwordless authentication",
@@ -1933,9 +1928,6 @@
     "authPageBrandingQuestionRemove": "Are you sure you want to remove the branding for Auth Pages ?",
     "authPageBrandingDeleteConfirm": "Confirm Delete Branding",
     "brandingLogoURL": "Logo URL",
-    "brandingLogoURLOrPath": "Logo URL or Path",
-    "brandingLogoPathDescription": "Enter a URL or a local path.",
-    "brandingLogoURLDescription": "Enter a publicly accessible URL to your logo image.",
     "brandingPrimaryColor": "Primary Color",
     "brandingLogoWidth": "Width (px)",
     "brandingLogoHeight": "Height (px)",

package.json

@@ -33,8 +33,8 @@
     },
     "dependencies": {
         "@asteasolutions/zod-to-openapi": "8.4.0",
-        "@aws-sdk/client-s3": "3.989.0",
-        "@faker-js/faker": "10.3.0",
+        "@aws-sdk/client-s3": "3.971.0",
+        "@faker-js/faker": "10.2.0",
         "@headlessui/react": "2.2.9",
         "@hookform/resolvers": "5.2.2",
         "@monaco-editor/react": "4.7.0",
@@ -59,66 +59,67 @@
         "@radix-ui/react-tabs": "1.1.13",
         "@radix-ui/react-toast": "1.2.15",
         "@radix-ui/react-tooltip": "1.2.8",
-        "@react-email/components": "1.0.7",
-        "@react-email/render": "2.0.4",
-        "@react-email/tailwind": "2.0.4",
+        "@react-email/components": "1.0.2",
+        "@react-email/render": "2.0.0",
+        "@react-email/tailwind": "2.0.2",
         "@simplewebauthn/browser": "13.2.2",
         "@simplewebauthn/server": "13.2.2",
         "@tailwindcss/forms": "0.5.11",
-        "@tanstack/react-query": "5.90.21",
+        "@tanstack/react-query": "5.90.12",
         "@tanstack/react-table": "8.21.3",
         "arctic": "3.7.0",
-        "axios": "1.13.5",
+        "axios": "1.13.2",
         "better-sqlite3": "11.9.1",
         "canvas-confetti": "1.9.4",
         "class-variance-authority": "0.7.1",
         "clsx": "2.1.1",
         "cmdk": "1.1.1",
         "cookie-parser": "1.4.7",
-        "cors": "2.8.6",
+        "cors": "2.8.5",
         "crypto-js": "4.2.0",
         "d3": "7.9.0",
+        "date-fns": "4.1.0",
         "drizzle-orm": "0.45.1",
+        "eslint": "9.39.2",
+        "eslint-config-next": "16.1.0",
         "express": "5.2.1",
         "express-rate-limit": "8.2.1",
-        "glob": "13.0.3",
+        "glob": "13.0.0",
         "helmet": "8.1.0",
         "http-errors": "2.0.1",
         "input-otp": "1.4.2",
-        "ioredis": "5.9.3",
+        "ioredis": "5.9.2",
         "jmespath": "0.16.0",
         "js-yaml": "4.1.1",
         "jsonwebtoken": "9.0.3",
-        "lucide-react": "0.563.0",
-        "maxmind": "5.0.5",
+        "lucide-react": "0.562.0",
+        "maxmind": "5.0.1",
         "moment": "2.30.1",
         "next": "15.5.12",
-        "next-intl": "4.8.2",
+        "next-intl": "4.7.0",
         "next-themes": "0.4.6",
         "nextjs-toploader": "3.9.17",
         "node-cache": "5.1.2",
-        "nodemailer": "8.0.1",
+        "nodemailer": "7.0.11",
         "oslo": "1.2.1",
-        "pg": "8.18.0",
-        "posthog-node": "5.24.15",
+        "pg": "8.17.1",
+        "posthog-node": "5.23.0",
         "qrcode.react": "4.2.0",
-        "react": "19.2.4",
-        "react-day-picker": "9.13.2",
-        "react-dom": "19.2.4",
+        "react": "19.2.3",
+        "react-day-picker": "9.13.0",
+        "react-dom": "19.2.3",
         "react-easy-sort": "1.8.0",
         "react-hook-form": "7.71.1",
         "react-icons": "5.5.0",
         "recharts": "2.15.4",
         "reodotdev": "1.0.0",
-        "resend": "6.9.2",
-        "semver": "7.7.4",
-        "sshpk": "^1.18.0",
-        "stripe": "20.3.1",
+        "resend": "6.8.0",
+        "semver": "7.7.3",
+        "stripe": "20.2.0",
         "swagger-ui-express": "5.0.1",
         "tailwind-merge": "3.4.0",
         "topojson-client": "3.1.0",
         "tw-animate-css": "1.4.0",
-        "use-debounce": "^10.1.0",
         "uuid": "13.0.0",
         "vaul": "1.1.2",
         "visionscarto-world-atlas": "1.0.0",
@@ -127,15 +128,14 @@
         "ws": "8.19.0",
         "yaml": "2.8.2",
         "yargs": "18.0.0",
-        "zod": "4.3.6",
+        "zod": "4.3.5",
         "zod-validation-error": "5.0.0"
     },
     "devDependencies": {
-        "@dotenvx/dotenvx": "1.52.0",
+        "@dotenvx/dotenvx": "1.51.2",
         "@esbuild-plugins/tsconfig-paths": "0.1.2",
-        "@react-email/preview-server": "5.2.8",
         "@tailwindcss/postcss": "4.1.18",
-        "@tanstack/react-query-devtools": "5.91.3",
+        "@tanstack/react-query-devtools": "5.91.1",
         "@types/better-sqlite3": "7.6.13",
         "@types/cookie-parser": "1.4.10",
         "@types/cors": "2.8.19",
@@ -144,33 +144,30 @@
         "@types/express": "5.0.6",
         "@types/express-session": "1.18.2",
         "@types/jmespath": "0.15.2",
-        "@types/js-yaml": "4.0.9",
         "@types/jsonwebtoken": "9.0.10",
-        "@types/node": "25.2.3",
-        "@types/nodemailer": "7.0.9",
+        "@types/node": "24.10.2",
+        "@types/nodemailer": "7.0.4",
         "@types/nprogress": "0.2.3",
         "@types/pg": "8.16.0",
-        "@types/react": "19.2.14",
+        "@types/react": "19.2.7",
         "@types/react-dom": "19.2.3",
         "@types/semver": "7.7.1",
-        "@types/sshpk": "^1.17.4",
         "@types/swagger-ui-express": "4.1.8",
         "@types/topojson-client": "3.1.5",
         "@types/ws": "8.18.1",
         "@types/yargs": "17.0.35",
+        "@types/js-yaml": "4.0.9",
         "babel-plugin-react-compiler": "1.0.0",
-        "drizzle-kit": "0.31.9",
-        "esbuild": "0.27.3",
+        "drizzle-kit": "0.31.8",
+        "esbuild": "0.27.2",
         "esbuild-node-externals": "1.20.1",
-        "eslint": "9.39.2",
-        "eslint-config-next": "16.1.6",
         "postcss": "8.5.6",
-        "prettier": "3.8.1",
-        "react-email": "5.2.8",
+        "prettier": "3.8.0",
+        "react-email": "5.2.5",
         "tailwindcss": "4.1.18",
         "tsc-alias": "1.8.16",
         "tsx": "4.21.0",
         "typescript": "5.9.3",
-        "typescript-eslint": "8.55.0"
+        "typescript-eslint": "8.53.1"
     }
 }

server/auth/actions.ts

@@ -131,8 +131,7 @@ export enum ActionsEnum {
     viewLogs = "viewLogs",
     exportLogs = "exportLogs",
     listApprovals = "listApprovals",
-    updateApprovals = "updateApprovals",
-    signSshKey = "signSshKey"
+    updateApprovals = "updateApprovals"
 }
 
 export async function checkUserActionPermission(

server/auth/canUserAccessSiteResource.ts

@@ -1,45 +0,0 @@
-import { db } from "@server/db";
-import { and, eq } from "drizzle-orm";
-import { roleSiteResources, userSiteResources } from "@server/db";
-
-export async function canUserAccessSiteResource({
-    userId,
-    resourceId,
-    roleId
-}: {
-    userId: string;
-    resourceId: number;
-    roleId: number;
-}): Promise<boolean> {
-    const roleResourceAccess = await db
-        .select()
-        .from(roleSiteResources)
-        .where(
-            and(
-                eq(roleSiteResources.siteResourceId, resourceId),
-                eq(roleSiteResources.roleId, roleId)
-            )
-        )
-        .limit(1);
-
-    if (roleResourceAccess.length > 0) {
-        return true;
-    }
-
-    const userResourceAccess = await db
-        .select()
-        .from(userSiteResources)
-        .where(
-            and(
-                eq(userSiteResources.userId, userId),
-                eq(userSiteResources.siteResourceId, resourceId)
-            )
-        )
-        .limit(1);
-
-    if (userResourceAccess.length > 0) {
-        return true;
-    }
-
-    return false;
-}

server/db/pg/schema/schema.ts

@@ -1,16 +1,18 @@
-import { randomUUID } from "crypto";
-import { InferSelectModel } from "drizzle-orm";
 import {
-    bigint,
-    boolean,
-    index,
-    integer,
     pgTable,
-    real,
     serial,
+    varchar,
+    boolean,
+    integer,
+    bigint,
+    real,
     text,
-    varchar
+    index,
+    uniqueIndex
 } from "drizzle-orm/pg-core";
+import { InferSelectModel } from "drizzle-orm";
+import { randomUUID } from "crypto";
+import { alias } from "yargs";
 
 export const domains = pgTable("domains", {
     domainId: varchar("domainId").primaryKey(),
@@ -53,11 +55,7 @@ export const orgs = pgTable("orgs", {
         .default(0),
     settingsLogRetentionDaysAction: integer("settingsLogRetentionDaysAction") // where 0 = dont keep logs and -1 = keep forever and 9001 = end of the following year
         .notNull()
-        .default(0),
-    sshCaPrivateKey: text("sshCaPrivateKey"), // Encrypted SSH CA private key (PEM format)
-    sshCaPublicKey: text("sshCaPublicKey"), // SSH CA public key (OpenSSH format)
-    isBillingOrg: boolean("isBillingOrg"),
-    billingOrgId: varchar("billingOrgId")
+        .default(0)
 });
 
 export const orgDomains = pgTable("orgDomains", {
@@ -190,9 +188,7 @@ export const targetHealthCheck = pgTable("targetHealthCheck", {
     hcFollowRedirects: boolean("hcFollowRedirects").default(true),
     hcMethod: varchar("hcMethod").default("GET"),
     hcStatus: integer("hcStatus"), // http code
-    hcHealth: text("hcHealth")
-        .$type<"unknown" | "healthy" | "unhealthy">()
-        .default("unknown"), // "unknown", "healthy", "unhealthy"
+    hcHealth: text("hcHealth").default("unknown"), // "unknown", "healthy", "unhealthy"
     hcTlsServerName: text("hcTlsServerName")
 });
 
@@ -222,7 +218,7 @@ export const siteResources = pgTable("siteResources", {
         .references(() => orgs.orgId, { onDelete: "cascade" }),
     niceId: varchar("niceId").notNull(),
     name: varchar("name").notNull(),
-    mode: varchar("mode").$type<"host" | "cidr">().notNull(), // "host" | "cidr" | "port"
+    mode: varchar("mode").notNull(), // "host" | "cidr" | "port"
     protocol: varchar("protocol"), // only for port mode
     proxyPort: integer("proxyPort"), // only for port mode
     destinationPort: integer("destinationPort"), // only for port mode
@@ -332,8 +328,7 @@ export const userOrgs = pgTable("userOrgs", {
         .notNull()
         .references(() => roles.roleId),
     isOwner: boolean("isOwner").notNull().default(false),
-    autoProvisioned: boolean("autoProvisioned").default(false),
-    pamUsername: varchar("pamUsername") // cleaned username for ssh and such
+    autoProvisioned: boolean("autoProvisioned").default(false)
 });
 
 export const emailVerificationCodes = pgTable("emailVerificationCodes", {
@@ -989,16 +984,6 @@ export const deviceWebAuthCodes = pgTable("deviceWebAuthCodes", {
     })
 });
 
-export const roundTripMessageTracker = pgTable("roundTripMessageTracker", {
-    messageId: serial("messageId").primaryKey(),
-    wsClientId: varchar("clientId"),
-    messageType: varchar("messageType"),
-    sentAt: bigint("sentAt", { mode: "number" }).notNull(),
-    receivedAt: bigint("receivedAt", { mode: "number" }),
-    error: text("error"),
-    complete: boolean("complete").notNull().default(false)
-});
-
 export type Org = InferSelectModel<typeof orgs>;
 export type User = InferSelectModel<typeof users>;
 export type Site = InferSelectModel<typeof sites>;
@@ -1059,4 +1044,3 @@ export type SecurityKey = InferSelectModel<typeof securityKeys>;
 export type WebauthnChallenge = InferSelectModel<typeof webauthnChallenge>;
 export type DeviceWebAuthCode = InferSelectModel<typeof deviceWebAuthCodes>;
 export type RequestAuditLog = InferSelectModel<typeof requestAuditLog>;
-export type RoundTripMessageTracker = InferSelectModel<typeof roundTripMessageTracker>;

server/db/sqlite/schema/schema.ts

@@ -1,6 +1,13 @@
 import { randomUUID } from "crypto";
 import { InferSelectModel } from "drizzle-orm";
-import { index, integer, sqliteTable, text } from "drizzle-orm/sqlite-core";
+import {
+    sqliteTable,
+    text,
+    integer,
+    index,
+    uniqueIndex
+} from "drizzle-orm/sqlite-core";
+import { no } from "zod/v4/locales";
 
 export const domains = sqliteTable("domains", {
     domainId: text("domainId").primaryKey(),
@@ -45,11 +52,7 @@ export const orgs = sqliteTable("orgs", {
         .default(0),
     settingsLogRetentionDaysAction: integer("settingsLogRetentionDaysAction") // where 0 = dont keep logs and -1 = keep forever and 9001 = end of the following year
         .notNull()
-        .default(0),
-    sshCaPrivateKey: text("sshCaPrivateKey"), // Encrypted SSH CA private key (PEM format)
-    sshCaPublicKey: text("sshCaPublicKey"), // SSH CA public key (OpenSSH format)
-    isBillingOrg: integer("isBillingOrg", { mode: "boolean" }),
-    billingOrgId: text("billingOrgId")
+        .default(0)
 });
 
 export const userDomains = sqliteTable("userDomains", {
@@ -211,9 +214,7 @@ export const targetHealthCheck = sqliteTable("targetHealthCheck", {
     }).default(true),
     hcMethod: text("hcMethod").default("GET"),
     hcStatus: integer("hcStatus"), // http code
-    hcHealth: text("hcHealth")
-        .$type<"unknown" | "healthy" | "unhealthy">()
-        .default("unknown"), // "unknown", "healthy", "unhealthy"
+    hcHealth: text("hcHealth").default("unknown"), // "unknown", "healthy", "unhealthy"
     hcTlsServerName: text("hcTlsServerName")
 });
 
@@ -245,7 +246,7 @@ export const siteResources = sqliteTable("siteResources", {
         .references(() => orgs.orgId, { onDelete: "cascade" }),
     niceId: text("niceId").notNull(),
     name: text("name").notNull(),
-    mode: text("mode").$type<"host" | "cidr">().notNull(), // "host" | "cidr" | "port"
+    mode: text("mode").notNull(), // "host" | "cidr" | "port"
     protocol: text("protocol"), // only for port mode
     proxyPort: integer("proxyPort"), // only for port mode
     destinationPort: integer("destinationPort"), // only for port mode
@@ -637,8 +638,7 @@ export const userOrgs = sqliteTable("userOrgs", {
     isOwner: integer("isOwner", { mode: "boolean" }).notNull().default(false),
     autoProvisioned: integer("autoProvisioned", {
         mode: "boolean"
-    }).default(false),
-    pamUsername: text("pamUsername") // cleaned username for ssh and such
+    }).default(false)
 });
 
 export const emailVerificationCodes = sqliteTable("emailVerificationCodes", {
@@ -1080,16 +1080,6 @@ export const deviceWebAuthCodes = sqliteTable("deviceWebAuthCodes", {
     })
 });
 
-export const roundTripMessageTracker = sqliteTable("roundTripMessageTracker", {
-    messageId: integer("messageId").primaryKey({ autoIncrement: true }),
-    wsClientId: text("clientId"),
-    messageType: text("messageType"),
-    sentAt: integer("sentAt").notNull(),
-    receivedAt: integer("receivedAt"),
-    error: text("error"),
-    complete: integer("complete", { mode: "boolean" }).notNull().default(false)
-});
-
 export type Org = InferSelectModel<typeof orgs>;
 export type User = InferSelectModel<typeof users>;
 export type Site = InferSelectModel<typeof sites>;
@@ -1151,6 +1141,3 @@ export type SecurityKey = InferSelectModel<typeof securityKeys>;
 export type WebauthnChallenge = InferSelectModel<typeof webauthnChallenge>;
 export type RequestAuditLog = InferSelectModel<typeof requestAuditLog>;
 export type DeviceWebAuthCode = InferSelectModel<typeof deviceWebAuthCodes>;
-export type RoundTripMessageTracker = InferSelectModel<
-    typeof roundTripMessageTracker
->;

server/lib/billing/features.ts

@@ -4,7 +4,6 @@ export enum FeatureId {
     EGRESS_DATA_MB = "egressDataMb",
     DOMAINS = "domains",
     REMOTE_EXIT_NODES = "remoteExitNodes",
-    ORGINIZATIONS = "organizations",
     TIER1 = "tier1"
 }
 
@@ -20,8 +19,6 @@ export async function getFeatureDisplayName(featureId: FeatureId): Promise<strin
             return "Domains";
         case FeatureId.REMOTE_EXIT_NODES:
             return "Remote Exit Nodes";
-        case FeatureId.ORGINIZATIONS:
-            return "Organizations";
         case FeatureId.TIER1:
             return "Home Lab";
         default:

server/lib/billing/limitSet.ts

@@ -7,12 +7,18 @@ export type LimitSet = Partial<{
     };
 }>;
 
+export const sandboxLimitSet: LimitSet = {
+    [FeatureId.USERS]: { value: 1, description: "Sandbox limit" },
+    [FeatureId.SITES]: { value: 1, description: "Sandbox limit" },
+    [FeatureId.DOMAINS]: { value: 0, description: "Sandbox limit" },
+    [FeatureId.REMOTE_EXIT_NODES]: { value: 0, description: "Sandbox limit" },
+};
+
 export const freeLimitSet: LimitSet = {
     [FeatureId.SITES]: { value: 5, description: "Basic limit" },
     [FeatureId.USERS]: { value: 5, description: "Basic limit" },
     [FeatureId.DOMAINS]: { value: 5, description: "Basic limit" },
     [FeatureId.REMOTE_EXIT_NODES]: { value: 1, description: "Basic limit" },
-    [FeatureId.ORGINIZATIONS]: { value: 1, description: "Basic limit" },
 };
 
 export const tier1LimitSet: LimitSet = {
@@ -20,7 +26,6 @@ export const tier1LimitSet: LimitSet = {
     [FeatureId.SITES]: { value: 10, description: "Home limit" },
     [FeatureId.DOMAINS]: { value: 10, description: "Home limit" },
     [FeatureId.REMOTE_EXIT_NODES]: { value: 1, description: "Home limit" },
-    [FeatureId.ORGINIZATIONS]: { value: 1, description: "Home limit" },
 };
 
 export const tier2LimitSet: LimitSet = {
@@ -40,10 +45,6 @@ export const tier2LimitSet: LimitSet = {
         value: 3,
         description: "Team limit"
     },
-    [FeatureId.ORGINIZATIONS]: {
-        value: 1,
-        description: "Team limit"
-    }
 };
 
 export const tier3LimitSet: LimitSet = {
@@ -63,8 +64,4 @@ export const tier3LimitSet: LimitSet = {
         value: 20,
         description: "Business limit"
     },
-    [FeatureId.ORGINIZATIONS]: {
-        value: 20,
-        description: "Business limit"
-    },
 };

server/lib/billing/tierMatrix.ts

@@ -14,8 +14,7 @@ export enum TierFeature {
     TwoFactorEnforcement = "twoFactorEnforcement", // handle downgrade by setting to optional
     SessionDurationPolicies = "sessionDurationPolicies", // handle downgrade by setting to default duration
     PasswordExpirationPolicies = "passwordExpirationPolicies", // handle downgrade by setting to default duration
-    AutoProvisioning = "autoProvisioning", // handle downgrade by disabling auto provisioning
-    SshPam = "sshPam"
+    AutoProvisioning = "autoProvisioning" // handle downgrade by disabling auto provisioning
 }
 
 export const tierMatrix: Record<TierFeature, Tier[]> = {
@@ -47,6 +46,5 @@ export const tierMatrix: Record<TierFeature, Tier[]> = {
         "tier3",
         "enterprise"
     ],
-    [TierFeature.AutoProvisioning]: ["tier1", "tier3", "enterprise"],
-    [TierFeature.SshPam]: ["enterprise"]
+    [TierFeature.AutoProvisioning]: ["tier1", "tier3", "enterprise"]
 };

server/lib/billing/usageService.ts

@@ -1,19 +1,34 @@
 import { eq, sql, and } from "drizzle-orm";
+import { v4 as uuidv4 } from "uuid";
+import { PutObjectCommand } from "@aws-sdk/client-s3";
 import {
     db,
     usage,
     customers,
+    sites,
+    newts,
     limits,
     Usage,
     Limit,
-    Transaction,
-    orgs
+    Transaction
 } from "@server/db";
 import { FeatureId, getFeatureMeterId } from "./features";
 import logger from "@server/logger";
+import { sendToClient } from "#dynamic/routers/ws";
 import { build } from "@server/build";
+import { s3Client } from "@server/lib/s3";
 import cache from "@server/lib/cache";
 
+interface StripeEvent {
+    identifier?: string;
+    timestamp: number;
+    event_name: string;
+    payload: {
+        value: number;
+        stripe_customer_id: string;
+    };
+}
+
 export function noop() {
     if (build !== "saas") {
         return true;
@@ -22,11 +37,41 @@ export function noop() {
 }
 
 export class UsageService {
+    private bucketName: string | undefined;
+    private events: StripeEvent[] = [];
+    private lastUploadTime: number = Date.now();
+    private isUploading: boolean = false;
 
     constructor() {
         if (noop()) {
             return;
         }
+
+        // this.bucketName = process.env.S3_BUCKET || undefined;
+
+        // // Periodically check and upload events
+        // setInterval(() => {
+        //     this.checkAndUploadEvents().catch((err) => {
+        //         logger.error("Error in periodic event upload:", err);
+        //     });
+        // }, 30000); // every 30 seconds
+
+        // // Handle graceful shutdown on SIGTERM
+        // process.on("SIGTERM", async () => {
+        //     logger.info(
+        //         "SIGTERM received, uploading events before shutdown..."
+        //     );
+        //     await this.forceUpload();
+        //     logger.info("Events uploaded, proceeding with shutdown");
+        // });
+
+        // // Handle SIGINT as well (Ctrl+C)
+        // process.on("SIGINT", async () => {
+        //     logger.info("SIGINT received, uploading events before shutdown...");
+        //     await this.forceUpload();
+        //     logger.info("Events uploaded, proceeding with shutdown");
+        //     process.exit(0);
+        // });
     }
 
     /**
@@ -46,8 +91,6 @@ export class UsageService {
             return null;
         }
 
-        let orgIdToUse = await this.getBillingOrg(orgId, transaction);
-
         // Truncate value to 11 decimal places
         value = this.truncateValue(value);
 
@@ -57,10 +100,20 @@ export class UsageService {
 
         while (attempt <= maxRetries) {
             try {
+                // Get subscription data for this org (with caching)
+                const customerId = await this.getCustomerId(orgId, featureId);
+
+                if (!customerId) {
+                    logger.warn(
+                        `No subscription data found for org ${orgId} and feature ${featureId}`
+                    );
+                    return null;
+                }
+
                 let usage;
                 if (transaction) {
                     usage = await this.internalAddUsage(
-                        orgIdToUse,
+                        orgId,
                         featureId,
                         value,
                         transaction
@@ -68,7 +121,7 @@ export class UsageService {
                 } else {
                     await db.transaction(async (trx) => {
                         usage = await this.internalAddUsage(
-                            orgIdToUse,
+                            orgId,
                             featureId,
                             value,
                             trx
@@ -76,6 +129,11 @@ export class UsageService {
                     });
                 }
 
+                // Log event for Stripe
+                // if (privateConfig.getRawPrivateConfig().flags.usage_reporting) {
+                //     await this.logStripeEvent(featureId, value, customerId);
+                // }
+
                 return usage || null;
             } catch (error: any) {
                 // Check if this is a deadlock error
@@ -92,7 +150,7 @@ export class UsageService {
                     const delay = baseDelay + jitter;
 
                     logger.warn(
-                        `Deadlock detected for ${orgIdToUse}/${featureId}, retrying attempt ${attempt}/${maxRetries} after ${delay.toFixed(0)}ms`
+                        `Deadlock detected for ${orgId}/${featureId}, retrying attempt ${attempt}/${maxRetries} after ${delay.toFixed(0)}ms`
                     );
 
                     await new Promise((resolve) => setTimeout(resolve, delay));
@@ -100,7 +158,7 @@ export class UsageService {
                 }
 
                 logger.error(
-                    `Failed to add usage for ${orgIdToUse}/${featureId} after ${attempt} attempts:`,
+                    `Failed to add usage for ${orgId}/${featureId} after ${attempt} attempts:`,
                     error
                 );
                 break;
@@ -111,7 +169,7 @@ export class UsageService {
     }
 
     private async internalAddUsage(
-        orgId: string, // here the orgId is the billing org already resolved by getBillingOrg in updateCount
+        orgId: string,
         featureId: FeatureId,
         value: number,
         trx: Transaction
@@ -130,14 +188,13 @@ export class UsageService {
                 featureId,
                 orgId,
                 meterId,
-                instantaneousValue: value,
                 latestValue: value,
                 updatedAt: Math.floor(Date.now() / 1000)
             })
             .onConflictDoUpdate({
                 target: usage.usageId,
                 set: {
-                    instantaneousValue: sql`${usage.instantaneousValue} + ${value}`
+                    latestValue: sql`${usage.latestValue} + ${value}`
                 }
             })
             .returning();
@@ -164,10 +221,18 @@ export class UsageService {
         if (noop()) {
             return;
         }
-
-        let orgIdToUse = await this.getBillingOrg(orgId);
-
         try {
+            if (!customerId) {
+                customerId =
+                    (await this.getCustomerId(orgId, featureId)) || undefined;
+                if (!customerId) {
+                    logger.warn(
+                        `No subscription data found for org ${orgId} and feature ${featureId}`
+                    );
+                    return;
+                }
+            }
+
             // Truncate value to 11 decimal places if provided
             if (value !== undefined && value !== null) {
                 value = this.truncateValue(value);
@@ -177,7 +242,7 @@ export class UsageService {
 
             await db.transaction(async (trx) => {
                 // Get existing meter record
-                const usageId = `${orgIdToUse}-${featureId}`;
+                const usageId = `${orgId}-${featureId}`;
                 // Get current usage record
                 [currentUsage] = await trx
                     .select()
@@ -199,7 +264,7 @@ export class UsageService {
                     await trx.insert(usage).values({
                         usageId,
                         featureId,
-                        orgId: orgIdToUse,
+                        orgId,
                         meterId,
                         instantaneousValue: value || 0,
                         latestValue: value || 0,
@@ -213,7 +278,7 @@ export class UsageService {
             // }
         } catch (error) {
             logger.error(
-                `Failed to update count usage for ${orgIdToUse}/${featureId}:`,
+                `Failed to update count usage for ${orgId}/${featureId}:`,
                 error
             );
         }
@@ -223,9 +288,7 @@ export class UsageService {
         orgId: string,
         featureId: FeatureId
     ): Promise<string | null> {
-        let orgIdToUse = await this.getBillingOrg(orgId);
-
-        const cacheKey = `customer_${orgIdToUse}_${featureId}`;
+        const cacheKey = `customer_${orgId}_${featureId}`;
         const cached = cache.get<string>(cacheKey);
 
         if (cached) {
@@ -239,7 +302,7 @@ export class UsageService {
                     customerId: customers.customerId
                 })
                 .from(customers)
-                .where(eq(customers.orgId, orgIdToUse))
+                .where(eq(customers.orgId, orgId))
                 .limit(1);
 
             if (!customer) {
@@ -254,13 +317,112 @@ export class UsageService {
             return customerId;
         } catch (error) {
             logger.error(
-                `Failed to get subscription data for ${orgIdToUse}/${featureId}:`,
+                `Failed to get subscription data for ${orgId}/${featureId}:`,
                 error
             );
             return null;
         }
     }
 
+    private async logStripeEvent(
+        featureId: FeatureId,
+        value: number,
+        customerId: string
+    ): Promise<void> {
+        // Truncate value to 11 decimal places before sending to Stripe
+        const truncatedValue = this.truncateValue(value);
+
+        const event: StripeEvent = {
+            identifier: uuidv4(),
+            timestamp: Math.floor(new Date().getTime() / 1000),
+            event_name: featureId,
+            payload: {
+                value: truncatedValue,
+                stripe_customer_id: customerId
+            }
+        };
+
+        this.addEventToMemory(event);
+        await this.checkAndUploadEvents();
+    }
+
+    private addEventToMemory(event: StripeEvent): void {
+        if (!this.bucketName) {
+            logger.warn(
+                "S3 bucket name is not configured, skipping event storage."
+            );
+            return;
+        }
+        this.events.push(event);
+    }
+
+    private async checkAndUploadEvents(): Promise<void> {
+        const now = Date.now();
+        const timeSinceLastUpload = now - this.lastUploadTime;
+
+        // Check if at least 1 minute has passed since last upload
+        if (timeSinceLastUpload >= 60000 && this.events.length > 0) {
+            await this.uploadEventsToS3();
+        }
+    }
+
+    private async uploadEventsToS3(): Promise<void> {
+        if (!this.bucketName) {
+            logger.warn(
+                "S3 bucket name is not configured, skipping S3 upload."
+            );
+            return;
+        }
+
+        if (this.events.length === 0) {
+            return;
+        }
+
+        // Check if already uploading
+        if (this.isUploading) {
+            logger.debug("Already uploading events, skipping");
+            return;
+        }
+
+        this.isUploading = true;
+
+        try {
+            // Take a snapshot of current events and clear the array
+            const eventsToUpload = [...this.events];
+            this.events = [];
+            this.lastUploadTime = Date.now();
+
+            const fileName = this.generateEventFileName();
+            const fileContent = JSON.stringify(eventsToUpload, null, 2);
+
+            // Upload to S3
+            const uploadCommand = new PutObjectCommand({
+                Bucket: this.bucketName,
+                Key: fileName,
+                Body: fileContent,
+                ContentType: "application/json"
+            });
+
+            await s3Client.send(uploadCommand);
+
+            logger.info(
+                `Uploaded ${fileName} to S3 with ${eventsToUpload.length} events`
+            );
+        } catch (error) {
+            logger.error("Failed to upload events to S3:", error);
+            // Note: Events are lost if upload fails. In a production system,
+            // you might want to add the events back to the array or implement retry logic
+        } finally {
+            this.isUploading = false;
+        }
+    }
+
+    private generateEventFileName(): string {
+        const timestamp = new Date().toISOString().replace(/[:.]/g, "-");
+        const uuid = uuidv4().substring(0, 8);
+        return `events-${timestamp}-${uuid}.json`;
+    }
+
     public async getUsage(
         orgId: string,
         featureId: FeatureId,
@@ -270,9 +432,7 @@ export class UsageService {
             return null;
         }
 
-        let orgIdToUse = await this.getBillingOrg(orgId, trx);
-
-        const usageId = `${orgIdToUse}-${featureId}`;
+        const usageId = `${orgId}-${featureId}`;
 
         try {
             const [result] = await trx
@@ -284,7 +444,7 @@ export class UsageService {
             if (!result) {
                 // Lets create one if it doesn't exist using upsert to handle race conditions
                 logger.info(
-                    `Creating new usage record for ${orgIdToUse}/${featureId}`
+                    `Creating new usage record for ${orgId}/${featureId}`
                 );
                 const meterId = getFeatureMeterId(featureId);
 
@@ -294,7 +454,7 @@ export class UsageService {
                         .values({
                             usageId,
                             featureId,
-                            orgId: orgIdToUse,
+                            orgId,
                             meterId,
                             latestValue: 0,
                             updatedAt: Math.floor(Date.now() / 1000)
@@ -316,7 +476,7 @@ export class UsageService {
                 } catch (insertError) {
                     // Fallback: try to fetch existing record in case of any insert issues
                     logger.warn(
-                        `Insert failed for ${orgIdToUse}/${featureId}, attempting to fetch existing record:`,
+                        `Insert failed for ${orgId}/${featureId}, attempting to fetch existing record:`,
                         insertError
                     );
                     const [existingUsage] = await trx
@@ -331,41 +491,19 @@ export class UsageService {
             return result;
         } catch (error) {
             logger.error(
-                `Failed to get usage for ${orgIdToUse}/${featureId}:`,
+                `Failed to get usage for ${orgId}/${featureId}:`,
                 error
             );
             throw error;
         }
     }
 
-    public async getBillingOrg(
-        orgId: string,
-        trx: Transaction | typeof db = db
-    ): Promise<string> {
-        let orgIdToUse = orgId;
-
-        // get the org
-        const [org] = await trx
-            .select()
-            .from(orgs)
-            .where(eq(orgs.orgId, orgId))
-            .limit(1);
-
-        if (!org) {
-            throw new Error(`Organization with ID ${orgId} not found`);
+    public async forceUpload(): Promise<void> {
+        if (this.events.length > 0) {
+            // Force upload regardless of time
+            this.lastUploadTime = 0; // Reset to force upload
+            await this.uploadEventsToS3();
         }
-
-        if (!org.isBillingOrg) {
-            if (org.billingOrgId) {
-                orgIdToUse = org.billingOrgId;
-            } else {
-                throw new Error(
-                    `Organization ${orgId} is not a billing org and does not have a billingOrgId set`
-                );
-            }
-        }
-
-        return orgIdToUse;
     }
 
     public async checkLimitSet(
@@ -377,9 +515,6 @@ export class UsageService {
         if (noop()) {
             return false;
         }
-
-        let orgIdToUse = await this.getBillingOrg(orgId, trx);
-
         // This method should check the current usage against the limits set for the organization
         // and kick out all of the sites on the org
         let hasExceededLimits = false;
@@ -393,7 +528,7 @@ export class UsageService {
                     .from(limits)
                     .where(
                         and(
-                            eq(limits.orgId, orgIdToUse),
+                            eq(limits.orgId, orgId),
                             eq(limits.featureId, featureId)
                         )
                     );
@@ -402,11 +537,11 @@ export class UsageService {
                 orgLimits = await trx
                     .select()
                     .from(limits)
-                    .where(eq(limits.orgId, orgIdToUse));
+                    .where(eq(limits.orgId, orgId));
             }
 
             if (orgLimits.length === 0) {
-                logger.debug(`No limits set for org ${orgIdToUse}`);
+                logger.debug(`No limits set for org ${orgId}`);
                 return false;
             }
 
@@ -417,7 +552,7 @@ export class UsageService {
                     currentUsage = usage;
                 } else {
                     currentUsage = await this.getUsage(
-                        orgIdToUse,
+                        orgId,
                         limit.featureId as FeatureId,
                         trx
                     );
@@ -428,10 +563,10 @@ export class UsageService {
                     currentUsage?.latestValue ||
                     0;
                 logger.debug(
-                    `Current usage for org ${orgIdToUse} on feature ${limit.featureId}: ${usageValue}`
+                    `Current usage for org ${orgId} on feature ${limit.featureId}: ${usageValue}`
                 );
                 logger.debug(
-                    `Limit for org ${orgIdToUse} on feature ${limit.featureId}: ${limit.value}`
+                    `Limit for org ${orgId} on feature ${limit.featureId}: ${limit.value}`
                 );
                 if (
                     currentUsage &&
@@ -439,7 +574,7 @@ export class UsageService {
                     usageValue > limit.value
                 ) {
                     logger.debug(
-                        `Org ${orgIdToUse} has exceeded limit for ${limit.featureId}: ` +
+                        `Org ${orgId} has exceeded limit for ${limit.featureId}: ` +
                             `${usageValue} > ${limit.value}`
                     );
                     hasExceededLimits = true;
@@ -447,7 +582,7 @@ export class UsageService {
                 }
             }
         } catch (error) {
-            logger.error(`Error checking limits for org ${orgIdToUse}:`, error);
+            logger.error(`Error checking limits for org ${orgId}:`, error);
         }
 
         return hasExceededLimits;

server/lib/createUserAccountOrg.ts

@@ -0,0 +1,197 @@
+import { isValidCIDR } from "@server/lib/validators";
+import { getNextAvailableOrgSubnet } from "@server/lib/ip";
+import {
+    actions,
+    apiKeyOrg,
+    apiKeys,
+    db,
+    domains,
+    Org,
+    orgDomains,
+    orgs,
+    roleActions,
+    roles,
+    userOrgs
+} from "@server/db";
+import { eq } from "drizzle-orm";
+import { defaultRoleAllowedActions } from "@server/routers/role";
+import { FeatureId, limitsService, sandboxLimitSet } from "@server/lib/billing";
+import { createCustomer } from "#dynamic/lib/billing";
+import { usageService } from "@server/lib/billing/usageService";
+import config from "@server/lib/config";
+
+export async function createUserAccountOrg(
+    userId: string,
+    userEmail: string
+): Promise<{
+    success: boolean;
+    org?: {
+        orgId: string;
+        name: string;
+        subnet: string;
+    };
+    error?: string;
+}> {
+    // const subnet = await getNextAvailableOrgSubnet();
+    const orgId = "org_" + userId;
+    const name = `${userEmail}'s Organization`;
+
+    // if (!isValidCIDR(subnet)) {
+    //     return {
+    //         success: false,
+    //         error: "Invalid subnet format. Please provide a valid CIDR notation."
+    //     };
+    // }
+
+    // // make sure the subnet is unique
+    // const subnetExists = await db
+    //     .select()
+    //     .from(orgs)
+    //     .where(eq(orgs.subnet, subnet))
+    //     .limit(1);
+
+    // if (subnetExists.length > 0) {
+    //     return { success: false, error: `Subnet ${subnet} already exists` };
+    // }
+
+    // make sure the orgId is unique
+    const orgExists = await db
+        .select()
+        .from(orgs)
+        .where(eq(orgs.orgId, orgId))
+        .limit(1);
+
+    if (orgExists.length > 0) {
+        return {
+            success: false,
+            error: `Organization with ID ${orgId} already exists`
+        };
+    }
+
+    let error = "";
+    let org: Org | null = null;
+
+    await db.transaction(async (trx) => {
+        const allDomains = await trx
+            .select()
+            .from(domains)
+            .where(eq(domains.configManaged, true));
+
+        const utilitySubnet = config.getRawConfig().orgs.utility_subnet_group;
+
+        const newOrg = await trx
+            .insert(orgs)
+            .values({
+                orgId,
+                name,
+                // subnet
+                subnet: "100.90.128.0/24", // TODO: this should not be hardcoded - or can it be the same in all orgs?
+                utilitySubnet: utilitySubnet,
+                createdAt: new Date().toISOString()
+            })
+            .returning();
+
+        if (newOrg.length === 0) {
+            error = "Failed to create organization";
+            trx.rollback();
+            return;
+        }
+
+        org = newOrg[0];
+
+        // Create admin role within the same transaction
+        const [insertedRole] = await trx
+            .insert(roles)
+            .values({
+                orgId: newOrg[0].orgId,
+                isAdmin: true,
+                name: "Admin",
+                description: "Admin role with the most permissions"
+            })
+            .returning({ roleId: roles.roleId });
+
+        if (!insertedRole || !insertedRole.roleId) {
+            error = "Failed to create Admin role";
+            trx.rollback();
+            return;
+        }
+
+        const roleId = insertedRole.roleId;
+
+        // Get all actions and create role actions
+        const actionIds = await trx.select().from(actions).execute();
+
+        if (actionIds.length > 0) {
+            await trx.insert(roleActions).values(
+                actionIds.map((action) => ({
+                    roleId,
+                    actionId: action.actionId,
+                    orgId: newOrg[0].orgId
+                }))
+            );
+        }
+
+        if (allDomains.length) {
+            await trx.insert(orgDomains).values(
+                allDomains.map((domain) => ({
+                    orgId: newOrg[0].orgId,
+                    domainId: domain.domainId
+                }))
+            );
+        }
+
+        await trx.insert(userOrgs).values({
+            userId,
+            orgId: newOrg[0].orgId,
+            roleId: roleId,
+            isOwner: true
+        });
+
+        const memberRole = await trx
+            .insert(roles)
+            .values({
+                name: "Member",
+                description: "Members can only view resources",
+                orgId
+            })
+            .returning();
+
+        await trx.insert(roleActions).values(
+            defaultRoleAllowedActions.map((action) => ({
+                roleId: memberRole[0].roleId,
+                actionId: action,
+                orgId
+            }))
+        );
+    });
+
+    await limitsService.applyLimitSetToOrg(orgId, sandboxLimitSet);
+
+    if (!org) {
+        return { success: false, error: "Failed to create org" };
+    }
+
+    if (error) {
+        return {
+            success: false,
+            error: `Failed to create org: ${error}`
+        };
+    }
+
+    // make sure we have the stripe customer
+    const customerId = await createCustomer(orgId, userEmail);
+
+    if (customerId) {
+        await usageService.updateCount(orgId, FeatureId.USERS, 1, customerId); // Only 1 because we are crating the org
+    }
+
+    return {
+        org: {
+            orgId,
+            name,
+            // subnet
+            subnet: "100.90.128.0/24"
+        },
+        success: true
+    };
+}

server/lib/deleteOrg.ts

@@ -19,8 +19,6 @@ import { sendToClient } from "#dynamic/routers/ws";
 import { deletePeer } from "@server/routers/gerbil/peers";
 import { OlmErrorCodes } from "@server/routers/olm/error";
 import { sendTerminateClient } from "@server/routers/client/terminate";
-import { usageService } from "./billing/usageService";
-import { FeatureId } from "./billing";
 
 export type DeleteOrgByIdResult = {
     deletedNewtIds: string[];
@@ -76,7 +74,9 @@ export async function deleteOrgById(
                         deletedNewtIds.push(deletedNewt.newtId);
                         await trx
                             .delete(newtSessions)
-                            .where(eq(newtSessions.newtId, deletedNewt.newtId));
+                            .where(
+                                eq(newtSessions.newtId, deletedNewt.newtId)
+                            );
                     }
                 }
             }
@@ -137,9 +137,6 @@ export async function deleteOrgById(
                 .where(inArray(domains.domainId, domainIdsToDelete));
         }
         await trx.delete(resources).where(eq(resources.orgId, orgId));
-
-        await usageService.add(orgId, FeatureId.ORGINIZATIONS, -1, trx); // here we are decreasing the org count BEFORE deleting the org because we need to still be able to get the org to get the billing org inside of here
-
         await trx.delete(orgs).where(eq(orgs.orgId, orgId));
     });
 
@@ -158,13 +155,15 @@ export function sendTerminationMessages(result: DeleteOrgByIdResult): void {
         );
     }
     for (const olmId of result.olmsToTerminate) {
-        sendTerminateClient(0, OlmErrorCodes.TERMINATED_REKEYED, olmId).catch(
-            (error) => {
-                logger.error(
-                    "Failed to send termination message to olm:",
-                    error
-                );
-            }
-        );
+        sendTerminateClient(
+            0,
+            OlmErrorCodes.TERMINATED_REKEYED,
+            olmId
+        ).catch((error) => {
+            logger.error(
+                "Failed to send termination message to olm:",
+                error
+            );
+        });
     }
 }

server/lib/userOrg.ts

@@ -1,142 +0,0 @@
-import {
-    db,
-    Org,
-    orgs,
-    resources,
-    siteResources,
-    sites,
-    Transaction,
-    UserOrg,
-    userOrgs,
-    userResources,
-    userSiteResources,
-    userSites
-} from "@server/db";
-import { eq, and, inArray, ne, exists } from "drizzle-orm";
-import { usageService } from "@server/lib/billing/usageService";
-import { FeatureId } from "@server/lib/billing";
-
-export async function assignUserToOrg(
-    org: Org,
-    values: typeof userOrgs.$inferInsert,
-    trx: Transaction | typeof db = db
-) {
-    const [userOrg] = await trx.insert(userOrgs).values(values).returning();
-
-    // calculate if the user is in any other of the orgs before we count it as an add to the billing org
-    if (org.billingOrgId) {
-        const otherBillingOrgs = await trx
-            .select()
-            .from(orgs)
-            .where(
-                and(
-                    eq(orgs.billingOrgId, org.billingOrgId),
-                    ne(orgs.orgId, org.orgId)
-                )
-            );
-
-        const billingOrgIds = otherBillingOrgs.map((o) => o.orgId);
-
-        const orgsInBillingDomainThatTheUserIsStillIn = await trx
-            .select()
-            .from(userOrgs)
-            .where(
-                and(
-                    eq(userOrgs.userId, userOrg.userId),
-                    inArray(userOrgs.orgId, billingOrgIds)
-                )
-            );
-
-        if (orgsInBillingDomainThatTheUserIsStillIn.length === 0) {
-            await usageService.add(org.orgId, FeatureId.USERS, 1, trx);
-        }
-    }
-}
-
-export async function removeUserFromOrg(
-    org: Org,
-    userId: string,
-    trx: Transaction | typeof db = db
-) {
-    await trx
-        .delete(userOrgs)
-        .where(and(eq(userOrgs.userId, userId), eq(userOrgs.orgId, org.orgId)));
-
-    await trx.delete(userResources).where(
-        and(
-            eq(userResources.userId, userId),
-            exists(
-                trx
-                    .select()
-                    .from(resources)
-                    .where(
-                        and(
-                            eq(resources.resourceId, userResources.resourceId),
-                            eq(resources.orgId, org.orgId)
-                        )
-                    )
-            )
-        )
-    );
-
-    await trx.delete(userSiteResources).where(
-        and(
-            eq(userSiteResources.userId, userId),
-            exists(
-                trx
-                    .select()
-                    .from(siteResources)
-                    .where(
-                        and(
-                            eq(
-                                siteResources.siteResourceId,
-                                userSiteResources.siteResourceId
-                            ),
-                            eq(siteResources.orgId, org.orgId)
-                        )
-                    )
-            )
-        )
-    );
-
-    await trx.delete(userSites).where(
-        and(
-            eq(userSites.userId, userId),
-            exists(
-                db
-                    .select()
-                    .from(sites)
-                    .where(
-                        and(
-                            eq(sites.siteId, userSites.siteId),
-                            eq(sites.orgId, org.orgId)
-                        )
-                    )
-            )
-        )
-    );
-
-    // calculate if the user is in any other of the orgs before we count it as an remove to the billing org
-    if (org.billingOrgId) {
-        const billingOrgs = await trx
-            .select()
-            .from(orgs)
-            .where(eq(orgs.billingOrgId, org.billingOrgId));
-
-        const billingOrgIds = billingOrgs.map((o) => o.orgId);
-
-        const orgsInBillingDomainThatTheUserIsStillIn = await trx
-            .select()
-            .from(userOrgs)
-            .where(
-                and(
-                    eq(userOrgs.userId, userId),
-                    inArray(userOrgs.orgId, billingOrgIds)
-                )
-            );
-
-        if (orgsInBillingDomainThatTheUserIsStillIn.length === 0) {
-            await usageService.add(org.orgId, FeatureId.USERS, -1, trx);
-        }
-    }
-}

server/openApi.ts

@@ -16,6 +16,5 @@ export enum OpenAPITags {
     Client = "Client",
     ApiKey = "API Key",
     Domain = "Domain",
-    Blueprint = "Blueprint",
-    Ssh = "SSH"
+    Blueprint = "Blueprint"
 }

server/private/lib/sshCA.ts

@@ -1,442 +0,0 @@
-/*
- * This file is part of a proprietary work.
- *
- * Copyright (c) 2025 Fossorial, Inc.
- * All rights reserved.
- *
- * This file is licensed under the Fossorial Commercial License.
- * You may not use this file except in compliance with the License.
- * Unauthorized use, copying, modification, or distribution is strictly prohibited.
- *
- * This file is not licensed under the AGPLv3.
- */
-
-import * as crypto from "crypto";
-
-/**
- * SSH CA "Server" - Pure TypeScript Implementation
- *
- * This module provides basic SSH Certificate Authority functionality using
- * only Node.js built-in crypto module. No external dependencies or subprocesses.
- *
- * Usage:
- *   1. generateCA() - Creates a new CA key pair, returns CA info including the
- *      TrustedUserCAKeys line to add to servers
- *   2. signPublicKey() - Signs a user's public key with the CA, returns a certificate
- */
-
-// ============================================================================
-// SSH Wire Format Helpers
-// ============================================================================
-
-/**
- * Encode a string in SSH wire format (4-byte length prefix + data)
- */
-function encodeString(data: Buffer | string): Buffer {
-    const buf = typeof data === "string" ? Buffer.from(data, "utf8") : data;
-    const len = Buffer.alloc(4);
-    len.writeUInt32BE(buf.length, 0);
-    return Buffer.concat([len, buf]);
-}
-
-/**
- * Encode a uint32 in SSH wire format (big-endian)
- */
-function encodeUInt32(value: number): Buffer {
-    const buf = Buffer.alloc(4);
-    buf.writeUInt32BE(value, 0);
-    return buf;
-}
-
-/**
- * Encode a uint64 in SSH wire format (big-endian)
- */
-function encodeUInt64(value: bigint): Buffer {
-    const buf = Buffer.alloc(8);
-    buf.writeBigUInt64BE(value, 0);
-    return buf;
-}
-
-/**
- * Decode a string from SSH wire format at the given offset
- * Returns the string buffer and the new offset
- */
-function decodeString(data: Buffer, offset: number): { value: Buffer; newOffset: number } {
-    const len = data.readUInt32BE(offset);
-    const value = data.subarray(offset + 4, offset + 4 + len);
-    return { value, newOffset: offset + 4 + len };
-}
-
-// ============================================================================
-// SSH Public Key Parsing/Encoding
-// ============================================================================
-
-/**
- * Parse an OpenSSH public key line (e.g., "ssh-ed25519 AAAA... comment")
- */
-function parseOpenSSHPublicKey(pubKeyLine: string): {
-    keyType: string;
-    keyData: Buffer;
-    comment: string;
-} {
-    const parts = pubKeyLine.trim().split(/\s+/);
-    if (parts.length < 2) {
-        throw new Error("Invalid public key format");
-    }
-
-    const keyType = parts[0];
-    const keyData = Buffer.from(parts[1], "base64");
-    const comment = parts.slice(2).join(" ") || "";
-
-    // Verify the key type in the blob matches
-    const { value: blobKeyType } = decodeString(keyData, 0);
-    if (blobKeyType.toString("utf8") !== keyType) {
-        throw new Error(`Key type mismatch: ${blobKeyType.toString("utf8")} vs ${keyType}`);
-    }
-
-    return { keyType, keyData, comment };
-}
-
-/**
- * Encode an Ed25519 public key in OpenSSH format
- */
-function encodeEd25519PublicKey(publicKey: Buffer): Buffer {
-    return Buffer.concat([
-        encodeString("ssh-ed25519"),
-        encodeString(publicKey)
-    ]);
-}
-
-/**
- * Format a public key blob as an OpenSSH public key line
- */
-function formatOpenSSHPublicKey(keyBlob: Buffer, comment: string = ""): string {
-    const { value: keyType } = decodeString(keyBlob, 0);
-    const base64 = keyBlob.toString("base64");
-    return `${keyType.toString("utf8")} ${base64}${comment ? " " + comment : ""}`;
-}
-
-// ============================================================================
-// SSH Certificate Building
-// ============================================================================
-
-interface CertificateOptions {
-    /** Serial number for the certificate */
-    serial?: bigint;
-    /** Certificate type: 1 = user, 2 = host */
-    certType?: number;
-    /** Key ID (usually username or identifier) */
-    keyId: string;
-    /** List of valid principals (usernames the cert is valid for) */
-    validPrincipals: string[];
-    /** Valid after timestamp (seconds since epoch) */
-    validAfter?: bigint;
-    /** Valid before timestamp (seconds since epoch) */
-    validBefore?: bigint;
-    /** Critical options (usually empty for user certs) */
-    criticalOptions?: Map<string, string>;
-    /** Extensions to enable */
-    extensions?: string[];
-}
-
-/**
- * Build the extensions section of the certificate
- */
-function buildExtensions(extensions: string[]): Buffer {
-    // Extensions are a series of name-value pairs, sorted by name
-    // For boolean extensions, the value is empty
-    const sortedExtensions = [...extensions].sort();
-
-    const parts: Buffer[] = [];
-    for (const ext of sortedExtensions) {
-        parts.push(encodeString(ext));
-        parts.push(encodeString("")); // Empty value for boolean extensions
-    }
-
-    return encodeString(Buffer.concat(parts));
-}
-
-/**
- * Build the critical options section
- */
-function buildCriticalOptions(options: Map<string, string>): Buffer {
-    const sortedKeys = [...options.keys()].sort();
-
-    const parts: Buffer[] = [];
-    for (const key of sortedKeys) {
-        parts.push(encodeString(key));
-        parts.push(encodeString(encodeString(options.get(key)!)));
-    }
-
-    return encodeString(Buffer.concat(parts));
-}
-
-/**
- * Build the valid principals section
- */
-function buildPrincipals(principals: string[]): Buffer {
-    const parts: Buffer[] = [];
-    for (const principal of principals) {
-        parts.push(encodeString(principal));
-    }
-    return encodeString(Buffer.concat(parts));
-}
-
-/**
- * Extract the raw Ed25519 public key from an OpenSSH public key blob
- */
-function extractEd25519PublicKey(keyBlob: Buffer): Buffer {
-    const { newOffset } = decodeString(keyBlob, 0); // Skip key type
-    const { value: publicKey } = decodeString(keyBlob, newOffset);
-    return publicKey;
-}
-
-// ============================================================================
-// CA Interface
-// ============================================================================
-
-export interface CAKeyPair {
-    /** CA private key in PEM format (keep this secret!) */
-    privateKeyPem: string;
-    /** CA public key in PEM format */
-    publicKeyPem: string;
-    /** CA public key in OpenSSH format (for TrustedUserCAKeys) */
-    publicKeyOpenSSH: string;
-    /** Raw CA public key bytes (Ed25519) */
-    publicKeyRaw: Buffer;
-}
-
-export interface SignedCertificate {
-    /** The certificate in OpenSSH format (save as id_ed25519-cert.pub or similar) */
-    certificate: string;
-    /** The certificate type string */
-    certType: string;
-    /** Serial number */
-    serial: bigint;
-    /** Key ID */
-    keyId: string;
-    /** Valid principals */
-    validPrincipals: string[];
-    /** Valid from timestamp */
-    validAfter: Date;
-    /** Valid until timestamp */
-    validBefore: Date;
-}
-
-// ============================================================================
-// Main Functions
-// ============================================================================
-
-/**
- * Generate a new SSH Certificate Authority key pair.
- *
- * Returns the CA keys and the line to add to /etc/ssh/sshd_config:
- *   TrustedUserCAKeys /etc/ssh/ca.pub
- *
- * Then save the publicKeyOpenSSH to /etc/ssh/ca.pub on the server.
- *
- * @param comment - Optional comment for the CA public key
- * @returns CA key pair and configuration info
- */
-export function generateCA(comment: string = "ssh-ca"): CAKeyPair {
-    // Generate Ed25519 key pair
-    const { publicKey, privateKey } = crypto.generateKeyPairSync("ed25519", {
-        publicKeyEncoding: { type: "spki", format: "pem" },
-        privateKeyEncoding: { type: "pkcs8", format: "pem" }
-    });
-
-    // Get raw public key bytes
-    const pubKeyObj = crypto.createPublicKey(publicKey);
-    const rawPubKey = pubKeyObj.export({ type: "spki", format: "der" });
-    // Ed25519 SPKI format: 12 byte header + 32 byte key
-    const ed25519PubKey = rawPubKey.subarray(rawPubKey.length - 32);
-
-    // Create OpenSSH format public key
-    const pubKeyBlob = encodeEd25519PublicKey(ed25519PubKey);
-    const publicKeyOpenSSH = formatOpenSSHPublicKey(pubKeyBlob, comment);
-
-    return {
-        privateKeyPem: privateKey,
-        publicKeyPem: publicKey,
-        publicKeyOpenSSH,
-        publicKeyRaw: ed25519PubKey
-    };
-}
-
-// ============================================================================
-// Helper Functions
-// ============================================================================
-
-/**
- * Get and decrypt the SSH CA keys for an organization.
- * 
- * @param orgId - Organization ID
- * @param decryptionKey - Key to decrypt the CA private key (typically server.secret from config)
- * @returns CA key pair or null if not found
- */
-export async function getOrgCAKeys(
-    orgId: string,
-    decryptionKey: string
-): Promise<CAKeyPair | null> {
-    const { db, orgs } = await import("@server/db");
-    const { eq } = await import("drizzle-orm");
-    const { decrypt } = await import("@server/lib/crypto");
-
-    const [org] = await db
-        .select({
-            sshCaPrivateKey: orgs.sshCaPrivateKey,
-            sshCaPublicKey: orgs.sshCaPublicKey
-        })
-        .from(orgs)
-        .where(eq(orgs.orgId, orgId))
-        .limit(1);
-
-    if (!org || !org.sshCaPrivateKey || !org.sshCaPublicKey) {
-        return null;
-    }
-
-    const privateKeyPem = decrypt(org.sshCaPrivateKey, decryptionKey);
-
-    // Extract raw public key from the OpenSSH format
-    const { keyData } = parseOpenSSHPublicKey(org.sshCaPublicKey);
-    const { newOffset } = decodeString(keyData, 0); // Skip key type
-    const { value: publicKeyRaw } = decodeString(keyData, newOffset);
-
-    // Get PEM format of public key
-    const pubKeyObj = crypto.createPublicKey({
-        key: privateKeyPem,
-        format: "pem"
-    });
-    const publicKeyPem = pubKeyObj.export({ type: "spki", format: "pem" }) as string;
-
-    return {
-        privateKeyPem,
-        publicKeyPem,
-        publicKeyOpenSSH: org.sshCaPublicKey,
-        publicKeyRaw
-    };
-}
-
-/**
- * Sign a user's SSH public key with the CA, producing a certificate.
- *
- * The resulting certificate should be saved alongside the user's private key
- * with a -cert.pub suffix. For example:
- *   - Private key: ~/.ssh/id_ed25519
- *   - Certificate: ~/.ssh/id_ed25519-cert.pub
- *
- * @param caPrivateKeyPem - CA private key in PEM format
- * @param userPublicKeyLine - User's public key in OpenSSH format
- * @param options - Certificate options (principals, validity, etc.)
- * @returns Signed certificate
- */
-export function signPublicKey(
-    caPrivateKeyPem: string,
-    userPublicKeyLine: string,
-    options: CertificateOptions
-): SignedCertificate {
-    // Parse the user's public key
-    const { keyType, keyData } = parseOpenSSHPublicKey(userPublicKeyLine);
-
-    // Determine certificate type string
-    let certTypeString: string;
-    if (keyType === "ssh-ed25519") {
-        certTypeString = "ssh-ed25519-cert-v01@openssh.com";
-    } else if (keyType === "ssh-rsa") {
-        certTypeString = "ssh-rsa-cert-v01@openssh.com";
-    } else if (keyType === "ecdsa-sha2-nistp256") {
-        certTypeString = "ecdsa-sha2-nistp256-cert-v01@openssh.com";
-    } else if (keyType === "ecdsa-sha2-nistp384") {
-        certTypeString = "ecdsa-sha2-nistp384-cert-v01@openssh.com";
-    } else if (keyType === "ecdsa-sha2-nistp521") {
-        certTypeString = "ecdsa-sha2-nistp521-cert-v01@openssh.com";
-    } else {
-        throw new Error(`Unsupported key type: ${keyType}`);
-    }
-
-    // Get CA public key from private key
-    const caPrivKey = crypto.createPrivateKey(caPrivateKeyPem);
-    const caPubKey = crypto.createPublicKey(caPrivKey);
-    const caRawPubKey = caPubKey.export({ type: "spki", format: "der" });
-    const caEd25519PubKey = caRawPubKey.subarray(caRawPubKey.length - 32);
-    const caPubKeyBlob = encodeEd25519PublicKey(caEd25519PubKey);
-
-    // Set defaults
-    const serial = options.serial ?? BigInt(Date.now());
-    const certType = options.certType ?? 1; // 1 = user cert
-    const now = BigInt(Math.floor(Date.now() / 1000));
-    const validAfter = options.validAfter ?? (now - 60n); // 1 minute ago
-    const validBefore = options.validBefore ?? (now + 86400n * 365n); // 1 year from now
-
-    // Default extensions for user certificates
-    const defaultExtensions = [
-        "permit-X11-forwarding",
-        "permit-agent-forwarding",
-        "permit-port-forwarding",
-        "permit-pty",
-        "permit-user-rc"
-    ];
-    const extensions = options.extensions ?? defaultExtensions;
-    const criticalOptions = options.criticalOptions ?? new Map();
-
-    // Generate nonce (random bytes)
-    const nonce = crypto.randomBytes(32);
-
-    // Extract the public key portion from the user's key blob
-    // For Ed25519: skip the key type string, get the public key (already encoded)
-    let userKeyPortion: Buffer;
-    if (keyType === "ssh-ed25519") {
-        // Skip the key type string, take the rest (which is encodeString(32-byte-key))
-        const { newOffset } = decodeString(keyData, 0);
-        userKeyPortion = keyData.subarray(newOffset);
-    } else {
-        // For other key types, extract everything after the key type
-        const { newOffset } = decodeString(keyData, 0);
-        userKeyPortion = keyData.subarray(newOffset);
-    }
-
-    // Build the certificate body (to be signed)
-    const certBody = Buffer.concat([
-        encodeString(certTypeString),
-        encodeString(nonce),
-        userKeyPortion,
-        encodeUInt64(serial),
-        encodeUInt32(certType),
-        encodeString(options.keyId),
-        buildPrincipals(options.validPrincipals),
-        encodeUInt64(validAfter),
-        encodeUInt64(validBefore),
-        buildCriticalOptions(criticalOptions),
-        buildExtensions(extensions),
-        encodeString(""), // reserved
-        encodeString(caPubKeyBlob) // signature key (CA public key)
-    ]);
-
-    // Sign the certificate body
-    const signature = crypto.sign(null, certBody, caPrivKey);
-
-    // Build the full signature blob (algorithm + signature)
-    const signatureBlob = Buffer.concat([
-        encodeString("ssh-ed25519"),
-        encodeString(signature)
-    ]);
-
-    // Build complete certificate
-    const certificate = Buffer.concat([
-        certBody,
-        encodeString(signatureBlob)
-    ]);
-
-    // Format as OpenSSH certificate line
-    const certLine = `${certTypeString} ${certificate.toString("base64")} ${options.keyId}`;
-
-    return {
-        certificate: certLine,
-        certType: certTypeString,
-        serial,
-        keyId: options.keyId,
-        validPrincipals: options.validPrincipals,
-        validAfter: new Date(Number(validAfter) * 1000),
-        validBefore: new Date(Number(validBefore) * 1000)
-    };
-}

server/private/routers/approvals/countApprovals.ts

@@ -19,7 +19,7 @@ import { fromError } from "zod-validation-error";
 
 import type { Request, Response, NextFunction } from "express";
 import { approvals, db, type Approval } from "@server/db";
-import { eq, sql, and, inArray } from "drizzle-orm";
+import { eq, sql, and } from "drizzle-orm";
 import response from "@server/lib/response";
 
 const paramsSchema = z.strictObject({
@@ -88,7 +88,7 @@ export async function countApprovals(
             .where(
                 and(
                     eq(approvals.orgId, orgId),
-                    inArray(approvals.decision, state)
+                    sql`${approvals.decision} in ${state}`
                 )
             );
 

server/private/routers/approvals/listApprovals.ts

@@ -28,7 +28,7 @@ import {
     currentFingerprint,
     type Approval
 } from "@server/db";
-import { eq, isNull, sql, not, and, desc, gte, lte } from "drizzle-orm";
+import { eq, isNull, sql, not, and, desc } from "drizzle-orm";
 import response from "@server/lib/response";
 import { getUserDeviceName } from "@server/db/names";
 
@@ -37,26 +37,18 @@ const paramsSchema = z.strictObject({
 });
 
 const querySchema = z.strictObject({
-    limit: z.coerce
-        .number<string>() // for prettier formatting
-        .int()
-        .positive()
+    limit: z
+        .string()
         .optional()
-        .catch(20)
-        .default(20),
-    cursorPending: z.coerce // pending cursor
-        .number<string>()
-        .int()
-        .max(1) // 0 means non pending
-        .min(0) // 1 means pending
+        .default("1000")
+        .transform(Number)
+        .pipe(z.int().nonnegative()),
+    offset: z
+        .string()
         .optional()
-        .catch(undefined),
-    cursorTimestamp: z.coerce
-        .number<string>()
-        .int()
-        .positive()
-        .optional()
-        .catch(undefined),
+        .default("0")
+        .transform(Number)
+        .pipe(z.int().nonnegative()),
     approvalState: z
         .enum(["pending", "approved", "denied", "all"])
         .optional()
@@ -69,21 +61,13 @@ const querySchema = z.strictObject({
         .pipe(z.number().int().positive().optional())
 });
 
-async function queryApprovals({
-    orgId,
-    limit,
-    approvalState,
-    cursorPending,
-    cursorTimestamp,
-    clientId
-}: {
-    orgId: string;
-    limit: number;
-    approvalState: z.infer<typeof querySchema>["approvalState"];
-    cursorPending?: number;
-    cursorTimestamp?: number;
-    clientId?: number;
-}) {
+async function queryApprovals(
+    orgId: string,
+    limit: number,
+    offset: number,
+    approvalState: z.infer<typeof querySchema>["approvalState"],
+    clientId?: number
+) {
     let state: Array<Approval["decision"]> = [];
     switch (approvalState) {
         case "pending":
@@ -99,26 +83,6 @@ async function queryApprovals({
             state = ["approved", "denied", "pending"];
     }
 
-    const conditions = [
-        eq(approvals.orgId, orgId),
-        sql`${approvals.decision} in ${state}`
-    ];
-
-    if (clientId) {
-        conditions.push(eq(approvals.clientId, clientId));
-    }
-
-    const pendingSortKey = sql`CASE ${approvals.decision} WHEN 'pending' THEN 1 ELSE 0 END`;
-
-    if (cursorPending != null && cursorTimestamp != null) {
-        // https://stackoverflow.com/a/79720298/10322846
-        // composite cursor, next data means (pending, timestamp) <= cursor
-        conditions.push(
-            lte(pendingSortKey, cursorPending),
-            lte(approvals.timestamp, cursorTimestamp)
-        );
-    }
-
     const res = await db
         .select({
             approvalId: approvals.approvalId,
@@ -141,8 +105,7 @@ async function queryApprovals({
             fingerprintArch: currentFingerprint.arch,
             fingerprintSerialNumber: currentFingerprint.serialNumber,
             fingerprintUsername: currentFingerprint.username,
-            fingerprintHostname: currentFingerprint.hostname,
-            timestamp: approvals.timestamp
+            fingerprintHostname: currentFingerprint.hostname
         })
         .from(approvals)
         .innerJoin(users, and(eq(approvals.userId, users.userId)))
@@ -155,12 +118,22 @@ async function queryApprovals({
         )
         .leftJoin(olms, eq(clients.clientId, olms.clientId))
         .leftJoin(currentFingerprint, eq(olms.olmId, currentFingerprint.olmId))
-        .where(and(...conditions))
-        .orderBy(desc(pendingSortKey), desc(approvals.timestamp))
-        .limit(limit + 1); // the `+1` is used for the cursor
+        .where(
+            and(
+                eq(approvals.orgId, orgId),
+                sql`${approvals.decision} in ${state}`,
+                ...(clientId ? [eq(approvals.clientId, clientId)] : [])
+            )
+        )
+        .orderBy(
+            sql`CASE ${approvals.decision} WHEN 'pending' THEN 0 ELSE 1 END`,
+            desc(approvals.timestamp)
+        )
+        .limit(limit)
+        .offset(offset);
 
     // Process results to format device names and build fingerprint objects
-    const approvalsList = res.slice(0, limit).map((approval) => {
+    return res.map((approval) => {
         const model = approval.deviceModel || null;
         const deviceName = approval.clientName
             ? getUserDeviceName(model, approval.clientName)
@@ -179,15 +152,15 @@ async function queryApprovals({
 
         const fingerprint = hasFingerprintData
             ? {
-                  platform: approval.fingerprintPlatform ?? null,
-                  osVersion: approval.fingerprintOsVersion ?? null,
-                  kernelVersion: approval.fingerprintKernelVersion ?? null,
-                  arch: approval.fingerprintArch ?? null,
-                  deviceModel: approval.deviceModel ?? null,
-                  serialNumber: approval.fingerprintSerialNumber ?? null,
-                  username: approval.fingerprintUsername ?? null,
-                  hostname: approval.fingerprintHostname ?? null
-              }
+                platform: approval.fingerprintPlatform || null,
+                osVersion: approval.fingerprintOsVersion || null,
+                kernelVersion: approval.fingerprintKernelVersion || null,
+                arch: approval.fingerprintArch || null,
+                deviceModel: approval.deviceModel || null,
+                serialNumber: approval.fingerprintSerialNumber || null,
+                username: approval.fingerprintUsername || null,
+                hostname: approval.fingerprintHostname || null
+            }
             : null;
 
         const {
@@ -210,30 +183,11 @@ async function queryApprovals({
             niceId: approval.niceId || null
         };
     });
-    let nextCursorPending: number | null = null;
-    let nextCursorTimestamp: number | null = null;
-    if (res.length > limit) {
-        const lastItem = res[limit];
-        nextCursorPending = lastItem.decision === "pending" ? 1 : 0;
-        nextCursorTimestamp = lastItem.timestamp;
-    }
-    return {
-        approvalsList,
-        nextCursorPending,
-        nextCursorTimestamp
-    };
 }
 
 export type ListApprovalsResponse = {
-    approvals: NonNullable<
-        Awaited<ReturnType<typeof queryApprovals>>
-    >["approvalsList"];
-    pagination: {
-        total: number;
-        limit: number;
-        cursorPending: number | null;
-        cursorTimestamp: number | null;
-    };
+    approvals: NonNullable<Awaited<ReturnType<typeof queryApprovals>>>;
+    pagination: { total: number; limit: number; offset: number };
 };
 
 export async function listApprovals(
@@ -261,25 +215,17 @@ export async function listApprovals(
                 )
             );
         }
-        const {
-            limit,
-            cursorPending,
-            cursorTimestamp,
-            approvalState,
-            clientId
-        } = parsedQuery.data;
+        const { limit, offset, approvalState, clientId } = parsedQuery.data;
 
         const { orgId } = parsedParams.data;
 
-        const { approvalsList, nextCursorPending, nextCursorTimestamp } =
-            await queryApprovals({
-                orgId: orgId.toString(),
-                limit,
-                cursorPending,
-                cursorTimestamp,
-                approvalState,
-                clientId
-            });
+        const approvalsList = await queryApprovals(
+            orgId.toString(),
+            limit,
+            offset,
+            approvalState,
+            clientId
+        );
 
         const [{ count }] = await db
             .select({ count: sql<number>`count(*)` })
@@ -291,8 +237,7 @@ export async function listApprovals(
                 pagination: {
                     total: count,
                     limit,
-                    cursorPending: nextCursorPending,
-                    cursorTimestamp: nextCursorTimestamp
+                    offset
                 }
             },
             success: true,

server/private/routers/billing/getOrgUsage.ts

@@ -85,14 +85,10 @@ export async function getOrgUsage(
             orgId,
             FeatureId.REMOTE_EXIT_NODES
         );
-        const organizations = await usageService.getUsage(
+        const egressData = await usageService.getUsage(
             orgId,
-            FeatureId.ORGINIZATIONS
+            FeatureId.EGRESS_DATA_MB
         );
-        // const egressData = await usageService.getUsage(
-        //     orgId,
-        //     FeatureId.EGRESS_DATA_MB
-        // );
 
         if (sites) {
             usageData.push(sites);
@@ -100,18 +96,15 @@ export async function getOrgUsage(
         if (users) {
             usageData.push(users);
         }
-        // if (egressData) {
-        //     usageData.push(egressData);
-        // }
+        if (egressData) {
+            usageData.push(egressData);
+        }
         if (domains) {
             usageData.push(domains);
         }
         if (remoteExitNodes) {
             usageData.push(remoteExitNodes);
         }
-        if (organizations) {
-            usageData.push(organizations);
-        }
 
         const orgLimits = await db
             .select()

server/private/routers/external.ts

@@ -25,7 +25,6 @@ import * as logs from "#private/routers/auditLogs";
 import * as misc from "#private/routers/misc";
 import * as reKey from "#private/routers/re-key";
 import * as approval from "#private/routers/approvals";
-import * as ssh from "#private/routers/ssh";
 
 import {
     verifyOrgAccess,
@@ -507,14 +506,3 @@ authenticated.put(
     verifyUserHasAction(ActionsEnum.reGenerateSecret),
     reKey.reGenerateExitNodeSecret
 );
-
-authenticated.post(
-    "/org/:orgId/ssh/sign-key",
-    verifyValidLicense,
-    verifyValidSubscription(tierMatrix.sshPam),
-    verifyOrgAccess,
-    verifyLimits,
-    // verifyUserHasAction(ActionsEnum.signSshKey),
-    logActionAudit(ActionsEnum.signSshKey),
-    ssh.signSshKey
-);

server/private/routers/generatedLicense/generateNewEnterpriseLicense.ts

@@ -37,9 +37,8 @@ export async function generateNewEnterpriseLicense(
     next: NextFunction
 ): Promise<any> {
     try {
-        const parsedParams = generateNewEnterpriseLicenseParamsSchema.safeParse(
-            req.params
-        );
+
+        const parsedParams = generateNewEnterpriseLicenseParamsSchema.safeParse(req.params);
         if (!parsedParams.success) {
             return next(
                 createHttpError(
@@ -64,10 +63,7 @@ export async function generateNewEnterpriseLicense(
 
         const licenseData = req.body;
 
-        if (
-            licenseData.tier != "big_license" &&
-            licenseData.tier != "small_license"
-        ) {
+        if (licenseData.tier != "big_license" && licenseData.tier != "small_license") {
             return next(
                 createHttpError(
                     HttpCode.BAD_REQUEST,
@@ -83,8 +79,7 @@ export async function generateNewEnterpriseLicense(
             return next(
                 createHttpError(
                     apiResponse.status || HttpCode.BAD_REQUEST,
-                    apiResponse.message ||
-                        "Failed to create license from Fossorial API"
+                    apiResponse.message || "Failed to create license from Fossorial API"
                 )
             );
         }
@@ -117,10 +112,7 @@ export async function generateNewEnterpriseLicense(
             );
         }
 
-        const tier =
-            licenseData.tier === "big_license"
-                ? LicenseId.BIG_LICENSE
-                : LicenseId.SMALL_LICENSE;
+        const tier = licenseData.tier === "big_license" ? LicenseId.BIG_LICENSE : LicenseId.SMALL_LICENSE;
         const tierPrice = getLicensePriceSet()[tier];
 
         const session = await stripe!.checkout.sessions.create({
@@ -130,7 +122,7 @@ export async function generateNewEnterpriseLicense(
                 {
                     price: tierPrice, // Use the standard tier
                     quantity: 1
-                }
+                },
             ], // Start with the standard feature set that matches the free limits
             customer: customer.customerId,
             mode: "subscription",

server/private/routers/loginPage/upsertLoginPageBranding.ts

@@ -26,7 +26,6 @@ import logger from "@server/logger";
 import { fromError } from "zod-validation-error";
 import { eq, InferInsertModel } from "drizzle-orm";
 import { build } from "@server/build";
-import { validateLocalPath } from "@app/lib/validateLocalPath";
 import config from "#private/lib/config";
 
 const paramsSchema = z.strictObject({
@@ -38,36 +37,14 @@ const bodySchema = z.strictObject({
         .union([
             z.literal(""),
             z
-                .string()
-                .superRefine(async (urlOrPath, ctx) => {
-                    const parseResult = z.url().safeParse(urlOrPath);
-                    if (!parseResult.success) {
-                        if (build !== "enterprise") {
-                            ctx.addIssue({
-                                code: "custom",
-                                message: "Must be a valid URL"
-                            });
-                            return;
-                        } else {
-                            try {
-                                validateLocalPath(urlOrPath);
-                            } catch (error) {
-                                ctx.addIssue({
-                                    code: "custom",
-                                    message: "Must be either a valid image URL or a valid pathname starting with `/` and not containing query parameters, `..` or `*`"
-                                });
-                            } finally {
-                                return;
-                            }
-                        }
-                    }
-
+                .url("Must be a valid URL")
+                .superRefine(async (url, ctx) => {
                     try {
-                        const response = await fetch(urlOrPath, {
+                        const response = await fetch(url, {
                             method: "HEAD"
                         }).catch(() => {
                             // If HEAD fails (CORS or method not allowed), try GET
-                            return fetch(urlOrPath, { method: "GET" });
+                            return fetch(url, { method: "GET" });
                         });
 
                         if (response.status !== 200) {

server/private/routers/remoteExitNode/createRemoteExitNode.ts

@@ -12,14 +12,7 @@
  */
 
 import { NextFunction, Request, Response } from "express";
-import {
-    db,
-    exitNodes,
-    exitNodeOrgs,
-    ExitNode,
-    ExitNodeOrg,
-    orgs
-} from "@server/db";
+import { db, exitNodes, exitNodeOrgs, ExitNode, ExitNodeOrg } from "@server/db";
 import HttpCode from "@server/types/HttpCode";
 import { z } from "zod";
 import { remoteExitNodes } from "@server/db";
@@ -32,7 +25,7 @@ import { createRemoteExitNodeSession } from "#private/auth/sessions/remoteExitNo
 import { fromError } from "zod-validation-error";
 import { hashPassword, verifyPassword } from "@server/auth/password";
 import logger from "@server/logger";
-import { and, eq, inArray, ne } from "drizzle-orm";
+import { and, eq } from "drizzle-orm";
 import { getNextAvailableSubnet } from "@server/lib/exitNodes";
 import { usageService } from "@server/lib/billing/usageService";
 import { FeatureId } from "@server/lib/billing";
@@ -176,17 +169,7 @@ export async function createRemoteExitNode(
             );
         }
 
-        const [org] = await db
-            .select()
-            .from(orgs)
-            .where(eq(orgs.orgId, orgId))
-            .limit(1);
-
-        if (!org) {
-            return next(
-                createHttpError(HttpCode.NOT_FOUND, "Organization not found")
-            );
-        }
+        let numExitNodeOrgs: ExitNodeOrg[] | undefined;
 
         await db.transaction(async (trx) => {
             if (!existingExitNode) {
@@ -234,44 +217,20 @@ export async function createRemoteExitNode(
                 });
             }
 
-            // calculate if the node is in any other of the orgs before we count it as an add to the billing org
-            if (org.billingOrgId) {
-                const otherBillingOrgs = await trx
-                    .select()
-                    .from(orgs)
-                    .where(
-                        and(
-                            eq(orgs.billingOrgId, org.billingOrgId),
-                            ne(orgs.orgId, orgId)
-                        )
-                    );
-
-                const billingOrgIds = otherBillingOrgs.map((o) => o.orgId);
-
-                const orgsInBillingDomainThatTheNodeIsStillIn = await trx
-                    .select()
-                    .from(exitNodeOrgs)
-                    .where(
-                        and(
-                            eq(
-                                exitNodeOrgs.exitNodeId,
-                                existingExitNode.exitNodeId
-                            ),
-                            inArray(exitNodeOrgs.orgId, billingOrgIds)
-                        )
-                    );
-
-                if (orgsInBillingDomainThatTheNodeIsStillIn.length === 0) {
-                    await usageService.add(
-                        orgId,
-                        FeatureId.REMOTE_EXIT_NODES,
-                        1,
-                        trx
-                    );
-                }
-            }
+            numExitNodeOrgs = await trx
+                .select()
+                .from(exitNodeOrgs)
+                .where(eq(exitNodeOrgs.orgId, orgId));
         });
 
+        if (numExitNodeOrgs) {
+            await usageService.updateCount(
+                orgId,
+                FeatureId.REMOTE_EXIT_NODES,
+                numExitNodeOrgs.length
+            );
+        }
+
         const token = generateSessionToken();
         await createRemoteExitNodeSession(token, remoteExitNodeId);
 

server/private/routers/remoteExitNode/deleteRemoteExitNode.ts

@@ -13,9 +13,9 @@
 
 import { NextFunction, Request, Response } from "express";
 import { z } from "zod";
-import { db, ExitNodeOrg, exitNodeOrgs, exitNodes, orgs } from "@server/db";
+import { db, ExitNodeOrg, exitNodeOrgs, exitNodes } from "@server/db";
 import { remoteExitNodes } from "@server/db";
-import { and, count, eq, inArray } from "drizzle-orm";
+import { and, count, eq } from "drizzle-orm";
 import response from "@server/lib/response";
 import HttpCode from "@server/types/HttpCode";
 import createHttpError from "http-errors";
@@ -50,8 +50,7 @@ export async function deleteRemoteExitNode(
         const [remoteExitNode] = await db
             .select()
             .from(remoteExitNodes)
-            .where(eq(remoteExitNodes.remoteExitNodeId, remoteExitNodeId))
-            .limit(1);
+            .where(eq(remoteExitNodes.remoteExitNodeId, remoteExitNodeId));
 
         if (!remoteExitNode) {
             return next(
@@ -71,17 +70,7 @@ export async function deleteRemoteExitNode(
             );
         }
 
-        const [org] = await db.select().from(orgs).where(eq(orgs.orgId, orgId));
-
-        if (!org) {
-            return next(
-                createHttpError(
-                    HttpCode.NOT_FOUND,
-                    `Org with ID ${orgId} not found`
-                )
-            );
-        }
-
+        let numExitNodeOrgs: ExitNodeOrg[] | undefined;
         await db.transaction(async (trx) => {
             await trx
                 .delete(exitNodeOrgs)
@@ -92,39 +81,38 @@ export async function deleteRemoteExitNode(
                     )
                 );
 
-            // calculate if the user is in any other of the orgs before we count it as an remove to the billing org
-            if (org.billingOrgId) {
-                const otherBillingOrgs = await trx
-                    .select()
-                    .from(orgs)
-                    .where(eq(orgs.billingOrgId, org.billingOrgId));
+            const [remainingExitNodeOrgs] = await trx
+                .select({ count: count() })
+                .from(exitNodeOrgs)
+                .where(eq(exitNodeOrgs.exitNodeId, remoteExitNode.exitNodeId!));
 
-                const billingOrgIds = otherBillingOrgs.map((o) => o.orgId);
-
-                const orgsInBillingDomainThatTheNodeIsStillIn = await trx
-                    .select()
-                    .from(exitNodeOrgs)
+            if (remainingExitNodeOrgs.count === 0) {
+                await trx
+                    .delete(remoteExitNodes)
                     .where(
-                        and(
-                            eq(
-                                exitNodeOrgs.exitNodeId,
-                                remoteExitNode.exitNodeId!
-                            ),
-                            inArray(exitNodeOrgs.orgId, billingOrgIds)
-                        )
+                        eq(remoteExitNodes.remoteExitNodeId, remoteExitNodeId)
                     );
-
-                if (orgsInBillingDomainThatTheNodeIsStillIn.length === 0) {
-                    await usageService.add(
-                        orgId,
-                        FeatureId.REMOTE_EXIT_NODES,
-                        -1,
-                        trx
+                await trx
+                    .delete(exitNodes)
+                    .where(
+                        eq(exitNodes.exitNodeId, remoteExitNode.exitNodeId!)
                     );
-                }
             }
+
+            numExitNodeOrgs = await trx
+                .select()
+                .from(exitNodeOrgs)
+                .where(eq(exitNodeOrgs.orgId, orgId));
         });
 
+        if (numExitNodeOrgs) {
+            await usageService.updateCount(
+                orgId,
+                FeatureId.REMOTE_EXIT_NODES,
+                numExitNodeOrgs.length
+            );
+        }
+
         return response(res, {
             data: null,
             success: true,

server/private/routers/ssh/index.ts

@@ -1,14 +0,0 @@
-/*
- * This file is part of a proprietary work.
- *
- * Copyright (c) 2025 Fossorial, Inc.
- * All rights reserved.
- *
- * This file is licensed under the Fossorial Commercial License.
- * You may not use this file except in compliance with the License.
- * Unauthorized use, copying, modification, or distribution is strictly prohibited.
- *
- * This file is not licensed under the AGPLv3.
- */
-
-export * from "./signSshKey";

server/private/routers/ssh/signSshKey.ts

@@ -1,403 +0,0 @@
-/*
- * This file is part of a proprietary work.
- *
- * Copyright (c) 2025 Fossorial, Inc.
- * All rights reserved.
- *
- * This file is licensed under the Fossorial Commercial License.
- * You may not use this file except in compliance with the License.
- * Unauthorized use, copying, modification, or distribution is strictly prohibited.
- *
- * This file is not licensed under the AGPLv3.
- */
-
-import { Request, Response, NextFunction } from "express";
-import { z } from "zod";
-import { db, newts, orgs, roundTripMessageTracker, siteResources, sites, userOrgs } from "@server/db";
-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";
-import { OpenAPITags, registry } from "@server/openApi";
-import { eq, or, and } from "drizzle-orm";
-import { canUserAccessSiteResource } from "@server/auth/canUserAccessSiteResource";
-import { signPublicKey, getOrgCAKeys } from "#private/lib/sshCA";
-import config from "@server/lib/config";
-import { sendToClient } from "#private/routers/ws";
-
-const paramsSchema = z.strictObject({
-    orgId: z.string().nonempty()
-});
-
-const bodySchema = z
-    .strictObject({
-        publicKey: z.string().nonempty(),
-        resourceId: z.number().int().positive().optional(),
-        resource: z.string().nonempty().optional() // this is either the nice id or the alias
-    })
-    .refine(
-        (data) => {
-            const fields = [data.resourceId, data.resource];
-            const definedFields = fields.filter((field) => field !== undefined);
-            return definedFields.length === 1;
-        },
-        {
-            message:
-                "Exactly one of resourceId, niceId, or alias must be provided"
-        }
-    );
-
-export type SignSshKeyResponse = {
-    certificate: string;
-    messageId: number;
-    sshUsername: string;
-    sshHost: string;
-    resourceId: number;
-    keyId: string;
-    validPrincipals: string[];
-    validAfter: string;
-    validBefore: string;
-    expiresIn: number;
-};
-
-// registry.registerPath({
-//     method: "post",
-//     path: "/org/{orgId}/ssh/sign-key",
-//     description: "Sign an SSH public key for access to a resource.",
-//     tags: [OpenAPITags.Org, OpenAPITags.Ssh],
-//     request: {
-//         params: paramsSchema,
-//         body: {
-//             content: {
-//                 "application/json": {
-//                     schema: bodySchema
-//                 }
-//             }
-//         }
-//     },
-//     responses: {}
-// });
-
-export async function signSshKey(
-    req: Request,
-    res: Response,
-    next: NextFunction
-): Promise<any> {
-    try {
-        const parsedParams = paramsSchema.safeParse(req.params);
-        if (!parsedParams.success) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    fromError(parsedParams.error).toString()
-                )
-            );
-        }
-
-        const parsedBody = bodySchema.safeParse(req.body);
-        if (!parsedBody.success) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    fromError(parsedBody.error).toString()
-                )
-            );
-        }
-
-        const { orgId } = parsedParams.data;
-        const {
-            publicKey,
-            resourceId,
-            resource: resourceQueryString
-        } = parsedBody.data;
-        const userId = req.user?.userId;
-        const roleId = req.userOrgRoleId!;
-
-        if (!userId) {
-            return next(
-                createHttpError(HttpCode.UNAUTHORIZED, "User not authenticated")
-            );
-        }
-
-        const [userOrg] = await db
-            .select()
-            .from(userOrgs)
-            .where(and(eq(userOrgs.orgId, orgId), eq(userOrgs.userId, userId)))
-            .limit(1);
-
-        if (!userOrg) {
-            return next(
-                createHttpError(
-                    HttpCode.FORBIDDEN,
-                    "User does not belong to the specified organization"
-                )
-            );
-        }
-
-        let usernameToUse;
-        if (!userOrg.pamUsername) {
-            if (req.user?.email) {
-                // Extract username from email (first part before @)
-                usernameToUse = req.user?.email.split("@")[0];
-                if (!usernameToUse) {
-                    return next(
-                        createHttpError(
-                            HttpCode.BAD_REQUEST,
-                            "Unable to extract username from email"
-                        )
-                    );
-                }
-            } else if (req.user?.username) {
-                usernameToUse = req.user.username;
-                // We need to clean out any spaces or special characters from the username to ensure it's valid for SSH certificates
-                usernameToUse = usernameToUse.replace(/[^a-zA-Z0-9_-]/g, "");
-                if (!usernameToUse) {
-                    return next(
-                        createHttpError(
-                            HttpCode.BAD_REQUEST,
-                            "Username is not valid for SSH certificate"
-                        )
-                    );
-                }
-            } else {
-                return next(
-                    createHttpError(
-                        HttpCode.BAD_REQUEST,
-                        "User does not have a valid email or username for SSH certificate"
-                    )
-                );
-            }
-
-            // check if we have a existing user in this org with the same
-            const [existingUserWithSameName] = await db
-                .select()
-                .from(userOrgs)
-                .where(
-                    and(
-                        eq(userOrgs.orgId, orgId),
-                        eq(userOrgs.pamUsername, usernameToUse)
-                    )
-                )
-                .limit(1);
-
-            if (existingUserWithSameName) {
-                let foundUniqueUsername = false;
-                for (let attempt = 0; attempt < 20; attempt++) {
-                    const randomNum = Math.floor(Math.random() * 101); // 0 to 100
-                    const candidateUsername = `${usernameToUse}${randomNum}`;
-
-                    const [existingUser] = await db
-                        .select()
-                        .from(userOrgs)
-                        .where(
-                            and(
-                                eq(userOrgs.orgId, orgId),
-                                eq(userOrgs.pamUsername, candidateUsername)
-                            )
-                        )
-                        .limit(1);
-
-                    if (!existingUser) {
-                        usernameToUse = candidateUsername;
-                        foundUniqueUsername = true;
-                        break;
-                    }
-                }
-
-                if (!foundUniqueUsername) {
-                    return next(
-                        createHttpError(
-                            HttpCode.CONFLICT,
-                            "Unable to generate a unique username for SSH certificate"
-                        )
-                    );
-                }
-            }
-        } else {
-            usernameToUse = userOrg.pamUsername;
-        }
-
-        // Get and decrypt the org's CA keys
-        const caKeys = await getOrgCAKeys(
-            orgId,
-            config.getRawConfig().server.secret!
-        );
-
-        if (!caKeys) {
-            return next(
-                createHttpError(
-                    HttpCode.NOT_FOUND,
-                    "SSH CA not configured for this organization"
-                )
-            );
-        }
-
-        // Verify the resource exists and belongs to the org
-        // Build the where clause dynamically based on which field is provided
-        let whereClause;
-        if (resourceId !== undefined) {
-            whereClause = eq(siteResources.siteResourceId, resourceId);
-        } else if (resourceQueryString !== undefined) {
-            whereClause = or(
-                eq(siteResources.niceId, resourceQueryString),
-                eq(siteResources.alias, resourceQueryString)
-            );
-        } else {
-            // This should never happen due to the schema validation, but TypeScript doesn't know that
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    "One of resourceId, niceId, or alias must be provided"
-                )
-            );
-        }
-
-        const resources = await db
-            .select()
-            .from(siteResources)
-            .where(and(whereClause, eq(siteResources.orgId, orgId)));
-
-        if (!resources || resources.length === 0) {
-            return next(
-                createHttpError(HttpCode.NOT_FOUND, `Resource not found`)
-            );
-        }
-
-        if (resources.length > 1) {
-            // error but this should not happen because the nice id cant contain a dot and the alias has to have a dot and both have to be unique within the org so there should never be multiple matches
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    `Multiple resources found matching the criteria`
-                )
-            );
-        }
-
-        const resource = resources[0];
-
-        if (resource.orgId !== orgId) {
-            return next(
-                createHttpError(
-                    HttpCode.FORBIDDEN,
-                    "Resource does not belong to the specified organization"
-                )
-            );
-        }
-
-        // Check if the user has access to the resource
-        const hasAccess = await canUserAccessSiteResource({
-            userId: userId,
-            resourceId: resource.siteResourceId,
-            roleId: roleId
-        });
-
-        if (!hasAccess) {
-            return next(
-                createHttpError(
-                    HttpCode.FORBIDDEN,
-                    "User does not have access to this resource"
-                )
-            );
-        }
-
-        // get the site
-        const [newt] = await db
-            .select()
-            .from(newts)
-            .where(eq(newts.siteId, resource.siteId))
-            .limit(1);
-
-        if (!newt) {
-            return next(
-                createHttpError(
-                    HttpCode.INTERNAL_SERVER_ERROR,
-                    "Site associated with resource not found"
-                )
-            );
-        }
-
-        // Sign the public key
-        const now = BigInt(Math.floor(Date.now() / 1000));
-        // only valid for 5 minutes
-        const validFor = 300n;
-
-        const cert = signPublicKey(caKeys.privateKeyPem, publicKey, {
-            keyId: `${usernameToUse}@${resource.niceId}`,
-            validPrincipals: [usernameToUse, resource.niceId],
-            validAfter: now - 60n, // Start 1 min ago for clock skew
-            validBefore: now + validFor
-        });
-
-        const [message] = await db
-            .insert(roundTripMessageTracker)
-            .values({
-                wsClientId: newt.newtId,
-                messageType: `newt/pam/connection`,
-                sentAt: Math.floor(Date.now() / 1000),
-            })
-            .returning();
-
-        if (!message) {
-            return next(
-                createHttpError(
-                    HttpCode.INTERNAL_SERVER_ERROR,
-                    "Failed to create message tracker entry"
-                )
-            );
-        }
-
-        await sendToClient(newt.newtId, {
-            type: `newt/pam/connection`,
-            data: {
-                messageId: message.messageId,
-                orgId: orgId,
-                agentPort: 22123,
-                agentHost: resource.destination,
-                caCert: caKeys.publicKeyOpenSSH,
-                username: usernameToUse,
-                niceId: resource.niceId,
-                metadata: {
-                    sudo: true, // we are hardcoding these for now but should make configurable from the role or something
-                    homedir: true
-                }
-            }
-        });
-
-        const expiresIn = Number(validFor); // seconds
-
-        let sshHost;
-        if (resource.alias && resource.alias != "") {
-            sshHost = resource.alias;
-        } else {
-            sshHost = resource.destination;
-        }
-
-        return response<SignSshKeyResponse>(res, {
-            data: {
-                certificate: cert.certificate,
-                messageId: message.messageId,
-                sshUsername: usernameToUse,
-                sshHost: sshHost,
-                resourceId: resource.siteResourceId,
-                keyId: cert.keyId,
-                validPrincipals: cert.validPrincipals,
-                validAfter: cert.validAfter.toISOString(),
-                validBefore: cert.validBefore.toISOString(),
-                expiresIn
-            },
-            success: true,
-            error: false,
-            message: "SSH key signed successfully",
-            status: HttpCode.OK
-        });
-    } catch (error) {
-        logger.error("Error signing SSH key:", error);
-        return next(
-            createHttpError(
-                HttpCode.INTERNAL_SERVER_ERROR,
-                "An error occurred while signing the SSH key"
-            )
-        );
-    }
-}

server/routers/auth/deleteMyAccount.ts

@@ -15,10 +15,11 @@ import {
 import { verifyPassword } from "@server/auth/password";
 import { verifyTotpCode } from "@server/auth/totp";
 import { calculateUserClientsForOrgs } from "@server/lib/calculateUserClientsForOrgs";
-import { deleteOrgById, sendTerminationMessages } from "@server/lib/deleteOrg";
+import {
+    deleteOrgById,
+    sendTerminationMessages
+} from "@server/lib/deleteOrg";
 import { UserType } from "@server/types/UserTypes";
-import { build } from "@server/build";
-import { getOrgTierData } from "#dynamic/lib/billing";
 
 const deleteMyAccountBody = z.strictObject({
     password: z.string().optional(),
@@ -39,6 +40,11 @@ export type DeleteMyAccountSuccessResponse = {
     success: true;
 };
 
+/**
+ * Self-service account deletion (saas only). Returns preview when no password;
+ * requires password and optional 2FA code to perform deletion. Uses shared
+ * deleteOrgById for each owned org (delete-my-account may delete multiple orgs).
+ */
 export async function deleteMyAccount(
     req: Request,
     res: Response,
@@ -85,35 +91,18 @@ export async function deleteMyAccount(
 
         const ownedOrgsRows = await db
             .select({
-                orgId: userOrgs.orgId,
-                isOwner: userOrgs.isOwner,
-                isBillingOrg: orgs.isBillingOrg
+                orgId: userOrgs.orgId
             })
             .from(userOrgs)
-            .innerJoin(orgs, eq(userOrgs.orgId, orgs.orgId))
             .where(
-                and(eq(userOrgs.userId, userId), eq(userOrgs.isOwner, true))
+                and(
+                    eq(userOrgs.userId, userId),
+                    eq(userOrgs.isOwner, true)
+                )
             );
 
         const orgIds = ownedOrgsRows.map((r) => r.orgId);
 
-        if (build === "saas" && orgIds.length > 0) {
-            const primaryOrgId = ownedOrgsRows.find(
-                (r) => r.isBillingOrg && r.isOwner
-            )?.orgId;
-            if (primaryOrgId) {
-                const { tier, active } = await getOrgTierData(primaryOrgId);
-                if (active && tier) {
-                    return next(
-                        createHttpError(
-                            HttpCode.BAD_REQUEST,
-                            "You must cancel your subscription before deleting your account"
-                        )
-                    );
-                }
-            }
-        }
-
         if (!password) {
             const orgsWithNames =
                 orgIds.length > 0
@@ -230,7 +219,10 @@ export async function deleteMyAccount(
     } catch (error) {
         logger.error(error);
         return next(
-            createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred")
+            createHttpError(
+                HttpCode.INTERNAL_SERVER_ERROR,
+                "An error occurred"
+            )
         );
     }
 }

server/routers/auth/signup.ts

@@ -1,7 +1,7 @@
 import { NextFunction, Request, Response } from "express";
 import { db, users } from "@server/db";
 import HttpCode from "@server/types/HttpCode";
-import { email, z } from "zod";
+import { z } from "zod";
 import { fromError } from "zod-validation-error";
 import createHttpError from "http-errors";
 import response from "@server/lib/response";
@@ -21,6 +21,7 @@ import { hashPassword } from "@server/auth/password";
 import { checkValidInvite } from "@server/auth/checkValidInvite";
 import { passwordSchema } from "@server/auth/passwordSchema";
 import { UserType } from "@server/types/UserTypes";
+import { createUserAccountOrg } from "@server/lib/createUserAccountOrg";
 import { build } from "@server/build";
 import resend, { AudienceIds, moveEmailToAudience } from "#dynamic/lib/resend";
 
@@ -30,8 +31,7 @@ export const signupBodySchema = z.object({
     inviteToken: z.string().optional(),
     inviteId: z.string().optional(),
     termsAcceptedTimestamp: z.string().nullable().optional(),
-    marketingEmailConsent: z.boolean().optional(),
-    skipVerificationEmail: z.boolean().optional()
+    marketingEmailConsent: z.boolean().optional()
 });
 
 export type SignUpBody = z.infer<typeof signupBodySchema>;
@@ -62,8 +62,7 @@ export async function signup(
         inviteToken,
         inviteId,
         termsAcceptedTimestamp,
-        marketingEmailConsent,
-        skipVerificationEmail
+        marketingEmailConsent
     } = parsedBody.data;
 
     const passwordHash = await hashPassword(password);
@@ -199,6 +198,26 @@ export async function signup(
         //     orgId: null,
         // });
 
+        if (build == "saas") {
+            const { success, error, org } = await createUserAccountOrg(
+                userId,
+                email
+            );
+            if (!success) {
+                if (error) {
+                    return next(
+                        createHttpError(HttpCode.INTERNAL_SERVER_ERROR, error)
+                    );
+                }
+                return next(
+                    createHttpError(
+                        HttpCode.INTERNAL_SERVER_ERROR,
+                        "Failed to create user account and organization"
+                    )
+                );
+            }
+        }
+
         const token = generateSessionToken();
         const sess = await createSession(token, userId);
         const isSecure = req.protocol === "https";
@@ -216,13 +235,7 @@ export async function signup(
         }
 
         if (config.getRawConfig().flags?.require_email_verification) {
-            if (!skipVerificationEmail) {
-                sendEmailVerificationCode(email, userId);
-            } else {
-                logger.debug(
-                    `User ${email} opted out of verification email during signup.`
-                );
-            }
+            sendEmailVerificationCode(email, userId);
 
             return response<SignUpResponse>(res, {
                 data: {
@@ -230,9 +243,7 @@ export async function signup(
                 },
                 success: true,
                 error: false,
-                message: skipVerificationEmail
-                    ? "User created successfully. Please verify your email."
-                    : `User created successfully. We sent an email to ${email} with a verification code.`,
+                message: `User created successfully. We sent an email to ${email} with a verification code.`,
                 status: HttpCode.OK
             });
         }

server/routers/client/index.ts

@@ -6,7 +6,6 @@ export * from "./unarchiveClient";
 export * from "./blockClient";
 export * from "./unblockClient";
 export * from "./listClients";
-export * from "./listUserDevices";
 export * from "./updateClient";
 export * from "./getClient";
 export * from "./createUserClient";

server/routers/client/listClients.ts

@@ -1,38 +1,34 @@
+import { db, olms, users } from "@server/db";
 import {
     clients,
-    clientSitesAssociationsCache,
-    currentFingerprint,
-    db,
-    olms,
     orgs,
     roleClients,
     sites,
     userClients,
-    users
+    clientSitesAssociationsCache,
+    currentFingerprint
 } from "@server/db";
-import response from "@server/lib/response";
 import logger from "@server/logger";
-import { OpenAPITags, registry } from "@server/openApi";
 import HttpCode from "@server/types/HttpCode";
-import type { PaginatedResponse } from "@server/types/Pagination";
+import response from "@server/lib/response";
 import {
     and,
-    asc,
-    desc,
+    count,
     eq,
     inArray,
+    isNotNull,
     isNull,
-    like,
     or,
-    sql,
-    type SQL
+    sql
 } from "drizzle-orm";
 import { NextFunction, Request, Response } from "express";
 import createHttpError from "http-errors";
-import NodeCache from "node-cache";
-import semver from "semver";
 import { z } from "zod";
 import { fromError } from "zod-validation-error";
+import { OpenAPITags, registry } from "@server/openApi";
+import NodeCache from "node-cache";
+import semver from "semver";
+import { getUserDeviceName } from "@server/db/names";
 
 const olmVersionCache = new NodeCache({ stdTTL: 3600 });
 
@@ -93,86 +89,38 @@ const listClientsParamsSchema = z.strictObject({
 });
 
 const listClientsSchema = z.object({
-    pageSize: z.coerce
-        .number<string>() // for prettier formatting
-        .int()
-        .positive()
+    limit: z
+        .string()
         .optional()
-        .catch(20)
-        .default(20)
-        .openapi({
-            type: "integer",
-            default: 20,
-            description: "Number of items per page"
-        }),
-    page: z.coerce
-        .number<string>() // for prettier formatting
-        .int()
-        .min(0)
+        .default("1000")
+        .transform(Number)
+        .pipe(z.int().positive()),
+    offset: z
+        .string()
         .optional()
-        .catch(1)
-        .default(1)
-        .openapi({
-            type: "integer",
-            default: 1,
-            description: "Page number to retrieve"
-        }),
-    query: z.string().optional(),
-    sort_by: z
-        .enum(["megabytesIn", "megabytesOut"])
-        .optional()
-        .catch(undefined)
-        .openapi({
-            type: "string",
-            enum: ["megabytesIn", "megabytesOut"],
-            description: "Field to sort by"
-        }),
-    order: z
-        .enum(["asc", "desc"])
-        .optional()
-        .default("asc")
-        .catch("asc")
-        .openapi({
-            type: "string",
-            enum: ["asc", "desc"],
-            default: "asc",
-            description: "Sort order"
-        }),
-    online: z
-        .enum(["true", "false"])
-        .transform((v) => v === "true")
-        .optional()
-        .catch(undefined)
-        .openapi({
-            type: "boolean",
-            description: "Filter by online status"
-        }),
-    status: z.preprocess(
-        (val: string | undefined) => {
-            if (val) {
-                return val.split(","); // the search query array is an array joined by commas
-            }
-            return undefined;
-        },
-        z
-            .array(z.enum(["active", "blocked", "archived"]))
-            .optional()
-            .default(["active"])
-            .catch(["active"])
-            .openapi({
-                type: "array",
-                items: {
-                    type: "string",
-                    enum: ["active", "blocked", "archived"]
-                },
-                default: ["active"],
-                description:
-                    "Filter by client status. Can be a comma-separated list of values. Defaults to 'active'."
-            })
-    )
+        .default("0")
+        .transform(Number)
+        .pipe(z.int().nonnegative()),
+    filter: z.enum(["user", "machine"]).optional()
 });
 
-function queryClientsBase() {
+function queryClients(
+    orgId: string,
+    accessibleClientIds: number[],
+    filter?: "user" | "machine"
+) {
+    const conditions = [
+        inArray(clients.clientId, accessibleClientIds),
+        eq(clients.orgId, orgId)
+    ];
+
+    // Add filter condition based on filter type
+    if (filter === "user") {
+        conditions.push(isNotNull(clients.userId));
+    } else if (filter === "machine") {
+        conditions.push(isNull(clients.userId));
+    }
+
     return db
         .select({
             clientId: clients.clientId,
@@ -194,13 +142,22 @@ function queryClientsBase() {
             approvalState: clients.approvalState,
             olmArchived: olms.archived,
             archived: clients.archived,
-            blocked: clients.blocked
+            blocked: clients.blocked,
+            deviceModel: currentFingerprint.deviceModel,
+            fingerprintPlatform: currentFingerprint.platform,
+            fingerprintOsVersion: currentFingerprint.osVersion,
+            fingerprintKernelVersion: currentFingerprint.kernelVersion,
+            fingerprintArch: currentFingerprint.arch,
+            fingerprintSerialNumber: currentFingerprint.serialNumber,
+            fingerprintUsername: currentFingerprint.username,
+            fingerprintHostname: currentFingerprint.hostname
         })
         .from(clients)
         .leftJoin(orgs, eq(clients.orgId, orgs.orgId))
         .leftJoin(olms, eq(clients.clientId, olms.clientId))
         .leftJoin(users, eq(clients.userId, users.userId))
-        .leftJoin(currentFingerprint, eq(olms.olmId, currentFingerprint.olmId));
+        .leftJoin(currentFingerprint, eq(olms.olmId, currentFingerprint.olmId))
+        .where(and(...conditions));
 }
 
 async function getSiteAssociations(clientIds: number[]) {
@@ -218,7 +175,7 @@ async function getSiteAssociations(clientIds: number[]) {
         .where(inArray(clientSitesAssociationsCache.clientId, clientIds));
 }
 
-type ClientWithSites = Awaited<ReturnType<typeof queryClientsBase>>[0] & {
+type ClientWithSites = Awaited<ReturnType<typeof queryClients>>[0] & {
     sites: Array<{
         siteId: number;
         siteName: string | null;
@@ -229,9 +186,10 @@ type ClientWithSites = Awaited<ReturnType<typeof queryClientsBase>>[0] & {
 
 type OlmWithUpdateAvailable = ClientWithSites;
 
-export type ListClientsResponse = PaginatedResponse<{
+export type ListClientsResponse = {
     clients: Array<ClientWithSites>;
-}>;
+    pagination: { total: number; limit: number; offset: number };
+};
 
 registry.registerPath({
     method: "get",
@@ -260,8 +218,7 @@ export async function listClients(
                 )
             );
         }
-        const { page, pageSize, online, query, status, sort_by, order } =
-            parsedQuery.data;
+        const { limit, offset, filter } = parsedQuery.data;
 
         const parsedParams = listClientsParamsSchema.safeParse(req.params);
         if (!parsedParams.success) {
@@ -310,73 +267,28 @@ export async function listClients(
         const accessibleClientIds = accessibleClients.map(
             (client) => client.clientId
         );
+        const baseQuery = queryClients(orgId, accessibleClientIds, filter);
 
         // Get client count with filter
-        const conditions = [
-            and(
-                inArray(clients.clientId, accessibleClientIds),
-                eq(clients.orgId, orgId),
-                isNull(clients.userId)
-            )
+        const countConditions = [
+            inArray(clients.clientId, accessibleClientIds),
+            eq(clients.orgId, orgId)
         ];
 
-        if (typeof online !== "undefined") {
-            conditions.push(eq(clients.online, online));
+        if (filter === "user") {
+            countConditions.push(isNotNull(clients.userId));
+        } else if (filter === "machine") {
+            countConditions.push(isNull(clients.userId));
         }
 
-        if (status.length > 0) {
-            const filterAggregates: (SQL<unknown> | undefined)[] = [];
+        const countQuery = db
+            .select({ count: count() })
+            .from(clients)
+            .where(and(...countConditions));
 
-            if (status.includes("active")) {
-                filterAggregates.push(
-                    and(eq(clients.archived, false), eq(clients.blocked, false))
-                );
-            }
-
-            if (status.includes("archived")) {
-                filterAggregates.push(eq(clients.archived, true));
-            }
-            if (status.includes("blocked")) {
-                filterAggregates.push(eq(clients.blocked, true));
-            }
-
-            conditions.push(or(...filterAggregates));
-        }
-
-        if (query) {
-            conditions.push(
-                or(
-                    like(
-                        sql`LOWER(${clients.name})`,
-                        "%" + query.toLowerCase() + "%"
-                    ),
-                    like(
-                        sql`LOWER(${clients.niceId})`,
-                        "%" + query.toLowerCase() + "%"
-                    )
-                )
-            );
-        }
-
-        const baseQuery = queryClientsBase().where(and(...conditions));
-
-        const countQuery = db.$count(baseQuery.as("filtered_clients"));
-
-        const listMachinesQuery = baseQuery
-            .limit(page)
-            .offset(pageSize * (page - 1))
-            .orderBy(
-                sort_by
-                    ? order === "asc"
-                        ? asc(clients[sort_by])
-                        : desc(clients[sort_by])
-                    : asc(clients.clientId)
-            );
-
-        const [clientsList, totalCount] = await Promise.all([
-            listMachinesQuery,
-            countQuery
-        ]);
+        const clientsList = await baseQuery.limit(limit).offset(offset);
+        const totalCountResult = await countQuery;
+        const totalCount = totalCountResult[0].count;
 
         // Get associated sites for all clients
         const clientIds = clientsList.map((client) => client.clientId);
@@ -407,8 +319,14 @@ export async function listClients(
 
         // Merge clients with their site associations and replace name with device name
         const clientsWithSites = clientsList.map((client) => {
+            const model = client.deviceModel || null;
+            let newName = client.name;
+            if (filter === "user") {
+                newName = getUserDeviceName(model, client.name);
+            }
             return {
                 ...client,
+                name: newName,
                 sites: sitesByClient[client.clientId] || []
             };
         });
@@ -453,8 +371,8 @@ export async function listClients(
                 clients: olmsWithUpdates,
                 pagination: {
                     total: totalCount,
-                    page,
-                    pageSize
+                    limit,
+                    offset
                 }
             },
             success: true,

server/routers/client/listUserDevices.ts

@@ -1,500 +0,0 @@
-import { build } from "@server/build";
-import {
-    clients,
-    currentFingerprint,
-    db,
-    olms,
-    orgs,
-    roleClients,
-    userClients,
-    users
-} from "@server/db";
-import { getUserDeviceName } from "@server/db/names";
-import response from "@server/lib/response";
-import logger from "@server/logger";
-import { OpenAPITags, registry } from "@server/openApi";
-import HttpCode from "@server/types/HttpCode";
-import type { PaginatedResponse } from "@server/types/Pagination";
-import {
-    and,
-    asc,
-    desc,
-    eq,
-    inArray,
-    isNotNull,
-    isNull,
-    like,
-    or,
-    sql,
-    type SQL
-} from "drizzle-orm";
-import { NextFunction, Request, Response } from "express";
-import createHttpError from "http-errors";
-import NodeCache from "node-cache";
-import semver from "semver";
-import { z } from "zod";
-import { fromError } from "zod-validation-error";
-
-const olmVersionCache = new NodeCache({ stdTTL: 3600 });
-
-async function getLatestOlmVersion(): Promise<string | null> {
-    try {
-        const cachedVersion = olmVersionCache.get<string>("latestOlmVersion");
-        if (cachedVersion) {
-            return cachedVersion;
-        }
-
-        const controller = new AbortController();
-        const timeoutId = setTimeout(() => controller.abort(), 1500);
-
-        const response = await fetch(
-            "https://api.github.com/repos/fosrl/olm/tags",
-            {
-                signal: controller.signal
-            }
-        );
-
-        clearTimeout(timeoutId);
-
-        if (!response.ok) {
-            logger.warn(
-                `Failed to fetch latest Olm version from GitHub: ${response.status} ${response.statusText}`
-            );
-            return null;
-        }
-
-        let tags = await response.json();
-        if (!Array.isArray(tags) || tags.length === 0) {
-            logger.warn("No tags found for Olm repository");
-            return null;
-        }
-        tags = tags.filter((version) => !version.name.includes("rc"));
-        const latestVersion = tags[0].name;
-
-        olmVersionCache.set("latestOlmVersion", latestVersion);
-
-        return latestVersion;
-    } catch (error: any) {
-        if (error.name === "AbortError") {
-            logger.warn("Request to fetch latest Olm version timed out (1.5s)");
-        } else if (error.cause?.code === "UND_ERR_CONNECT_TIMEOUT") {
-            logger.warn("Connection timeout while fetching latest Olm version");
-        } else {
-            logger.warn(
-                "Error fetching latest Olm version:",
-                error.message || error
-            );
-        }
-        return null;
-    }
-}
-
-const listUserDevicesParamsSchema = z.strictObject({
-    orgId: z.string()
-});
-
-const listUserDevicesSchema = z.object({
-    pageSize: z.coerce
-        .number<string>() // for prettier formatting
-        .int()
-        .positive()
-        .optional()
-        .catch(20)
-        .default(20)
-        .openapi({
-            type: "integer",
-            default: 20,
-            description: "Number of items per page"
-        }),
-    page: z.coerce
-        .number<string>() // for prettier formatting
-        .int()
-        .min(0)
-        .optional()
-        .catch(1)
-        .default(1)
-        .openapi({
-            type: "integer",
-            default: 1,
-            description: "Page number to retrieve"
-        }),
-    query: z.string().optional(),
-    sort_by: z
-        .enum(["megabytesIn", "megabytesOut"])
-        .optional()
-        .catch(undefined)
-        .openapi({
-            type: "string",
-            enum: ["megabytesIn", "megabytesOut"],
-            description: "Field to sort by"
-        }),
-    order: z
-        .enum(["asc", "desc"])
-        .optional()
-        .default("asc")
-        .catch("asc")
-        .openapi({
-            type: "string",
-            enum: ["asc", "desc"],
-            default: "asc",
-            description: "Sort order"
-        }),
-    online: z
-        .enum(["true", "false"])
-        .transform((v) => v === "true")
-        .optional()
-        .catch(undefined)
-        .openapi({
-            type: "boolean",
-            description: "Filter by online status"
-        }),
-    agent: z
-        .enum([
-            "windows",
-            "android",
-            "cli",
-            "olm",
-            "macos",
-            "ios",
-            "ipados",
-            "unknown"
-        ])
-        .optional()
-        .catch(undefined)
-        .openapi({
-            type: "string",
-            enum: [
-                "windows",
-                "android",
-                "cli",
-                "olm",
-                "macos",
-                "ios",
-                "ipados",
-                "unknown"
-            ],
-            description:
-                "Filter by agent type. Use 'unknown' to filter clients with no agent detected."
-        }),
-    status: z.preprocess(
-        (val: string | undefined) => {
-            if (val) {
-                return val.split(","); // the search query array is an array joined by commas
-            }
-            return undefined;
-        },
-        z
-            .array(
-                z.enum(["active", "pending", "denied", "blocked", "archived"])
-            )
-            .optional()
-            .default(["active", "pending"])
-            .catch(["active", "pending"])
-            .openapi({
-                type: "array",
-                items: {
-                    type: "string",
-                    enum: ["active", "pending", "denied", "blocked", "archived"]
-                },
-                default: ["active", "pending"],
-                description:
-                    "Filter by device status. Can include multiple values separated by commas. 'active' means not archived, not blocked, and if approval is enabled, approved. 'pending' and 'denied' are only applicable if approval is enabled."
-            })
-    )
-});
-
-function queryUserDevicesBase() {
-    return db
-        .select({
-            clientId: clients.clientId,
-            orgId: clients.orgId,
-            name: clients.name,
-            pubKey: clients.pubKey,
-            subnet: clients.subnet,
-            megabytesIn: clients.megabytesIn,
-            megabytesOut: clients.megabytesOut,
-            orgName: orgs.name,
-            type: clients.type,
-            online: clients.online,
-            olmVersion: olms.version,
-            userId: clients.userId,
-            username: users.username,
-            userEmail: users.email,
-            niceId: clients.niceId,
-            agent: olms.agent,
-            approvalState: clients.approvalState,
-            olmArchived: olms.archived,
-            archived: clients.archived,
-            blocked: clients.blocked,
-            deviceModel: currentFingerprint.deviceModel,
-            fingerprintPlatform: currentFingerprint.platform,
-            fingerprintOsVersion: currentFingerprint.osVersion,
-            fingerprintKernelVersion: currentFingerprint.kernelVersion,
-            fingerprintArch: currentFingerprint.arch,
-            fingerprintSerialNumber: currentFingerprint.serialNumber,
-            fingerprintUsername: currentFingerprint.username,
-            fingerprintHostname: currentFingerprint.hostname
-        })
-        .from(clients)
-        .leftJoin(orgs, eq(clients.orgId, orgs.orgId))
-        .leftJoin(olms, eq(clients.clientId, olms.clientId))
-        .leftJoin(users, eq(clients.userId, users.userId))
-        .leftJoin(currentFingerprint, eq(olms.olmId, currentFingerprint.olmId));
-}
-
-type OlmWithUpdateAvailable = Awaited<
-    ReturnType<typeof queryUserDevicesBase>
->[0] & {
-    olmUpdateAvailable?: boolean;
-};
-
-export type ListUserDevicesResponse = PaginatedResponse<{
-    devices: Array<OlmWithUpdateAvailable>;
-}>;
-
-registry.registerPath({
-    method: "get",
-    path: "/org/{orgId}/user-devices",
-    description: "List all user devices for an organization.",
-    tags: [OpenAPITags.Client, OpenAPITags.Org],
-    request: {
-        query: listUserDevicesSchema,
-        params: listUserDevicesParamsSchema
-    },
-    responses: {}
-});
-
-export async function listUserDevices(
-    req: Request,
-    res: Response,
-    next: NextFunction
-): Promise<any> {
-    try {
-        const parsedQuery = listUserDevicesSchema.safeParse(req.query);
-        if (!parsedQuery.success) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    fromError(parsedQuery.error)
-                )
-            );
-        }
-        const { page, pageSize, query, sort_by, online, status, agent, order } =
-            parsedQuery.data;
-
-        const parsedParams = listUserDevicesParamsSchema.safeParse(req.params);
-        if (!parsedParams.success) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    fromError(parsedParams.error)
-                )
-            );
-        }
-        const { orgId } = parsedParams.data;
-
-        if (req.user && orgId && orgId !== req.userOrgId) {
-            return next(
-                createHttpError(
-                    HttpCode.FORBIDDEN,
-                    "User does not have access to this organization"
-                )
-            );
-        }
-
-        let accessibleClients;
-        if (req.user) {
-            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!)
-                    )
-                );
-        } else {
-            accessibleClients = await db
-                .select({ clientId: clients.clientId })
-                .from(clients)
-                .where(eq(clients.orgId, orgId));
-        }
-
-        const accessibleClientIds = accessibleClients.map(
-            (client) => client.clientId
-        );
-        // Get client count with filter
-        const conditions = [
-            and(
-                inArray(clients.clientId, accessibleClientIds),
-                eq(clients.orgId, orgId),
-                isNotNull(clients.userId)
-            )
-        ];
-
-        if (query) {
-            conditions.push(
-                or(
-                    like(
-                        sql`LOWER(${clients.name})`,
-                        "%" + query.toLowerCase() + "%"
-                    ),
-                    like(
-                        sql`LOWER(${clients.niceId})`,
-                        "%" + query.toLowerCase() + "%"
-                    ),
-                    like(
-                        sql`LOWER(${users.email})`,
-                        "%" + query.toLowerCase() + "%"
-                    )
-                )
-            );
-        }
-
-        if (typeof online !== "undefined") {
-            conditions.push(eq(clients.online, online));
-        }
-
-        const agentValueMap = {
-            windows: "Pangolin Windows",
-            android: "Pangolin Android",
-            ios: "Pangolin iOS",
-            ipados: "Pangolin iPadOS",
-            macos: "Pangolin macOS",
-            cli: "Pangolin CLI",
-            olm: "Olm CLI"
-        } satisfies Record<
-            Exclude<typeof agent, undefined | "unknown">,
-            string
-        >;
-        if (typeof agent !== "undefined") {
-            if (agent === "unknown") {
-                conditions.push(isNull(olms.agent));
-            } else {
-                conditions.push(eq(olms.agent, agentValueMap[agent]));
-            }
-        }
-
-        if (status.length > 0) {
-            const filterAggregates: (SQL<unknown> | undefined)[] = [];
-
-            if (status.includes("active")) {
-                filterAggregates.push(
-                    and(
-                        eq(clients.archived, false),
-                        eq(clients.blocked, false),
-                        build !== "oss"
-                            ? or(
-                                  eq(clients.approvalState, "approved"),
-                                  isNull(clients.approvalState) // approval state of `NULL` means approved by default
-                              )
-                            : undefined // undefined are automatically ignored by `drizzle-orm`
-                    )
-                );
-            }
-
-            if (status.includes("archived")) {
-                filterAggregates.push(eq(clients.archived, true));
-            }
-            if (status.includes("blocked")) {
-                filterAggregates.push(eq(clients.blocked, true));
-            }
-
-            if (build !== "oss") {
-                if (status.includes("pending")) {
-                    filterAggregates.push(eq(clients.approvalState, "pending"));
-                }
-                if (status.includes("denied")) {
-                    filterAggregates.push(eq(clients.approvalState, "denied"));
-                }
-            }
-
-            conditions.push(or(...filterAggregates));
-        }
-
-        const baseQuery = queryUserDevicesBase().where(and(...conditions));
-
-        const countQuery = db.$count(baseQuery.as("filtered_clients"));
-
-        const listDevicesQuery = baseQuery
-            .limit(pageSize)
-            .offset(pageSize * (page - 1))
-            .orderBy(
-                sort_by
-                    ? order === "asc"
-                        ? asc(clients[sort_by])
-                        : desc(clients[sort_by])
-                    : asc(clients.clientId)
-            );
-
-        const [clientsList, totalCount] = await Promise.all([
-            listDevicesQuery,
-            countQuery
-        ]);
-
-        // Merge clients with their site associations and replace name with device name
-        const olmsWithUpdates: OlmWithUpdateAvailable[] = clientsList.map(
-            (client) => {
-                const model = client.deviceModel || null;
-                const newName = getUserDeviceName(model, client.name);
-                const OlmWithUpdate: OlmWithUpdateAvailable = {
-                    ...client,
-                    name: newName
-                };
-                // Initially set to false, will be updated if version check succeeds
-                OlmWithUpdate.olmUpdateAvailable = false;
-                return OlmWithUpdate;
-            }
-        );
-
-        // Try to get the latest version, but don't block if it fails
-        try {
-            const latestOlmVersion = await getLatestOlmVersion();
-
-            if (latestOlmVersion) {
-                olmsWithUpdates.forEach((client) => {
-                    try {
-                        client.olmUpdateAvailable = semver.lt(
-                            client.olmVersion ? client.olmVersion : "",
-                            latestOlmVersion
-                        );
-                    } catch (error) {
-                        client.olmUpdateAvailable = false;
-                    }
-                });
-            }
-        } catch (error) {
-            // Log the error but don't let it block the response
-            logger.warn(
-                "Failed to check for OLM updates, continuing without update info:",
-                error
-            );
-        }
-
-        return response<ListUserDevicesResponse>(res, {
-            data: {
-                devices: olmsWithUpdates,
-                pagination: {
-                    total: totalCount,
-                    page,
-                    pageSize
-                }
-            },
-            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/domain/createOrgDomain.ts

@@ -148,6 +148,7 @@ export async function createOrgDomain(
             }
         }
 
+        let numOrgDomains: OrgDomains[] | undefined;
         let aRecords: CreateDomainResponse["aRecords"];
         let cnameRecords: CreateDomainResponse["cnameRecords"];
         let txtRecords: CreateDomainResponse["txtRecords"];
@@ -346,9 +347,20 @@ export async function createOrgDomain(
                 await trx.insert(dnsRecords).values(recordsToInsert);
             }
 
-            await usageService.add(orgId, FeatureId.DOMAINS, 1, trx);
+            numOrgDomains = await trx
+                .select()
+                .from(orgDomains)
+                .where(eq(orgDomains.orgId, orgId));
         });
 
+        if (numOrgDomains) {
+            await usageService.updateCount(
+                orgId,
+                FeatureId.DOMAINS,
+                numOrgDomains.length
+            );
+        }
+
         if (!returned) {
             return next(
                 createHttpError(

server/routers/domain/deleteOrgDomain.ts

@@ -36,6 +36,8 @@ export async function deleteAccountDomain(
         }
         const { domainId, orgId } = parsed.data;
 
+        let numOrgDomains: OrgDomains[] | undefined;
+
         await db.transaction(async (trx) => {
             const [existing] = await trx
                 .select()
@@ -77,9 +79,20 @@ export async function deleteAccountDomain(
 
             await trx.delete(domains).where(eq(domains.domainId, domainId));
 
-            await usageService.add(orgId, FeatureId.DOMAINS, -1, trx);
+            numOrgDomains = await trx
+                .select()
+                .from(orgDomains)
+                .where(eq(orgDomains.orgId, orgId));
         });
 
+        if (numOrgDomains) {
+            await usageService.updateCount(
+                orgId,
+                FeatureId.DOMAINS,
+                numOrgDomains.length
+            );
+        }
+
         return response<DeleteAccountDomainResponse>(res, {
             data: { success: true },
             success: true,

server/routers/external.ts

@@ -50,7 +50,6 @@ import createHttpError from "http-errors";
 import { build } from "@server/build";
 import { createStore } from "#dynamic/lib/rateLimitStore";
 import { logActionAudit } from "#dynamic/middlewares";
-import { checkRoundTripMessage } from "./ws";
 
 // Root routes
 export const unauthenticated = Router();
@@ -65,8 +64,9 @@ authenticated.use(verifySessionUserMiddleware);
 
 authenticated.get("/pick-org-defaults", org.pickOrgDefaults);
 authenticated.get("/org/checkId", org.checkId);
-
-authenticated.put("/org", getUserOrgs, org.createOrg);
+if (build === "oss" || build === "enterprise") {
+    authenticated.put("/org", getUserOrgs, org.createOrg);
+}
 
 authenticated.get("/orgs", verifyUserIsServerAdmin, org.listOrgs);
 authenticated.get("/user/:userId/orgs", verifyIsLoggedInUser, org.listUserOrgs);
@@ -86,14 +86,16 @@ authenticated.post(
     org.updateOrg
 );
 
-authenticated.delete(
-    "/org/:orgId",
-    verifyOrgAccess,
-    verifyUserIsOrgOwner,
-    verifyUserHasAction(ActionsEnum.deleteOrg),
-    logActionAudit(ActionsEnum.deleteOrg),
-    org.deleteOrg
-);
+if (build !== "saas") {
+    authenticated.delete(
+        "/org/:orgId",
+        verifyOrgAccess,
+        verifyUserIsOrgOwner,
+        verifyUserHasAction(ActionsEnum.deleteOrg),
+        logActionAudit(ActionsEnum.deleteOrg),
+        org.deleteOrg
+    );
+}
 
 authenticated.put(
     "/org/:orgId/site",
@@ -143,13 +145,6 @@ authenticated.get(
     client.listClients
 );
 
-authenticated.get(
-    "/org/:orgId/user-devices",
-    verifyOrgAccess,
-    verifyUserHasAction(ActionsEnum.listClients),
-    client.listUserDevices
-);
-
 authenticated.get(
     "/client/:clientId",
     verifyClientAccess,
@@ -1121,8 +1116,6 @@ authenticated.get(
     blueprints.getBlueprint
 );
 
-authenticated.get("/ws/round-trip-message/:messageId", checkRoundTripMessage);
-
 // Auth routes
 export const authRouter = Router();
 unauthenticated.use("/auth", authRouter);

server/routers/idp/createIdpOrgPolicy.ts

@@ -70,15 +70,6 @@ export async function createIdpOrgPolicy(
         const { idpId, orgId } = parsedParams.data;
         const { roleMapping, orgMapping } = parsedBody.data;
 
-        if (process.env.IDENTITY_PROVIDER_MODE === "org") {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    "Global IdP creation is not allowed in the current identity provider mode. Set app.identity_provider_mode to 'global' in the private configuration to enable this feature."
-                )
-            );
-        }
-
         const [existing] = await db
             .select()
             .from(idp)

server/routers/idp/createOidcIdp.ts

@@ -80,17 +80,6 @@ export async function createOidcIdp(
             tags
         } = parsedBody.data;
 
-        if (
-            process.env.IDENTITY_PROVIDER_MODE === "org"
-        ) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    "Global IdP creation is not allowed in the current identity provider mode. Set app.identity_provider_mode to 'global' in the private configuration to enable this feature."
-                )
-            );
-        }
-
         const key = config.getRawConfig().server.secret!;
 
         const encryptedSecret = encrypt(clientSecret, key);

server/routers/idp/updateIdpOrgPolicy.ts

@@ -69,15 +69,6 @@ export async function updateIdpOrgPolicy(
         const { idpId, orgId } = parsedParams.data;
         const { roleMapping, orgMapping } = parsedBody.data;
 
-        if (process.env.IDENTITY_PROVIDER_MODE === "org") {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    "Global IdP creation is not allowed in the current identity provider mode. Set app.identity_provider_mode to 'global' in the private configuration to enable this feature."
-                )
-            );
-        }
-
         // Check if IDP and policy exist
         const [existing] = await db
             .select()

server/routers/idp/updateOidcIdp.ts

@@ -99,15 +99,6 @@ export async function updateOidcIdp(
             tags
         } = parsedBody.data;
 
-        if (process.env.IDENTITY_PROVIDER_MODE === "org") {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    "Global IdP creation is not allowed in the current identity provider mode. Set app.identity_provider_mode to 'global' in the private configuration to enable this feature."
-                )
-            );
-        }
-
         // Check if IDP exists and is of type OIDC
         const [existingIdp] = await db
             .select()

server/routers/idp/validateOidcCallback.ts

@@ -36,10 +36,6 @@ import { build } from "@server/build";
 import { calculateUserClientsForOrgs } from "@server/lib/calculateUserClientsForOrgs";
 import { isSubscribed } from "#dynamic/lib/isSubscribed";
 import { tierMatrix } from "@server/lib/billing/tierMatrix";
-import {
-    assignUserToOrg,
-    removeUserFromOrg
-} from "@server/lib/userOrg";
 
 const ensureTrailingSlash = (url: string): string => {
     return url;
@@ -440,7 +436,6 @@ export async function validateOidcCallback(
                 }
             }
 
-            // These are the orgs that the user should be provisioned into based on the IdP mappings and the token claims
             logger.debug("User org info", { userOrgInfo });
 
             let existingUserId = existingUser?.userId;
@@ -459,32 +454,15 @@ export async function validateOidcCallback(
                         );
 
                     if (!existingUserOrgs.length) {
-                        // delete all auto-provisioned user orgs
-                        const autoProvisionedUserOrgs = await db
-                            .select()
-                            .from(userOrgs)
+                        // delete all auto -provisioned user orgs
+                        await db
+                            .delete(userOrgs)
                             .where(
                                 and(
                                     eq(userOrgs.userId, existingUser.userId),
                                     eq(userOrgs.autoProvisioned, true)
                                 )
                             );
-                        const orgIdsToRemove = autoProvisionedUserOrgs.map(
-                            (uo) => uo.orgId
-                        );
-                        if (orgIdsToRemove.length > 0) {
-                            const orgsToRemove = await db
-                                .select()
-                                .from(orgs)
-                                .where(inArray(orgs.orgId, orgIdsToRemove));
-                            for (const org of orgsToRemove) {
-                                await removeUserFromOrg(
-                                    org,
-                                    existingUser.userId,
-                                    db
-                                );
-                            }
-                        }
 
                         await calculateUserClientsForOrgs(existingUser.userId);
 
@@ -506,7 +484,7 @@ export async function validateOidcCallback(
                 }
             }
 
-                const orgUserCounts: { orgId: string; userCount: number }[] = [];
+            const orgUserCounts: { orgId: string; userCount: number }[] = [];
 
             // sync the user with the orgs and roles
             await db.transaction(async (trx) => {
@@ -560,14 +538,15 @@ export async function validateOidcCallback(
                 );
 
                 if (orgsToDelete.length > 0) {
-                    const orgIdsToRemove = orgsToDelete.map((org) => org.orgId);
-                    const fullOrgsToRemove = await trx
-                        .select()
-                        .from(orgs)
-                        .where(inArray(orgs.orgId, orgIdsToRemove));
-                    for (const org of fullOrgsToRemove) {
-                        await removeUserFromOrg(org, userId!, trx);
-                    }
+                    await trx.delete(userOrgs).where(
+                        and(
+                            eq(userOrgs.userId, userId!),
+                            inArray(
+                                userOrgs.orgId,
+                                orgsToDelete.map((org) => org.orgId)
+                            )
+                        )
+                    );
                 }
 
                 // Update roles for existing auto-provisioned orgs where the role has changed
@@ -608,24 +587,15 @@ export async function validateOidcCallback(
                 );
 
                 if (orgsToAdd.length > 0) {
-                    for (const org of orgsToAdd) {
-                        const [fullOrg] = await trx
-                            .select()
-                            .from(orgs)
-                            .where(eq(orgs.orgId, org.orgId));
-                        if (fullOrg) {
-                            await assignUserToOrg(
-                                fullOrg,
-                                {
-                                    orgId: org.orgId,
-                                    userId: userId!,
-                                    roleId: org.roleId,
-                                    autoProvisioned: true,
-                                },
-                                trx
-                            );
-                        }
-                    }
+                    await trx.insert(userOrgs).values(
+                        orgsToAdd.map((org) => ({
+                            userId: userId!,
+                            orgId: org.orgId,
+                            roleId: org.roleId,
+                            autoProvisioned: true,
+                            dateCreated: new Date().toISOString()
+                        }))
+                    );
                 }
 
                 // Loop through all the orgs and get the total number of users from the userOrgs table

server/routers/integration.ts

@@ -866,13 +866,6 @@ authenticated.get(
     client.listClients
 );
 
-authenticated.get(
-    "/org/:orgId/user-devices",
-    verifyApiKeyOrgAccess,
-    verifyApiKeyHasAction(ActionsEnum.listClients),
-    client.listUserDevices
-);
-
 authenticated.get(
     "/client/:clientId",
     verifyApiKeyClientAccess,

server/routers/org/createOrg.ts

@@ -1,7 +1,7 @@
 import { Request, Response, NextFunction } from "express";
 import { z } from "zod";
 import { db } from "@server/db";
-import { and, count, eq } from "drizzle-orm";
+import { eq } from "drizzle-orm";
 import {
     domains,
     Org,
@@ -24,12 +24,10 @@ import { OpenAPITags, registry } from "@server/openApi";
 import { isValidCIDR } from "@server/lib/validators";
 import { createCustomer } from "#dynamic/lib/billing";
 import { usageService } from "@server/lib/billing/usageService";
-import { FeatureId, limitsService, freeLimitSet } from "@server/lib/billing";
+import { FeatureId } from "@server/lib/billing";
 import { build } from "@server/build";
 import { calculateUserClientsForOrgs } from "@server/lib/calculateUserClientsForOrgs";
 import { doCidrsOverlap } from "@server/lib/ip";
-import { generateCA } from "@server/private/lib/sshCA";
-import { encrypt } from "@server/lib/crypto";
 
 const createOrgSchema = z.strictObject({
     orgId: z.string(),
@@ -110,7 +108,6 @@ export async function createOrg(
         //         )
         //     );
         // }
-        //
 
         // make sure the orgId is unique
         const orgExists = await db
@@ -137,80 +134,8 @@ export async function createOrg(
             );
         }
 
-        let isFirstOrg: boolean | null = null;
-        let billingOrgIdForNewOrg: string | null = null;
-        if (build === "saas" && req.user) {
-            const ownedOrgs = await db
-                .select()
-                .from(userOrgs)
-                .where(
-                    and(
-                        eq(userOrgs.userId, req.user.userId),
-                        eq(userOrgs.isOwner, true)
-                    )
-                );
-            if (ownedOrgs.length === 0) {
-                isFirstOrg = true;
-            } else {
-                isFirstOrg = false;
-                const [billingOrg] = await db
-                    .select({ orgId: orgs.orgId })
-                    .from(orgs)
-                    .innerJoin(userOrgs, eq(orgs.orgId, userOrgs.orgId))
-                    .where(
-                        and(
-                            eq(userOrgs.userId, req.user.userId),
-                            eq(userOrgs.isOwner, true),
-                            eq(orgs.isBillingOrg, true)
-                        )
-                    )
-                    .limit(1);
-                if (billingOrg) {
-                    billingOrgIdForNewOrg = billingOrg.orgId;
-                }
-            }
-        }
-
-        if (build == "saas") {
-            if (!billingOrgIdForNewOrg) {
-                return next(
-                    createHttpError(
-                        HttpCode.INTERNAL_SERVER_ERROR,
-                        "Billing org not found for user. Cannot create new organization."
-                    )
-                );
-            }
-
-            const usage = await usageService.getUsage(billingOrgIdForNewOrg, FeatureId.ORGINIZATIONS);
-            if (!usage) {
-                return next(
-                    createHttpError(
-                        HttpCode.NOT_FOUND,
-                        "No usage data found for this organization"
-                    )
-                );
-            }
-            const rejectOrgs = await usageService.checkLimitSet(
-                billingOrgIdForNewOrg,
-                FeatureId.ORGINIZATIONS,
-                {
-                    ...usage,
-                    instantaneousValue: (usage.instantaneousValue || 0) + 1
-                } // We need to add one to know if we are violating the limit
-            );
-            if (rejectOrgs) {
-                return next(
-                    createHttpError(
-                        HttpCode.FORBIDDEN,
-                        "Organization limit exceeded. Please upgrade your plan."
-                    )
-                );
-            }
-        }
-
         let error = "";
         let org: Org | null = null;
-        let numOrgs: number | null = null;
 
         await db.transaction(async (trx) => {
             const allDomains = await trx
@@ -218,21 +143,6 @@ export async function createOrg(
                 .from(domains)
                 .where(eq(domains.configManaged, true));
 
-            // Generate SSH CA keys for the org
-            // const ca = generateCA(`${orgId}-ca`);
-            // const encryptionKey = config.getRawConfig().server.secret!;
-            // const encryptedCaPrivateKey = encrypt(ca.privateKeyPem, encryptionKey);
-
-            const saasBillingFields =
-                build === "saas" && req.user && isFirstOrg !== null
-                    ? isFirstOrg
-                        ? { isBillingOrg: true as const, billingOrgId: orgId } // if this is the first org, it becomes the billing org for itself
-                        : {
-                              isBillingOrg: false as const,
-                              billingOrgId: billingOrgIdForNewOrg
-                          }
-                    : {};
-
             const newOrg = await trx
                 .insert(orgs)
                 .values({
@@ -240,10 +150,7 @@ export async function createOrg(
                     name,
                     subnet,
                     utilitySubnet,
-                    createdAt: new Date().toISOString(),
-                    // sshCaPrivateKey: encryptedCaPrivateKey,
-                    // sshCaPublicKey: ca.publicKeyOpenSSH,
-                    ...saasBillingFields
+                    createdAt: new Date().toISOString()
                 })
                 .returning();
 
@@ -345,17 +252,6 @@ export async function createOrg(
             );
 
             await calculateUserClientsForOrgs(ownerUserId, trx);
-
-            if (billingOrgIdForNewOrg) {
-                const [numOrgsResult] = await trx
-                    .select({ count: count() })
-                    .from(orgs)
-                    .where(eq(orgs.billingOrgId, billingOrgIdForNewOrg)); // all the billable orgs including the primary org that is the billing org itself
-
-                numOrgs = numOrgsResult.count;
-            } else {
-                numOrgs = 1; // we only have one org if there is no billing org found out
-            }
         });
 
         if (!org) {
@@ -371,8 +267,8 @@ export async function createOrg(
             return next(createHttpError(HttpCode.INTERNAL_SERVER_ERROR, error));
         }
 
-        if (build === "saas" && isFirstOrg === true) {
-            await limitsService.applyLimitSetToOrg(orgId, freeLimitSet);
+        if (build == "saas") {
+            // make sure we have the stripe customer
             const customerId = await createCustomer(orgId, req.user?.email);
             if (customerId) {
                 await usageService.updateCount(
@@ -384,14 +280,6 @@ export async function createOrg(
             }
         }
 
-        if (numOrgs) {
-            usageService.updateCount(
-                billingOrgIdForNewOrg || orgId,
-                FeatureId.ORGINIZATIONS,
-                numOrgs
-            );
-        }
-
         return response(res, {
             data: org,
             success: true,

server/routers/org/deleteOrg.ts

@@ -7,8 +7,6 @@ import logger from "@server/logger";
 import { fromError } from "zod-validation-error";
 import { OpenAPITags, registry } from "@server/openApi";
 import { deleteOrgById, sendTerminationMessages } from "@server/lib/deleteOrg";
-import { db, userOrgs, orgs } from "@server/db";
-import { eq, and } from "drizzle-orm";
 
 const deleteOrgSchema = z.strictObject({
     orgId: z.string()
@@ -43,48 +41,6 @@ export async function deleteOrg(
             );
         }
         const { orgId } = parsedParams.data;
-
-        const [data] = await db
-            .select()
-            .from(userOrgs)
-            .innerJoin(orgs, eq(userOrgs.orgId, orgs.orgId))
-            .where(
-                and(
-                    eq(userOrgs.orgId, orgId),
-                    eq(userOrgs.userId, req.user!.userId)
-                )
-            );
-
-        const org = data?.orgs;
-        const userOrg = data?.userOrgs;
-
-        if (!org || !userOrg) {
-            return next(
-                createHttpError(
-                    HttpCode.NOT_FOUND,
-                    `Organization with ID ${orgId} not found`
-                )
-            );
-        }
-
-        if (!userOrg.isOwner) {
-            return next(
-                createHttpError(
-                    HttpCode.FORBIDDEN,
-                    "Only organization owners can delete the organization"
-                )
-            );
-        }
-
-        if (org.isBillingOrg) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    "Cannot delete a primary organization"
-                )
-            );
-        }
-
         const result = await deleteOrgById(orgId);
         sendTerminationMessages(result);
         return response(res, {

server/routers/org/listUserOrgs.ts

@@ -40,11 +40,7 @@ const listOrgsSchema = z.object({
 //     responses: {}
 // });
 
-type ResponseOrg = Org & {
-    isOwner?: boolean;
-    isAdmin?: boolean;
-    isPrimaryOrg?: boolean;
-};
+type ResponseOrg = Org & { isOwner?: boolean; isAdmin?: boolean };
 
 export type ListUserOrgsResponse = {
     orgs: ResponseOrg[];
@@ -136,9 +132,6 @@ export async function listUserOrgs(
             if (val.roles && val.roles.isAdmin) {
                 res.isAdmin = val.roles.isAdmin;
             }
-            if (val.userOrgs?.isOwner && val.orgs?.isBillingOrg) {
-                res.isPrimaryOrg = val.orgs.isBillingOrg;
-            }
             return res;
         });
 

server/routers/resource/listResources.ts

@@ -1,99 +1,74 @@
+import { Request, Response, NextFunction } from "express";
+import { z } from "zod";
 import {
     db,
     resourceHeaderAuth,
-    resourceHeaderAuthExtendedCompatibility,
+    resourceHeaderAuthExtendedCompatibility
+} from "@server/db";
+import {
+    resources,
+    userResources,
+    roleResources,
     resourcePassword,
     resourcePincode,
-    resources,
-    roleResources,
-    targetHealthCheck,
     targets,
-    userResources
+    targetHealthCheck
 } from "@server/db";
 import response from "@server/lib/response";
-import logger from "@server/logger";
-import { OpenAPITags, registry } from "@server/openApi";
 import HttpCode from "@server/types/HttpCode";
-import type { PaginatedResponse } from "@server/types/Pagination";
-import {
-    and,
-    asc,
-    count,
-    eq,
-    inArray,
-    isNull,
-    like,
-    not,
-    or,
-    sql,
-    type SQL
-} from "drizzle-orm";
-import { NextFunction, Request, Response } from "express";
 import createHttpError from "http-errors";
-import { z } from "zod";
+import { sql, eq, or, inArray, and, count } from "drizzle-orm";
+import logger from "@server/logger";
 import { fromZodError } from "zod-validation-error";
+import { OpenAPITags, registry } from "@server/openApi";
 
 const listResourcesParamsSchema = z.strictObject({
     orgId: z.string()
 });
 
 const listResourcesSchema = z.object({
-    pageSize: z.coerce
-        .number<string>() // for prettier formatting
-        .int()
-        .positive()
+    limit: z
+        .string()
         .optional()
-        .catch(20)
-        .default(20)
-        .openapi({
-            type: "integer",
-            default: 20,
-            description: "Number of items per page"
-        }),
-    page: z.coerce
-        .number<string>() // for prettier formatting
-        .int()
-        .min(0)
+        .default("1000")
+        .transform(Number)
+        .pipe(z.int().nonnegative()),
+
+    offset: z
+        .string()
         .optional()
-        .catch(1)
-        .default(1)
-        .openapi({
-            type: "integer",
-            default: 1,
-            description: "Page number to retrieve"
-        }),
-    query: z.string().optional(),
-    enabled: z
-        .enum(["true", "false"])
-        .transform((v) => v === "true")
-        .optional()
-        .catch(undefined)
-        .openapi({
-            type: "boolean",
-            description: "Filter resources based on enabled status"
-        }),
-    authState: z
-        .enum(["protected", "not_protected", "none"])
-        .optional()
-        .catch(undefined)
-        .openapi({
-            type: "string",
-            enum: ["protected", "not_protected", "none"],
-            description:
-                "Filter resources based on authentication state. `protected` means the resource has at least one auth mechanism (password, pincode, header auth, SSO, or email whitelist). `not_protected` means the resource has no auth mechanisms. `none` means the resource is not protected by HTTP (i.e. it has no auth mechanisms and http is false)."
-        }),
-    healthStatus: z
-        .enum(["no_targets", "healthy", "degraded", "offline", "unknown"])
-        .optional()
-        .catch(undefined)
-        .openapi({
-            type: "string",
-            enum: ["no_targets", "healthy", "degraded", "offline", "unknown"],
-            description:
-                "Filter resources based on health status of their targets. `healthy` means all targets are healthy. `degraded` means at least one target is unhealthy, but not all are unhealthy. `offline` means all targets are unhealthy. `unknown` means all targets have unknown health status. `no_targets` means the resource has no targets."
-        })
+        .default("0")
+        .transform(Number)
+        .pipe(z.int().nonnegative())
 });
 
+// (resource fields + a single joined target)
+type JoinedRow = {
+    resourceId: number;
+    niceId: string;
+    name: string;
+    ssl: boolean;
+    fullDomain: string | null;
+    passwordId: number | null;
+    sso: boolean;
+    pincodeId: number | null;
+    whitelist: boolean;
+    http: boolean;
+    protocol: string;
+    proxyPort: number | null;
+    enabled: boolean;
+    domainId: string | null;
+    headerAuthId: number | null;
+
+    targetId: number | null;
+    targetIp: string | null;
+    targetPort: number | null;
+    targetEnabled: boolean | null;
+
+    hcHealth: string | null;
+    hcEnabled: boolean | null;
+};
+
 // grouped by resource with targets[])
 export type ResourceWithTargets = {
     resourceId: number;
@@ -116,32 +91,11 @@ export type ResourceWithTargets = {
         ip: string;
         port: number;
         enabled: boolean;
-        healthStatus: "healthy" | "unhealthy" | "unknown" | null;
+        healthStatus?: "healthy" | "unhealthy" | "unknown";
     }>;
 };
 
-// Aggregate filters
-const total_targets = count(targets.targetId);
-const healthy_targets = sql<number>`SUM(
-                    CASE
-                    WHEN ${targetHealthCheck.hcHealth} = 'healthy' THEN 1
-                    ELSE 0
-                    END
-                ) `;
-const unknown_targets = sql<number>`SUM(
-                    CASE
-                    WHEN ${targetHealthCheck.hcHealth} = 'unknown' THEN 1
-                    ELSE 0
-                    END
-                ) `;
-const unhealthy_targets = sql<number>`SUM(
-                    CASE
-                    WHEN ${targetHealthCheck.hcHealth} = 'unhealthy' THEN 1
-                    ELSE 0
-                    END
-                ) `;
-
-function queryResourcesBase() {
+function queryResources(accessibleResourceIds: number[], orgId: string) {
     return db
         .select({
             resourceId: resources.resourceId,
@@ -160,7 +114,14 @@ function queryResourcesBase() {
             niceId: resources.niceId,
             headerAuthId: resourceHeaderAuth.headerAuthId,
             headerAuthExtendedCompatibilityId:
-                resourceHeaderAuthExtendedCompatibility.headerAuthExtendedCompatibilityId
+                resourceHeaderAuthExtendedCompatibility.headerAuthExtendedCompatibilityId,
+            targetId: targets.targetId,
+            targetIp: targets.ip,
+            targetPort: targets.port,
+            targetEnabled: targets.enabled,
+
+            hcHealth: targetHealthCheck.hcHealth,
+            hcEnabled: targetHealthCheck.hcEnabled
         })
         .from(resources)
         .leftJoin(
@@ -187,18 +148,18 @@ function queryResourcesBase() {
             targetHealthCheck,
             eq(targetHealthCheck.targetId, targets.targetId)
         )
-        .groupBy(
-            resources.resourceId,
-            resourcePassword.passwordId,
-            resourcePincode.pincodeId,
-            resourceHeaderAuth.headerAuthId,
-            resourceHeaderAuthExtendedCompatibility.headerAuthExtendedCompatibilityId
+        .where(
+            and(
+                inArray(resources.resourceId, accessibleResourceIds),
+                eq(resources.orgId, orgId)
+            )
         );
 }
 
-export type ListResourcesResponse = PaginatedResponse<{
+export type ListResourcesResponse = {
     resources: ResourceWithTargets[];
-}>;
+    pagination: { total: number; limit: number; offset: number };
+};
 
 registry.registerPath({
     method: "get",
@@ -229,8 +190,7 @@ export async function listResources(
                 )
             );
         }
-        const { page, pageSize, authState, enabled, query, healthStatus } =
-            parsedQuery.data;
+        const { limit, offset } = parsedQuery.data;
 
         const parsedParams = listResourcesParamsSchema.safeParse(req.params);
         if (!parsedParams.success) {
@@ -292,133 +252,14 @@ export async function listResources(
             (resource) => resource.resourceId
         );
 
-        const conditions = [
-            and(
-                inArray(resources.resourceId, accessibleResourceIds),
-                eq(resources.orgId, orgId)
-            )
-        ];
+        const countQuery: any = db
+            .select({ count: count() })
+            .from(resources)
+            .where(inArray(resources.resourceId, accessibleResourceIds));
 
-        if (query) {
-            conditions.push(
-                or(
-                    like(
-                        sql`LOWER(${resources.name})`,
-                        "%" + query.toLowerCase() + "%"
-                    ),
-                    like(
-                        sql`LOWER(${resources.niceId})`,
-                        "%" + query.toLowerCase() + "%"
-                    ),
-                    like(
-                        sql`LOWER(${resources.fullDomain})`,
-                        "%" + query.toLowerCase() + "%"
-                    )
-                )
-            );
-        }
-        if (typeof enabled !== "undefined") {
-            conditions.push(eq(resources.enabled, enabled));
-        }
+        const baseQuery = queryResources(accessibleResourceIds, orgId);
 
-        if (typeof authState !== "undefined") {
-            switch (authState) {
-                case "none":
-                    conditions.push(eq(resources.http, false));
-                    break;
-                case "protected":
-                    conditions.push(
-                        or(
-                            eq(resources.sso, true),
-                            eq(resources.emailWhitelistEnabled, true),
-                            not(isNull(resourceHeaderAuth.headerAuthId)),
-                            not(isNull(resourcePincode.pincodeId)),
-                            not(isNull(resourcePassword.passwordId))
-                        )
-                    );
-                    break;
-                case "not_protected":
-                    conditions.push(
-                        not(eq(resources.sso, true)),
-                        not(eq(resources.emailWhitelistEnabled, true)),
-                        isNull(resourceHeaderAuth.headerAuthId),
-                        isNull(resourcePincode.pincodeId),
-                        isNull(resourcePassword.passwordId)
-                    );
-                    break;
-            }
-        }
-
-        let aggregateFilters: SQL<any> | undefined = sql`1 = 1`;
-
-        if (typeof healthStatus !== "undefined") {
-            switch (healthStatus) {
-                case "healthy":
-                    aggregateFilters = and(
-                        sql`${total_targets} > 0`,
-                        sql`${healthy_targets} = ${total_targets}`
-                    );
-                    break;
-                case "degraded":
-                    aggregateFilters = and(
-                        sql`${total_targets} > 0`,
-                        sql`${unhealthy_targets} > 0`
-                    );
-                    break;
-                case "no_targets":
-                    aggregateFilters = sql`${total_targets} = 0`;
-                    break;
-                case "offline":
-                    aggregateFilters = and(
-                        sql`${total_targets} > 0`,
-                        sql`${healthy_targets} = 0`,
-                        sql`${unhealthy_targets} = ${total_targets}`
-                    );
-                    break;
-                case "unknown":
-                    aggregateFilters = and(
-                        sql`${total_targets} > 0`,
-                        sql`${unknown_targets} = ${total_targets}`
-                    );
-                    break;
-            }
-        }
-
-        const baseQuery = queryResourcesBase()
-            .where(and(...conditions))
-            .having(aggregateFilters);
-
-        // we need to add `as` so that drizzle filters the result as a subquery
-        const countQuery = db.$count(baseQuery.as("filtered_resources"));
-
-        const [rows, totalCount] = await Promise.all([
-            baseQuery
-                .limit(pageSize)
-                .offset(pageSize * (page - 1))
-                .orderBy(asc(resources.resourceId)),
-            countQuery
-        ]);
-
-        const resourceIdList = rows.map((row) => row.resourceId);
-        const allResourceTargets =
-            resourceIdList.length === 0
-                ? []
-                : await db
-                      .select({
-                          targetId: targets.targetId,
-                          resourceId: targets.resourceId,
-                          ip: targets.ip,
-                          port: targets.port,
-                          enabled: targets.enabled,
-                          healthStatus: targetHealthCheck.hcHealth,
-                          hcEnabled: targetHealthCheck.hcEnabled
-                      })
-                      .from(targets)
-                      .where(inArray(targets.resourceId, resourceIdList))
-                      .leftJoin(
-                          targetHealthCheck,
-                          eq(targetHealthCheck.targetId, targets.targetId)
-                      );
+        const rows: JoinedRow[] = await baseQuery.limit(limit).offset(offset);
 
         // avoids TS issues with reduce/never[]
         const map = new Map<number, ResourceWithTargets>();
@@ -447,20 +288,44 @@ export async function listResources(
                 map.set(row.resourceId, entry);
             }
 
-            entry.targets = allResourceTargets.filter(
-                (t) => t.resourceId === entry.resourceId
-            );
+            if (
+                row.targetId != null &&
+                row.targetIp &&
+                row.targetPort != null &&
+                row.targetEnabled != null
+            ) {
+                let healthStatus: "healthy" | "unhealthy" | "unknown" =
+                    "unknown";
+
+                if (row.hcEnabled && row.hcHealth) {
+                    healthStatus = row.hcHealth as
+                        | "healthy"
+                        | "unhealthy"
+                        | "unknown";
+                }
+
+                entry.targets.push({
+                    targetId: row.targetId,
+                    ip: row.targetIp,
+                    port: row.targetPort,
+                    enabled: row.targetEnabled,
+                    healthStatus: healthStatus
+                });
+            }
         }
 
         const resourcesList: ResourceWithTargets[] = Array.from(map.values());
 
+        const totalCountResult = await countQuery;
+        const totalCount = totalCountResult[0]?.count ?? 0;
+
         return response<ListResourcesResponse>(res, {
             data: {
                 resources: resourcesList,
                 pagination: {
                     total: totalCount,
-                    pageSize,
-                    page
+                    limit,
+                    offset
                 }
             },
             success: true,

server/routers/resource/updateResource.ts

@@ -33,7 +33,7 @@ const updateResourceParamsSchema = z.strictObject({
 const updateHttpResourceBodySchema = z
     .strictObject({
         name: z.string().min(1).max(255).optional(),
-        niceId: z.string().min(1).max(255).regex(/^[a-zA-Z0-9-]+$/, "niceId can only contain letters, numbers, and dashes").optional(),
+        niceId: z.string().min(1).max(255).optional(),
         subdomain: subdomainSchema.nullable().optional(),
         ssl: z.boolean().optional(),
         sso: z.boolean().optional(),

server/routers/site/createSite.ts

@@ -6,7 +6,7 @@ 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, count } from "drizzle-orm";
+import { eq, and } from "drizzle-orm";
 import { getUniqueSiteName } from "../../db/names";
 import { addPeer } from "../gerbil/peers";
 import { fromError } from "zod-validation-error";
@@ -288,6 +288,7 @@ export async function createSite(
         const niceId = await getUniqueSiteName(orgId);
 
         let newSite: Site | undefined;
+        let numSites: Site[] | undefined;
         await db.transaction(async (trx) => {
             if (type == "newt") {
                 [newSite] = await trx
@@ -442,9 +443,20 @@ export async function createSite(
                 });
             }
 
-            await usageService.add(orgId, FeatureId.SITES, 1, trx);
+            numSites = await trx
+                .select()
+                .from(sites)
+                .where(eq(sites.orgId, orgId));
         });
 
+        if (numSites) {
+            await usageService.updateCount(
+                orgId,
+                FeatureId.SITES,
+                numSites.length
+            );
+        }
+
         if (!newSite) {
             return next(
                 createHttpError(

server/routers/site/deleteSite.ts

@@ -64,6 +64,7 @@ export async function deleteSite(
         }
 
         let deletedNewtId: string | null = null;
+        let numSites: Site[] | undefined;
 
         await db.transaction(async (trx) => {
             if (site.type == "wireguard") {
@@ -100,9 +101,21 @@ export async function deleteSite(
                 }
             }
 
-            await usageService.add(site.orgId, FeatureId.SITES, -1, trx);
+            await trx.delete(sites).where(eq(sites.siteId, siteId));
+
+            numSites = await trx
+                .select()
+                .from(sites)
+                .where(eq(sites.orgId, site.orgId));
         });
 
+        if (numSites) {
+            await usageService.updateCount(
+                site.orgId,
+                FeatureId.SITES,
+                numSites.length
+            );
+        }
         // Send termination message outside of transaction to prevent blocking
         if (deletedNewtId) {
             const payload = {

server/routers/site/listSites.ts

@@ -1,25 +1,17 @@
-import {
-    db,
-    exitNodes,
-    newts,
-    orgs,
-    remoteExitNodes,
-    roleSites,
-    sites,
-    userSites
-} from "@server/db";
-import cache from "@server/lib/cache";
-import response from "@server/lib/response";
+import { db, exitNodes, newts } from "@server/db";
+import { orgs, roleSites, sites, userSites } from "@server/db";
+import { remoteExitNodes } from "@server/db";
 import logger from "@server/logger";
-import { OpenAPITags, registry } from "@server/openApi";
 import HttpCode from "@server/types/HttpCode";
-import type { PaginatedResponse } from "@server/types/Pagination";
-import { and, asc, desc, eq, inArray, like, or, sql } from "drizzle-orm";
+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 semver from "semver";
 import { z } from "zod";
 import { fromError } from "zod-validation-error";
+import { OpenAPITags, registry } from "@server/openApi";
+import semver from "semver";
+import cache from "@server/lib/cache";
 
 async function getLatestNewtVersion(): Promise<string | null> {
     try {
@@ -82,63 +74,21 @@ const listSitesParamsSchema = z.strictObject({
 });
 
 const listSitesSchema = z.object({
-    pageSize: z.coerce
-        .number<string>() // for prettier formatting
-        .int()
-        .positive()
+    limit: z
+        .string()
         .optional()
-        .catch(20)
-        .default(20)
-        .openapi({
-            type: "integer",
-            default: 20,
-            description: "Number of items per page"
-        }),
-    page: z.coerce
-        .number<string>() // for prettier formatting
-        .int()
-        .min(0)
+        .default("1000")
+        .transform(Number)
+        .pipe(z.int().positive()),
+    offset: z
+        .string()
         .optional()
-        .catch(1)
-        .default(1)
-        .openapi({
-            type: "integer",
-            default: 1,
-            description: "Page number to retrieve"
-        }),
-    query: z.string().optional(),
-    sort_by: z
-        .enum(["megabytesIn", "megabytesOut"])
-        .optional()
-        .catch(undefined)
-        .openapi({
-            type: "string",
-            enum: ["megabytesIn", "megabytesOut"],
-            description: "Field to sort by"
-        }),
-    order: z
-        .enum(["asc", "desc"])
-        .optional()
-        .default("asc")
-        .catch("asc")
-        .openapi({
-            type: "string",
-            enum: ["asc", "desc"],
-            default: "asc",
-            description: "Sort order"
-        }),
-    online: z
-        .enum(["true", "false"])
-        .transform((v) => v === "true")
-        .optional()
-        .catch(undefined)
-        .openapi({
-            type: "boolean",
-            description: "Filter by online status"
-        })
+        .default("0")
+        .transform(Number)
+        .pipe(z.int().nonnegative())
 });
 
-function querySitesBase() {
+function querySites(orgId: string, accessibleSiteIds: number[]) {
     return db
         .select({
             siteId: sites.siteId,
@@ -165,16 +115,23 @@ function querySitesBase() {
         .leftJoin(
             remoteExitNodes,
             eq(remoteExitNodes.exitNodeId, sites.exitNodeId)
+        )
+        .where(
+            and(
+                inArray(sites.siteId, accessibleSiteIds),
+                eq(sites.orgId, orgId)
+            )
         );
 }
 
-type SiteWithUpdateAvailable = Awaited<ReturnType<typeof querySitesBase>>[0] & {
+type SiteWithUpdateAvailable = Awaited<ReturnType<typeof querySites>>[0] & {
     newtUpdateAvailable?: boolean;
 };
 
-export type ListSitesResponse = PaginatedResponse<{
+export type ListSitesResponse = {
     sites: SiteWithUpdateAvailable[];
-}>;
+    pagination: { total: number; limit: number; offset: number };
+};
 
 registry.registerPath({
     method: "get",
@@ -203,6 +160,7 @@ export async function listSites(
                 )
             );
         }
+        const { limit, offset } = parsedQuery.data;
 
         const parsedParams = listSitesParamsSchema.safeParse(req.params);
         if (!parsedParams.success) {
@@ -245,67 +203,34 @@ export async function listSites(
                 .where(eq(sites.orgId, orgId));
         }
 
-        const { pageSize, page, query, sort_by, order, online } =
-            parsedQuery.data;
-
         const accessibleSiteIds = accessibleSites.map((site) => site.siteId);
+        const baseQuery = querySites(orgId, accessibleSiteIds);
 
-        const conditions = [
-            and(
-                inArray(sites.siteId, accessibleSiteIds),
-                eq(sites.orgId, orgId)
-            )
-        ];
-        if (query) {
-            conditions.push(
-                or(
-                    like(
-                        sql`LOWER(${sites.name})`,
-                        "%" + query.toLowerCase() + "%"
-                    ),
-                    like(
-                        sql`LOWER(${sites.niceId})`,
-                        "%" + query.toLowerCase() + "%"
-                    )
+        const countQuery = db
+            .select({ count: count() })
+            .from(sites)
+            .where(
+                and(
+                    inArray(sites.siteId, accessibleSiteIds),
+                    eq(sites.orgId, orgId)
                 )
             );
-        }
-        if (typeof online !== "undefined") {
-            conditions.push(eq(sites.online, online));
-        }
 
-        const baseQuery = querySitesBase().where(and(...conditions));
-
-        // we need to add `as` so that drizzle filters the result as a subquery
-        const countQuery = db.$count(
-            querySitesBase().where(and(...conditions))
-        );
-
-        const siteListQuery = baseQuery
-            .limit(pageSize)
-            .offset(pageSize * (page - 1))
-            .orderBy(
-                sort_by
-                    ? order === "asc"
-                        ? asc(sites[sort_by])
-                        : desc(sites[sort_by])
-                    : asc(sites.siteId)
-            );
-
-        const [totalCount, rows] = await Promise.all([
-            countQuery,
-            siteListQuery
-        ]);
+        const sitesList = await baseQuery.limit(limit).offset(offset);
+        const totalCountResult = await countQuery;
+        const totalCount = totalCountResult[0].count;
 
         // Get latest version asynchronously without blocking the response
         const latestNewtVersionPromise = getLatestNewtVersion();
 
-        const sitesWithUpdates: SiteWithUpdateAvailable[] = rows.map((site) => {
-            const siteWithUpdate: SiteWithUpdateAvailable = { ...site };
-            // Initially set to false, will be updated if version check succeeds
-            siteWithUpdate.newtUpdateAvailable = false;
-            return siteWithUpdate;
-        });
+        const sitesWithUpdates: SiteWithUpdateAvailable[] = sitesList.map(
+            (site) => {
+                const siteWithUpdate: SiteWithUpdateAvailable = { ...site };
+                // Initially set to false, will be updated if version check succeeds
+                siteWithUpdate.newtUpdateAvailable = false;
+                return siteWithUpdate;
+            }
+        );
 
         // Try to get the latest version, but don't block if it fails
         try {
@@ -342,8 +267,8 @@ export async function listSites(
                 sites: sitesWithUpdates,
                 pagination: {
                     total: totalCount,
-                    pageSize,
-                    page
+                    limit,
+                    offset
                 }
             },
             success: true,

server/routers/siteResource/createSiteResource.ts

@@ -284,7 +284,7 @@ export async function createSiteResource(
                     niceId,
                     orgId,
                     name,
-                    mode: mode as "host" | "cidr",
+                    mode,
                     // protocol: mode === "port" ? protocol : null,
                     // proxyPort: mode === "port" ? proxyPort : null,
                     // destinationPort: mode === "port" ? destinationPort : null,

server/routers/siteResource/listAllSiteResourcesByOrg.ts

@@ -1,90 +1,41 @@
-import { db, SiteResource, siteResources, sites } from "@server/db";
+import { Request, Response, NextFunction } from "express";
+import { z } from "zod";
+import { db } from "@server/db";
+import { siteResources, sites, SiteResource } from "@server/db";
 import response from "@server/lib/response";
+import HttpCode from "@server/types/HttpCode";
+import createHttpError from "http-errors";
+import { eq, and } from "drizzle-orm";
+import { fromError } from "zod-validation-error";
 import logger from "@server/logger";
 import { OpenAPITags, registry } from "@server/openApi";
-import HttpCode from "@server/types/HttpCode";
-import type { PaginatedResponse } from "@server/types/Pagination";
-import { and, asc, eq, like, 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 listAllSiteResourcesByOrgParamsSchema = z.strictObject({
     orgId: z.string()
 });
 
 const listAllSiteResourcesByOrgQuerySchema = z.object({
-    pageSize: z.coerce
-        .number<string>() // for prettier formatting
-        .int()
-        .positive()
+    limit: z
+        .string()
         .optional()
-        .catch(20)
-        .default(20)
-        .openapi({
-            type: "integer",
-            default: 20,
-            description: "Number of items per page"
-        }),
-    page: z.coerce
-        .number<string>() // for prettier formatting
-        .int()
-        .min(0)
+        .default("1000")
+        .transform(Number)
+        .pipe(z.int().positive()),
+    offset: z
+        .string()
         .optional()
-        .catch(1)
-        .default(1)
-        .openapi({
-            type: "integer",
-            default: 1,
-            description: "Page number to retrieve"
-        }),
-    query: z.string().optional(),
-    mode: z
-        .enum(["host", "cidr"])
-        .optional()
-        .catch(undefined)
-        .openapi({
-            type: "string",
-            enum: ["host", "cidr"],
-            description: "Filter site resources by mode"
-        })
+        .default("0")
+        .transform(Number)
+        .pipe(z.int().nonnegative())
 });
 
-export type ListAllSiteResourcesByOrgResponse = PaginatedResponse<{
+export type ListAllSiteResourcesByOrgResponse = {
     siteResources: (SiteResource & {
         siteName: string;
         siteNiceId: string;
         siteAddress: string | null;
     })[];
-}>;
-
-function querySiteResourcesBase() {
-    return db
-        .select({
-            siteResourceId: siteResources.siteResourceId,
-            siteId: siteResources.siteId,
-            orgId: siteResources.orgId,
-            niceId: siteResources.niceId,
-            name: siteResources.name,
-            mode: siteResources.mode,
-            protocol: siteResources.protocol,
-            proxyPort: siteResources.proxyPort,
-            destinationPort: siteResources.destinationPort,
-            destination: siteResources.destination,
-            enabled: siteResources.enabled,
-            alias: siteResources.alias,
-            aliasAddress: siteResources.aliasAddress,
-            tcpPortRangeString: siteResources.tcpPortRangeString,
-            udpPortRangeString: siteResources.udpPortRangeString,
-            disableIcmp: siteResources.disableIcmp,
-            siteName: sites.name,
-            siteNiceId: sites.niceId,
-            siteAddress: sites.address
-        })
-        .from(siteResources)
-        .innerJoin(sites, eq(siteResources.siteId, sites.siteId));
-}
+};
 
 registry.registerPath({
     method: "get",
@@ -129,67 +80,39 @@ export async function listAllSiteResourcesByOrg(
         }
 
         const { orgId } = parsedParams.data;
-        const { page, pageSize, query, mode } = parsedQuery.data;
+        const { limit, offset } = parsedQuery.data;
 
-        const conditions = [and(eq(siteResources.orgId, orgId))];
-        if (query) {
-            conditions.push(
-                or(
-                    like(
-                        sql`LOWER(${siteResources.name})`,
-                        "%" + query.toLowerCase() + "%"
-                    ),
-                    like(
-                        sql`LOWER(${siteResources.niceId})`,
-                        "%" + query.toLowerCase() + "%"
-                    ),
-                    like(
-                        sql`LOWER(${siteResources.destination})`,
-                        "%" + query.toLowerCase() + "%"
-                    ),
-                    like(
-                        sql`LOWER(${siteResources.alias})`,
-                        "%" + query.toLowerCase() + "%"
-                    ),
-                    like(
-                        sql`LOWER(${siteResources.aliasAddress})`,
-                        "%" + query.toLowerCase() + "%"
-                    ),
-                    like(
-                        sql`LOWER(${sites.name})`,
-                        "%" + query.toLowerCase() + "%"
-                    )
-                )
-            );
-        }
+        // Get all site resources for the org with site names
+        const siteResourcesList = await db
+            .select({
+                siteResourceId: siteResources.siteResourceId,
+                siteId: siteResources.siteId,
+                orgId: siteResources.orgId,
+                niceId: siteResources.niceId,
+                name: siteResources.name,
+                mode: siteResources.mode,
+                protocol: siteResources.protocol,
+                proxyPort: siteResources.proxyPort,
+                destinationPort: siteResources.destinationPort,
+                destination: siteResources.destination,
+                enabled: siteResources.enabled,
+                alias: siteResources.alias,
+                aliasAddress: siteResources.aliasAddress,
+                tcpPortRangeString: siteResources.tcpPortRangeString,
+                udpPortRangeString: siteResources.udpPortRangeString,
+                disableIcmp: siteResources.disableIcmp,
+                siteName: sites.name,
+                siteNiceId: sites.niceId,
+                siteAddress: sites.address
+            })
+            .from(siteResources)
+            .innerJoin(sites, eq(siteResources.siteId, sites.siteId))
+            .where(eq(siteResources.orgId, orgId))
+            .limit(limit)
+            .offset(offset);
 
-        if (mode) {
-            conditions.push(eq(siteResources.mode, mode));
-        }
-
-        const baseQuery = querySiteResourcesBase().where(and(...conditions));
-
-        const countQuery = db.$count(
-            querySiteResourcesBase().where(and(...conditions))
-        );
-
-        const [siteResourcesList, totalCount] = await Promise.all([
-            baseQuery
-                .limit(pageSize)
-                .offset(pageSize * (page - 1))
-                .orderBy(asc(siteResources.siteResourceId)),
-            countQuery
-        ]);
-
-        return response<ListAllSiteResourcesByOrgResponse>(res, {
-            data: {
-                siteResources: siteResourcesList,
-                pagination: {
-                    total: totalCount,
-                    pageSize,
-                    page
-                }
-            },
+        return response(res, {
+            data: { siteResources: siteResourcesList },
             success: true,
             error: false,
             message: "Site resources retrieved successfully",

server/routers/siteResource/updateSiteResource.ts

@@ -41,7 +41,6 @@ const updateSiteResourceSchema = z
     .strictObject({
         name: z.string().min(1).max(255).optional(),
         siteId: z.int(),
-        // niceId: z.string().min(1).max(255).regex(/^[a-zA-Z0-9-]+$/, "niceId can only contain letters, numbers, and dashes").optional(),
         // mode: z.enum(["host", "cidr", "port"]).optional(),
         mode: z.enum(["host", "cidr"]).optional(),
         // protocol: z.enum(["tcp", "udp"]).nullish(),

server/routers/target/handleHealthcheckStatusMessage.ts

@@ -105,10 +105,7 @@ export const handleHealthcheckStatusMessage: MessageHandler = async (
             await db
                 .update(targetHealthCheck)
                 .set({
-                    hcHealth: healthStatus.status as
-                        | "unknown"
-                        | "healthy"
-                        | "unhealthy"
+                    hcHealth: healthStatus.status
                 })
                 .where(eq(targetHealthCheck.targetId, targetIdNum))
                 .execute();

server/routers/user/acceptInvite.ts

@@ -1,8 +1,8 @@
 import { Request, Response, NextFunction } from "express";
 import { z } from "zod";
-import { db, orgs, UserOrg } from "@server/db";
+import { db, UserOrg } from "@server/db";
 import { roles, userInvites, userOrgs, users } from "@server/db";
-import { eq, and, inArray, ne } from "drizzle-orm";
+import { eq } from "drizzle-orm";
 import response from "@server/lib/response";
 import HttpCode from "@server/types/HttpCode";
 import createHttpError from "http-errors";
@@ -14,7 +14,6 @@ import { usageService } from "@server/lib/billing/usageService";
 import { FeatureId } from "@server/lib/billing";
 import { calculateUserClientsForOrgs } from "@server/lib/calculateUserClientsForOrgs";
 import { build } from "@server/build";
-import { assignUserToOrg } from "@server/lib/userOrg";
 
 const acceptInviteBodySchema = z.strictObject({
     token: z.string(),
@@ -126,22 +125,8 @@ export async function acceptInvite(
             }
         }
 
-        const [org] = await db
-            .select()
-            .from(orgs)
-            .where(eq(orgs.orgId, existingInvite.orgId))
-            .limit(1);
-
-        if (!org) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    "Organization does not exist. Please contact an admin."
-                )
-            );
-        }
-
         let roleId: number;
+        let totalUsers: UserOrg[] | undefined;
         // get the role to make sure it exists
         const existingRole = await db
             .select()
@@ -161,15 +146,12 @@ export async function acceptInvite(
         }
 
         await db.transaction(async (trx) => {
-            await assignUserToOrg(
-                org,
-                {
-                    userId: existingUser[0].userId,
-                    orgId: existingInvite.orgId,
-                    roleId: existingInvite.roleId
-                },
-                trx
-            );
+            // add the user to the org
+            await trx.insert(userOrgs).values({
+                userId: existingUser[0].userId,
+                orgId: existingInvite.orgId,
+                roleId: existingInvite.roleId
+            });
 
             // delete the invite
             await trx
@@ -178,11 +160,25 @@ export async function acceptInvite(
 
             await calculateUserClientsForOrgs(existingUser[0].userId, trx);
 
+            // Get the total number of users in the org now
+            totalUsers = await trx
+                .select()
+                .from(userOrgs)
+                .where(eq(userOrgs.orgId, existingInvite.orgId));
+
             logger.debug(
-                `User ${existingUser[0].userId} accepted invite to org ${existingInvite.orgId}`
+                `User ${existingUser[0].userId} accepted invite to org ${existingInvite.orgId}. Total users in org: ${totalUsers.length}`
             );
         });
 
+        if (totalUsers) {
+            await usageService.updateCount(
+                existingInvite.orgId,
+                FeatureId.USERS,
+                totalUsers.length
+            );
+        }
+
         return response<AcceptInviteResponse>(res, {
             data: { accepted: true, orgId: existingInvite.orgId },
             success: true,

server/routers/user/createOrgUser.ts

@@ -6,8 +6,8 @@ import createHttpError from "http-errors";
 import logger from "@server/logger";
 import { fromError } from "zod-validation-error";
 import { OpenAPITags, registry } from "@server/openApi";
-import { db, orgs, UserOrg } from "@server/db";
-import { and, eq, inArray, ne } from "drizzle-orm";
+import { db, UserOrg } from "@server/db";
+import { and, eq } from "drizzle-orm";
 import { idp, idpOidcConfig, roles, userOrgs, users } from "@server/db";
 import { generateId } from "@server/auth/sessions/app";
 import { usageService } from "@server/lib/billing/usageService";
@@ -16,7 +16,6 @@ import { build } from "@server/build";
 import { calculateUserClientsForOrgs } from "@server/lib/calculateUserClientsForOrgs";
 import { isSubscribed } from "#dynamic/lib/isSubscribed";
 import { tierMatrix } from "@server/lib/billing/tierMatrix";
-import { assignUserToOrg } from "@server/lib/userOrg";
 
 const paramsSchema = z.strictObject({
     orgId: z.string().nonempty()
@@ -152,21 +151,6 @@ export async function createOrgUser(
                 );
             }
 
-            const [org] = await db
-                .select()
-                .from(orgs)
-                .where(eq(orgs.orgId, orgId))
-                .limit(1);
-
-            if (!org) {
-                return next(
-                    createHttpError(
-                        HttpCode.NOT_FOUND,
-                        "Organization not found"
-                    )
-                );
-            }
-
             const [idpRes] = await db
                 .select()
                 .from(idp)
@@ -188,6 +172,8 @@ export async function createOrgUser(
                 );
             }
 
+            let orgUsers: UserOrg[] | undefined;
+
             await db.transaction(async (trx) => {
                 const [existingUser] = await trx
                     .select()
@@ -221,12 +207,15 @@ export async function createOrgUser(
                         );
                     }
 
-                    await assignUserToOrg(org, {
-                        orgId,
-                        userId: existingUser.userId,
-                        roleId: role.roleId,
-                        autoProvisioned: false
-                    }, trx);
+                    await trx
+                        .insert(userOrgs)
+                        .values({
+                            orgId,
+                            userId: existingUser.userId,
+                            roleId: role.roleId,
+                            autoProvisioned: false
+                        })
+                        .returning();
                 } else {
                     userId = generateId(15);
 
@@ -244,16 +233,33 @@ export async function createOrgUser(
                         })
                         .returning();
 
-                        await assignUserToOrg(org, {
+                    await trx
+                        .insert(userOrgs)
+                        .values({
                             orgId,
                             userId: newUser.userId,
                             roleId: role.roleId,
                             autoProvisioned: false
-                        }, trx);
+                        })
+                        .returning();
                 }
 
+                // List all of the users in the org
+                orgUsers = await trx
+                    .select()
+                    .from(userOrgs)
+                    .where(eq(userOrgs.orgId, orgId));
+
                 await calculateUserClientsForOrgs(userId, trx);
             });
+
+            if (orgUsers) {
+                await usageService.updateCount(
+                    orgId,
+                    FeatureId.USERS,
+                    orgUsers.length
+                );
+            }
         } else {
             return next(
                 createHttpError(HttpCode.BAD_REQUEST, "User type is required")

server/routers/user/removeUserOrg.ts

@@ -1,16 +1,8 @@
 import { Request, Response, NextFunction } from "express";
 import { z } from "zod";
-import {
-    db,
-    orgs,
-    resources,
-    siteResources,
-    sites,
-    UserOrg,
-    userSiteResources
-} from "@server/db";
+import { db, resources, sites, UserOrg } from "@server/db";
 import { userOrgs, userResources, users, userSites } from "@server/db";
-import { and, count, eq, exists, inArray } from "drizzle-orm";
+import { and, count, eq, exists } from "drizzle-orm";
 import response from "@server/lib/response";
 import HttpCode from "@server/types/HttpCode";
 import createHttpError from "http-errors";
@@ -22,7 +14,6 @@ import { FeatureId } from "@server/lib/billing";
 import { build } from "@server/build";
 import { UserType } from "@server/types/UserTypes";
 import { calculateUserClientsForOrgs } from "@server/lib/calculateUserClientsForOrgs";
-import { removeUserFromOrg } from "@server/lib/userOrg";
 
 const removeUserSchema = z.strictObject({
     userId: z.string(),
@@ -59,16 +50,16 @@ export async function removeUserOrg(
         const { userId, orgId } = parsedParams.data;
 
         // get the user first
-        const [user] = await db
+        const user = await db
             .select()
             .from(userOrgs)
             .where(and(eq(userOrgs.userId, userId), eq(userOrgs.orgId, orgId)));
 
-        if (!user) {
+        if (!user || user.length === 0) {
             return next(createHttpError(HttpCode.NOT_FOUND, "User not found"));
         }
 
-        if (user.isOwner) {
+        if (user[0].isOwner) {
             return next(
                 createHttpError(
                     HttpCode.BAD_REQUEST,
@@ -77,20 +68,56 @@ export async function removeUserOrg(
             );
         }
 
-        const [org] = await db
-            .select()
-            .from(orgs)
-            .where(eq(orgs.orgId, orgId))
-            .limit(1);
-
-        if (!org) {
-            return next(
-                createHttpError(HttpCode.NOT_FOUND, "Organization not found")
-            );
-        }
+        let userCount: UserOrg[] | undefined;
 
         await db.transaction(async (trx) => {
-            await removeUserFromOrg(org, userId, trx);
+            await trx
+                .delete(userOrgs)
+                .where(
+                    and(eq(userOrgs.userId, userId), eq(userOrgs.orgId, orgId))
+                );
+
+            await db.delete(userResources).where(
+                and(
+                    eq(userResources.userId, userId),
+                    exists(
+                        db
+                            .select()
+                            .from(resources)
+                            .where(
+                                and(
+                                    eq(
+                                        resources.resourceId,
+                                        userResources.resourceId
+                                    ),
+                                    eq(resources.orgId, orgId)
+                                )
+                            )
+                    )
+                )
+            );
+
+            await db.delete(userSites).where(
+                and(
+                    eq(userSites.userId, userId),
+                    exists(
+                        db
+                            .select()
+                            .from(sites)
+                            .where(
+                                and(
+                                    eq(sites.siteId, userSites.siteId),
+                                    eq(sites.orgId, orgId)
+                                )
+                            )
+                    )
+                )
+            );
+
+            userCount = await trx
+                .select()
+                .from(userOrgs)
+                .where(eq(userOrgs.orgId, orgId));
 
             // if (build === "saas") {
             //     const [rootUser] = await trx
@@ -112,6 +139,14 @@ export async function removeUserOrg(
             await calculateUserClientsForOrgs(userId, trx);
         });
 
+        if (userCount) {
+            await usageService.updateCount(
+                orgId,
+                FeatureId.USERS,
+                userCount.length
+            );
+        }
+
         return response(res, {
             data: null,
             success: true,

server/routers/ws/checkRoundTripMessage.ts

@@ -1,85 +0,0 @@
-import { Request, Response, NextFunction } from "express";
-import { z } from "zod";
-import { db, roundTripMessageTracker } from "@server/db";
-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";
-import { eq } from "drizzle-orm";
-import { OpenAPITags, registry } from "@server/openApi";
-
-const checkRoundTripMessageParamsSchema = z
-    .object({
-        messageId: z
-            .string()
-            .transform(Number)
-            .pipe(z.number().int().positive())
-    })
-    .strict();
-
-// registry.registerPath({
-//     method: "get",
-//     path: "/ws/round-trip-message/{messageId}",
-//     description:
-//         "Check if a round trip message has been completed by checking the roundTripMessageTracker table",
-//     tags: [OpenAPITags.WebSocket],
-//     request: {
-//         params: checkRoundTripMessageParamsSchema
-//     },
-//     responses: {}
-// });
-
-export async function checkRoundTripMessage(
-    req: Request,
-    res: Response,
-    next: NextFunction
-): Promise<any> {
-    try {
-        const parsedParams = checkRoundTripMessageParamsSchema.safeParse(
-            req.params
-        );
-        if (!parsedParams.success) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    fromError(parsedParams.error).toString()
-                )
-            );
-        }
-
-        const { messageId } = parsedParams.data;
-
-        // Get the round trip message from the tracker
-        const [message] = await db
-            .select()
-            .from(roundTripMessageTracker)
-            .where(eq(roundTripMessageTracker.messageId, messageId))
-            .limit(1);
-
-        if (!message) {
-            return next(
-                createHttpError(HttpCode.NOT_FOUND, "Message not found")
-            );
-        }
-
-        return response(res, {
-            data: {
-                messageId: message.messageId,
-                complete: message.complete,
-                sentAt: message.sentAt,
-                receivedAt: message.receivedAt,
-                error: message.error,
-            },
-            success: true,
-            error: false,
-            message: "Round trip message status retrieved successfully",
-            status: HttpCode.OK
-        });
-    } catch (error) {
-        logger.error(error);
-        return next(
-            createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred")
-        );
-    }
-}

server/routers/ws/handleRoundTripMessage.ts

@@ -1,49 +0,0 @@
-import { db, roundTripMessageTracker } from "@server/db";
-import { MessageHandler } from "@server/routers/ws";
-import { eq } from "drizzle-orm";
-import logger from "@server/logger";
-
-interface RoundTripCompleteMessage {
-    messageId: number;
-    complete: boolean;
-    error?: string;
-}
-
-export const handleRoundTripMessage: MessageHandler = async (
-    context
-) => {
-    const { message, client: c } = context;
-
-    logger.info("Handling round trip message");
-
-    const data = message.data as RoundTripCompleteMessage;
-
-    try {
-        const { messageId, complete, error } = data;
-
-        if (!messageId) {
-            logger.error("Round trip message missing messageId");
-            return;
-        }
-
-        // Update the roundTripMessageTracker with completion status
-        await db
-            .update(roundTripMessageTracker)
-            .set({
-                complete: complete,
-                receivedAt: Math.floor(Date.now() / 1000),
-                error: error || null
-            })
-            .where(eq(roundTripMessageTracker.messageId, messageId));
-
-        logger.info(`Round trip message ${messageId} marked as complete: ${complete}`);
-
-        if (error) {
-            logger.warn(`Round trip message ${messageId} completed with error: ${error}`);
-        }
-    } catch (error) {
-        logger.error("Error processing round trip message:", error);
-    }
-
-    return;
-};

server/routers/ws/index.ts

@@ -1,3 +1,2 @@
 export * from "./ws";
 export * from "./types";
-export * from "./checkRoundTripMessage";

server/routers/ws/messageHandlers.ts

@@ -18,7 +18,6 @@ import {
     handleOlmDisconnecingMessage
 } from "../olm";
 import { handleHealthcheckStatusMessage } from "../target";
-import { handleRoundTripMessage } from "./handleRoundTripMessage";
 import { MessageHandler } from "./types";
 
 export const messageHandlers: Record<string, MessageHandler> = {
@@ -36,8 +35,7 @@ export const messageHandlers: Record<string, MessageHandler> = {
     "newt/socket/containers": handleDockerContainersMessage,
     "newt/ping/request": handleNewtPingRequestMessage,
     "newt/blueprint/apply": handleApplyBlueprintMessage,
-    "newt/healthcheck/status": handleHealthcheckStatusMessage,
-    "ws/round-trip/complete": handleRoundTripMessage
+    "newt/healthcheck/status": handleHealthcheckStatusMessage
 };
 
 startOlmOfflineChecker(); // this is to handle the offline check for olms

server/types/Pagination.ts

@@ -1,5 +0,0 @@
-export type Pagination = { total: number; pageSize: number; page: number };
-
-export type PaginatedResponse<T> = T & {
-    pagination: Pagination;
-};

src/app/[orgId]/settings/(private)/billing/layout.tsx

@@ -6,7 +6,6 @@ import { redirect } from "next/navigation";
 import { getTranslations } from "next-intl/server";
 import { getCachedOrgUser } from "@app/lib/api/getCachedOrgUser";
 import { getCachedOrg } from "@app/lib/api/getCachedOrg";
-import { build } from "@server/build";
 
 type BillingSettingsProps = {
     children: React.ReactNode;
@@ -18,9 +17,6 @@ export default async function BillingSettingsPage({
     params
 }: BillingSettingsProps) {
     const { orgId } = await params;
-    if (build !== "saas") {
-        redirect(`/${orgId}/settings`);
-    }
 
     const user = await verifySession();
 
@@ -44,10 +40,6 @@ export default async function BillingSettingsPage({
         redirect(`/${orgId}`);
     }
 
-    if (!(org?.org?.isBillingOrg && orgUser?.isOwner)) {
-        redirect(`/${orgId}`);
-    }
-
     const t = await getTranslations();
 
     return (

src/app/[orgId]/settings/(private)/billing/page.tsx

@@ -110,42 +110,37 @@ const planOptions: PlanOption[] = [
 // Tier limits mapping derived from limit sets
 const tierLimits: Record<
     Tier | "basic",
-    { users: number; sites: number; domains: number; remoteNodes: number; organizations: number }
+    { users: number; sites: number; domains: number; remoteNodes: number }
 > = {
     basic: {
         users: freeLimitSet[FeatureId.USERS]?.value ?? 0,
         sites: freeLimitSet[FeatureId.SITES]?.value ?? 0,
         domains: freeLimitSet[FeatureId.DOMAINS]?.value ?? 0,
-        remoteNodes: freeLimitSet[FeatureId.REMOTE_EXIT_NODES]?.value ?? 0,
-        organizations: freeLimitSet[FeatureId.ORGINIZATIONS]?.value ?? 0
+        remoteNodes: freeLimitSet[FeatureId.REMOTE_EXIT_NODES]?.value ?? 0
     },
     tier1: {
         users: tier1LimitSet[FeatureId.USERS]?.value ?? 0,
         sites: tier1LimitSet[FeatureId.SITES]?.value ?? 0,
         domains: tier1LimitSet[FeatureId.DOMAINS]?.value ?? 0,
-        remoteNodes: tier1LimitSet[FeatureId.REMOTE_EXIT_NODES]?.value ?? 0,
-        organizations: tier1LimitSet[FeatureId.ORGINIZATIONS]?.value ?? 0
+        remoteNodes: tier1LimitSet[FeatureId.REMOTE_EXIT_NODES]?.value ?? 0
     },
     tier2: {
         users: tier2LimitSet[FeatureId.USERS]?.value ?? 0,
         sites: tier2LimitSet[FeatureId.SITES]?.value ?? 0,
         domains: tier2LimitSet[FeatureId.DOMAINS]?.value ?? 0,
-        remoteNodes: tier2LimitSet[FeatureId.REMOTE_EXIT_NODES]?.value ?? 0,
-        organizations: tier2LimitSet[FeatureId.ORGINIZATIONS]?.value ?? 0
+        remoteNodes: tier2LimitSet[FeatureId.REMOTE_EXIT_NODES]?.value ?? 0
     },
     tier3: {
         users: tier3LimitSet[FeatureId.USERS]?.value ?? 0,
         sites: tier3LimitSet[FeatureId.SITES]?.value ?? 0,
         domains: tier3LimitSet[FeatureId.DOMAINS]?.value ?? 0,
-        remoteNodes: tier3LimitSet[FeatureId.REMOTE_EXIT_NODES]?.value ?? 0,
-        organizations: tier3LimitSet[FeatureId.ORGINIZATIONS]?.value ?? 0
+        remoteNodes: tier3LimitSet[FeatureId.REMOTE_EXIT_NODES]?.value ?? 0
     },
     enterprise: {
         users: 0, // Custom for enterprise
         sites: 0, // Custom for enterprise
         domains: 0, // Custom for enterprise
-        remoteNodes: 0, // Custom for enterprise
-        organizations: 0 // Custom for enterprise
+        remoteNodes: 0 // Custom for enterprise
     }
 };
 
@@ -184,7 +179,6 @@ export default function BillingPage() {
     const SITES = "sites";
     const DOMAINS = "domains";
     const REMOTE_EXIT_NODES = "remoteExitNodes";
-    const ORGINIZATIONS = "organizations";
 
     // Confirmation dialog state
     const [showConfirmDialog, setShowConfirmDialog] = useState(false);
@@ -625,16 +619,6 @@ export default function BillingPage() {
             });
         }
 
-        // Check organizations
-        const organizationsUsage = getUsageValue(ORGINIZATIONS);
-        if (limits.organizations > 0 && organizationsUsage > limits.organizations) {
-            violations.push({
-                feature: "Organizations",
-                currentUsage: organizationsUsage,
-                newLimit: limits.organizations
-            });
-        }
-
         return violations;
     };
 
@@ -871,41 +855,6 @@ export default function BillingPage() {
                                         )}
                                     </InfoSectionContent>
                                 </InfoSection>
-                                <InfoSection>
-                                    <InfoSectionTitle className="flex items-center gap-1 text-xs">
-                                        {t("billingOrganizations") ||
-                                            "Organizations"}
-                                    </InfoSectionTitle>
-                                    <InfoSectionContent className="text-sm">
-                                        {isOverLimit(ORGINIZATIONS) ? (
-                                            <Tooltip>
-                                                <TooltipTrigger className="flex items-center gap-1">
-                                                    <AlertTriangle className="h-3 w-3 text-orange-400" />
-                                                    <span className={cn(
-                                                        "text-orange-600 dark:text-orange-400 font-medium"
-                                                    )}>
-                                                        {getLimitValue(ORGINIZATIONS) ??
-                                                            t("billingUnlimited") ??
-                                                            "∞"}{" "}
-                                                        {getLimitValue(ORGINIZATIONS) !==
-                                                            null && "organizations"}
-                                                    </span>
-                                                </TooltipTrigger>
-                                                <TooltipContent>
-                                                    <p>{t("billingUsageExceedsLimit", { current: getUsageValue(ORGINIZATIONS), limit: getLimitValue(ORGINIZATIONS) ?? 0 }) || `Current usage (${getUsageValue(ORGINIZATIONS)}) exceeds limit (${getLimitValue(ORGINIZATIONS)})`}</p>
-                                                </TooltipContent>
-                                            </Tooltip>
-                                        ) : (
-                                            <>
-                                                {getLimitValue(ORGINIZATIONS) ??
-                                                    t("billingUnlimited") ??
-                                                    "∞"}{" "}
-                                                {getLimitValue(ORGINIZATIONS) !==
-                                                    null && "organizations"}
-                                            </>
-                                        )}
-                                    </InfoSectionContent>
-                                </InfoSection>
                                 <InfoSection>
                                     <InfoSectionTitle className="flex items-center gap-1 text-xs">
                                         {t("billingRemoteNodes") ||

src/app/[orgId]/settings/(private)/license/layout.tsx

@@ -4,8 +4,6 @@ import { redirect } from "next/navigation";
 import { cache } from "react";
 import { getTranslations } from "next-intl/server";
 import { build } from "@server/build";
-import { getCachedOrgUser } from "@app/lib/api/getCachedOrgUser";
-import { getCachedOrg } from "@app/lib/api/getCachedOrg";
 
 type LicensesSettingsProps = {
     children: React.ReactNode;
@@ -29,26 +27,6 @@ export default async function LicensesSetingsLayoutProps({
         redirect(`/`);
     }
 
-    let orgUser = null;
-    try {
-        const res = await getCachedOrgUser(orgId, user.userId);
-        orgUser = res.data.data;
-    } catch {
-        redirect(`/${orgId}`);
-    }
-
-    let org = null;
-    try {
-        const res = await getCachedOrg(orgId);
-        org = res.data.data;
-    } catch {
-        redirect(`/${orgId}`);
-    }
-
-    if (!org?.org?.isBillingOrg || !orgUser?.isOwner) {
-        redirect(`/${orgId}`);
-    }
-
     const t = await getTranslations();
 
     return (

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

@@ -7,11 +7,10 @@ import { authCookieHeader } from "@app/lib/api/cookies";
 import { ListClientsResponse } from "@server/routers/client";
 import { AxiosResponse } from "axios";
 import { getTranslations } from "next-intl/server";
-import type { Pagination } from "@server/types/Pagination";
 
 type ClientsPageProps = {
     params: Promise<{ orgId: string }>;
-    searchParams: Promise<Record<string, string>>;
+    searchParams: Promise<{ view?: string }>;
 };
 
 export const dynamic = "force-dynamic";
@@ -20,25 +19,17 @@ export default async function ClientsPage(props: ClientsPageProps) {
     const t = await getTranslations();
 
     const params = await props.params;
-    const searchParams = new URLSearchParams(await props.searchParams);
 
     let machineClients: ListClientsResponse["clients"] = [];
-    let pagination: Pagination = {
-        page: 1,
-        total: 0,
-        pageSize: 20
-    };
 
     try {
         const machineRes = await internal.get<
             AxiosResponse<ListClientsResponse>
         >(
-            `/org/${params.orgId}/clients?${searchParams.toString()}`,
+            `/org/${params.orgId}/clients?filter=machine`,
             await authCookieHeader()
         );
-        const responseData = machineRes.data.data;
-        machineClients = responseData.clients;
-        pagination = responseData.pagination;
+        machineClients = machineRes.data.data.clients;
     } catch (e) {}
 
     function formatSize(mb: number): string {
@@ -89,11 +80,6 @@ export default async function ClientsPage(props: ClientsPageProps) {
             <MachineClientsTable
                 machineClients={machineClientRows}
                 orgId={params.orgId}
-                rowCount={pagination.total}
-                pagination={{
-                    pageIndex: pagination.page - 1,
-                    pageSize: pagination.pageSize
-                }}
             />
         </>
     );

src/app/[orgId]/settings/clients/user/[niceId]/general/page.tsx

@@ -602,8 +602,7 @@ export default function GeneralPage() {
                                                     )
                                                         ? formatPostureValue(
                                                               client.posture
-                                                                  .biometricsEnabled ===
-                                                                  true
+                                                                  .biometricsEnabled
                                                           )
                                                         : "-"}
                                                 </InfoSectionContent>
@@ -623,8 +622,7 @@ export default function GeneralPage() {
                                                     )
                                                         ? formatPostureValue(
                                                               client.posture
-                                                                  .diskEncrypted ===
-                                                                  true
+                                                                  .diskEncrypted
                                                           )
                                                         : "-"}
                                                 </InfoSectionContent>
@@ -644,8 +642,7 @@ export default function GeneralPage() {
                                                     )
                                                         ? formatPostureValue(
                                                               client.posture
-                                                                  .firewallEnabled ===
-                                                                  true
+                                                                  .firewallEnabled
                                                           )
                                                         : "-"}
                                                 </InfoSectionContent>
@@ -666,8 +663,7 @@ export default function GeneralPage() {
                                                     )
                                                         ? formatPostureValue(
                                                               client.posture
-                                                                  .autoUpdatesEnabled ===
-                                                                  true
+                                                                  .autoUpdatesEnabled
                                                           )
                                                         : "-"}
                                                 </InfoSectionContent>
@@ -687,8 +683,7 @@ export default function GeneralPage() {
                                                     )
                                                         ? formatPostureValue(
                                                               client.posture
-                                                                  .tpmAvailable ===
-                                                                  true
+                                                                  .tpmAvailable
                                                           )
                                                         : "-"}
                                                 </InfoSectionContent>
@@ -712,8 +707,7 @@ export default function GeneralPage() {
                                                     )
                                                         ? formatPostureValue(
                                                               client.posture
-                                                                  .windowsAntivirusEnabled ===
-                                                                  true
+                                                                  .windowsAntivirusEnabled
                                                           )
                                                         : "-"}
                                                 </InfoSectionContent>
@@ -733,8 +727,7 @@ export default function GeneralPage() {
                                                     )
                                                         ? formatPostureValue(
                                                               client.posture
-                                                                  .macosSipEnabled ===
-                                                                  true
+                                                                  .macosSipEnabled
                                                           )
                                                         : "-"}
                                                 </InfoSectionContent>
@@ -758,8 +751,7 @@ export default function GeneralPage() {
                                                     )
                                                         ? formatPostureValue(
                                                               client.posture
-                                                                  .macosGatekeeperEnabled ===
-                                                                  true
+                                                                  .macosGatekeeperEnabled
                                                           )
                                                         : "-"}
                                                 </InfoSectionContent>
@@ -783,8 +775,7 @@ export default function GeneralPage() {
                                                     )
                                                         ? formatPostureValue(
                                                               client.posture
-                                                                  .macosFirewallStealthMode ===
-                                                                  true
+                                                                  .macosFirewallStealthMode
                                                           )
                                                         : "-"}
                                                 </InfoSectionContent>
@@ -805,8 +796,7 @@ export default function GeneralPage() {
                                                     )
                                                         ? formatPostureValue(
                                                               client.posture
-                                                                  .linuxAppArmorEnabled ===
-                                                                  true
+                                                                  .linuxAppArmorEnabled
                                                           )
                                                         : "-"}
                                                 </InfoSectionContent>
@@ -827,8 +817,7 @@ export default function GeneralPage() {
                                                     )
                                                         ? formatPostureValue(
                                                               client.posture
-                                                                  .linuxSELinuxEnabled ===
-                                                                  true
+                                                                  .linuxSELinuxEnabled
                                                           )
                                                         : "-"}
                                                 </InfoSectionContent>

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

@@ -1,16 +1,14 @@
-import SettingsSectionTitle from "@app/components/SettingsSectionTitle";
-import type { ClientRow } from "@app/components/UserDevicesTable";
-import UserDevicesTable from "@app/components/UserDevicesTable";
 import { internal } from "@app/lib/api";
 import { authCookieHeader } from "@app/lib/api/cookies";
-import { type ListUserDevicesResponse } from "@server/routers/client";
-import type { Pagination } from "@server/types/Pagination";
 import { AxiosResponse } from "axios";
+import SettingsSectionTitle from "@app/components/SettingsSectionTitle";
+import { ListClientsResponse } from "@server/routers/client";
 import { getTranslations } from "next-intl/server";
+import type { ClientRow } from "@app/components/UserDevicesTable";
+import UserDevicesTable from "@app/components/UserDevicesTable";
 
 type ClientsPageProps = {
     params: Promise<{ orgId: string }>;
-    searchParams: Promise<Record<string, string>>;
 };
 
 export const dynamic = "force-dynamic";
@@ -19,26 +17,15 @@ export default async function ClientsPage(props: ClientsPageProps) {
     const t = await getTranslations();
 
     const params = await props.params;
-    const searchParams = new URLSearchParams(await props.searchParams);
 
-    let userClients: ListUserDevicesResponse["devices"] = [];
-
-    let pagination: Pagination = {
-        page: 1,
-        total: 0,
-        pageSize: 20
-    };
+    let userClients: ListClientsResponse["clients"] = [];
 
     try {
-        const userRes = await internal.get<
-            AxiosResponse<ListUserDevicesResponse>
-        >(
-            `/org/${params.orgId}/user-devices?${searchParams.toString()}`,
+        const userRes = await internal.get<AxiosResponse<ListClientsResponse>>(
+            `/org/${params.orgId}/clients?filter=user`,
             await authCookieHeader()
         );
-        const responseData = userRes.data.data;
-        userClients = responseData.devices;
-        pagination = responseData.pagination;
+        userClients = userRes.data.data.clients;
     } catch (e) {}
 
     function formatSize(mb: number): string {
@@ -52,29 +39,31 @@ export default async function ClientsPage(props: ClientsPageProps) {
     }
 
     const mapClientToRow = (
-        client: ListUserDevicesResponse["devices"][number]
+        client: ListClientsResponse["clients"][0]
     ): ClientRow => {
         // Build fingerprint object if any fingerprint data exists
         const hasFingerprintData =
-            client.fingerprintPlatform ||
-            client.fingerprintOsVersion ||
-            client.fingerprintKernelVersion ||
-            client.fingerprintArch ||
-            client.fingerprintSerialNumber ||
-            client.fingerprintUsername ||
-            client.fingerprintHostname ||
-            client.deviceModel;
+            (client as any).fingerprintPlatform ||
+            (client as any).fingerprintOsVersion ||
+            (client as any).fingerprintKernelVersion ||
+            (client as any).fingerprintArch ||
+            (client as any).fingerprintSerialNumber ||
+            (client as any).fingerprintUsername ||
+            (client as any).fingerprintHostname ||
+            (client as any).deviceModel;
 
         const fingerprint = hasFingerprintData
             ? {
-                  platform: client.fingerprintPlatform,
-                  osVersion: client.fingerprintOsVersion,
-                  kernelVersion: client.fingerprintKernelVersion,
-                  arch: client.fingerprintArch,
-                  deviceModel: client.deviceModel,
-                  serialNumber: client.fingerprintSerialNumber,
-                  username: client.fingerprintUsername,
-                  hostname: client.fingerprintHostname
+                  platform: (client as any).fingerprintPlatform || null,
+                  osVersion: (client as any).fingerprintOsVersion || null,
+                  kernelVersion:
+                      (client as any).fingerprintKernelVersion || null,
+                  arch: (client as any).fingerprintArch || null,
+                  deviceModel: (client as any).deviceModel || null,
+                  serialNumber:
+                      (client as any).fingerprintSerialNumber || null,
+                  username: (client as any).fingerprintUsername || null,
+                  hostname: (client as any).fingerprintHostname || null
               }
             : null;
 
@@ -82,19 +71,19 @@ export default async function ClientsPage(props: ClientsPageProps) {
             name: client.name,
             id: client.clientId,
             subnet: client.subnet.split("/")[0],
-            mbIn: formatSize(client.megabytesIn ?? 0),
-            mbOut: formatSize(client.megabytesOut ?? 0),
+            mbIn: formatSize(client.megabytesIn || 0),
+            mbOut: formatSize(client.megabytesOut || 0),
             orgId: params.orgId,
             online: client.online,
             olmVersion: client.olmVersion || undefined,
-            olmUpdateAvailable: Boolean(client.olmUpdateAvailable),
+            olmUpdateAvailable: client.olmUpdateAvailable || false,
             userId: client.userId,
             username: client.username,
             userEmail: client.userEmail,
             niceId: client.niceId,
             agent: client.agent,
-            archived: Boolean(client.archived),
-            blocked: Boolean(client.blocked),
+            archived: client.archived || false,
+            blocked: client.blocked || false,
             approvalState: client.approvalState,
             fingerprint
         };
@@ -112,11 +101,6 @@ export default async function ClientsPage(props: ClientsPageProps) {
             <UserDevicesTable
                 userClients={userClientRows}
                 orgId={params.orgId}
-                rowCount={pagination.total}
-                pagination={{
-                    pageIndex: pagination.page - 1,
-                    pageSize: pagination.pageSize
-                }}
             />
         </>
     );

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

@@ -3,7 +3,11 @@ import ConfirmDeleteDialog from "@app/components/ConfirmDeleteDialog";
 import { Button } from "@app/components/ui/button";
 import { useOrgContext } from "@app/hooks/useOrgContext";
 import { toast } from "@app/hooks/useToast";
-import { useState, useTransition, useActionState } from "react";
+import {
+    useState,
+    useTransition,
+    useActionState
+} from "react";
 import {
     Form,
     FormControl,
@@ -50,7 +54,7 @@ export default function GeneralPage() {
     return (
         <SettingsContainer>
             <GeneralSectionForm org={org.org} />
-            {!org.org.isBillingOrg && <DeleteForm org={org.org} />}
+            {build !== "saas" && <DeleteForm org={org.org} />}
         </SettingsContainer>
     );
 }

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

@@ -77,16 +77,12 @@ export default async function SettingsLayout(props: SettingsLayoutProps) {
         }
     } catch (e) {}
 
-    const primaryOrg = orgs.find((o) => o.orgId === params.orgId)?.isPrimaryOrg;
-
     return (
         <UserProvider user={user}>
             <Layout
                 orgId={params.orgId}
                 orgs={orgs}
-                navItems={orgNavSections(env, {
-                    isPrimaryOrg: primaryOrg
-                })}
+                navItems={orgNavSections(env)}
             >
                 {children}
             </Layout>

src/app/[orgId]/settings/resources/client/page.tsx

@@ -14,7 +14,7 @@ import { redirect } from "next/navigation";
 
 export interface ClientResourcesPageProps {
     params: Promise<{ orgId: string }>;
-    searchParams: Promise<Record<string, string>>;
+    searchParams: Promise<{ view?: string }>;
 }
 
 export default async function ClientResourcesPage(
@@ -22,24 +22,22 @@ export default async function ClientResourcesPage(
 ) {
     const params = await props.params;
     const t = await getTranslations();
-    const searchParams = new URLSearchParams(await props.searchParams);
+
+    let resources: ListResourcesResponse["resources"] = [];
+    try {
+        const res = await internal.get<AxiosResponse<ListResourcesResponse>>(
+            `/org/${params.orgId}/resources`,
+            await authCookieHeader()
+        );
+        resources = res.data.data.resources;
+    } catch (e) {}
 
     let siteResources: ListAllSiteResourcesByOrgResponse["siteResources"] = [];
-    let pagination: ListResourcesResponse["pagination"] = {
-        total: 0,
-        page: 1,
-        pageSize: 20
-    };
     try {
         const res = await internal.get<
             AxiosResponse<ListAllSiteResourcesByOrgResponse>
-        >(
-            `/org/${params.orgId}/site-resources?${searchParams.toString()}`,
-            await authCookieHeader()
-        );
-        const responseData = res.data.data;
-        siteResources = responseData.siteResources;
-        pagination = responseData.pagination;
+        >(`/org/${params.orgId}/site-resources`, await authCookieHeader());
+        siteResources = res.data.data.siteResources;
     } catch (e) {}
 
     let org = null;
@@ -91,10 +89,9 @@ export default async function ClientResourcesPage(
                 <ClientResourcesTable
                     internalResources={internalResourceRows}
                     orgId={params.orgId}
-                    rowCount={pagination.total}
-                    pagination={{
-                        pageIndex: pagination.page - 1,
-                        pageSize: pagination.pageSize
+                    defaultSort={{
+                        id: "name",
+                        desc: false
                     }}
                 />
             </OrgProvider>

src/app/[orgId]/settings/resources/proxy/page.tsx

@@ -16,7 +16,7 @@ import { cache } from "react";
 
 export interface ProxyResourcesPageProps {
     params: Promise<{ orgId: string }>;
-    searchParams: Promise<Record<string, string>>;
+    searchParams: Promise<{ view?: string }>;
 }
 
 export default async function ProxyResourcesPage(
@@ -24,22 +24,14 @@ export default async function ProxyResourcesPage(
 ) {
     const params = await props.params;
     const t = await getTranslations();
-    const searchParams = new URLSearchParams(await props.searchParams);
 
     let resources: ListResourcesResponse["resources"] = [];
-    let pagination: ListResourcesResponse["pagination"] = {
-        total: 0,
-        page: 1,
-        pageSize: 20
-    };
     try {
         const res = await internal.get<AxiosResponse<ListResourcesResponse>>(
-            `/org/${params.orgId}/resources?${searchParams.toString()}`,
+            `/org/${params.orgId}/resources`,
             await authCookieHeader()
         );
-        const responseData = res.data.data;
-        resources = responseData.resources;
-        pagination = responseData.pagination;
+        resources = res.data.data.resources;
     } catch (e) {}
 
     let siteResources: ListAllSiteResourcesByOrgResponse["siteResources"] = [];
@@ -112,10 +104,9 @@ export default async function ProxyResourcesPage(
                 <ProxyResourcesTable
                     resources={resourceRows}
                     orgId={params.orgId}
-                    rowCount={pagination.total}
-                    pagination={{
-                        pageIndex: pagination.page - 1,
-                        pageSize: pagination.pageSize
+                    defaultSort={{
+                        id: "name",
+                        desc: false
                     }}
                 />
             </OrgProvider>

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

@@ -63,6 +63,7 @@ import { QRCodeCanvas } from "qrcode.react";
 import { useTranslations } from "next-intl";
 import { build } from "@server/build";
 import { NewtSiteInstallCommands } from "@app/components/newt-install-commands";
+import { id } from "date-fns/locale";
 
 type SiteType = "newt" | "wireguard" | "local";
 

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

@@ -9,30 +9,19 @@ import { getTranslations } from "next-intl/server";
 
 type SitesPageProps = {
     params: Promise<{ orgId: string }>;
-    searchParams: Promise<Record<string, string>>;
 };
 
 export const dynamic = "force-dynamic";
 
 export default async function SitesPage(props: SitesPageProps) {
     const params = await props.params;
-
-    const searchParams = new URLSearchParams(await props.searchParams);
-
     let sites: ListSitesResponse["sites"] = [];
-    let pagination: ListSitesResponse["pagination"] = {
-        total: 0,
-        page: 1,
-        pageSize: 20
-    };
     try {
         const res = await internal.get<AxiosResponse<ListSitesResponse>>(
-            `/org/${params.orgId}/sites?${searchParams.toString()}`,
+            `/org/${params.orgId}/sites`,
             await authCookieHeader()
         );
-        const responseData = res.data.data;
-        sites = responseData.sites;
-        pagination = responseData.pagination;
+        sites = res.data.data.sites;
     } catch (e) {}
 
     const t = await getTranslations();
@@ -71,6 +60,8 @@ export default async function SitesPage(props: SitesPageProps) {
 
     return (
         <>
+            {/* <SitesSplashCard /> */}
+
             <SettingsSectionTitle
                 title={t("siteManageSites")}
                 description={t("siteDescription")}
@@ -78,15 +69,7 @@ export default async function SitesPage(props: SitesPageProps) {
 
             <SitesBanner />
 
-            <SitesTable
-                sites={siteRows}
-                orgId={params.orgId}
-                rowCount={pagination.total}
-                pagination={{
-                    pageIndex: pagination.page - 1,
-                    pageSize: pagination.pageSize
-                }}
-            />
+            <SitesTable sites={siteRows} orgId={params.orgId} />
         </>
     );
 }

src/app/auth/signup/page.tsx

@@ -15,7 +15,6 @@ export default async function Page(props: {
         redirect: string | undefined;
         email: string | undefined;
         fromSmartLogin: string | undefined;
-        skipVerificationEmail: string | undefined;
     }>;
 }) {
     const searchParams = await props.searchParams;
@@ -76,10 +75,6 @@ export default async function Page(props: {
                 inviteId={inviteId}
                 emailParam={searchParams.email}
                 fromSmartLogin={searchParams.fromSmartLogin === "true"}
-                skipVerificationEmail={
-                    searchParams.skipVerificationEmail === "true" ||
-                    searchParams.skipVerificationEmail === "1"
-                }
             />
 
             <p className="text-center text-muted-foreground mt-4">

src/app/navigation.tsx

@@ -31,10 +31,6 @@ export type SidebarNavSection = {
     items: SidebarNavItem[];
 };
 
-export type OrgNavSectionsOptions = {
-    isPrimaryOrg?: boolean;
-};
-
 // Merged from 'user-management-and-resources' branch
 export const orgLangingNavItems: SidebarNavItem[] = [
     {
@@ -44,10 +40,7 @@ export const orgLangingNavItems: SidebarNavItem[] = [
     }
 ];
 
-export const orgNavSections = (
-    env?: Env,
-    options?: OrgNavSectionsOptions
-): SidebarNavSection[] => [
+export const orgNavSections = (env?: Env): SidebarNavSection[] => [
     {
         heading: "sidebarGeneral",
         items: [
@@ -221,28 +214,28 @@ export const orgNavSections = (
                 title: "sidebarSettings",
                 href: "/{orgId}/settings/general",
                 icon: <Settings className="size-4 flex-none" />
-            }
-        ]
-    },
-    ...(build == "saas" && options?.isPrimaryOrg
-        ? [
-              {
-                  heading: "sidebarBillingAndLicenses",
-                  items: [
+            },
+
+            ...(build == "saas"
+                ? [
                       {
                           title: "sidebarBilling",
                           href: "/{orgId}/settings/billing",
                           icon: <CreditCard className="size-4 flex-none" />
-                      },
+                      }
+                  ]
+                : []),
+            ...(build == "saas"
+                ? [
                       {
                           title: "sidebarEnterpriseLicenses",
                           href: "/{orgId}/settings/license",
                           icon: <TicketCheck className="size-4 flex-none" />
                       }
                   ]
-              }
-          ]
-        : [])
+                : [])
+        ]
+    }
 ];
 
 export const adminNavSections = (env?: Env): SidebarNavSection[] => [

src/app/page.tsx

@@ -73,7 +73,7 @@ export default async function Page(props: {
 
     if (!orgs.length) {
         if (!env.flags.disableUserCreateOrg || user.serverAdmin) {
-            redirect("/setup?firstOrg");
+            redirect("/setup");
         }
     }
 
@@ -86,14 +86,6 @@ export default async function Page(props: {
         targetOrgId = lastOrgCookie;
     } else {
         let ownedOrg = orgs.find((org) => org.isOwner);
-        let primaryOrg = orgs.find((org) => org.isPrimaryOrg);
-        if (!ownedOrg) {
-            if (primaryOrg) {
-                ownedOrg = primaryOrg;
-            } else {
-                ownedOrg = orgs[0];
-            }
-        }
         if (!ownedOrg) {
             ownedOrg = orgs[0];
         }

src/app/setup/page.tsx

@@ -4,14 +4,19 @@ import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 import { toast } from "@app/hooks/useToast";
 import { useCallback, useEffect, useState } from "react";
+import {
+    Card,
+    CardContent,
+    CardDescription,
+    CardHeader,
+    CardTitle
+} from "@app/components/ui/card";
 import { formatAxiosError } from "@app/lib/api";
 import { createApiClient } from "@app/lib/api";
 import { useEnvContext } from "@app/hooks/useEnvContext";
-import { useUserContext } from "@app/hooks/useUserContext";
-import { build } from "@server/build";
 import { Separator } from "@/components/ui/separator";
 import { z } from "zod";
-import { useRouter, useSearchParams } from "next/navigation";
+import { useRouter } from "next/navigation";
 import { useForm } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod";
 import {
@@ -30,7 +35,7 @@ import {
     CollapsibleContent,
     CollapsibleTrigger
 } from "@app/components/ui/collapsible";
-import { ArrowRight, ChevronsUpDown } from "lucide-react";
+import { ChevronsUpDown } from "lucide-react";
 import { cn } from "@app/lib/cn";
 
 type Step = "org" | "site" | "resources";
@@ -40,7 +45,6 @@ export default function StepperForm() {
     const [orgIdTaken, setOrgIdTaken] = useState(false);
     const t = useTranslations();
     const { env } = useEnvContext();
-    const { user } = useUserContext();
 
     const [loading, setLoading] = useState(false);
     const [isChecked, setIsChecked] = useState(false);
@@ -67,27 +71,12 @@ export default function StepperForm() {
 
     const api = createApiClient(useEnvContext());
     const router = useRouter();
-    const searchParams = useSearchParams();
-    const isFirstOrg = searchParams.get("firstOrg") != null;
 
     // Fetch default subnet on component mount
     useEffect(() => {
         fetchDefaultSubnet();
     }, []);
 
-    // Prefill org name and id when build is saas and firstOrg query param is set
-    useEffect(() => {
-        if (build !== "saas" || !user || !isFirstOrg) return;
-
-        const orgName = user.email
-            ? `${user.email}'s Organization`
-            : "My Organization";
-        const orgId = `org_${user.userId}`;
-        orgForm.setValue("orgName", orgName);
-        orgForm.setValue("orgId", orgId);
-        debouncedCheckOrgIdAvailability(orgId);
-    }, []);
-
     const fetchDefaultSubnet = async () => {
         try {
             const res = await api.get(`/pick-org-defaults`);
@@ -172,239 +161,263 @@ export default function StepperForm() {
     }
 
     return (
-        <section className="space-y-6">
-            <div>
-                <h1 className="text-2xl font-semibold tracking-tight">
-                    {t("setupNewOrg")}
-                </h1>
-                <p className="text-muted-foreground text-sm mt-1">
-                    {t("setupCreate")}
-                </p>
-            </div>
-            <div className="flex justify-between mb-2">
-                <div className="flex flex-col items-center">
-                    <div
-                        className={`w-8 h-8 rounded-full flex items-center justify-center mb-2 ${
-                            currentStep === "org"
-                                ? "bg-primary text-primary-foreground"
-                                : "bg-muted text-muted-foreground"
-                        }`}
-                    >
-                        1
-                    </div>
-                    <span
-                        className={`text-sm font-medium ${
-                            currentStep === "org"
-                                ? "text-primary"
-                                : "text-muted-foreground"
-                        }`}
-                    >
-                        {t("setupCreateOrg")}
-                    </span>
-                </div>
-                <div className="flex flex-col items-center">
-                    <div
-                        className={`w-8 h-8 rounded-full flex items-center justify-center mb-2 ${
-                            currentStep === "site"
-                                ? "bg-primary text-primary-foreground"
-                                : "bg-muted text-muted-foreground"
-                        }`}
-                    >
-                        2
-                    </div>
-                    <span
-                        className={`text-sm font-medium ${
-                            currentStep === "site"
-                                ? "text-primary"
-                                : "text-muted-foreground"
-                        }`}
-                    >
-                        {t("siteCreate")}
-                    </span>
-                </div>
-                <div className="flex flex-col items-center">
-                    <div
-                        className={`w-8 h-8 rounded-full flex items-center justify-center mb-2 ${
-                            currentStep === "resources"
-                                ? "bg-primary text-primary-foreground"
-                                : "bg-muted text-muted-foreground"
-                        }`}
-                    >
-                        3
-                    </div>
-                    <span
-                        className={`text-sm font-medium ${
-                            currentStep === "resources"
-                                ? "text-primary"
-                                : "text-muted-foreground"
-                        }`}
-                    >
-                        {t("setupCreateResources")}
-                    </span>
-                </div>
-            </div>
-
-            <Separator />
-
-            {currentStep === "org" && (
-                <Form {...orgForm}>
-                    <form
-                        onSubmit={orgForm.handleSubmit(orgSubmit)}
-                        className="space-y-4"
-                    >
-                        <FormField
-                            control={orgForm.control}
-                            name="orgName"
-                            render={({ field }) => (
-                                <FormItem>
-                                    <FormLabel>{t("setupOrgName")}</FormLabel>
-                                    <FormControl>
-                                        <Input
-                                            type="text"
-                                            {...field}
-                                            onChange={(e) => {
-                                                // Prevent "/" in orgName input
-                                                const sanitizedValue =
-                                                    e.target.value.replace(
-                                                        /\//g,
-                                                        "-"
-                                                    );
-                                                const orgId =
-                                                    generateId(sanitizedValue);
-                                                orgForm.setValue(
-                                                    "orgId",
-                                                    orgId
-                                                );
-                                                orgForm.setValue(
-                                                    "orgName",
-                                                    sanitizedValue
-                                                );
-                                                debouncedCheckOrgIdAvailability(
-                                                    orgId
-                                                );
-                                            }}
-                                            value={field.value.replace(
-                                                /\//g,
-                                                "-"
-                                            )}
-                                        />
-                                    </FormControl>
-                                    <FormMessage />
-                                    <FormDescription>
-                                        {t("orgDisplayName")}
-                                    </FormDescription>
-                                </FormItem>
-                            )}
-                        />
-                        <FormField
-                            control={orgForm.control}
-                            name="orgId"
-                            render={({ field }) => (
-                                <FormItem>
-                                    <FormLabel>{t("orgId")}</FormLabel>
-                                    <FormControl>
-                                        <Input type="text" {...field} />
-                                    </FormControl>
-                                    <FormMessage />
-                                    <FormDescription>
-                                        {t("setupIdentifierMessage")}
-                                    </FormDescription>
-                                </FormItem>
-                            )}
-                        />
-
-                        <Collapsible
-                            open={isAdvancedOpen}
-                            onOpenChange={setIsAdvancedOpen}
-                            className="space-y-2"
-                        >
-                            <div className="flex items-center justify-between space-x-4">
-                                <CollapsibleTrigger asChild>
-                                    <Button
-                                        type="button"
-                                        variant="text"
-                                        size="sm"
-                                        className="p-0 flex items-center justify-between w-full"
-                                    >
-                                        <h4 className="text-sm">
-                                            {t("advancedSettings")}
-                                        </h4>
-                                        <div>
-                                            <ChevronsUpDown className="h-4 w-4" />
-                                            <span className="sr-only">
-                                                {t("toggle")}
-                                            </span>
-                                        </div>
-                                    </Button>
-                                </CollapsibleTrigger>
+        <>
+            <Card>
+                <CardHeader>
+                    <CardTitle>{t("setupNewOrg")}</CardTitle>
+                    <CardDescription>{t("setupCreate")}</CardDescription>
+                </CardHeader>
+                <CardContent>
+                    <section className="space-y-6">
+                        <div className="flex justify-between mb-2">
+                            <div className="flex flex-col items-center">
+                                <div
+                                    className={`w-8 h-8 rounded-full flex items-center justify-center mb-2 ${
+                                        currentStep === "org"
+                                            ? "bg-primary text-primary-foreground"
+                                            : "bg-muted text-muted-foreground"
+                                    }`}
+                                >
+                                    1
+                                </div>
+                                <span
+                                    className={`text-sm font-medium ${
+                                        currentStep === "org"
+                                            ? "text-primary"
+                                            : "text-muted-foreground"
+                                    }`}
+                                >
+                                    {t("setupCreateOrg")}
+                                </span>
+                            </div>
+                            <div className="flex flex-col items-center">
+                                <div
+                                    className={`w-8 h-8 rounded-full flex items-center justify-center mb-2 ${
+                                        currentStep === "site"
+                                            ? "bg-primary text-primary-foreground"
+                                            : "bg-muted text-muted-foreground"
+                                    }`}
+                                >
+                                    2
+                                </div>
+                                <span
+                                    className={`text-sm font-medium ${
+                                        currentStep === "site"
+                                            ? "text-primary"
+                                            : "text-muted-foreground"
+                                    }`}
+                                >
+                                    {t("siteCreate")}
+                                </span>
+                            </div>
+                            <div className="flex flex-col items-center">
+                                <div
+                                    className={`w-8 h-8 rounded-full flex items-center justify-center mb-2 ${
+                                        currentStep === "resources"
+                                            ? "bg-primary text-primary-foreground"
+                                            : "bg-muted text-muted-foreground"
+                                    }`}
+                                >
+                                    3
+                                </div>
+                                <span
+                                    className={`text-sm font-medium ${
+                                        currentStep === "resources"
+                                            ? "text-primary"
+                                            : "text-muted-foreground"
+                                    }`}
+                                >
+                                    {t("setupCreateResources")}
+                                </span>
                             </div>
-                            <CollapsibleContent className="space-y-4">
-                                <FormField
-                                    control={orgForm.control}
-                                    name="subnet"
-                                    render={({ field }) => (
-                                        <FormItem>
-                                            <FormLabel>
-                                                {t("setupSubnetAdvanced")}
-                                            </FormLabel>
-                                            <FormControl>
-                                                <Input type="text" {...field} />
-                                            </FormControl>
-                                            <FormMessage />
-                                            <FormDescription>
-                                                {t("setupSubnetDescription")}
-                                            </FormDescription>
-                                        </FormItem>
-                                    )}
-                                />
-
-                                <FormField
-                                    control={orgForm.control}
-                                    name="utilitySubnet"
-                                    render={({ field }) => (
-                                        <FormItem>
-                                            <FormLabel>
-                                                {t("setupUtilitySubnet")}
-                                            </FormLabel>
-                                            <FormControl>
-                                                <Input type="text" {...field} />
-                                            </FormControl>
-                                            <FormMessage />
-                                            <FormDescription>
-                                                {t(
-                                                    "setupUtilitySubnetDescription"
-                                                )}
-                                            </FormDescription>
-                                        </FormItem>
-                                    )}
-                                />
-                            </CollapsibleContent>
-                        </Collapsible>
-
-                        {orgIdTaken && !orgCreated ? (
-                            <Alert variant="destructive">
-                                <AlertDescription>
-                                    {t("setupErrorIdentifier")}
-                                </AlertDescription>
-                            </Alert>
-                        ) : null}
-
-                        {/* Error Alert removed, errors now shown as toast */}
-
-                        <div className="flex justify-end">
-                            <Button
-                                type="submit"
-                                loading={loading}
-                                disabled={loading || orgIdTaken}
-                            >
-                                {t("setupCreateOrg")}
-                                <ArrowRight className="ml-2 h-4 w-4" />
-                            </Button>
                         </div>
-                    </form>
-                </Form>
-            )}
-        </section>
+
+                        <Separator />
+
+                        {currentStep === "org" && (
+                            <Form {...orgForm}>
+                                <form
+                                    onSubmit={orgForm.handleSubmit(orgSubmit)}
+                                    className="space-y-4"
+                                >
+                                    <FormField
+                                        control={orgForm.control}
+                                        name="orgName"
+                                        render={({ field }) => (
+                                            <FormItem>
+                                                <FormLabel>
+                                                    {t("setupOrgName")}
+                                                </FormLabel>
+                                                <FormControl>
+                                                    <Input
+                                                        type="text"
+                                                        {...field}
+                                                        onChange={(e) => {
+                                                            // Prevent "/" in orgName input
+                                                            const sanitizedValue =
+                                                                e.target.value.replace(
+                                                                    /\//g,
+                                                                    "-"
+                                                                );
+                                                            const orgId =
+                                                                generateId(
+                                                                    sanitizedValue
+                                                                );
+                                                            orgForm.setValue(
+                                                                "orgId",
+                                                                orgId
+                                                            );
+                                                            orgForm.setValue(
+                                                                "orgName",
+                                                                sanitizedValue
+                                                            );
+                                                            debouncedCheckOrgIdAvailability(
+                                                                orgId
+                                                            );
+                                                        }}
+                                                        value={field.value.replace(
+                                                            /\//g,
+                                                            "-"
+                                                        )}
+                                                    />
+                                                </FormControl>
+                                                <FormMessage />
+                                                <FormDescription>
+                                                    {t("orgDisplayName")}
+                                                </FormDescription>
+                                            </FormItem>
+                                        )}
+                                    />
+                                    <FormField
+                                        control={orgForm.control}
+                                        name="orgId"
+                                        render={({ field }) => (
+                                            <FormItem>
+                                                <FormLabel>
+                                                    {t("orgId")}
+                                                </FormLabel>
+                                                <FormControl>
+                                                    <Input
+                                                        type="text"
+                                                        {...field}
+                                                    />
+                                                </FormControl>
+                                                <FormMessage />
+                                                <FormDescription>
+                                                    {t(
+                                                        "setupIdentifierMessage"
+                                                    )}
+                                                </FormDescription>
+                                            </FormItem>
+                                        )}
+                                    />
+
+                                    <Collapsible
+                                        open={isAdvancedOpen}
+                                        onOpenChange={setIsAdvancedOpen}
+                                        className="space-y-2"
+                                    >
+                                        <div className="flex items-center justify-between space-x-4">
+                                            <CollapsibleTrigger asChild>
+                                                <Button
+                                                    type="button"
+                                                    variant="text"
+                                                    size="sm"
+                                                    className="p-0 flex items-center justify-between w-full"
+                                                >
+                                                    <h4 className="text-sm">
+                                                        {t("advancedSettings")}
+                                                    </h4>
+                                                    <div>
+                                                        <ChevronsUpDown className="h-4 w-4" />
+                                                        <span className="sr-only">
+                                                            {t("toggle")}
+                                                        </span>
+                                                    </div>
+                                                </Button>
+                                            </CollapsibleTrigger>
+                                        </div>
+                                        <CollapsibleContent className="space-y-4">
+                                            <FormField
+                                                control={orgForm.control}
+                                                name="subnet"
+                                                render={({ field }) => (
+                                                    <FormItem>
+                                                        <FormLabel>
+                                                            {t(
+                                                                "setupSubnetAdvanced"
+                                                            )}
+                                                        </FormLabel>
+                                                        <FormControl>
+                                                            <Input
+                                                                type="text"
+                                                                {...field}
+                                                            />
+                                                        </FormControl>
+                                                        <FormMessage />
+                                                        <FormDescription>
+                                                            {t(
+                                                                "setupSubnetDescription"
+                                                            )}
+                                                        </FormDescription>
+                                                    </FormItem>
+                                                )}
+                                            />
+
+                                            <FormField
+                                                control={orgForm.control}
+                                                name="utilitySubnet"
+                                                render={({ field }) => (
+                                                    <FormItem>
+                                                        <FormLabel>
+                                                            {t(
+                                                                "setupUtilitySubnet"
+                                                            )}
+                                                        </FormLabel>
+                                                        <FormControl>
+                                                            <Input
+                                                                type="text"
+                                                                {...field}
+                                                            />
+                                                        </FormControl>
+                                                        <FormMessage />
+                                                        <FormDescription>
+                                                            {t(
+                                                                "setupUtilitySubnetDescription"
+                                                            )}
+                                                        </FormDescription>
+                                                    </FormItem>
+                                                )}
+                                            />
+                                        </CollapsibleContent>
+                                    </Collapsible>
+
+                                    {orgIdTaken && !orgCreated ? (
+                                        <Alert variant="destructive">
+                                            <AlertDescription>
+                                                {t("setupErrorIdentifier")}
+                                            </AlertDescription>
+                                        </Alert>
+                                    ) : null}
+
+                                    {/* Error Alert removed, errors now shown as toast */}
+
+                                    <div className="flex justify-end">
+                                        <Button
+                                            type="submit"
+                                            loading={loading}
+                                            disabled={loading || orgIdTaken}
+                                        >
+                                            {t("setupCreateOrg")}
+                                        </Button>
+                                    </div>
+                                </form>
+                            </Form>
+                        )}
+                    </section>
+                </CardContent>
+            </Card>
+        </>
     );
 }
 

src/components/ApprovalFeed.tsx

@@ -2,16 +2,16 @@
 import { useEnvContext } from "@app/hooks/useEnvContext";
 import { toast } from "@app/hooks/useToast";
 import { createApiClient, formatAxiosError } from "@app/lib/api";
+import { getUserDisplayName } from "@app/lib/getUserDisplayName";
 import { cn } from "@app/lib/cn";
 import { formatFingerprintInfo } from "@app/lib/formatDeviceFingerprint";
-import { getUserDisplayName } from "@app/lib/getUserDisplayName";
 import {
     approvalFiltersSchema,
     approvalQueries,
     type ApprovalItem
 } from "@app/lib/queries";
-import { useInfiniteQuery } from "@tanstack/react-query";
-import { Ban, Check, Loader, RefreshCw } from "lucide-react";
+import { useQuery } from "@tanstack/react-query";
+import { ArrowRight, Ban, Check, LaptopMinimal, RefreshCw } from "lucide-react";
 import { useTranslations } from "next-intl";
 import Link from "next/link";
 import { usePathname, useRouter, useSearchParams } from "next/navigation";
@@ -54,20 +54,12 @@ export function ApprovalFeed({
 
     const { isPaidUser } = usePaidStatus();
 
-    const {
-        data,
-        isFetching,
-        isLoading,
-        refetch,
-        hasNextPage,
-        fetchNextPage,
-        isFetchingNextPage
-    } = useInfiniteQuery({
+    const { data, isFetching, refetch } = useQuery({
         ...approvalQueries.listApprovals(orgId, filters),
         enabled: isPaidUser(tierMatrix.deviceApprovals)
     });
 
-    const approvals = data?.pages.flatMap((data) => data.approvals) ?? [];
+    const approvals = data?.approvals ?? [];
 
     // Show empty state if no approvals are enabled for any role
     if (!hasApprovalsEnabled) {
@@ -123,13 +115,13 @@ export function ApprovalFeed({
                         onClick={() => {
                             refetch();
                         }}
-                        disabled={isFetching || isLoading}
+                        disabled={isFetching}
                         className="lg:static gap-2"
                     >
                         <RefreshCw
                             className={cn(
                                 "size-4",
-                                (isFetching || isLoading) && "animate-spin"
+                                isFetching && "animate-spin"
                             )}
                         />
                         {t("refresh")}
@@ -153,30 +145,13 @@ export function ApprovalFeed({
                         ))}
 
                         {approvals.length === 0 && (
-                            <li className="flex justify-center items-center p-4 text-muted-foreground gap-2">
-                                {isLoading
-                                    ? t("loadingApprovals")
-                                    : t("approvalListEmpty")}
-
-                                {isLoading && (
-                                    <Loader className="size-4 flex-none animate-spin" />
-                                )}
+                            <li className="flex justify-center items-center p-4 text-muted-foreground">
+                                {t("approvalListEmpty")}
                             </li>
                         )}
                     </ul>
                 </CardHeader>
             </Card>
-            {hasNextPage && (
-                <Button
-                    variant="secondary"
-                    className="self-center"
-                    size="lg"
-                    loading={isFetchingNextPage}
-                    onClick={() => fetchNextPage()}
-                >
-                    {t("approvalLoadMore")}
-                </Button>
-            )}
         </div>
     );
 }

src/components/AuthPageBrandingForm.tsx

@@ -1,5 +1,9 @@
 "use client";
 
+import { zodResolver } from "@hookform/resolvers/zod";
+import { startTransition, useActionState, useState } from "react";
+import { useForm } from "react-hook-form";
+import z from "zod";
 import {
     Form,
     FormControl,
@@ -9,11 +13,6 @@ import {
     FormLabel,
     FormMessage
 } from "@app/components/ui/form";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useTranslations } from "next-intl";
-import { useActionState } from "react";
-import { useForm } from "react-hook-form";
-import z from "zod";
 import {
     SettingsSection,
     SettingsSectionBody,
@@ -22,19 +21,19 @@ import {
     SettingsSectionHeader,
     SettingsSectionTitle
 } from "./Settings";
+import { useTranslations } from "next-intl";
 
-import { useEnvContext } from "@app/hooks/useEnvContext";
-import { usePaidStatus } from "@app/hooks/usePaidStatus";
-import { toast } from "@app/hooks/useToast";
-import { createApiClient, formatAxiosError } from "@app/lib/api";
-import { build } from "@server/build";
 import type { GetLoginPageBrandingResponse } from "@server/routers/loginPage/types";
-import { XIcon } from "lucide-react";
-import { useRouter } from "next/navigation";
-import { PaidFeaturesAlert } from "./PaidFeaturesAlert";
-import { Button } from "./ui/button";
 import { Input } from "./ui/input";
-import { validateLocalPath } from "@app/lib/validateLocalPath";
+import { ExternalLink, InfoIcon, XIcon } from "lucide-react";
+import { Button } from "./ui/button";
+import { createApiClient, formatAxiosError } from "@app/lib/api";
+import { useEnvContext } from "@app/hooks/useEnvContext";
+import { useRouter } from "next/navigation";
+import { toast } from "@app/hooks/useToast";
+import { usePaidStatus } from "@app/hooks/usePaidStatus";
+import { build } from "@server/build";
+import { PaidFeaturesAlert } from "./PaidFeaturesAlert";
 import { Alert, AlertDescription, AlertTitle } from "./ui/alert";
 import { tierMatrix } from "@server/lib/billing/tierMatrix";
 
@@ -46,36 +45,13 @@ export type AuthPageCustomizationProps = {
 const AuthPageFormSchema = z.object({
     logoUrl: z.union([
         z.literal(""),
-        z.string().superRefine(async (urlOrPath, ctx) => {
-            const parseResult = z.url().safeParse(urlOrPath);
-            if (!parseResult.success) {
-                if (build !== "enterprise") {
-                    ctx.addIssue({
-                        code: "custom",
-                        message: "Must be a valid URL"
-                    });
-                    return;
-                } else {
-                    try {
-                        validateLocalPath(urlOrPath);
-                    } catch (error) {
-                        ctx.addIssue({
-                            code: "custom",
-                            message:
-                                "Must be either a valid image URL or a valid pathname starting with `/` and not containing query parameters, `..` or `*`"
-                        });
-                    } finally {
-                        return;
-                    }
-                }
-            }
-
+        z.url("Must be a valid URL").superRefine(async (url, ctx) => {
             try {
-                const response = await fetch(urlOrPath, {
+                const response = await fetch(url, {
                     method: "HEAD"
                 }).catch(() => {
                     // If HEAD fails (CORS or method not allowed), try GET
-                    return fetch(urlOrPath, { method: "GET" });
+                    return fetch(url, { method: "GET" });
                 });
 
                 if (response.status !== 200) {
@@ -295,25 +271,12 @@ export default function AuthPageBrandingForm({
                                         render={({ field }) => (
                                             <FormItem className="md:col-span-3">
                                                 <FormLabel>
-                                                    {build === "enterprise"
-                                                        ? t(
-                                                              "brandingLogoURLOrPath"
-                                                          )
-                                                        : t("brandingLogoURL")}
+                                                    {t("brandingLogoURL")}
                                                 </FormLabel>
                                                 <FormControl>
                                                     <Input {...field} />
                                                 </FormControl>
                                                 <FormMessage />
-                                                <FormDescription>
-                                                    {build === "enterprise"
-                                                        ? t(
-                                                              "brandingLogoPathDescription"
-                                                          )
-                                                        : t(
-                                                              "brandingLogoURLDescription"
-                                                          )}
-                                                </FormDescription>
                                             </FormItem>
                                         )}
                                     />

src/components/ClientResourcesTable.tsx

@@ -25,11 +25,6 @@ import CreateInternalResourceDialog from "@app/components/CreateInternalResource
 import EditInternalResourceDialog from "@app/components/EditInternalResourceDialog";
 import { orgQueries } from "@app/lib/queries";
 import { useQuery } from "@tanstack/react-query";
-import type { PaginationState } from "@tanstack/react-table";
-import { ControlledDataTable } from "./ui/controlled-data-table";
-import { useNavigationContext } from "@app/hooks/useNavigationContext";
-import { useDebouncedCallback } from "use-debounce";
-import { ColumnFilterButton } from "./ColumnFilterButton";
 
 export type InternalResourceRow = {
     id: number;
@@ -56,22 +51,18 @@ export type InternalResourceRow = {
 type ClientResourcesTableProps = {
     internalResources: InternalResourceRow[];
     orgId: string;
-    pagination: PaginationState;
-    rowCount: number;
+    defaultSort?: {
+        id: string;
+        desc: boolean;
+    };
 };
 
 export default function ClientResourcesTable({
     internalResources,
     orgId,
-    pagination,
-    rowCount
+    defaultSort
 }: ClientResourcesTableProps) {
     const router = useRouter();
-    const {
-        navigate: filter,
-        isNavigating: isFiltering,
-        searchParams
-    } = useNavigationContext();
     const t = useTranslations();
 
     const { env } = useEnvContext();
@@ -131,7 +122,19 @@ export default function ClientResourcesTable({
             accessorKey: "name",
             enableHiding: false,
             friendlyName: t("name"),
-            header: () => <span className="p-3">{t("name")}</span>
+            header: ({ column }) => {
+                return (
+                    <Button
+                        variant="ghost"
+                        onClick={() =>
+                            column.toggleSorting(column.getIsSorted() === "asc")
+                        }
+                    >
+                        {t("name")}
+                        <ArrowUpDown className="ml-2 h-4 w-4" />
+                    </Button>
+                );
+            }
         },
         {
             id: "niceId",
@@ -177,24 +180,9 @@ export default function ClientResourcesTable({
             accessorKey: "mode",
             friendlyName: t("editInternalResourceDialogMode"),
             header: () => (
-                <ColumnFilterButton
-                    options={[
-                        {
-                            value: "host",
-                            label: t("editInternalResourceDialogModeHost")
-                        },
-                        {
-                            value: "cidr",
-                            label: t("editInternalResourceDialogModeCidr")
-                        }
-                    ]}
-                    selectedValue={searchParams.get("mode") ?? undefined}
-                    onValueChange={(value) => handleFilterChange("mode", value)}
-                    searchPlaceholder={t("searchPlaceholder")}
-                    emptyMessage={t("emptySearchOptions")}
-                    label={t("editInternalResourceDialogMode")}
-                    className="p-3"
-                />
+                <span className="p-3">
+                    {t("editInternalResourceDialogMode")}
+                </span>
             ),
             cell: ({ row }) => {
                 const resourceRow = row.original;
@@ -312,37 +300,6 @@ export default function ClientResourcesTable({
         }
     ];
 
-    function handleFilterChange(
-        column: string,
-        value: string | undefined | null
-    ) {
-        searchParams.delete(column);
-        searchParams.delete("page");
-
-        if (value) {
-            searchParams.set(column, value);
-        }
-        filter({
-            searchParams
-        });
-    }
-
-    const handlePaginationChange = (newPage: PaginationState) => {
-        searchParams.set("page", (newPage.pageIndex + 1).toString());
-        searchParams.set("pageSize", newPage.pageSize.toString());
-        filter({
-            searchParams
-        });
-    };
-
-    const handleSearchChange = useDebouncedCallback((query: string) => {
-        searchParams.set("query", query);
-        searchParams.delete("page");
-        filter({
-            searchParams
-        });
-    }, 300);
-
     return (
         <>
             {selectedInternalResource && (
@@ -370,20 +327,19 @@ export default function ClientResourcesTable({
                 />
             )}
 
-            <ControlledDataTable
+            <DataTable
                 columns={internalColumns}
-                rows={internalResources}
-                tableId="internal-resources"
+                data={internalResources}
+                persistPageSize="internal-resources"
                 searchPlaceholder={t("resourcesSearch")}
+                searchColumn="name"
                 onAdd={() => setIsCreateDialogOpen(true)}
                 addButtonText={t("resourceAdd")}
-                onSearch={handleSearchChange}
                 onRefresh={refreshData}
-                onPaginationChange={handlePaginationChange}
-                pagination={pagination}
-                rowCount={rowCount}
-                isRefreshing={isRefreshing || isFiltering}
-                enableColumnVisibility
+                isRefreshing={isRefreshing}
+                defaultSort={defaultSort}
+                enableColumnVisibility={true}
+                persistColumnVisibility="internal-resources"
                 columnVisibility={{
                     niceId: false,
                     aliasAddress: false

src/components/ColumnFilter.tsx

@@ -15,7 +15,6 @@ import {
 } from "@app/components/ui/command";
 import { CheckIcon, ChevronDownIcon, Filter } from "lucide-react";
 import { cn } from "@app/lib/cn";
-import { Badge } from "./ui/badge";
 
 interface FilterOption {
     value: string;
@@ -62,19 +61,16 @@ export function ColumnFilter({
                 >
                     <div className="flex items-center gap-2">
                         <Filter className="h-4 w-4" />
-
-                        {selectedOption && (
-                            <Badge className="truncate" variant="secondary">
-                                {selectedOption
-                                    ? selectedOption.label
-                                    : placeholder}
-                            </Badge>
-                        )}
+                        <span className="truncate">
+                            {selectedOption
+                                ? selectedOption.label
+                                : placeholder}
+                        </span>
                     </div>
                     <ChevronDownIcon className="h-4 w-4 shrink-0 opacity-50" />
                 </Button>
             </PopoverTrigger>
-            <PopoverContent className="p-0 w-50" align="start">
+            <PopoverContent className="p-0 w-[200px]" align="start">
                 <Command>
                     <CommandInput placeholder={searchPlaceholder} />
                     <CommandList>

src/components/ColumnFilterButton.tsx

@@ -1,126 +0,0 @@
-import { useState } from "react";
-import { Button } from "@app/components/ui/button";
-import {
-    Popover,
-    PopoverContent,
-    PopoverTrigger
-} from "@app/components/ui/popover";
-import {
-    Command,
-    CommandEmpty,
-    CommandGroup,
-    CommandInput,
-    CommandItem,
-    CommandList
-} from "@app/components/ui/command";
-import { CheckIcon, ChevronDownIcon, Funnel } from "lucide-react";
-import { cn } from "@app/lib/cn";
-import { Badge } from "./ui/badge";
-
-interface FilterOption {
-    value: string;
-    label: string;
-}
-
-interface ColumnFilterButtonProps {
-    options: FilterOption[];
-    selectedValue?: string;
-    onValueChange: (value: string | undefined) => void;
-    placeholder?: string;
-    searchPlaceholder?: string;
-    emptyMessage?: string;
-    className?: string;
-    label: string;
-}
-
-export function ColumnFilterButton({
-    options,
-    selectedValue,
-    onValueChange,
-    placeholder,
-    searchPlaceholder = "Search...",
-    emptyMessage = "No options found",
-    className,
-    label
-}: ColumnFilterButtonProps) {
-    const [open, setOpen] = useState(false);
-
-    const selectedOption = options.find(
-        (option) => option.value === selectedValue
-    );
-
-    return (
-        <Popover open={open} onOpenChange={setOpen}>
-            <PopoverTrigger asChild>
-                <Button
-                    variant="ghost"
-                    role="combobox"
-                    aria-expanded={open}
-                    className={cn(
-                        "justify-between text-sm h-8 px-2",
-                        !selectedValue && "text-muted-foreground",
-                        className
-                    )}
-                >
-                    <div className="flex items-center gap-2">
-                        {label}
-
-                        <Funnel className="size-4 flex-none" />
-
-                        {selectedOption && (
-                            <Badge className="truncate" variant="secondary">
-                                {selectedOption.label}
-                            </Badge>
-                        )}
-                    </div>
-                </Button>
-            </PopoverTrigger>
-            <PopoverContent className="p-0 w-50" align="start">
-                <Command>
-                    <CommandInput placeholder={searchPlaceholder} />
-                    <CommandList>
-                        <CommandEmpty>{emptyMessage}</CommandEmpty>
-                        <CommandGroup>
-                            {/* Clear filter option */}
-                            {selectedValue && (
-                                <CommandItem
-                                    onSelect={() => {
-                                        onValueChange(undefined);
-                                        setOpen(false);
-                                    }}
-                                    className="text-muted-foreground"
-                                >
-                                    Clear filter
-                                </CommandItem>
-                            )}
-                            {options.map((option) => (
-                                <CommandItem
-                                    key={option.value}
-                                    value={option.label}
-                                    onSelect={() => {
-                                        onValueChange(
-                                            selectedValue === option.value
-                                                ? undefined
-                                                : option.value
-                                        );
-                                        setOpen(false);
-                                    }}
-                                >
-                                    <CheckIcon
-                                        className={cn(
-                                            "mr-2 h-4 w-4",
-                                            selectedValue === option.value
-                                                ? "opacity-100"
-                                                : "opacity-0"
-                                        )}
-                                    />
-                                    {option.label}
-                                </CommandItem>
-                            ))}
-                        </CommandGroup>
-                    </CommandList>
-                </Command>
-            </PopoverContent>
-        </Popover>
-    );
-}

src/components/CreateInternalResourceDialog.tsx

@@ -255,7 +255,10 @@ export default function CreateInternalResourceDialog({
     const { data: usersResponse = [] } = useQuery(orgQueries.users({ orgId }));
     const { data: clientsResponse = [] } = useQuery(
         orgQueries.clients({
-            orgId
+            orgId,
+            filters: {
+                filter: "machine"
+            }
         })
     );
 

src/components/EditInternalResourceDialog.tsx

@@ -277,7 +277,10 @@ export default function EditInternalResourceDialog({
             orgQueries.roles({ orgId }),
             orgQueries.users({ orgId }),
             orgQueries.clients({
-                orgId
+                orgId,
+                filters: {
+                    filter: "machine"
+                }
             }),
             resourceQueries.siteResourceUsers({ siteResourceId: resource.id }),
             resourceQueries.siteResourceRoles({ siteResourceId: resource.id }),

src/components/LayoutSidebar.tsx

@@ -189,12 +189,10 @@ export function LayoutSidebar({
             <div className="w-full border-t border-border" />
 
             <div className="p-4 pt-1 flex flex-col shrink-0">
-                {canShowProductUpdates ? (
+                {canShowProductUpdates && (
                     <div className="mb-3">
                         <ProductUpdates isCollapsed={isSidebarCollapsed} />
                     </div>
-                ) : (
-                    <div className="mb-3"></div>
                 )}
 
                 {build === "enterprise" && (

src/components/MachineClientsTable.tsx

@@ -16,23 +16,13 @@ import {
     ArrowRight,
     ArrowUpDown,
     MoreHorizontal,
-    CircleSlash,
-    ArrowDown01Icon,
-    ArrowUp10Icon,
-    ChevronsUpDownIcon
+    CircleSlash
 } from "lucide-react";
 import { useTranslations } from "next-intl";
 import Link from "next/link";
 import { useRouter } from "next/navigation";
 import { useMemo, useState, useTransition } from "react";
 import { Badge } from "./ui/badge";
-import type { PaginationState } from "@tanstack/react-table";
-import { ControlledDataTable } from "./ui/controlled-data-table";
-import { useNavigationContext } from "@app/hooks/useNavigationContext";
-import { useDebouncedCallback } from "use-debounce";
-import z from "zod";
-import { getNextSortOrder, getSortDirection } from "@app/lib/sortColumn";
-import { ColumnFilterButton } from "./ColumnFilterButton";
 
 export type ClientRow = {
     id: number;
@@ -58,24 +48,14 @@ export type ClientRow = {
 type ClientTableProps = {
     machineClients: ClientRow[];
     orgId: string;
-    pagination: PaginationState;
-    rowCount: number;
 };
 
 export default function MachineClientsTable({
     machineClients,
-    orgId,
-    pagination,
-    rowCount
+    orgId
 }: ClientTableProps) {
     const router = useRouter();
 
-    const {
-        navigate: filter,
-        isNavigating: isFiltering,
-        searchParams
-    } = useNavigationContext();
-
     const t = useTranslations();
 
     const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
@@ -85,7 +65,6 @@ export default function MachineClientsTable({
 
     const api = createApiClient(useEnvContext());
     const [isRefreshing, startTransition] = useTransition();
-    const [isNavigatingToAddPage, startNavigation] = useTransition();
 
     const defaultMachineColumnVisibility = {
         subnet: false,
@@ -203,8 +182,22 @@ export default function MachineClientsTable({
             {
                 accessorKey: "name",
                 enableHiding: false,
-                friendlyName: t("name"),
-                header: () => <span className="px-3">{t("name")}</span>,
+                friendlyName: "Name",
+                header: ({ column }) => {
+                    return (
+                        <Button
+                            variant="ghost"
+                            onClick={() =>
+                                column.toggleSorting(
+                                    column.getIsSorted() === "asc"
+                                )
+                            }
+                        >
+                            Name
+                            <ArrowUpDown className="ml-2 h-4 w-4" />
+                        </Button>
+                    );
+                },
                 cell: ({ row }) => {
                     const r = row.original;
                     return (
@@ -231,35 +224,38 @@ export default function MachineClientsTable({
             {
                 accessorKey: "niceId",
                 friendlyName: "Identifier",
-                header: () => <span className="px-3">{t("identifier")}</span>
+                header: ({ column }) => {
+                    return (
+                        <Button
+                            variant="ghost"
+                            onClick={() =>
+                                column.toggleSorting(
+                                    column.getIsSorted() === "asc"
+                                )
+                            }
+                        >
+                            {t("identifier")}
+                            <ArrowUpDown className="ml-2 h-4 w-4" />
+                        </Button>
+                    );
+                }
             },
             {
                 accessorKey: "online",
-                friendlyName: t("online"),
-                header: () => {
+                friendlyName: "Connectivity",
+                header: ({ column }) => {
                     return (
-                        <ColumnFilterButton
-                            options={[
-                                {
-                                    value: "true",
-                                    label: t("connected")
-                                },
-                                {
-                                    value: "false",
-                                    label: t("disconnected")
-                                }
-                            ]}
-                            selectedValue={
-                                searchParams.get("online") ?? undefined
+                        <Button
+                            variant="ghost"
+                            onClick={() =>
+                                column.toggleSorting(
+                                    column.getIsSorted() === "asc"
+                                )
                             }
-                            onValueChange={(value) =>
-                                handleFilterChange("online", value)
-                            }
-                            searchPlaceholder={t("searchPlaceholder")}
-                            emptyMessage={t("emptySearchOptions")}
-                            label={t("online")}
-                            className="p-3"
-                        />
+                        >
+                            Connectivity
+                            <ArrowUpDown className="ml-2 h-4 w-4" />
+                        </Button>
                     );
                 },
                 cell: ({ row }) => {
@@ -283,52 +279,38 @@ export default function MachineClientsTable({
             },
             {
                 accessorKey: "mbIn",
-                friendlyName: t("dataIn"),
-                header: () => {
-                    const dataInOrder = getSortDirection(
-                        "megabytesIn",
-                        searchParams
-                    );
-
-                    const Icon =
-                        dataInOrder === "asc"
-                            ? ArrowDown01Icon
-                            : dataInOrder === "desc"
-                              ? ArrowUp10Icon
-                              : ChevronsUpDownIcon;
+                friendlyName: "Data In",
+                header: ({ column }) => {
                     return (
                         <Button
                             variant="ghost"
-                            onClick={() => toggleSort("megabytesIn")}
+                            onClick={() =>
+                                column.toggleSorting(
+                                    column.getIsSorted() === "asc"
+                                )
+                            }
                         >
-                            {t("dataIn")}
-                            <Icon className="ml-2 h-4 w-4" />
+                            Data In
+                            <ArrowUpDown className="ml-2 h-4 w-4" />
                         </Button>
                     );
                 }
             },
             {
                 accessorKey: "mbOut",
-                friendlyName: t("dataOut"),
-                header: () => {
-                    const dataOutOrder = getSortDirection(
-                        "megabytesOut",
-                        searchParams
-                    );
-
-                    const Icon =
-                        dataOutOrder === "asc"
-                            ? ArrowDown01Icon
-                            : dataOutOrder === "desc"
-                              ? ArrowUp10Icon
-                              : ChevronsUpDownIcon;
+                friendlyName: "Data Out",
+                header: ({ column }) => {
                     return (
                         <Button
                             variant="ghost"
-                            onClick={() => toggleSort("megabytesOut")}
+                            onClick={() =>
+                                column.toggleSorting(
+                                    column.getIsSorted() === "asc"
+                                )
+                            }
                         >
-                            {t("dataOut")}
-                            <Icon className="ml-2 h-4 w-4" />
+                            Data Out
+                            <ArrowUpDown className="ml-2 h-4 w-4" />
                         </Button>
                     );
                 }
@@ -336,7 +318,21 @@ export default function MachineClientsTable({
             {
                 accessorKey: "client",
                 friendlyName: t("agent"),
-                header: () => <span className="px-3">{t("agent")}</span>,
+                header: ({ column }) => {
+                    return (
+                        <Button
+                            variant="ghost"
+                            onClick={() =>
+                                column.toggleSorting(
+                                    column.getIsSorted() === "asc"
+                                )
+                            }
+                        >
+                            {t("agent")}
+                            <ArrowUpDown className="ml-2 h-4 w-4" />
+                        </Button>
+                    );
+                },
                 cell: ({ row }) => {
                     const originalRow = row.original;
 
@@ -360,8 +356,22 @@ export default function MachineClientsTable({
             },
             {
                 accessorKey: "subnet",
-                friendlyName: t("address"),
-                header: () => <span className="px-3">{t("address")}</span>
+                friendlyName: "Address",
+                header: ({ column }) => {
+                    return (
+                        <Button
+                            variant="ghost"
+                            onClick={() =>
+                                column.toggleSorting(
+                                    column.getIsSorted() === "asc"
+                                )
+                            }
+                        >
+                            Address
+                            <ArrowUpDown className="ml-2 h-4 w-4" />
+                        </Button>
+                    );
+                }
             }
         ];
 
@@ -445,56 +455,7 @@ export default function MachineClientsTable({
         }
 
         return baseColumns;
-    }, [hasRowsWithoutUserId, t, getSortDirection, toggleSort]);
-
-    const booleanSearchFilterSchema = z
-        .enum(["true", "false"])
-        .optional()
-        .catch(undefined);
-
-    function handleFilterChange(
-        column: string,
-        value: string | null | undefined | string[]
-    ) {
-        searchParams.delete(column);
-        searchParams.delete("page");
-
-        if (typeof value === "string") {
-            searchParams.set(column, value);
-        } else if (value) {
-            for (const val of value) {
-                searchParams.append(column, val);
-            }
-        }
-
-        filter({
-            searchParams
-        });
-    }
-
-    function toggleSort(column: string) {
-        const newSearch = getNextSortOrder(column, searchParams);
-
-        filter({
-            searchParams: newSearch
-        });
-    }
-
-    const handlePaginationChange = (newPage: PaginationState) => {
-        searchParams.set("page", (newPage.pageIndex + 1).toString());
-        searchParams.set("pageSize", newPage.pageSize.toString());
-        filter({
-            searchParams
-        });
-    };
-
-    const handleSearchChange = useDebouncedCallback((query: string) => {
-        searchParams.set("query", query);
-        searchParams.delete("page");
-        filter({
-            searchParams
-        });
-    }, 300);
+    }, [hasRowsWithoutUserId, t]);
 
     return (
         <>
@@ -517,25 +478,20 @@ export default function MachineClientsTable({
                     title="Delete Client"
                 />
             )}
-            <ControlledDataTable
+            <DataTable
                 columns={columns}
-                rows={machineClients}
-                tableId="machine-clients"
+                data={machineClients || []}
+                persistPageSize="machine-clients"
                 searchPlaceholder={t("resourcesSearch")}
+                searchColumn="name"
                 onAdd={() =>
-                    startNavigation(() =>
-                        router.push(`/${orgId}/settings/clients/machine/create`)
-                    )
+                    router.push(`/${orgId}/settings/clients/machine/create`)
                 }
-                pagination={pagination}
-                rowCount={rowCount}
                 addButtonText={t("createClient")}
                 onRefresh={refreshData}
-                isRefreshing={isRefreshing || isFiltering}
-                onSearch={handleSearchChange}
-                onPaginationChange={handlePaginationChange}
-                isNavigatingToAddPage={isNavigatingToAddPage}
-                enableColumnVisibility
+                isRefreshing={isRefreshing}
+                enableColumnVisibility={true}
+                persistColumnVisibility="machine-clients"
                 columnVisibility={defaultMachineColumnVisibility}
                 stickyLeftColumn="name"
                 stickyRightColumn="actions"
@@ -562,10 +518,30 @@ export default function MachineClientsTable({
                                 value: "blocked"
                             }
                         ],
-                        onValueChange(selectedValues: string[]) {
-                            handleFilterChange("status", selectedValues);
+                        filterFn: (
+                            row: ClientRow,
+                            selectedValues: (string | number | boolean)[]
+                        ) => {
+                            if (selectedValues.length === 0) return true;
+                            const rowArchived = row.archived || false;
+                            const rowBlocked = row.blocked || false;
+                            const isActive = !rowArchived && !rowBlocked;
+
+                            if (selectedValues.includes("active") && isActive)
+                                return true;
+                            if (
+                                selectedValues.includes("archived") &&
+                                rowArchived
+                            )
+                                return true;
+                            if (
+                                selectedValues.includes("blocked") &&
+                                rowBlocked
+                            )
+                                return true;
+                            return false;
                         },
-                        values: searchParams.getAll("status")
+                        defaultValues: ["active"] // Default to showing active clients
                     }
                 ]}
             />

src/components/OrgSelector.tsx

@@ -20,13 +20,12 @@ import {
     TooltipProvider,
     TooltipTrigger
 } from "@app/components/ui/tooltip";
-import { Badge } from "@app/components/ui/badge";
 import { useEnvContext } from "@app/hooks/useEnvContext";
 import { cn } from "@app/lib/cn";
 import { ListUserOrgsResponse } from "@server/routers/org";
 import { Check, ChevronsUpDown, Plus, Building2, Users } from "lucide-react";
-import { usePathname, useRouter } from "next/navigation";
-import { useMemo, useState } from "react";
+import { useRouter } from "next/navigation";
+import { useState } from "react";
 import { useUserContext } from "@app/hooks/useUserContext";
 import { useTranslations } from "next-intl";
 
@@ -44,23 +43,11 @@ export function OrgSelector({
     const { user } = useUserContext();
     const [open, setOpen] = useState(false);
     const router = useRouter();
-    const pathname = usePathname();
     const { env } = useEnvContext();
     const t = useTranslations();
 
     const selectedOrg = orgs?.find((org) => org.orgId === orgId);
 
-    const sortedOrgs = useMemo(() => {
-        if (!orgs?.length) return orgs ?? [];
-        return [...orgs].sort((a, b) => {
-            const aPrimary = Boolean(a.isPrimaryOrg);
-            const bPrimary = Boolean(b.isPrimaryOrg);
-            if (aPrimary && !bPrimary) return -1;
-            if (!aPrimary && bPrimary) return 1;
-            return 0;
-        });
-    }, [orgs]);
-
     const orgSelectorContent = (
         <Popover open={open} onOpenChange={setOpen}>
             <PopoverTrigger asChild>
@@ -96,7 +83,7 @@ export function OrgSelector({
             <PopoverContent className="w-[320px] p-0" align="start">
                 <Command className="rounded-lg">
                     <CommandInput
-                        placeholder={t("searchPlaceholder")}
+                        placeholder={t("searchProgress")}
                         className="border-0 focus:ring-0"
                     />
                     <CommandEmpty className="py-6 text-center">
@@ -137,38 +124,24 @@ export function OrgSelector({
                     )}
                     <CommandGroup heading={t("orgs")} className="py-2">
                         <CommandList>
-                            {sortedOrgs.map((org) => (
+                            {orgs?.map((org) => (
                                 <CommandItem
                                     key={org.orgId}
                                     onSelect={() => {
                                         setOpen(false);
-                                        const newPath = pathname.replace(
-                                            /^\/[^/]+/,
-                                            `/${org.orgId}`
-                                        );
-                                        router.push(newPath);
+                                        router.push(`/${org.orgId}/settings`);
                                     }}
                                     className="mx-2 rounded-md"
                                 >
                                     <div className="flex items-center justify-center w-8 h-8 rounded-lg bg-muted mr-3">
                                         <Users className="h-4 w-4 text-muted-foreground" />
                                     </div>
-                                    <div className="flex flex-col flex-1 min-w-0">
-                                        <div className="flex items-center gap-2 flex-wrap">
-                                            <span className="font-medium truncate">
-                                                {org.name}
-                                            </span>
-                                            {org.isPrimaryOrg && (
-                                                <Badge
-                                                    variant="outline"
-                                                    className="shrink-0 text-[10px] px-1.5 py-0 font-medium"
-                                                >
-                                                    {t("primary")}
-                                                </Badge>
-                                            )}
-                                        </div>
-                                        <span className="text-xs text-muted-foreground font-mono">
-                                            {org.orgId}
+                                    <div className="flex flex-col flex-1">
+                                        <span className="font-medium">
+                                            {org.name}
+                                        </span>
+                                        <span className="text-xs text-muted-foreground">
+                                            {t("organization")}
                                         </span>
                                     </div>
                                     <Check

src/components/ProxyResourcesTable.tsx

@@ -2,8 +2,9 @@
 
 import ConfirmDeleteDialog from "@app/components/ConfirmDeleteDialog";
 import CopyToClipboard from "@app/components/CopyToClipboard";
-import { Button } from "@app/components/ui/button";
+import { DataTable } from "@app/components/ui/data-table";
 import { ExtendedColumnDef } from "@app/components/ui/data-table";
+import { Button } from "@app/components/ui/button";
 import {
     DropdownMenu,
     DropdownMenuContent,
@@ -13,14 +14,13 @@ import {
 import { InfoPopup } from "@app/components/ui/info-popup";
 import { Switch } from "@app/components/ui/switch";
 import { useEnvContext } from "@app/hooks/useEnvContext";
-import { useNavigationContext } from "@app/hooks/useNavigationContext";
 import { toast } from "@app/hooks/useToast";
 import { createApiClient, formatAxiosError } from "@app/lib/api";
 import { UpdateResourceResponse } from "@server/routers/resource";
-import type { PaginationState } from "@tanstack/react-table";
 import { AxiosResponse } from "axios";
 import {
     ArrowRight,
+    ArrowUpDown,
     CheckCircle2,
     ChevronDown,
     Clock,
@@ -32,24 +32,14 @@ import {
 import { useTranslations } from "next-intl";
 import Link from "next/link";
 import { useRouter } from "next/navigation";
-import {
-    useOptimistic,
-    useRef,
-    useState,
-    useTransition,
-    type ComponentRef
-} from "react";
-import { useDebouncedCallback } from "use-debounce";
-import z from "zod";
-import { ColumnFilterButton } from "./ColumnFilterButton";
-import { ControlledDataTable } from "./ui/controlled-data-table";
+import { useState, useTransition } from "react";
 
 export type TargetHealth = {
     targetId: number;
     ip: string;
     port: number;
     enabled: boolean;
-    healthStatus: "healthy" | "unhealthy" | "unknown" | null;
+    healthStatus?: "healthy" | "unhealthy" | "unknown";
 };
 
 export type ResourceRow = {
@@ -127,22 +117,18 @@ function StatusIcon({
 type ProxyResourcesTableProps = {
     resources: ResourceRow[];
     orgId: string;
-    pagination: PaginationState;
-    rowCount: number;
+    defaultSort?: {
+        id: string;
+        desc: boolean;
+    };
 };
 
 export default function ProxyResourcesTable({
     resources,
     orgId,
-    pagination,
-    rowCount
+    defaultSort
 }: ProxyResourcesTableProps) {
     const router = useRouter();
-    const {
-        navigate: filter,
-        isNavigating: isFiltering,
-        searchParams
-    } = useNavigationContext();
     const t = useTranslations();
 
     const { env } = useEnvContext();
@@ -154,7 +140,6 @@ export default function ProxyResourcesTable({
         useState<ResourceRow | null>();
 
     const [isRefreshing, startTransition] = useTransition();
-    const [isNavigatingToAddPage, startNavigation] = useTransition();
 
     const refreshData = () => {
         startTransition(() => {
@@ -189,24 +174,23 @@ export default function ProxyResourcesTable({
     };
 
     async function toggleResourceEnabled(val: boolean, resourceId: number) {
-        try {
-            await api.post<AxiosResponse<UpdateResourceResponse>>(
+        await api
+            .post<AxiosResponse<UpdateResourceResponse>>(
                 `resource/${resourceId}`,
                 {
                     enabled: val
                 }
-            );
-            router.refresh();
-        } catch (e) {
-            toast({
-                variant: "destructive",
-                title: t("resourcesErrorUpdate"),
-                description: formatAxiosError(
-                    e,
-                    t("resourcesErrorUpdateDescription")
-                )
+            )
+            .catch((e) => {
+                toast({
+                    variant: "destructive",
+                    title: t("resourcesErrorUpdate"),
+                    description: formatAxiosError(
+                        e,
+                        t("resourcesErrorUpdateDescription")
+                    )
+                });
             });
-        }
     }
 
     function TargetStatusCell({ targets }: { targets?: TargetHealth[] }) {
@@ -252,7 +236,7 @@ export default function ProxyResourcesTable({
                         <ChevronDown className="h-3 w-3" />
                     </Button>
                 </DropdownMenuTrigger>
-                <DropdownMenuContent align="start" className="min-w-70">
+                <DropdownMenuContent align="start" className="min-w-[280px]">
                     {monitoredTargets.length > 0 && (
                         <>
                             {monitoredTargets.map((target) => (
@@ -318,14 +302,38 @@ export default function ProxyResourcesTable({
             accessorKey: "name",
             enableHiding: false,
             friendlyName: t("name"),
-            header: () => <span className="p-3">{t("name")}</span>
+            header: ({ column }) => {
+                return (
+                    <Button
+                        variant="ghost"
+                        onClick={() =>
+                            column.toggleSorting(column.getIsSorted() === "asc")
+                        }
+                    >
+                        {t("name")}
+                        <ArrowUpDown className="ml-2 h-4 w-4" />
+                    </Button>
+                );
+            }
         },
         {
             id: "niceId",
             accessorKey: "nice",
             friendlyName: t("identifier"),
             enableHiding: true,
-            header: () => <span className="p-3">{t("identifier")}</span>,
+            header: ({ column }) => {
+                return (
+                    <Button
+                        variant="ghost"
+                        onClick={() =>
+                            column.toggleSorting(column.getIsSorted() === "asc")
+                        }
+                    >
+                        {t("identifier")}
+                        <ArrowUpDown className="ml-2 h-4 w-4" />
+                    </Button>
+                );
+            },
             cell: ({ row }) => {
                 return <span>{row.original.nice || "-"}</span>;
             }
@@ -351,33 +359,19 @@ export default function ProxyResourcesTable({
             id: "status",
             accessorKey: "status",
             friendlyName: t("status"),
-            header: () => (
-                <ColumnFilterButton
-                    options={[
-                        { value: "healthy", label: t("resourcesTableHealthy") },
-                        {
-                            value: "degraded",
-                            label: t("resourcesTableDegraded")
-                        },
-                        { value: "offline", label: t("resourcesTableOffline") },
-                        {
-                            value: "no_targets",
-                            label: t("resourcesTableNoTargets")
-                        },
-                        { value: "unknown", label: t("resourcesTableUnknown") }
-                    ]}
-                    selectedValue={
-                        searchParams.get("healthStatus") ?? undefined
-                    }
-                    onValueChange={(value) =>
-                        handleFilterChange("healthStatus", value)
-                    }
-                    searchPlaceholder={t("searchPlaceholder")}
-                    emptyMessage={t("emptySearchOptions")}
-                    label={t("status")}
-                    className="p-3"
-                />
-            ),
+            header: ({ column }) => {
+                return (
+                    <Button
+                        variant="ghost"
+                        onClick={() =>
+                            column.toggleSorting(column.getIsSorted() === "asc")
+                        }
+                    >
+                        {t("status")}
+                        <ArrowUpDown className="ml-2 h-4 w-4" />
+                    </Button>
+                );
+            },
             cell: ({ row }) => {
                 const resourceRow = row.original;
                 return <TargetStatusCell targets={resourceRow.targets} />;
@@ -425,23 +419,19 @@ export default function ProxyResourcesTable({
         {
             accessorKey: "authState",
             friendlyName: t("authentication"),
-            header: () => (
-                <ColumnFilterButton
-                    options={[
-                        { value: "protected", label: t("protected") },
-                        { value: "not_protected", label: t("notProtected") },
-                        { value: "none", label: t("none") }
-                    ]}
-                    selectedValue={searchParams.get("authState") ?? undefined}
-                    onValueChange={(value) =>
-                        handleFilterChange("authState", value)
-                    }
-                    searchPlaceholder={t("searchPlaceholder")}
-                    emptyMessage={t("emptySearchOptions")}
-                    label={t("authentication")}
-                    className="p-3"
-                />
-            ),
+            header: ({ column }) => {
+                return (
+                    <Button
+                        variant="ghost"
+                        onClick={() =>
+                            column.toggleSorting(column.getIsSorted() === "asc")
+                        }
+                    >
+                        {t("authentication")}
+                        <ArrowUpDown className="ml-2 h-4 w-4" />
+                    </Button>
+                );
+            },
             cell: ({ row }) => {
                 const resourceRow = row.original;
                 return (
@@ -466,28 +456,20 @@ export default function ProxyResourcesTable({
         {
             accessorKey: "enabled",
             friendlyName: t("enabled"),
-            header: () => (
-                <ColumnFilterButton
-                    options={[
-                        { value: "true", label: t("enabled") },
-                        { value: "false", label: t("disabled") }
-                    ]}
-                    selectedValue={booleanSearchFilterSchema.parse(
-                        searchParams.get("enabled")
-                    )}
-                    onValueChange={(value) =>
-                        handleFilterChange("enabled", value)
-                    }
-                    searchPlaceholder={t("searchPlaceholder")}
-                    emptyMessage={t("emptySearchOptions")}
-                    label={t("enabled")}
-                    className="p-3"
-                />
-            ),
+            header: () => <span className="p-3">{t("enabled")}</span>,
             cell: ({ row }) => (
-                <ResourceEnabledForm
-                    resource={row.original}
-                    onToggleResourceEnabled={toggleResourceEnabled}
+                <Switch
+                    defaultChecked={
+                        row.original.http
+                            ? !!row.original.domainId && row.original.enabled
+                            : row.original.enabled
+                    }
+                    disabled={
+                        row.original.http ? !row.original.domainId : false
+                    }
+                    onCheckedChange={(val) =>
+                        toggleResourceEnabled(val, row.original.id)
+                    }
                 />
             )
         },
@@ -543,42 +525,6 @@ export default function ProxyResourcesTable({
         }
     ];
 
-    const booleanSearchFilterSchema = z
-        .enum(["true", "false"])
-        .optional()
-        .catch(undefined);
-
-    function handleFilterChange(
-        column: string,
-        value: string | undefined | null
-    ) {
-        searchParams.delete(column);
-        searchParams.delete("page");
-
-        if (value) {
-            searchParams.set(column, value);
-        }
-        filter({
-            searchParams
-        });
-    }
-
-    const handlePaginationChange = (newPage: PaginationState) => {
-        searchParams.set("page", (newPage.pageIndex + 1).toString());
-        searchParams.set("pageSize", newPage.pageSize.toString());
-        filter({
-            searchParams
-        });
-    };
-
-    const handleSearchChange = useDebouncedCallback((query: string) => {
-        searchParams.set("query", query);
-        searchParams.delete("page");
-        filter({
-            searchParams
-        });
-    }, 300);
-
     return (
         <>
             {selectedResource && (
@@ -601,25 +547,21 @@ export default function ProxyResourcesTable({
                 />
             )}
 
-            <ControlledDataTable
+            <DataTable
                 columns={proxyColumns}
-                rows={resources}
-                tableId="proxy-resources"
+                data={resources}
+                persistPageSize="proxy-resources"
                 searchPlaceholder={t("resourcesSearch")}
-                pagination={pagination}
-                rowCount={rowCount}
-                onSearch={handleSearchChange}
-                onPaginationChange={handlePaginationChange}
+                searchColumn="name"
                 onAdd={() =>
-                    startNavigation(() =>
-                        router.push(`/${orgId}/settings/resources/proxy/create`)
-                    )
+                    router.push(`/${orgId}/settings/resources/proxy/create`)
                 }
                 addButtonText={t("resourceAdd")}
                 onRefresh={refreshData}
-                isRefreshing={isRefreshing || isFiltering}
-                isNavigatingToAddPage={isNavigatingToAddPage}
-                enableColumnVisibility
+                isRefreshing={isRefreshing}
+                defaultSort={defaultSort}
+                enableColumnVisibility={true}
+                persistColumnVisibility="proxy-resources"
                 columnVisibility={{ niceId: false }}
                 stickyLeftColumn="name"
                 stickyRightColumn="actions"
@@ -627,43 +569,3 @@ export default function ProxyResourcesTable({
         </>
     );
 }
-
-type ResourceEnabledFormProps = {
-    resource: ResourceRow;
-    onToggleResourceEnabled: (
-        val: boolean,
-        resourceId: number
-    ) => Promise<void>;
-};
-
-function ResourceEnabledForm({
-    resource,
-    onToggleResourceEnabled
-}: ResourceEnabledFormProps) {
-    const enabled = resource.http
-        ? !!resource.domainId && resource.enabled
-        : resource.enabled;
-    const [optimisticEnabled, setOptimisticEnabled] = useOptimistic(enabled);
-
-    const formRef = useRef<ComponentRef<"form">>(null);
-
-    async function submitAction(formData: FormData) {
-        const newEnabled = !(formData.get("enabled") === "on");
-        setOptimisticEnabled(newEnabled);
-        await onToggleResourceEnabled(newEnabled, resource.id);
-    }
-
-    return (
-        <form action={submitAction} ref={formRef}>
-            <Switch
-                checked={optimisticEnabled}
-                disabled={
-                    (resource.http && !resource.domainId) ||
-                    optimisticEnabled !== enabled
-                }
-                name="enabled"
-                onCheckedChange={() => formRef.current?.requestSubmit()}
-            />
-        </form>
-    );
-}

src/components/SignupForm.tsx

@@ -72,7 +72,6 @@ type SignupFormProps = {
     inviteToken?: string;
     emailParam?: string;
     fromSmartLogin?: boolean;
-    skipVerificationEmail?: boolean;
 };
 
 const formSchema = z
@@ -104,8 +103,7 @@ export default function SignupForm({
     inviteId,
     inviteToken,
     emailParam,
-    fromSmartLogin = false,
-    skipVerificationEmail = false
+    fromSmartLogin = false
 }: SignupFormProps) {
     const router = useRouter();
     const { env } = useEnvContext();
@@ -149,8 +147,7 @@ export default function SignupForm({
                 inviteToken,
                 termsAcceptedTimestamp: termsAgreedAt,
                 marketingEmailConsent:
-                    build === "saas" ? marketingEmailConsent : undefined,
-                skipVerificationEmail: skipVerificationEmail || undefined
+                    build === "saas" ? marketingEmailConsent : undefined
             })
             .catch((e) => {
                 console.error(e);

src/components/SitesDataTable.tsx

@@ -0,0 +1,50 @@
+"use client";
+
+import { ColumnDef } from "@tanstack/react-table";
+import { DataTable } from "@app/components/ui/data-table";
+import { useTranslations } from "next-intl";
+
+interface DataTableProps<TData, TValue> {
+    columns: ColumnDef<TData, TValue>[];
+    data: TData[];
+    createSite?: () => void;
+    onRefresh?: () => void;
+    isRefreshing?: boolean;
+    columnVisibility?: Record<string, boolean>;
+    enableColumnVisibility?: boolean;
+}
+
+export function SitesDataTable<TData, TValue>({
+    columns,
+    data,
+    createSite,
+    onRefresh,
+    isRefreshing,
+    columnVisibility,
+    enableColumnVisibility
+}: DataTableProps<TData, TValue>) {
+    const t = useTranslations();
+
+    return (
+        <DataTable
+            columns={columns}
+            data={data}
+            persistPageSize="sites-table"
+            title={t("sites")}
+            searchPlaceholder={t("searchSitesProgress")}
+            searchColumn="name"
+            onAdd={createSite}
+            addButtonText={t("siteAdd")}
+            onRefresh={onRefresh}
+            isRefreshing={isRefreshing}
+            defaultSort={{
+                id: "name",
+                desc: false
+            }}
+            columnVisibility={columnVisibility}
+            enableColumnVisibility={enableColumnVisibility}
+            stickyLeftColumn="name"
+            stickyRightColumn="actions"
+        />
+    );
+}

src/components/SitesTable.tsx

@@ -1,42 +1,37 @@
 "use client";
 
-import ConfirmDeleteDialog from "@app/components/ConfirmDeleteDialog";
-
-import { Badge } from "@app/components/ui/badge";
-import { Button } from "@app/components/ui/button";
+import { Column, ColumnDef } from "@tanstack/react-table";
+import { ExtendedColumnDef } from "@app/components/ui/data-table";
+import { SitesDataTable } from "@app/components/SitesDataTable";
 import {
     DropdownMenu,
     DropdownMenuContent,
     DropdownMenuItem,
     DropdownMenuTrigger
 } from "@app/components/ui/dropdown-menu";
-import { InfoPopup } from "@app/components/ui/info-popup";
-import { useEnvContext } from "@app/hooks/useEnvContext";
-import { useNavigationContext } from "@app/hooks/useNavigationContext";
-import { getNextSortOrder, getSortDirection } from "@app/lib/sortColumn";
-import { toast } from "@app/hooks/useToast";
-import { createApiClient, formatAxiosError } from "@app/lib/api";
-import { build } from "@server/build";
-import { type PaginationState } from "@tanstack/react-table";
+import { Button } from "@app/components/ui/button";
 import {
-    ArrowDown01Icon,
     ArrowRight,
-    ArrowUp10Icon,
+    ArrowUpDown,
     ArrowUpRight,
-    ChevronsUpDownIcon,
-    MoreHorizontal
+    Check,
+    MoreHorizontal,
+    X
 } from "lucide-react";
-import { useTranslations } from "next-intl";
 import Link from "next/link";
-import { usePathname, useRouter } from "next/navigation";
-import { useState, useTransition } from "react";
-import { useDebouncedCallback } from "use-debounce";
-import z from "zod";
-import { ColumnFilterButton } from "./ColumnFilterButton";
-import {
-    ControlledDataTable,
-    type ExtendedColumnDef
-} from "./ui/controlled-data-table";
+import { useRouter } from "next/navigation";
+import { AxiosResponse } from "axios";
+import { useState, useEffect } 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 { useTranslations } from "next-intl";
+import { parseDataSize } from "@app/lib/dataSize";
+import { Badge } from "@app/components/ui/badge";
+import { InfoPopup } from "@app/components/ui/info-popup";
+import { build } from "@server/build";
 
 export type SiteRow = {
     id: number;
@@ -57,91 +52,79 @@ export type SiteRow = {
 
 type SitesTableProps = {
     sites: SiteRow[];
-    pagination: PaginationState;
     orgId: string;
-    rowCount: number;
 };
 
-export default function SitesTable({
-    sites,
-    orgId,
-    pagination,
-    rowCount
-}: SitesTableProps) {
+export default function SitesTable({ sites, orgId }: SitesTableProps) {
     const router = useRouter();
-    const pathname = usePathname();
-    const {
-        navigate: filter,
-        isNavigating: isFiltering,
-        searchParams
-    } = useNavigationContext();
 
     const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
     const [selectedSite, setSelectedSite] = useState<SiteRow | null>(null);
-    const [isRefreshing, startTransition] = useTransition();
-    const [isNavigatingToAddPage, startNavigation] = useTransition();
+    const [rows, setRows] = useState<SiteRow[]>(sites);
+    const [isRefreshing, setIsRefreshing] = useState(false);
 
     const api = createApiClient(useEnvContext());
     const t = useTranslations();
+    const { env } = useEnvContext();
 
-    const booleanSearchFilterSchema = z
-        .enum(["true", "false"])
-        .optional()
-        .catch(undefined);
+    // Update local state when props change (e.g., after refresh)
+    useEffect(() => {
+        setRows(sites);
+    }, [sites]);
 
-    function handleFilterChange(
-        column: string,
-        value: string | undefined | null
-    ) {
-        const sp = new URLSearchParams(searchParams);
-        sp.delete(column);
-        sp.delete("page");
-
-        if (value) {
-            sp.set(column, value);
+    const refreshData = async () => {
+        console.log("Data refreshed");
+        setIsRefreshing(true);
+        try {
+            await new Promise((resolve) => setTimeout(resolve, 200));
+            router.refresh();
+        } catch (error) {
+            toast({
+                title: t("error"),
+                description: t("refreshError"),
+                variant: "destructive"
+            });
+        } finally {
+            setIsRefreshing(false);
         }
-        startTransition(() => router.push(`${pathname}?${sp.toString()}`));
-    }
+    };
 
-    function refreshData() {
-        startTransition(async () => {
-            try {
-                router.refresh();
-            } catch (error) {
+    const deleteSite = (siteId: number) => {
+        api.delete(`/site/${siteId}`)
+            .catch((e) => {
+                console.error(t("siteErrorDelete"), e);
                 toast({
-                    title: t("error"),
-                    description: t("refreshError"),
-                    variant: "destructive"
+                    variant: "destructive",
+                    title: t("siteErrorDelete"),
+                    description: formatAxiosError(e, t("siteErrorDelete"))
                 });
-            }
-        });
-    }
+            })
+            .then(() => {
+                router.refresh();
+                setIsDeleteModalOpen(false);
 
-    function deleteSite(siteId: number) {
-        startTransition(async () => {
-            await api
-                .delete(`/site/${siteId}`)
-                .catch((e) => {
-                    console.error(t("siteErrorDelete"), e);
-                    toast({
-                        variant: "destructive",
-                        title: t("siteErrorDelete"),
-                        description: formatAxiosError(e, t("siteErrorDelete"))
-                    });
-                })
-                .then(() => {
-                    router.refresh();
-                    setIsDeleteModalOpen(false);
-                });
-        });
-    }
+                const newRows = rows.filter((row) => row.id !== siteId);
+
+                setRows(newRows);
+            });
+    };
 
     const columns: ExtendedColumnDef<SiteRow>[] = [
         {
             accessorKey: "name",
             enableHiding: false,
-            header: () => {
-                return <span className="p-3">{t("name")}</span>;
+            header: ({ column }) => {
+                return (
+                    <Button
+                        variant="ghost"
+                        onClick={() =>
+                            column.toggleSorting(column.getIsSorted() === "asc")
+                        }
+                    >
+                        {t("name")}
+                        <ArrowUpDown className="ml-2 h-4 w-4" />
+                    </Button>
+                );
             }
         },
         {
@@ -149,8 +132,18 @@ export default function SitesTable({
             accessorKey: "nice",
             friendlyName: t("identifier"),
             enableHiding: true,
-            header: () => {
-                return <span className="p-3">{t("identifier")}</span>;
+            header: ({ column }) => {
+                return (
+                    <Button
+                        variant="ghost"
+                        onClick={() =>
+                            column.toggleSorting(column.getIsSorted() === "asc")
+                        }
+                    >
+                        {t("identifier")}
+                        <ArrowUpDown className="ml-2 h-4 w-4" />
+                    </Button>
+                );
             },
             cell: ({ row }) => {
                 return <span>{row.original.nice || "-"}</span>;
@@ -159,24 +152,17 @@ export default function SitesTable({
         {
             accessorKey: "online",
             friendlyName: t("online"),
-            header: () => {
+            header: ({ column }) => {
                 return (
-                    <ColumnFilterButton
-                        options={[
-                            { value: "true", label: t("online") },
-                            { value: "false", label: t("offline") }
-                        ]}
-                        selectedValue={booleanSearchFilterSchema.parse(
-                            searchParams.get("online")
-                        )}
-                        onValueChange={(value) =>
-                            handleFilterChange("online", value)
+                    <Button
+                        variant="ghost"
+                        onClick={() =>
+                            column.toggleSorting(column.getIsSorted() === "asc")
                         }
-                        searchPlaceholder={t("searchPlaceholder")}
-                        emptyMessage={t("emptySearchOptions")}
-                        label={t("online")}
-                        className="p-3"
-                    />
+                    >
+                        {t("online")}
+                        <ArrowUpDown className="ml-2 h-4 w-4" />
+                    </Button>
                 );
             },
             cell: ({ row }) => {
@@ -208,59 +194,58 @@ export default function SitesTable({
         {
             accessorKey: "mbIn",
             friendlyName: t("dataIn"),
-            header: () => {
-                const dataInOrder = getSortDirection(
-                    "megabytesIn",
-                    searchParams
-                );
-                const Icon =
-                    dataInOrder === "asc"
-                        ? ArrowDown01Icon
-                        : dataInOrder === "desc"
-                          ? ArrowUp10Icon
-                          : ChevronsUpDownIcon;
+            header: ({ column }) => {
                 return (
                     <Button
                         variant="ghost"
-                        onClick={() => toggleSort("megabytesIn")}
+                        onClick={() =>
+                            column.toggleSorting(column.getIsSorted() === "asc")
+                        }
                     >
                         {t("dataIn")}
-                        <Icon className="ml-2 h-4 w-4" />
+                        <ArrowUpDown className="ml-2 h-4 w-4" />
                     </Button>
                 );
-            }
+            },
+            sortingFn: (rowA, rowB) =>
+                parseDataSize(rowA.original.mbIn) -
+                parseDataSize(rowB.original.mbIn)
         },
         {
             accessorKey: "mbOut",
             friendlyName: t("dataOut"),
-            header: () => {
-                const dataOutOrder = getSortDirection(
-                    "megabytesOut",
-                    searchParams
-                );
-
-                const Icon =
-                    dataOutOrder === "asc"
-                        ? ArrowDown01Icon
-                        : dataOutOrder === "desc"
-                          ? ArrowUp10Icon
-                          : ChevronsUpDownIcon;
+            header: ({ column }) => {
                 return (
                     <Button
                         variant="ghost"
-                        onClick={() => toggleSort("megabytesOut")}
+                        onClick={() =>
+                            column.toggleSorting(column.getIsSorted() === "asc")
+                        }
                     >
                         {t("dataOut")}
-                        <Icon className="ml-2 h-4 w-4" />
+                        <ArrowUpDown className="ml-2 h-4 w-4" />
                     </Button>
                 );
-            }
+            },
+            sortingFn: (rowA, rowB) =>
+                parseDataSize(rowA.original.mbOut) -
+                parseDataSize(rowB.original.mbOut)
         },
         {
             accessorKey: "type",
             friendlyName: t("type"),
-            header: () => {
-                return <span className="p-3">{t("type")}</span>;
+            header: ({ column }) => {
+                return (
+                    <Button
+                        variant="ghost"
+                        onClick={() =>
+                            column.toggleSorting(column.getIsSorted() === "asc")
+                        }
+                    >
+                        {t("type")}
+                        <ArrowUpDown className="ml-2 h-4 w-4" />
+                    </Button>
+                );
             },
             cell: ({ row }) => {
                 const originalRow = row.original;
@@ -305,8 +290,18 @@ export default function SitesTable({
         {
             accessorKey: "exitNode",
             friendlyName: t("exitNode"),
-            header: () => {
-                return <span className="p-3">{t("exitNode")}</span>;
+            header: ({ column }) => {
+                return (
+                    <Button
+                        variant="ghost"
+                        onClick={() =>
+                            column.toggleSorting(column.getIsSorted() === "asc")
+                        }
+                    >
+                        {t("exitNode")}
+                        <ArrowUpDown className="ml-2 h-4 w-4" />
+                    </Button>
+                );
             },
             cell: ({ row }) => {
                 const originalRow = row.original;
@@ -359,8 +354,18 @@ export default function SitesTable({
         },
         {
             accessorKey: "address",
-            header: () => {
-                return <span className="p-3">{t("address")}</span>;
+            header: ({ column }: { column: Column<SiteRow, unknown> }) => {
+                return (
+                    <Button
+                        variant="ghost"
+                        onClick={() =>
+                            column.toggleSorting(column.getIsSorted() === "asc")
+                        }
+                    >
+                        Address
+                        <ArrowUpDown className="ml-2 h-4 w-4" />
+                    </Button>
+                );
             },
             cell: ({ row }: { row: any }) => {
                 const originalRow = row.original;
@@ -423,30 +428,6 @@ export default function SitesTable({
         }
     ];
 
-    function toggleSort(column: string) {
-        const newSearch = getNextSortOrder(column, searchParams);
-
-        filter({
-            searchParams: newSearch
-        });
-    }
-
-    const handlePaginationChange = (newPage: PaginationState) => {
-        searchParams.set("page", (newPage.pageIndex + 1).toString());
-        searchParams.set("pageSize", newPage.pageSize.toString());
-        filter({
-            searchParams
-        });
-    };
-
-    const handleSearchChange = useDebouncedCallback((query: string) => {
-        searchParams.set("query", query);
-        searchParams.delete("page");
-        filter({
-            searchParams
-        });
-    }, 300);
-
     return (
         <>
             {selectedSite && (
@@ -463,42 +444,27 @@ export default function SitesTable({
                         </div>
                     }
                     buttonText={t("siteConfirmDelete")}
-                    onConfirm={async () =>
-                        startTransition(() => deleteSite(selectedSite!.id))
-                    }
+                    onConfirm={async () => deleteSite(selectedSite!.id)}
                     string={selectedSite.name}
                     title={t("siteDelete")}
                 />
             )}
 
-            <ControlledDataTable
+            <SitesDataTable
                 columns={columns}
-                rows={sites}
-                tableId="sites-table"
-                searchPlaceholder={t("searchSitesProgress")}
-                pagination={pagination}
-                onPaginationChange={handlePaginationChange}
-                onAdd={() =>
-                    startNavigation(() =>
-                        router.push(`/${orgId}/settings/sites/create`)
-                    )
+                data={rows}
+                createSite={() =>
+                    router.push(`/${orgId}/settings/sites/create`)
                 }
-                isNavigatingToAddPage={isNavigatingToAddPage}
-                searchQuery={searchParams.get("query")?.toString()}
-                onSearch={handleSearchChange}
-                addButtonText={t("siteAdd")}
                 onRefresh={refreshData}
-                isRefreshing={isRefreshing || isFiltering}
-                rowCount={rowCount}
+                isRefreshing={isRefreshing}
                 columnVisibility={{
                     niceId: false,
                     nice: false,
                     exitNode: false,
                     address: false
                 }}
-                enableColumnVisibility
-                stickyLeftColumn="name"
-                stickyRightColumn="actions"
+                enableColumnVisibility={true}
             />
         </>
     );

src/components/TanstackQueryProvider.tsx

@@ -1,13 +1,11 @@
 "use client";
+import * as React from "react";
+import { QueryClientProvider } from "@tanstack/react-query";
+import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
+import { QueryClient } from "@tanstack/react-query";
 import { useEnvContext } from "@app/hooks/useEnvContext";
 import { createApiClient } from "@app/lib/api";
-import {
-    keepPreviousData,
-    QueryClient,
-    QueryClientProvider
-} from "@tanstack/react-query";
-import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
-import * as React from "react";
+import { durationToMs } from "@app/lib/durationToMs";
 
 export type ReactQueryProviderProps = {
     children: React.ReactNode;
@@ -24,8 +22,7 @@ export function TanstackQueryProvider({ children }: ReactQueryProviderProps) {
                         staleTime: 0,
                         meta: {
                             api
-                        },
-                        placeholderData: keepPreviousData
+                        }
                     },
                     mutations: {
                         meta: { api }

src/components/UserDevicesTable.tsx

@@ -2,41 +2,34 @@
 
 import ConfirmDeleteDialog from "@app/components/ConfirmDeleteDialog";
 import { Button } from "@app/components/ui/button";
-import { ExtendedColumnDef } from "@app/components/ui/data-table";
+import { DataTable, ExtendedColumnDef } from "@app/components/ui/data-table";
 import {
     DropdownMenu,
     DropdownMenuContent,
     DropdownMenuItem,
     DropdownMenuTrigger
 } from "@app/components/ui/dropdown-menu";
-import { InfoPopup } from "@app/components/ui/info-popup";
 import { useEnvContext } from "@app/hooks/useEnvContext";
-import { useNavigationContext } from "@app/hooks/useNavigationContext";
-import { getNextSortOrder, getSortDirection } from "@app/lib/sortColumn";
 import { toast } from "@app/hooks/useToast";
 import { createApiClient, formatAxiosError } from "@app/lib/api";
-import { formatFingerprintInfo } from "@app/lib/formatDeviceFingerprint";
 import { getUserDisplayName } from "@app/lib/getUserDisplayName";
-import { build } from "@server/build";
-import type { PaginationState } from "@tanstack/react-table";
+import { formatFingerprintInfo, formatPlatform } from "@app/lib/formatDeviceFingerprint";
 import {
-    ArrowDown01Icon,
     ArrowRight,
-    ArrowUp10Icon,
+    ArrowUpDown,
     ArrowUpRight,
-    ChevronsUpDownIcon,
-    CircleSlash,
-    MoreHorizontal
+    MoreHorizontal,
+    CircleSlash
 } from "lucide-react";
 import { useTranslations } from "next-intl";
 import Link from "next/link";
 import { useRouter } from "next/navigation";
 import { useMemo, useState, useTransition } from "react";
-import { useDebouncedCallback } from "use-debounce";
 import ClientDownloadBanner from "./ClientDownloadBanner";
-import { ColumnFilterButton } from "./ColumnFilterButton";
 import { Badge } from "./ui/badge";
-import { ControlledDataTable } from "./ui/controlled-data-table";
+import { build } from "@server/build";
+import { usePaidStatus } from "@app/hooks/usePaidStatus";
+import { InfoPopup } from "@app/components/ui/info-popup";
 
 export type ClientRow = {
     id: number;
@@ -72,15 +65,9 @@ export type ClientRow = {
 type ClientTableProps = {
     userClients: ClientRow[];
     orgId: string;
-    pagination: PaginationState;
-    rowCount: number;
 };
 
-export default function UserDevicesTable({
-    userClients,
-    pagination,
-    rowCount
-}: ClientTableProps) {
+export default function UserDevicesTable({ userClients }: ClientTableProps) {
     const router = useRouter();
     const t = useTranslations();
 
@@ -90,11 +77,6 @@ export default function UserDevicesTable({
     );
 
     const api = createApiClient(useEnvContext());
-    const {
-        navigate: filter,
-        isNavigating: isFiltering,
-        searchParams
-    } = useNavigationContext();
     const [isRefreshing, startTransition] = useTransition();
 
     const defaultUserColumnVisibility = {
@@ -206,12 +188,8 @@ export default function UserDevicesTable({
         try {
             // Fetch approvalId for this client using clientId query parameter
             const approvalsRes = await api.get<{
-                data: {
-                    approvals: Array<{ approvalId: number; clientId: number }>;
-                };
-            }>(
-                `/org/${clientRow.orgId}/approvals?approvalState=pending&clientId=${clientRow.id}`
-            );
+                data: { approvals: Array<{ approvalId: number; clientId: number }> };
+            }>(`/org/${clientRow.orgId}/approvals?approvalState=pending&clientId=${clientRow.id}`);
 
             const approval = approvalsRes.data.data.approvals[0];
 
@@ -224,12 +202,9 @@ export default function UserDevicesTable({
                 return;
             }
 
-            await api.put(
-                `/org/${clientRow.orgId}/approvals/${approval.approvalId}`,
-                {
-                    decision: "approved"
-                }
-            );
+            await api.put(`/org/${clientRow.orgId}/approvals/${approval.approvalId}`, {
+                decision: "approved"
+            });
 
             toast({
                 title: t("accessApprovalUpdated"),
@@ -255,12 +230,8 @@ export default function UserDevicesTable({
         try {
             // Fetch approvalId for this client using clientId query parameter
             const approvalsRes = await api.get<{
-                data: {
-                    approvals: Array<{ approvalId: number; clientId: number }>;
-                };
-            }>(
-                `/org/${clientRow.orgId}/approvals?approvalState=pending&clientId=${clientRow.id}`
-            );
+                data: { approvals: Array<{ approvalId: number; clientId: number }> };
+            }>(`/org/${clientRow.orgId}/approvals?approvalState=pending&clientId=${clientRow.id}`);
 
             const approval = approvalsRes.data.data.approvals[0];
 
@@ -273,12 +244,9 @@ export default function UserDevicesTable({
                 return;
             }
 
-            await api.put(
-                `/org/${clientRow.orgId}/approvals/${approval.approvalId}`,
-                {
-                    decision: "denied"
-                }
-            );
+            await api.put(`/org/${clientRow.orgId}/approvals/${approval.approvalId}`, {
+                decision: "denied"
+            });
 
             toast({
                 title: t("accessApprovalUpdated"),
@@ -311,7 +279,21 @@ export default function UserDevicesTable({
                 accessorKey: "name",
                 enableHiding: false,
                 friendlyName: t("name"),
-                header: () => <span className="px-3">{t("name")}</span>,
+                header: ({ column }) => {
+                    return (
+                        <Button
+                            variant="ghost"
+                            onClick={() =>
+                                column.toggleSorting(
+                                    column.getIsSorted() === "asc"
+                                )
+                            }
+                        >
+                            {t("name")}
+                            <ArrowUpDown className="ml-2 h-4 w-4" />
+                        </Button>
+                    );
+                },
                 cell: ({ row }) => {
                     const r = row.original;
                     const fingerprintInfo = r.fingerprint
@@ -361,12 +343,40 @@ export default function UserDevicesTable({
             {
                 accessorKey: "niceId",
                 friendlyName: t("identifier"),
-                header: () => <span className="px-3">{t("identifier")}</span>
+                header: ({ column }) => {
+                    return (
+                        <Button
+                            variant="ghost"
+                            onClick={() =>
+                                column.toggleSorting(
+                                    column.getIsSorted() === "asc"
+                                )
+                            }
+                        >
+                            {t("identifier")}
+                            <ArrowUpDown className="ml-2 h-4 w-4" />
+                        </Button>
+                    );
+                }
             },
             {
                 accessorKey: "userEmail",
                 friendlyName: t("users"),
-                header: () => <span className="px-3">{t("users")}</span>,
+                header: ({ column }) => {
+                    return (
+                        <Button
+                            variant="ghost"
+                            onClick={() =>
+                                column.toggleSorting(
+                                    column.getIsSorted() === "asc"
+                                )
+                            }
+                        >
+                            {t("users")}
+                            <ArrowUpDown className="ml-2 h-4 w-4" />
+                        </Button>
+                    );
+                },
                 cell: ({ row }) => {
                     const r = row.original;
                     return r.userId ? (
@@ -388,31 +398,20 @@ export default function UserDevicesTable({
             },
             {
                 accessorKey: "online",
-                friendlyName: t("online"),
-                header: () => {
+                friendlyName: t("connectivity"),
+                header: ({ column }) => {
                     return (
-                        <ColumnFilterButton
-                            options={[
-                                {
-                                    value: "true",
-                                    label: t("connected")
-                                },
-                                {
-                                    value: "false",
-                                    label: t("disconnected")
-                                }
-                            ]}
-                            selectedValue={
-                                searchParams.get("online") ?? undefined
+                        <Button
+                            variant="ghost"
+                            onClick={() =>
+                                column.toggleSorting(
+                                    column.getIsSorted() === "asc"
+                                )
                             }
-                            onValueChange={(value) =>
-                                handleFilterChange("online", value)
-                            }
-                            searchPlaceholder={t("searchPlaceholder")}
-                            emptyMessage={t("emptySearchOptions")}
-                            label={t("online")}
-                            className="p-3"
-                        />
+                        >
+                            {t("online")}
+                            <ArrowUpDown className="ml-2 h-4 w-4" />
+                        </Button>
                     );
                 },
                 cell: ({ row }) => {
@@ -437,25 +436,18 @@ export default function UserDevicesTable({
             {
                 accessorKey: "mbIn",
                 friendlyName: t("dataIn"),
-                header: () => {
-                    const dataInOrder = getSortDirection(
-                        "megabytesIn",
-                        searchParams
-                    );
-
-                    const Icon =
-                        dataInOrder === "asc"
-                            ? ArrowDown01Icon
-                            : dataInOrder === "desc"
-                              ? ArrowUp10Icon
-                              : ChevronsUpDownIcon;
+                header: ({ column }) => {
                     return (
                         <Button
                             variant="ghost"
-                            onClick={() => toggleSort("megabytesIn")}
+                            onClick={() =>
+                                column.toggleSorting(
+                                    column.getIsSorted() === "asc"
+                                )
+                            }
                         >
                             {t("dataIn")}
-                            <Icon className="ml-2 h-4 w-4" />
+                            <ArrowUpDown className="ml-2 h-4 w-4" />
                         </Button>
                     );
                 }
@@ -463,25 +455,18 @@ export default function UserDevicesTable({
             {
                 accessorKey: "mbOut",
                 friendlyName: t("dataOut"),
-                header: () => {
-                    const dataOutOrder = getSortDirection(
-                        "megabytesOut",
-                        searchParams
-                    );
-
-                    const Icon =
-                        dataOutOrder === "asc"
-                            ? ArrowDown01Icon
-                            : dataOutOrder === "desc"
-                              ? ArrowUp10Icon
-                              : ChevronsUpDownIcon;
+                header: ({ column }) => {
                     return (
                         <Button
                             variant="ghost"
-                            onClick={() => toggleSort("megabytesOut")}
+                            onClick={() =>
+                                column.toggleSorting(
+                                    column.getIsSorted() === "asc"
+                                )
+                            }
                         >
                             {t("dataOut")}
-                            <Icon className="ml-2 h-4 w-4" />
+                            <ArrowUpDown className="ml-2 h-4 w-4" />
                         </Button>
                     );
                 }
@@ -489,52 +474,21 @@ export default function UserDevicesTable({
             {
                 accessorKey: "client",
                 friendlyName: t("agent"),
-                header: () => (
-                    <ColumnFilterButton
-                        options={[
-                            {
-                                value: "macos",
-                                label: "Pangolin macOS"
-                            },
-                            {
-                                value: "ios",
-                                label: "Pangolin iOS"
-                            },
-                            {
-                                value: "ipados",
-                                label: "Pangolin iPadOS"
-                            },
-                            {
-                                value: "android",
-                                label: "Pangolin Android"
-                            },
-                            {
-                                value: "windows",
-                                label: "Pangolin Windows"
-                            },
-                            {
-                                value: "cli",
-                                label: "Pangolin CLI"
-                            },
-                            {
-                                value: "olm",
-                                label: "Olm CLI"
-                            },
-                            {
-                                value: "unknown",
-                                label: t("unknown")
+                header: ({ column }) => {
+                    return (
+                        <Button
+                            variant="ghost"
+                            onClick={() =>
+                                column.toggleSorting(
+                                    column.getIsSorted() === "asc"
+                                )
                             }
-                        ]}
-                        selectedValue={searchParams.get("agent") ?? undefined}
-                        onValueChange={(value) =>
-                            handleFilterChange("agent", value)
-                        }
-                        searchPlaceholder={t("searchPlaceholder")}
-                        emptyMessage={t("emptySearchOptions")}
-                        label={t("agent")}
-                        className="p-3"
-                    />
-                ),
+                        >
+                            {t("agent")}
+                            <ArrowUpDown className="ml-2 h-4 w-4" />
+                        </Button>
+                    );
+                },
                 cell: ({ row }) => {
                     const originalRow = row.original;
 
@@ -560,7 +514,21 @@ export default function UserDevicesTable({
             {
                 accessorKey: "subnet",
                 friendlyName: t("address"),
-                header: () => <span className="px-3">{t("address")}</span>
+                header: ({ column }) => {
+                    return (
+                        <Button
+                            variant="ghost"
+                            onClick={() =>
+                                column.toggleSorting(
+                                    column.getIsSorted() === "asc"
+                                )
+                            }
+                        >
+                            {t("address")}
+                            <ArrowUpDown className="ml-2 h-4 w-4" />
+                        </Button>
+                    );
+                }
             }
         ];
 
@@ -580,25 +548,20 @@ export default function UserDevicesTable({
                                 </Button>
                             </DropdownMenuTrigger>
                             <DropdownMenuContent align="end">
-                                {clientRow.approvalState === "pending" &&
-                                    build !== "oss" && (
-                                        <>
-                                            <DropdownMenuItem
-                                                onClick={() =>
-                                                    approveDevice(clientRow)
-                                                }
-                                            >
-                                                <span>{t("approve")}</span>
-                                            </DropdownMenuItem>
-                                            <DropdownMenuItem
-                                                onClick={() =>
-                                                    denyDevice(clientRow)
-                                                }
-                                            >
-                                                <span>{t("deny")}</span>
-                                            </DropdownMenuItem>
-                                        </>
-                                    )}
+                                {clientRow.approvalState === "pending" && (
+                                    <>
+                                        <DropdownMenuItem
+                                            onClick={() => approveDevice(clientRow)}
+                                        >
+                                            <span>{t("approve")}</span>
+                                        </DropdownMenuItem>
+                                        <DropdownMenuItem
+                                            onClick={() => denyDevice(clientRow)}
+                                        >
+                                            <span>{t("deny")}</span>
+                                        </DropdownMenuItem>
+                                    </>
+                                )}
                                 <DropdownMenuItem
                                     onClick={() => {
                                         if (clientRow.archived) {
@@ -658,7 +621,7 @@ export default function UserDevicesTable({
         });
 
         return baseColumns;
-    }, [hasRowsWithoutUserId, t, getSortDirection, toggleSort]);
+    }, [hasRowsWithoutUserId, t]);
 
     const statusFilterOptions = useMemo(() => {
         const allOptions = [
@@ -689,59 +652,12 @@ export default function UserDevicesTable({
             }
         ];
 
-        if (build === "oss") {
-            return allOptions.filter(
-                (option) =>
-                    option.value !== "pending" && option.value !== "denied"
-            );
-        }
-
         return allOptions;
     }, [t]);
 
-    function handleFilterChange(
-        column: string,
-        value: string | null | undefined | string[]
-    ) {
-        searchParams.delete(column);
-        searchParams.delete("page");
-
-        if (typeof value === "string") {
-            searchParams.set(column, value);
-        } else if (value) {
-            for (const val of value) {
-                searchParams.append(column, val);
-            }
-        }
-
-        filter({
-            searchParams
-        });
-    }
-
-    function toggleSort(column: string) {
-        const newSearch = getNextSortOrder(column, searchParams);
-
-        filter({
-            searchParams: newSearch
-        });
-    }
-
-    const handlePaginationChange = (newPage: PaginationState) => {
-        searchParams.set("page", (newPage.pageIndex + 1).toString());
-        searchParams.set("pageSize", newPage.pageSize.toString());
-        filter({
-            searchParams
-        });
-    };
-
-    const handleSearchChange = useDebouncedCallback((query: string) => {
-        searchParams.set("query", query);
-        searchParams.delete("page");
-        filter({
-            searchParams
-        });
-    }, 300);
+    const statusFilterDefaultValues = useMemo(() => {
+        return ["active", "pending"];
+    }, []);
 
     return (
         <>
@@ -766,19 +682,17 @@ export default function UserDevicesTable({
             )}
             <ClientDownloadBanner />
 
-            <ControlledDataTable
+            <DataTable
                 columns={columns}
-                rows={userClients || []}
-                tableId="user-clients"
+                data={userClients || []}
+                persistPageSize="user-clients"
                 searchPlaceholder={t("resourcesSearch")}
+                searchColumn="name"
                 onRefresh={refreshData}
-                isRefreshing={isRefreshing || isFiltering}
-                enableColumnVisibility
+                isRefreshing={isRefreshing}
+                enableColumnVisibility={true}
+                persistColumnVisibility="user-clients"
                 columnVisibility={defaultUserColumnVisibility}
-                onSearch={handleSearchChange}
-                onPaginationChange={handlePaginationChange}
-                pagination={pagination}
-                rowCount={rowCount}
                 stickyLeftColumn="name"
                 stickyRightColumn="actions"
                 filters={[
@@ -788,10 +702,41 @@ export default function UserDevicesTable({
                         multiSelect: true,
                         displayMode: "calculated",
                         options: statusFilterOptions,
-                        onValueChange: (selectedValues: string[]) => {
-                            handleFilterChange("status", selectedValues);
+                        filterFn: (
+                            row: ClientRow,
+                            selectedValues: (string | number | boolean)[]
+                        ) => {
+                            if (selectedValues.length === 0) return true;
+                            const rowArchived = row.archived;
+                            const rowBlocked = row.blocked;
+                            const approvalState = row.approvalState;
+                            const isActive = !rowArchived && !rowBlocked && approvalState !== "pending" && approvalState !== "denied";
+
+                            if (selectedValues.includes("active") && isActive)
+                                return true;
+                            if (
+                                selectedValues.includes("pending") &&
+                                approvalState === "pending"
+                            )
+                                return true;
+                            if (
+                                selectedValues.includes("denied") &&
+                                approvalState === "denied"
+                            )
+                                return true;
+                            if (
+                                selectedValues.includes("archived") &&
+                                rowArchived
+                            )
+                                return true;
+                            if (
+                                selectedValues.includes("blocked") &&
+                                rowBlocked
+                            )
+                                return true;
+                            return false;
                         },
-                        values: searchParams.getAll("status")
+                        defaultValues: statusFilterDefaultValues
                     }
                 ]}
             />

src/components/resource-target-address-item.tsx

@@ -20,7 +20,6 @@ import {
 import { Input } from "./ui/input";
 import { Popover, PopoverContent, PopoverTrigger } from "./ui/popover";
 import { Select, SelectContent, SelectItem, SelectTrigger } from "./ui/select";
-import { useEffect } from "react";
 
 type SiteWithUpdateAvailable = ListSitesResponse["sites"][number];