calvin.erfmann/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-07-12 17:02:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Standardize db rebuildClientAssociationsFromClient

Browse Source
This commit is contained in:
Owen
2026-06-23 15:45:02 -04:00
parent a9b7cce49b
commit c11d24e10a
12 changed files with 51 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/lib/calculateUserClientsForOrgs.ts
+1 -1
View File
@@ -42,7 +42,7 @@ function runQueuedClientAssociationRebuilds(
void (async () => { void (async () => {
for (const client of uniqueClientsById.values()) { for (const client of uniqueClientsById.values()) {
try { try {
await rebuildClientAssociationsFromClient(client, db); await rebuildClientAssociationsFromClient(client);
} catch (error) { } catch (error) {
logger.error( logger.error(
`Failed rebuilding associations for client ${client.clientId} (user ${userId}): ${String(error)}` `Failed rebuilding associations for client ${client.clientId} (user ${userId}): ${String(error)}`
server/lib/rebuildClientAssociations.ts
+3 -3
View File
@@ -1043,9 +1043,9 @@ async function handleSubnetProxyTargetUpdates(
} }
export async function rebuildClientAssociationsFromClient( export async function rebuildClientAssociationsFromClient(
client: Client, client: Client
trx: Transaction | typeof db = db
): Promise<void> { ): Promise<void> {
const trx = primaryDb;
try { try {
return await lockManager.withLock( return await lockManager.withLock(
`rebuild-client-associations:client:${client.clientId}`, `rebuild-client-associations:client:${client.clientId}`,
@@ -2137,7 +2137,7 @@ export function startRebuildQueueProcessor(): void {
return; return;
} }
await rebuildClientAssociationsFromClient(client, primaryDb); await rebuildClientAssociationsFromClient(client);
} }
}); });
} }
server/private/routers/user/addUserRole.ts
+5 -7
View File
@@ -163,13 +163,11 @@ export async function addUserRole(
}); });
for (const orgClient of orgClientsToRebuild) { for (const orgClient of orgClientsToRebuild) {
rebuildClientAssociationsFromClient(orgClient, primaryDb).catch( rebuildClientAssociationsFromClient(orgClient).catch((e) => {
(e) => { logger.error(
logger.error( `Failed to rebuild client associations for client ${orgClient.clientId} after adding role: ${e}`
`Failed to rebuild client associations for client ${orgClient.clientId} after adding role: ${e}` );
); });
}
);
} }
return response(res, { return response(res, {
server/private/routers/user/removeUserRole.ts
+5 -7
View File
@@ -170,13 +170,11 @@ export async function removeUserRole(
}); });
for (const orgClient of orgClientsToRebuild) { for (const orgClient of orgClientsToRebuild) {
rebuildClientAssociationsFromClient(orgClient, primaryDb).catch( rebuildClientAssociationsFromClient(orgClient).catch((e) => {
(e) => { logger.error(
logger.error( `Failed to rebuild client associations for client ${orgClient.clientId} after removing role: ${e}`
`Failed to rebuild client associations for client ${orgClient.clientId} after removing role: ${e}` );
); });
}
);
} }
return response(res, { return response(res, {
server/private/routers/user/setUserOrgRoles.ts
+5 -7
View File
@@ -150,13 +150,11 @@ export async function setUserOrgRoles(
}); });
for (const orgClient of orgClientsToRebuild) { for (const orgClient of orgClientsToRebuild) {
rebuildClientAssociationsFromClient(orgClient, primaryDb).catch( rebuildClientAssociationsFromClient(orgClient).catch((e) => {
(e) => { logger.error(
logger.error( `Failed to rebuild client associations for client ${orgClient.clientId} after setting roles: ${e}`
`Failed to rebuild client associations for client ${orgClient.clientId} after setting roles: ${e}` );
); });
}
);
} }
return response(res, { return response(res, {
server/routers/client/createClient.ts
+5 -7
View File
@@ -280,13 +280,11 @@ export async function createClient(
}); });
if (newClient) { if (newClient) {
rebuildClientAssociationsFromClient(newClient, primaryDb).catch( rebuildClientAssociationsFromClient(newClient).catch((e) => {
(e) => { logger.error(
logger.error( `Failed to rebuild client associations after creating client: ${e}`
`Failed to rebuild client associations after creating client: ${e}` );
); });
}
);
} }
return response<CreateClientResponse>(res, { return response<CreateClientResponse>(res, {
server/routers/client/createUserClient.ts
+5 -7
View File
@@ -255,13 +255,11 @@ export async function createUserClient(
}); });
if (newClient) { if (newClient) {
rebuildClientAssociationsFromClient(newClient, primaryDb).catch( rebuildClientAssociationsFromClient(newClient).catch((e) => {
(e) => { logger.error(
logger.error( `Failed to rebuild client associations after creating user client: ${e}`
`Failed to rebuild client associations after creating user client: ${e}` );
); });
}
);
} }
return response<CreateClientAndOlmResponse>(res, { return response<CreateClientAndOlmResponse>(res, {
server/routers/client/deleteClient.ts
+5 -7
View File
@@ -109,13 +109,11 @@ export async function deleteClient(
}); });
if (deletedClient) { if (deletedClient) {
rebuildClientAssociationsFromClient(deletedClient, primaryDb).catch( rebuildClientAssociationsFromClient(deletedClient).catch((e) => {
(e) => { logger.error(
logger.error( `Failed to rebuild client associations after deleting client ${clientId}: ${e}`
`Failed to rebuild client associations after deleting client ${clientId}: ${e}` );
); });
}
);
if (olm) { if (olm) {
sendTerminateClient( sendTerminateClient(
deletedClient.clientId, deletedClient.clientId,
server/routers/client/rebuildClientAssociationsCacheRoute.ts
+6 -2
View File
@@ -60,13 +60,17 @@ export async function rebuildClientAssociationsCacheRoute(
); );
} }
await rebuildClientAssociationsFromClient(client); rebuildClientAssociationsFromClient(client).catch((e) => {
logger.error(
`Failed to rebuild client associations for client ${clientId}: ${e}`
);
});
return response(res, { return response(res, {
data: null, data: null,
success: true, success: true,
error: false, error: false,
message: "Client association cache rebuilt successfully", message: "Client association cache queued successfully",
status: HttpCode.OK status: HttpCode.OK
}); });
} catch (error) { } catch (error) {
server/routers/olm/deleteUserOlm.ts
+5 -7
View File
@@ -86,13 +86,11 @@ export async function deleteUserOlm(
}); });
if (deletedClient) { if (deletedClient) {
rebuildClientAssociationsFromClient(deletedClient, primaryDb).catch( rebuildClientAssociationsFromClient(deletedClient).catch((e) => {
(e) => { logger.error(
logger.error( `Failed to rebuild client-site associations after deleting OLM ${olmId}: ${e}`
`Failed to rebuild client-site associations after deleting OLM ${olmId}: ${e}` );
); });
}
);
sendTerminateClient( sendTerminateClient(
deletedClient.clientId, deletedClient.clientId,
OlmErrorCodes.TERMINATED_DELETED, OlmErrorCodes.TERMINATED_DELETED,
server/routers/siteResource/batchAddClientToSiteResources.ts
+1 -1
View File
@@ -235,7 +235,7 @@ export async function batchAddClientToSiteResources(
} }
}); });
rebuildClientAssociationsFromClient(client, primaryDb).catch((e) => { rebuildClientAssociationsFromClient(client).catch((e) => {
logger.error( logger.error(
`Failed to rebuild client associations after batch adding site resources for client ${clientId}: ${e}` `Failed to rebuild client associations after batch adding site resources for client ${clientId}: ${e}`
); );
server/routers/user/addUserRoleLegacy.ts
+5 -7
View File
@@ -159,13 +159,11 @@ export async function addUserRoleLegacy(
}); });
for (const orgClient of orgClientsToRebuild) { for (const orgClient of orgClientsToRebuild) {
rebuildClientAssociationsFromClient(orgClient, primaryDb).catch( rebuildClientAssociationsFromClient(orgClient).catch((e) => {
(e) => { logger.error(
logger.error( `Failed to rebuild client associations for client ${orgClient.clientId} after adding role: ${e}`
`Failed to rebuild client associations for client ${orgClient.clientId} after adding role: ${e}` );
); });
}
);
} }
return response(res, { return response(res, {