remove usages of userApi and userApi itself

Author: JeromeBu

api/scripts/compile-data.ts

@@ -7,7 +7,6 @@ import { env } from "../src/env";
 (async () => {
     const kyselyDb = new Kysely<Database>({ dialect: createPgDialect(env.databaseUrl) });
     const { useCases } = await bootstrapCore({
-        "keycloakUserApiParams": undefined,
         "dbConfig": {
             "dbKind": "kysely",
             "kyselyDb": kyselyDb

api/src/core/adapters/dbApi/in-memory/createInMemoryAgentRepository.ts

@@ -33,7 +33,8 @@ export const createInMemoryAgentRepository = (): {
             },
             getAllOrganizations: () => {
                 throw new Error("Not implemented");
-            }
+            },
+            countAll: async () => agents.length
         },
         testHelpers: {
             setAgents: (newAgents: DbAgentWithId[]) => {

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")

api/src/core/adapters/userApi.ts

@@ -1,5 +1,4 @@
 import { Kysely } from "kysely";
-import { createObjectThatThrowsIfAccessed } from "../tools/createObjectThatThrowsIfAccessed";
 import { comptoirDuLibreApi } from "./adapters/comptoirDuLibreApi";
 import { createKyselyPgDbApi } from "./adapters/dbApi/kysely/createPgDbApi";
 import { Database } from "./adapters/dbApi/kysely/kysely.database";
@@ -10,13 +9,11 @@ import { createGetSoftwareLatestVersion } from "./adapters/getSoftwareLatestVers
 import { getWikidataSoftware } from "./adapters/wikidata/getWikidataSoftware";
 import { getWikidataSoftwareOptions } from "./adapters/wikidata/getWikidataSoftwareOptions";
 import { halAdapter } from "./adapters/hal";
-import { createKeycloakUserApi, type KeycloakUserApiParams } from "./adapters/userApi";
 import type { ComptoirDuLibreApi } from "./ports/ComptoirDuLibreApi";
 import { DbApiV2 } from "./ports/DbApiV2";
 import type { ExternalDataOrigin, GetSoftwareExternalData } from "./ports/GetSoftwareExternalData";
 import type { GetSoftwareExternalDataOptions } from "./ports/GetSoftwareExternalDataOptions";
 import type { GetSoftwareLatestVersion } from "./ports/GetSoftwareLatestVersion";
-import type { UserApi } from "./ports/UserApi";
 import { UseCases } from "./usecases";
 import { makeGetAgent } from "./usecases/getAgent";
 import { makeGetSoftwareFormAutoFillDataFromExternalAndOtherSources } from "./usecases/getSoftwareFormAutoFillDataFromExternalAndOtherSources";
@@ -28,7 +25,6 @@ type DbConfig = PgDbConfig;
 
 type ParamsOfBootstrapCore = {
     dbConfig: DbConfig;
-    keycloakUserApiParams: KeycloakUserApiParams | undefined;
     githubPersonalAccessTokenForApiRateLimit: string;
     doPerPerformPeriodicalCompilation: boolean;
     doPerformCacheInitialization: boolean;
@@ -41,7 +37,6 @@ type ParamsOfBootstrapCore = {
 export type Context = {
     paramsOfBootstrapCore: ParamsOfBootstrapCore;
     dbApi: DbApiV2;
-    userApi: UserApi;
     comptoirDuLibreApi: ComptoirDuLibreApi;
     getSoftwareExternalData: GetSoftwareExternalData;
     getSoftwareLatestVersion: GetSoftwareLatestVersion;
@@ -63,10 +58,8 @@ export async function bootstrapCore(
 ): Promise<{ dbApi: DbApiV2; context: Context; useCases: UseCases }> {
     const {
         dbConfig,
-        keycloakUserApiParams,
         githubPersonalAccessTokenForApiRateLimit,
         doPerPerformPeriodicalCompilation,
-        doPerformCacheInitialization,
         externalSoftwareDataOrigin,
         initializeSoftwareFromSource,
         botAgentEmail,
@@ -81,20 +74,9 @@ export async function bootstrapCore(
 
     const { dbApi } = getDbApiAndInitializeCache(dbConfig);
 
-    const { userApi, initializeUserApiCache } =
-        keycloakUserApiParams === undefined
-            ? {
-                  "userApi": createObjectThatThrowsIfAccessed<Context["userApi"]>({
-                      "debugMessage": "No Keycloak server"
-                  }),
-                  "initializeUserApiCache": async () => {}
-              }
-            : createKeycloakUserApi(keycloakUserApiParams);
-
     const context: Context = {
         "paramsOfBootstrapCore": params,
         dbApi,
-        userApi,
         comptoirDuLibreApi,
         getSoftwareExternalData,
         getSoftwareLatestVersion
@@ -114,11 +96,6 @@ export async function bootstrapCore(
         getAgent: makeGetAgent({ agentRepository: dbApi.agent })
     };
 
-    if (doPerformCacheInitialization) {
-        console.log("Performing user cache initialization...");
-        await initializeUserApiCache();
-    }
-
     if (initializeSoftwareFromSource) {
         if (!botAgentEmail) throw new Error("No bot agent email provided");
         if (externalSoftwareDataOrigin === "HAL") {

api/src/core/bootstrap.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[]>;
 }
 

api/src/core/ports/DbApiV2.ts

@@ -24,9 +24,8 @@ export const createTestCaller = async ({ user }: TestCallerConfig = { user: defa
     const externalSoftwareDataOrigin: ExternalDataOrigin = "wikidata";
     const kyselyDb = new Kysely<Database>({ dialect: createPgDialect(testPgUrl) });
 
-    const { context, dbApi, useCases } = await bootstrapCore({
+    const { dbApi, useCases } = await bootstrapCore({
         "dbConfig": { dbKind: "kysely", kyselyDb },
-        "keycloakUserApiParams": undefined,
         "githubPersonalAccessTokenForApiRateLimit": "fake-token",
         "doPerPerformPeriodicalCompilation": false,
         "doPerformCacheInitialization": false,
@@ -44,7 +43,6 @@ export const createTestCaller = async ({ user }: TestCallerConfig = { user: defa
     const { router } = createRouter({
         useCases,
         dbApi,
-        coreContext: context,
         keycloakParams: undefined,
         redirectUrl: undefined,
         externalSoftwareDataOrigin,

api/src/core/ports/UserApi.ts

@@ -8,7 +8,6 @@ import superjson from "superjson";
 import type { Equals, ReturnType } from "tsafe";
 import { assert } from "tsafe/assert";
 import { z } from "zod";
-import type { Context as CoreContext } from "../core";
 import { DbApiV2 } from "../core/ports/DbApiV2";
 import {
     ExternalDataOrigin,
@@ -35,7 +34,6 @@ import type { User } from "./user";
 export function createRouter(params: {
     dbApi: DbApiV2;
     useCases: UseCases;
-    coreContext: CoreContext;
     keycloakParams:
         | (KeycloakParams & {
               organizationUserProfileAttributeName: string;
@@ -51,7 +49,6 @@ export function createRouter(params: {
 }) {
     const {
         useCases,
-        coreContext,
         dbApi,
         keycloakParams,
         jwtClaimByUserKey,
@@ -494,7 +491,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 };

api/src/rpc/createTestCaller.ts

@@ -68,23 +68,11 @@ export async function startRpcService(params: {
 
     const kyselyDb = new Kysely<Database>({ dialect: createPgDialect(databaseUrl) });
 
-    const {
-        dbApi,
-        context: coreContext,
-        useCases
-    } = await bootstrapCore({
+    const { dbApi, useCases } = await bootstrapCore({
         "dbConfig": {
             "dbKind": "kysely",
             "kyselyDb": kyselyDb
         },
-        "keycloakUserApiParams":
-            keycloakParams === undefined
-                ? undefined
-                : {
-                      "url": keycloakParams.url,
-                      "realm": keycloakParams.realm,
-                      "adminPassword": keycloakParams.adminPassword
-                  },
         githubPersonalAccessTokenForApiRateLimit,
         "doPerPerformPeriodicalCompilation": true,
         // "doPerPerformPeriodicalCompilation": !isDevEnvironnement && redirectUrl === undefined,
@@ -117,7 +105,6 @@ export async function startRpcService(params: {
         dbApi,
         getSoftwareExternalDataOptions,
         getSoftwareExternalData,
-        coreContext,
         jwtClaimByUserKey,
         "keycloakParams":
             keycloakParams === undefined

api/src/rpc/router.ts

@@ -1,7 +1,7 @@
-import { useEffect, useState, useMemo } from "react";
+import { useEffect, useState } from "react";
 import { tss } from "tss-react";
 import { fr } from "@codegouvfr/react-dsfr";
-import { useTranslation, useGetOrganizationFullName, evtLang } from "ui/i18n";
+import { useTranslation, evtLang } from "ui/i18n";
 import { assert } from "tsafe/assert";
 import { Equals } from "tsafe";
 import { declareComponentKeys } from "i18nifty";
@@ -209,9 +209,6 @@ function AccountReady(props: { className?: string }) {
 }
 
 const useStyles = tss.withName({ Account }).create({
-    organizationInput: {
-        flex: 1
-    },
     "oidcInfos": {
         "paddingTop": fr.spacing("6v"),
         "maxWidth": 650,