feat: do not show org selection if user has only one org

cypress/e2e/signin_from_agentconnect_client.cy.js

@@ -14,12 +14,6 @@ describe('sign-in from agentconnect client', () => {
       .contains('Se connecter')
       .click();
 
-    cy.get('.fr-grid-row .fr-col-12:first-child .fr-tile__link').contains(
-      'Commune de lamalou-les-bains - Mairie'
-    );
-
-    cy.get('.fr-grid-row .fr-col-12:first-child .fr-tile__link').click();
-
     cy.contains('[email protected]');
     cy.contains('21340126800130');
   });

cypress/e2e/signin_from_standard_client.cy.js

@@ -2,7 +2,7 @@ const MONCOMPTEPRO_HOST =
   Cypress.env('MONCOMPTEPRO_HOST') || 'http://localhost:3000';
 
 describe('sign-in from standard client', () => {
-  it('should sign-in', function () {
+  it('should sign-in without org selection when having only one organization', function () {
     cy.visit(`http://localhost:4000`);
     cy.get('button.moncomptepro-button').click();
 
@@ -14,17 +14,11 @@ describe('sign-in from standard client', () => {
       .contains('Se connecter')
       .click();
 
-    cy.get('.fr-grid-row .fr-col-12:first-child .fr-tile__link').contains(
-      'Commune de lamalou-les-bains - Mairie'
-    );
-
-    cy.get('.fr-grid-row .fr-col-12:first-child .fr-tile__link').click();
-
     cy.contains('[email protected]');
     cy.contains('Commune de lamalou-les-bains - Mairie');
   });
 
-  it('should sign-in with org selection', function () {
+  it('should sign-in with org selection when having two organization', function () {
     cy.visit(`http://localhost:4000`);
     cy.get('button.moncomptepro-button').click();
 

src/middlewares/user.ts

@@ -3,7 +3,10 @@ import { isEmpty } from 'lodash';
 import { isUrlTrusted } from '../services/security';
 import { updateEmailAddressVerificationStatus } from '../managers/user';
 import { isEligibleToSponsorship } from '../services/organization';
-import { getOrganizationsByUserId } from '../managers/organization/main';
+import {
+  getOrganizationsByUserId,
+  selectOrganization,
+} from '../managers/organization/main';
 import {
   greetForJoiningOrganization,
   notifyAllMembers,
@@ -159,7 +162,18 @@ export const checkUserHasSelectedAnOrganizationMiddleware = (
         req.session.mustReturnOneOrganizationInPayload &&
         !selectedOrganizationId
       ) {
-        return res.redirect('/users/select-organization');
+        const userOrganisations = await getOrganizationsByUserId(
+          getUserFromLoggedInSession(req).id
+        );
+
+        if (userOrganisations.length === 1) {
+          await selectOrganization({
+            user_id: getUserFromLoggedInSession(req).id,
+            organization_id: userOrganisations[0].id,
+          });
+        } else {
+          return res.redirect('/users/select-organization');
+        }
       }
 
       return next();