From 0e649883cb94a5fe85381138b509627fe829ea39 Mon Sep 17 00:00:00 2001
From: Owen <owen@txv.io>
Date: Wed, 29 Oct 2025 17:21:32 -0700
Subject: [PATCH] More bugfixes

---
 server/private/lib/logAccessAudit.ts         | 4 ++--
 server/private/middlewares/logActionAudit.ts | 4 ++--
 server/routers/badger/logRequestAudit.ts     | 4 ++--
 server/routers/org/updateOrg.ts              | 7 ++++++-
 server/setup/scriptsPg/1.12.0.ts             | 2 +-
 src/components/DomainsTable.tsx              | 6 ++----
 6 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/server/private/lib/logAccessAudit.ts b/server/private/lib/logAccessAudit.ts
index 03d11312..72f81069 100644
--- a/server/private/lib/logAccessAudit.ts
+++ b/server/private/lib/logAccessAudit.ts
@@ -52,7 +52,7 @@ export async function cleanUpOldLogs(orgId: string, retentionDays: number) {
     const cutoffTimestamp = now - retentionDays * 24 * 60 * 60;
 
     try {
-        const deleteResult = await db
+        await db
             .delete(accessAuditLog)
             .where(
                 and(
@@ -62,7 +62,7 @@ export async function cleanUpOldLogs(orgId: string, retentionDays: number) {
             );
 
         logger.debug(
-            `Cleaned up ${deleteResult.changes} access audit logs older than ${retentionDays} days`
+            `Cleaned up access audit logs older than ${retentionDays} days`
         );
     } catch (error) {
         logger.error("Error cleaning up old action audit logs:", error);
diff --git a/server/private/middlewares/logActionAudit.ts b/server/private/middlewares/logActionAudit.ts
index 7a73ed07..33051c3b 100644
--- a/server/private/middlewares/logActionAudit.ts
+++ b/server/private/middlewares/logActionAudit.ts
@@ -51,7 +51,7 @@ export async function cleanUpOldLogs(orgId: string, retentionDays: number) {
     const cutoffTimestamp = now - retentionDays * 24 * 60 * 60;
 
     try {
-        const deleteResult = await db
+        await db
             .delete(actionAuditLog)
             .where(
                 and(
@@ -61,7 +61,7 @@ export async function cleanUpOldLogs(orgId: string, retentionDays: number) {
             );
 
         logger.debug(
-            `Cleaned up ${deleteResult.changes} action audit logs older than ${retentionDays} days`
+            `Cleaned up action audit logs older than ${retentionDays} days`
         );
     } catch (error) {
         logger.error("Error cleaning up old action audit logs:", error);
diff --git a/server/routers/badger/logRequestAudit.ts b/server/routers/badger/logRequestAudit.ts
index 3416b77d..6beb52c6 100644
--- a/server/routers/badger/logRequestAudit.ts
+++ b/server/routers/badger/logRequestAudit.ts
@@ -60,7 +60,7 @@ export async function cleanUpOldLogs(orgId: string, retentionDays: number) {
     const cutoffTimestamp = now - retentionDays * 24 * 60 * 60;
 
     try {
-        const deleteResult = await db
+        await db
             .delete(requestAuditLog)
             .where(
                 and(
@@ -70,7 +70,7 @@ export async function cleanUpOldLogs(orgId: string, retentionDays: number) {
             );
 
         logger.debug(
-            `Cleaned up ${deleteResult.changes} request audit logs older than ${retentionDays} days`
+            `Cleaned up request audit logs older than ${retentionDays} days`
         );
     } catch (error) {
         logger.error("Error cleaning up old request audit logs:", error);
diff --git a/server/routers/org/updateOrg.ts b/server/routers/org/updateOrg.ts
index a1739371..7cfe072d 100644
--- a/server/routers/org/updateOrg.ts
+++ b/server/routers/org/updateOrg.ts
@@ -10,10 +10,10 @@ import logger from "@server/logger";
 import { fromError } from "zod-validation-error";
 import { OpenAPITags, registry } from "@server/openApi";
 import { build } from "@server/build";
-import { UserType } from "@server/types/UserTypes";
 import license from "#dynamic/license/license";
 import { getOrgTierData } from "#dynamic/lib/billing";
 import { TierId } from "@server/lib/billing/tiers";
+import { cache } from "@server/lib/cache";
 
 const updateOrgParamsSchema = z
     .object({
@@ -138,6 +138,11 @@ export async function updateOrg(
             );
         }
 
+        // invalidate the cache for all of the orgs retention days
+        cache.del(`org_${orgId}_retentionDays`);
+        cache.del(`org_${orgId}_actionDays`);
+        cache.del(`org_${orgId}_accessDays`);
+
         return response(res, {
             data: updatedOrg[0],
             success: true,
diff --git a/server/setup/scriptsPg/1.12.0.ts b/server/setup/scriptsPg/1.12.0.ts
index 4476b37b..7f07694c 100644
--- a/server/setup/scriptsPg/1.12.0.ts
+++ b/server/setup/scriptsPg/1.12.0.ts
@@ -119,7 +119,7 @@ export default async function migration() {
             // insert two records into the dnsRecords table for each domain
             await db.execute(sql`
                 INSERT INTO "dnsRecords" ("domainId", "recordType", "baseDomain", "value", "verified")
-                VALUES (${domain.domainId}, 'A', ${`*.${domain.baseDomain}`}, ${'Server IP Address'}, true)
+                VALUES (${"*." + domain.domainId}, 'A', ${`*.${domain.baseDomain}`}, ${'Server IP Address'}, true)
             `);
             await db.execute(sql`
                 INSERT INTO "dnsRecords" ("domainId", "recordType", "baseDomain", "value", "verified")
diff --git a/src/components/DomainsTable.tsx b/src/components/DomainsTable.tsx
index 492daa81..ef6bd615 100644
--- a/src/components/DomainsTable.tsx
+++ b/src/components/DomainsTable.tsx
@@ -186,10 +186,8 @@ export default function DomainsTable({ domains, orgId }: Props) {
             cell: ({ row }) => {
                 const { verified, failed, type } = row.original;
                 if (verified) {
-                    type === "wildcard" ? (
-                        <Badge variant="outlinePrimary">
-                            {t("manual", { fallback: "Manual" })}
-                        </Badge>
+                    return type == "wildcard" ? (
+                        <Badge variant="outlinePrimary">{t("manual")}</Badge>
                     ) : (
                         <Badge variant="green">{t("verified")}</Badge>
                     );