remove usages of userApi

codegouvfr · Dec 11, 2024 · b9fea1e · b9fea1e
1 parent bf50208
commit b9fea1e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 27 deletions.
diff --git a/api/src/core/adapters/dbApi/kysely/createPgAgentRepository.ts b/api/src/core/adapters/dbApi/kysely/createPgAgentRepository.ts
@@ -38,6 +38,12 @@ export const createPgAgentRepository = (db: Kysely<Database>): AgentRepository =
                     declarations: [...usersDeclarations, ...referentsDeclarations]
                 }))
             ),
+    countAll: () =>
+        db
+            .selectFrom("agents")
+            .select(qb => qb.fn.countAll<number>().as("count"))
+            .executeTakeFirstOrThrow()
+            .then(({ count }) => +count),
     getAllOrganizations: () =>
         db
             .selectFrom("agents")

diff --git a/api/src/core/adapters/userApi.ts b/api/src/core/adapters/userApi.ts
@@ -32,27 +32,6 @@ export function createKeycloakUserApi(params: KeycloakUserApiParams): {
                 "body": { email }
             })
         ),
-        "getAllowedEmailRegexp": memoize(
-            async () => {
-                const attributes = await keycloakAdminApiClient.getUserProfileAttributes();
-
-                let emailRegExpStr: string;
-
-                try {
-                    emailRegExpStr = (attributes.find(({ name }) => name === "email") as any).validations.pattern
-                        .pattern;
-                } catch {
-                    throw new Error(`Can't extract RegExp from ${JSON.stringify(attributes)}`);
-                }
-
-                return emailRegExpStr;
-            },
-            {
-                "promise": true,
-                maxAge,
-                "preFetch": true
-            }
-        ),
         "getUserCount": memoize(
             async () => {
                 let count = 0;
@@ -93,7 +72,7 @@ export function createKeycloakUserApi(params: KeycloakUserApiParams): {
         console.log("Starting userApi cache initialization...");
 
         await Promise.all(
-            (["getUserCount", "getAllowedEmailRegexp"] as const).map(async function callee(methodName) {
+            (["getUserCount"] as const).map(async function callee(methodName) {
                 const f = userApi[methodName];
 
                 await f();

diff --git a/api/src/core/ports/DbApiV2.ts b/api/src/core/ports/DbApiV2.ts
@@ -99,6 +99,7 @@ export interface AgentRepository {
     remove: (agentId: number) => Promise<void>;
     getByEmail: (email: string) => Promise<AgentWithId | undefined>;
     getAll: () => Promise<AgentWithId[]>;
+    countAll: () => Promise<number>;
     getAllOrganizations: () => Promise<string[]>;
 }
 

diff --git a/api/src/core/ports/UserApi.ts b/api/src/core/ports/UserApi.ts
@@ -1,9 +1,5 @@
 export type UserApi = {
     updateUserEmail: (params: { userId: string; email: string }) => Promise<void>;
-    getAllowedEmailRegexp: {
-        (): Promise<string>;
-        clear: () => void;
-    };
     getUserCount: {
         (): Promise<number>;
         clear: () => void;

diff --git a/api/src/rpc/router.ts b/api/src/rpc/router.ts
@@ -494,7 +494,7 @@ export function createRouter(params: {
                     });
                 await dbApi.agent.update({ ...agent, email: newEmail });
             }),
-        "getRegisteredUserCount": loggedProcedure.query(async () => coreContext.userApi.getUserCount()),
+        "getRegisteredUserCount": loggedProcedure.query(async () => dbApi.agent.countAll()),
         "getTotalReferentCount": loggedProcedure.query(async () => {
             const referentCount = await dbApi.softwareReferent.getTotalCount();
             return { referentCount };