From dfe4314a5b4ff465dec491ffba18b56bbd3f0591 Mon Sep 17 00:00:00 2001
From: Fred KISSIE <fredkiss3@gmail.com>
Date: Fri, 25 Sep 2026 21:10:52 +0200
Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactor?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/routers/idp/validateOidcCallback.ts | 65 +++++++++++-----------
 1 file changed, 32 insertions(+), 33 deletions(-)

diff --git a/server/routers/idp/validateOidcCallback.ts b/server/routers/idp/validateOidcCallback.ts
index 57b16964d..1498e23a7 100644
--- a/server/routers/idp/validateOidcCallback.ts
+++ b/server/routers/idp/validateOidcCallback.ts
@@ -1,45 +1,44 @@
-import { Request, Response, NextFunction } from "express";
-import { z } from "zod";
-import { db, Org, primaryDb } 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 {
-    idp,
-    idpOidcConfig,
-    idpOrg,
-    orgs,
-    Role,
-    roles,
-    userOrgRoles,
-    userOrgs,
-    users
-} from "@server/db";
-import { and, eq, inArray } from "drizzle-orm";
-import * as arctic from "arctic";
-import { generateOidcRedirectUrl } from "@server/lib/idp/generateRedirectUrl";
-import jmespath from "jmespath";
-import jsonwebtoken from "jsonwebtoken";
-import config from "@server/lib/config";
+import { isLicensedOrSubscribed } from "#dynamic/lib/isLicencedOrSubscribed";
+import { unwrapRoleMapping } from "@app/lib/idpRoleMapping";
 import {
     createSession,
     generateId,
     generateSessionToken,
     serializeSessionCookie
 } from "@server/auth/sessions/app";
-import { decrypt } from "@server/lib/crypto";
-import { UserType } from "@server/types/UserTypes";
-import { LimitId } from "@server/lib/billing";
-import { usageService } from "@server/lib/billing/usageService";
 import { build } from "@server/build";
-import { calculateUserClientsForOrgs } from "@server/lib/calculateUserClientsForOrgs";
-import { isSubscribed } from "#dynamic/lib/isSubscribed";
-import { isLicensedOrSubscribed } from "#dynamic/lib/isLicencedOrSubscribed";
+import {
+    db,
+    idp,
+    idpOidcConfig,
+    idpOrg,
+    Org,
+    orgs,
+    roles,
+    userOrgRoles,
+    userOrgs,
+    users
+} from "@server/db";
+import { LimitId } from "@server/lib/billing";
 import { tierMatrix } from "@server/lib/billing/tierMatrix";
+import { usageService } from "@server/lib/billing/usageService";
+import { calculateUserClientsForOrgs } from "@server/lib/calculateUserClientsForOrgs";
+import config from "@server/lib/config";
+import { decrypt } from "@server/lib/crypto";
+import { generateOidcRedirectUrl } from "@server/lib/idp/generateRedirectUrl";
+import response from "@server/lib/response";
 import { assignUserToOrg, removeUserFromOrg } from "@server/lib/userOrg";
-import { unwrapRoleMapping } from "@app/lib/idpRoleMapping";
+import logger from "@server/logger";
+import HttpCode from "@server/types/HttpCode";
+import { UserType } from "@server/types/UserTypes";
+import * as arctic from "arctic";
+import { and, eq, inArray } from "drizzle-orm";
+import { NextFunction, Request, Response } from "express";
+import createHttpError from "http-errors";
+import jmespath from "jmespath";
+import jsonwebtoken from "jsonwebtoken";
+import { z } from "zod";
+import { fromError } from "zod-validation-error";
 
 const ensureTrailingSlash = (url: string): string => {
     return url;