remove useless keycloak params

codegouvfr · Dec 11, 2024 · e414259 · e414259
1 parent d0bbca1
commit e414259
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 44 deletions.
diff --git a/api/src/env.ts b/api/src/env.ts
@@ -7,9 +7,7 @@ const zConfiguration = z.object({
         .object({
             "url": z.string().nonempty(), //Example: https://auth.code.gouv.fr/auth (with the /auth at the end)
             "realm": z.string().nonempty(),
-            "clientId": z.string().nonempty(),
-            "adminPassword": z.string().nonempty(),
-            "organizationUserProfileAttributeName": z.string().nonempty()
+            "clientId": z.string().nonempty()
         })
         .optional(),
     "termsOfServiceUrl": zLocalizedString,

diff --git a/api/src/rpc/router.ts b/api/src/rpc/router.ts
@@ -34,11 +34,7 @@ import type { User } from "./user";
 export function createRouter(params: {
     dbApi: DbApiV2;
     useCases: UseCases;
-    keycloakParams:
-        | (KeycloakParams & {
-              organizationUserProfileAttributeName: string;
-          })
-        | undefined;
+    keycloakParams: KeycloakParams | undefined;
     jwtClaimByUserKey: Record<keyof User, string>;
     termsOfServiceUrl: LocalizedString;
     readmeUrl: LocalizedString;
@@ -108,17 +104,6 @@ export function createRouter(params: {
                 return () => out;
             })()
         ),
-        "getOrganizationUserProfileAttributeName": loggedProcedure.query(
-            (() => {
-                const { organizationUserProfileAttributeName } = keycloakParams ?? {};
-                if (organizationUserProfileAttributeName === undefined) {
-                    return () => {
-                        throw new TRPCError({ "code": "METHOD_NOT_SUPPORTED" });
-                    };
-                }
-                return () => organizationUserProfileAttributeName;
-            })()
-        ),
         "getSoftwares": loggedProcedure.query(() => dbApi.software.getAll()),
         "getInstances": loggedProcedure.query(() => dbApi.instance.getAll()),
         "getExternalSoftwareOptions": loggedProcedure

diff --git a/api/src/rpc/start.ts b/api/src/rpc/start.ts
@@ -29,8 +29,6 @@ export async function startRpcService(params: {
         url: string;
         realm: string;
         clientId: string;
-        adminPassword: string;
-        organizationUserProfileAttributeName: string;
     };
     termsOfServiceUrl: LocalizedString;
     readmeUrl: LocalizedString;
@@ -112,8 +110,7 @@ export async function startRpcService(params: {
                 : {
                       "url": keycloakParams.url,
                       "realm": keycloakParams.realm,
-                      "clientId": keycloakParams.clientId,
-                      "organizationUserProfileAttributeName": keycloakParams.organizationUserProfileAttributeName
+                      "clientId": keycloakParams.clientId
                   },
         termsOfServiceUrl,
         readmeUrl,

diff --git a/deployments/docker-compose-example/.env.sample b/deployments/docker-compose-example/.env.sample
@@ -1,8 +1,6 @@
 SILL_KEYCLOAK_URL=http://localhost:8081/auth
 SILL_KEYCLOAK_REALM=codegouv
 SILL_KEYCLOAK_CLIENT_ID=sill
-SILL_KEYCLOAK_ADMIN_PASSWORD=xxx
-SILL_KEYCLOAK_ORGANIZATION_USER_PROFILE_ATTRIBUTE_NAME=agencyName
 SILL_README_URL=https://raw.githubusercontent.com/codegouvfr/sill/refs/heads/main/README.md
 SILL_TERMS_OF_SERVICE_URL=https://code.gouv.fr/sill/tos_fr.md
 SILL_JWT_ID=sub

diff --git a/web/src/core/adapter/sillApi.ts b/web/src/core/adapter/sillApi.ts
@@ -51,12 +51,6 @@ export function createSillApi(params: {
         "getOidcParams": memoize(() => trpcClient.getOidcParams.query(), {
             "promise": true
         }),
-        "getOrganizationUserProfileAttributeName": memoize(
-            () => trpcClient.getOrganizationUserProfileAttributeName.query(),
-            {
-                "promise": true
-            }
-        ),
         "getSoftwares": memoize(() => trpcClient.getSoftwares.query(), {
             "promise": true
         }),

diff --git a/web/src/core/adapter/sillApiMock.ts b/web/src/core/adapter/sillApiMock.ts
@@ -25,12 +25,6 @@ export const sillApi: SillApi = {
         }),
         { "promise": true }
     ),
-    "getOrganizationUserProfileAttributeName": memoize(
-        async () => {
-            throw new Error("not implemented");
-        },
-        { "promise": true }
-    ),
     "getSoftwares": memoize(() => Promise.resolve([...softwares]), { "promise": true }),
     "getInstances": memoize(
         async () => {

diff --git a/web/src/core/ports/SillApi.ts b/web/src/core/ports/SillApi.ts
@@ -23,12 +23,6 @@ export type SillApi = {
         >;
         clear: () => void;
     };
-    getOrganizationUserProfileAttributeName: {
-        (params: TrpcRouterInput["getOrganizationUserProfileAttributeName"]): Promise<
-            TrpcRouterOutput["getOrganizationUserProfileAttributeName"]
-        >;
-        clear: () => void;
-    };
     getSoftwares: {
         (params: TrpcRouterInput["getSoftwares"]): Promise<
             TrpcRouterOutput["getSoftwares"]

diff --git a/web/src/core/usecases/userAuthentication/thunks.ts b/web/src/core/usecases/userAuthentication/thunks.ts
@@ -31,7 +31,6 @@ export const thunks = {
 
             const [, , { oidc }] = args;
 
-            console.log("asesrting user not logged : ", oidc.isUserLoggedIn);
             assert(!oidc.isUserLoggedIn);
 
             return oidc.login({ doesCurrentHrefRequiresAuth });