From 5d9cb9fa217de1ed0ff089002f1beb7133e07526 Mon Sep 17 00:00:00 2001 From: miloschwartz Date: Sat, 24 Jan 2026 11:11:25 -0800 Subject: [PATCH] fix clear olmId from client on archive --- server/routers/olm/archiveUserOlm.ts | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/server/routers/olm/archiveUserOlm.ts b/server/routers/olm/archiveUserOlm.ts index b1a7bb4d..cdb7a5a0 100644 --- a/server/routers/olm/archiveUserOlm.ts +++ b/server/routers/olm/archiveUserOlm.ts @@ -1,6 +1,6 @@ import { NextFunction, Request, Response } from "express"; import { db } from "@server/db"; -import { olms, clients } from "@server/db"; +import { olms } from "@server/db"; import { eq } from "drizzle-orm"; import HttpCode from "@server/types/HttpCode"; import createHttpError from "http-errors"; @@ -8,9 +8,6 @@ import response from "@server/lib/response"; import { z } from "zod"; import { fromError } from "zod-validation-error"; import logger from "@server/logger"; -import { rebuildClientAssociationsFromClient } from "@server/lib/rebuildClientAssociations"; -import { sendTerminateClient } from "../client/terminate"; -import { OlmErrorCodes } from "./error"; const paramsSchema = z .object({ @@ -37,26 +34,7 @@ export async function archiveUserOlm( const { olmId } = parsedParams.data; - // Archive the OLM and disconnect associated clients in a transaction await db.transaction(async (trx) => { - // Find all clients associated with this OLM - const associatedClients = await trx - .select() - .from(clients) - .where(eq(clients.olmId, olmId)); - - // Disconnect clients from the OLM (set olmId to null) - for (const client of associatedClients) { - await trx - .update(clients) - .set({ olmId: null }) - .where(eq(clients.clientId, client.clientId)); - - await rebuildClientAssociationsFromClient(client, trx); - await sendTerminateClient(client.clientId, OlmErrorCodes.TERMINATED_ARCHIVED, olmId); - } - - // Archive the OLM (set archived to true) await trx .update(olms) .set({ archived: true })