Merge branch 'main' into SPSH-1025

dBildungsplattform · Sep 9, 2024 · 6abfee2 · 6abfee2
2 parents 1d4ba2e + 4bf3c8c
commit 6abfee2
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 6 deletions.
diff --git a/src/core/ldap/domain/ldap-client.service.spec.ts b/src/core/ldap/domain/ldap-client.service.spec.ts
@@ -200,6 +200,29 @@ describe('LDAP Client Service', () => {
                 expect(result.ok).toBeTruthy();
             });
 
+            it('when called with extra entryUUID should return truthy result', async () => {
+                ldapClientMock.getClient.mockImplementation(() => {
+                    clientMock.bind.mockResolvedValue();
+                    clientMock.add.mockResolvedValueOnce();
+                    clientMock.search.mockResolvedValueOnce(
+                        createMock<SearchResult>({ searchEntries: [createMock<Entry>()] }),
+                    ); //mock existsSchule
+                    clientMock.search.mockResolvedValueOnce(createMock<SearchResult>()); //mock existsLehrer
+
+                    return clientMock;
+                });
+                const testLehrer: PersonData = {
+                    id: faker.string.uuid(),
+                    vorname: faker.person.firstName(),
+                    familienname: faker.person.lastName(),
+                    referrer: faker.lorem.word(),
+                    ldapEntryUUID: faker.string.uuid(),
+                };
+                const result: Result<PersonData> = await ldapClientService.createLehrer(testLehrer, organisation);
+
+                expect(result.ok).toBeTruthy();
+            });
+
             it('when called with valid person and an organisation without kennung should return error result', async () => {
                 ldapClientMock.getClient.mockImplementation(() => {
                     clientMock.bind.mockResolvedValue();

diff --git a/src/core/ldap/domain/ldap-client.service.ts b/src/core/ldap/domain/ldap-client.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { ClassLogger } from '../../logging/class-logger.js';
-import { Client, SearchResult } from 'ldapts';
+import { Client, Control, SearchResult } from 'ldapts';
 import { LdapEntityType, LdapOrganisationEntry, LdapPersonEntry, LdapRoleEntry } from './ldap.types.js';
 import { KennungRequiredForSchuleError } from '../../../modules/organisation/specification/error/kennung-required-for-schule.error.js';
 import { LdapClient } from './ldap-client.js';
@@ -15,6 +15,7 @@ export type PersonData = {
     familienname: string;
     id: string;
     referrer?: string;
+    ldapEntryUUID?: string;
 };
 
 type OrganisationData = {
@@ -154,7 +155,15 @@ export class LdapClientService {
                 mail: [`${person.referrer}@schule-sh.de`],
                 objectclass: ['inetOrgPerson'],
             };
-            await client.add(lehrerUid, entry);
+
+            const controls: Control[] = [];
+            if (person.ldapEntryUUID) {
+                const relaxRulesControlOID: string = '1.3.6.1.4.1.4203.666.5.12';
+                entry.entryUUID = person.ldapEntryUUID;
+                controls.push(new Control(relaxRulesControlOID));
+            }
+
+            await client.add(lehrerUid, entry, controls);
             this.logger.info(`LDAP: Successfully created lehrer ${lehrerUid}`);
 
             return { ok: true, value: person };

diff --git a/src/core/ldap/domain/ldap.types.ts b/src/core/ldap/domain/ldap.types.ts
@@ -4,6 +4,7 @@ export type LdapPersonEntry = {
     employeeNumber: string;
     mail: string[];
     objectclass: string[];
+    entryUUID?: string;
 };
 
 export type LdapOrganisationEntry = {

diff --git a/src/modules/personenkontext/domain/personenkontexte-update.ts b/src/modules/personenkontext/domain/personenkontexte-update.ts
@@ -282,7 +282,8 @@ export class PersonenkontexteUpdate {
         return undefined;
     }
 
-    public async update(): Promise<Personenkontext<true>[] | PersonenkontexteUpdateError> {
+    public async update(ldapEntryUUID?: string): Promise<Personenkontext<true>[] | PersonenkontexteUpdateError> {
+        //If first lehrer kontext is created and a UUID is passed as ldapEntryUUID it is used as internal LDAP entryUUID (needed for migration, can be build back afterwards)
         const sentPKs: Personenkontext<true>[] | PersonenkontexteUpdateError = await this.getSentPersonenkontexte();
         if (sentPKs instanceof PersonenkontexteUpdateError) {
             return sentPKs;
@@ -317,7 +318,8 @@ export class PersonenkontexteUpdate {
         const existingPKsAfterUpdate: Personenkontext<true>[] = await this.dBiamPersonenkontextRepo.findByPerson(
             this.personId,
         );
-        await this.publishEvent(deletedPKs, createdPKs, existingPKsAfterUpdate);
+
+        await this.publishEvent(deletedPKs, createdPKs, existingPKsAfterUpdate, ldapEntryUUID);
 
         return existingPKsAfterUpdate;
     }
@@ -326,6 +328,7 @@ export class PersonenkontexteUpdate {
         deletedPKs: Personenkontext<true>[],
         createdPKs: Personenkontext<true>[],
         existingPKs: Personenkontext<true>[],
+        ldapEntryUUID?: string,
     ): Promise<void> {
         const deletedRollenIDs: RolleID[] = deletedPKs.map((pk: Personenkontext<true>) => pk.rolleId);
         const createdRollenIDs: RolleID[] = createdPKs.map((pk: Personenkontext<true>) => pk.rolleId);
@@ -372,6 +375,7 @@ export class PersonenkontexteUpdate {
                     orgas.get(pk.organisationId)!,
                     rollen.get(pk.rolleId)!,
                 ]),
+                ldapEntryUUID,
             ),
         );
     }

diff --git a/src/shared/events/personenkontext-event.types.ts b/src/shared/events/personenkontext-event.types.ts
@@ -8,6 +8,7 @@ export type PersonenkontextEventPersonData = {
     familienname: string;
     referrer?: string;
     email?: string;
+    ldapEntryUUID?: string;
 };
 
 export type PersonenkontextEventKontextData = {

diff --git a/src/shared/events/personenkontext-updated.event.ts b/src/shared/events/personenkontext-updated.event.ts
@@ -10,12 +10,13 @@ export type PersonenkontextUpdatedPersonData = PersonenkontextEventPersonData;
 
 export type PersonenkontextUpdatedData = PersonenkontextEventKontextData;
 
-function mapPersonToData(person: Person<true>): PersonenkontextUpdatedPersonData {
+function mapPersonToData(person: Person<true>, ldapEntryUUID?: string): PersonenkontextUpdatedPersonData {
     return {
         id: person.id,
         vorname: person.vorname,
         familienname: person.familienname,
         referrer: person.referrer,
+        ldapEntryUUID: ldapEntryUUID,
         email: person.email,
     };
 }
@@ -50,9 +51,10 @@ export class PersonenkontextUpdatedEvent extends BaseEvent {
         newKontexte: [Personenkontext<true>, Organisation<true>, Rolle<true>][],
         removedKontexte: [Personenkontext<true>, Organisation<true>, Rolle<true>][],
         currentKontexte: [Personenkontext<true>, Organisation<true>, Rolle<true>][],
+        ldapEntryUUID?: string,
     ): PersonenkontextUpdatedEvent {
         return new PersonenkontextUpdatedEvent(
-            mapPersonToData(person),
+            mapPersonToData(person, ldapEntryUUID),
             newKontexte.map(mapPersonenkontextAndRolleAggregateToData),
             removedKontexte.map(mapPersonenkontextAndRolleAggregateToData),
             currentKontexte.map(mapPersonenkontextAndRolleAggregateToData),