✨ add organization_label to returned scopes

back/apps/core-fca-low/src/config/oidc-provider.ts

@@ -108,6 +108,7 @@ export default {
       idp_id: ["idp_id"],
       idp_acr: ["idp_acr"],
       roles: ["roles"],
+      organization_label: ["organization_label"],
       groups: ["groups"],
       custom: ["custom"],
 

back/apps/core-fca-low/src/dto/identity-for-sp.dto.ts

@@ -2,6 +2,7 @@ import {
   IsDefined,
   IsEnum,
   IsObject,
+  IsOptional,
   IsString,
   MaxLength,
   MinLength,
@@ -34,6 +35,10 @@ export class IdentityForSpDto extends IdentityFromIdpDto {
   @IsString()
   idp_acr: string;
 
+  @IsString()
+  @IsOptional()
+  organization_label?: string;
+
   @IsEnum(
     [
       "dirigeant",

back/apps/core-fca-low/src/services/identity.sanitizer.spec.ts

@@ -185,6 +185,11 @@ describe("IdentitySanitizer", () => {
       (cachedOrganizationService.computeRoles as jest.Mock).mockReturnValue([
         "agent_public",
       ]);
+      (
+        cachedOrganizationService.getCachedOrganizationBySiret as jest.Mock
+      ).mockReturnValue({
+        libelle: "Organization Label",
+      });
 
       const identityForSp = await identitySanitizer.transformIdentity(
         identityFromIdp as IdentityFromIdpDto,
@@ -197,6 +202,7 @@ describe("IdentitySanitizer", () => {
         cachedOrganizationService.getCachedOrganizationBySiret,
       ).toHaveBeenCalledWith("12345678900007");
       expect(identityForSp.roles).toEqual(["agent_public"]);
+      expect(identityForSp.organization_label).toEqual("Organization Label");
     });
 
     it("should handle error when getCachedOrganizationBySiret throws", async () => {

back/apps/core-fca-low/src/services/identity.sanitizer.ts

@@ -80,6 +80,7 @@ export class IdentitySanitizer {
           await this.cachedOrganizationService.getCachedOrganizationBySiret(
             identityForSp.siret,
           );
+        identityForSp.organization_label = cachedOrganization.libelle;
         const roles =
           this.cachedOrganizationService.computeRoles(cachedOrganization);
         identityForSp.roles = roles;

back/apps/mock-identity-provider-fca-low/src/user-data.ts

@@ -32,13 +32,13 @@ const defaultUser = {
   website: "http://example.com",
   zoneinfo: "Europe/Berlin",
   // ProConnect claims
-  siret: "13002526500013",
+  siret: "21920023500014",
   // Deprecated ProConnect claims
   belonging_population: "agent",
   "chorusdt:matricule": "USER_AGC",
   "chorusdt:societe": "CHT",
   organizational_unit: "comptabilite",
-  siren: "130025265",
+  siren: "219200235",
   uid: "1",
   usual_name: "Doe",
 };

back/apps/mock-service-provider-fca-low/src/main.ts

@@ -33,7 +33,7 @@ const PC_CLIENT_SECRET = decrypt(
 );
 const PC_PROVIDER = process.env.IdentityProviderAdapterEnv_DISCOVERY_URL;
 const PC_SCOPES =
-  "openid uid given_name usual_name email siren siret organizational_unit belonging_population phone chorusdt idp_id idp_acr custom roles";
+  "openid uid given_name usual_name email siren siret organizational_unit belonging_population phone chorusdt idp_id idp_acr custom roles organization_label";
 const LOGIN_HINT = "";
 const PC_ID_TOKEN_SIGNED_RESPONSE_ALG =
   process.env.IdentityProviderAdapterEnv_ID_TOKEN_SIGNED_RESPONSE_ALG;

docker/volumes/mongo-fca-low/scripts/db-states/_default/scopes.js

@@ -79,6 +79,11 @@ db.scopes.update(
   { scope: "roles", fd: "IDENTITY", label: "", __v: 0 },
   { upsert: true },
 );
+db.scopes.update(
+  { scope: "organization_label" },
+  { scope: "organization_label", fd: "IDENTITY", label: "", __v: 0 },
+  { upsert: true },
+);
 
 // -- Scopes - Desk
 print("Initializing Desk scopes...");

docker/volumes/mongo-fca-low/scripts/db-states/_default/sp.js

@@ -36,6 +36,7 @@ const fsa = {
       'groups',
       'custom',
       'roles',
+      'organization_label'
     ],
     introspection_signed_response_alg: null,
     introspection_encrypted_response_alg: null,
@@ -80,6 +81,7 @@ const fsa = {
       'idp_acr',
       'custom',
       'roles',
+      'organization_label'
     ],
     introspection_signed_response_alg: null,
     introspection_encrypted_response_alg: null,
@@ -124,6 +126,7 @@ const fsa = {
       'idp_acr',
       'custom',
       'roles',
+      'organization_label'
     ],
     introspection_signed_response_alg: null,
     introspection_encrypted_response_alg: null,

quality/cypress/fixtures/fca-low/scopes.json

@@ -16,7 +16,8 @@
       "idp_id",
       "idp_acr",
       "custom",
-      "roles"
+      "roles",
+      "organization_label"
     ]
   },
   {
@@ -35,7 +36,8 @@
       "idp_id",
       "idp_acr",
       "custom",
-      "roles"
+      "roles",
+      "organization_label"
     ]
   },
   {

quality/cypress/support/common/helpers/user-helper.ts

@@ -11,6 +11,7 @@ export interface User {
   uid: string;
   usual_name: string;
   roles: string[];
+  organization_label: string;
 }
 
 export function getDefaultUser(): User {
@@ -25,10 +26,11 @@ export function getDefaultUser(): User {
     given_name: "John",
     organizational_unit: "comptabilite",
     phone_number: "+49 000 000000",
-    siren: "130025265",
-    siret: "13002526500013",
+    siren: "219200235",
+    siret: "21920023500014",
     uid: "1",
     usual_name: "Doe",
     roles: ["agent_public"],
+    organization_label: "Commune de clamart - Mairie",
   };
 }

quality/cypress/support/usager/steps/contact-support-steps.ts

@@ -74,8 +74,8 @@ Then(
           organizational_unit: "comptabilite",
           phone_number: "+49 000 000000",
           phone_number_verified: false,
-          siren: "130025265",
-          siret: "13002526500013",
+          siren: "219200235",
+          siret: "21920023500014",
           sub: "1",
           uid: "1",
           usual_name: "Doe",