Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SPSH-1544: UEM Inbetriebnahme-Passwort erzeugen #820

Merged
merged 17 commits into from
Dec 12, 2024
Merged

SPSH-1544: UEM Inbetriebnahme-Passwort erzeugen #820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
2e868f7
rm PersonRepository-ref in LdapClientSvc, adjust Email-events to cont…
DPDS93CT Dec 5, 2024
97b273c
Merge branch 'release-1.0' into SPSH-1544
DPDS93CT Dec 5, 2024
44744ec
fix existing test cases
DPDS93CT Dec 6, 2024
8cee9c4
add test cases after adjusting LDAPClientSvc
DPDS93CT Dec 6, 2024
c9273ca
Merge branch 'release-1.0' into SPSH-1544
DPDS93CT Dec 6, 2024
8d771f6
remove dead imports and comments
DPDS93CT Dec 6, 2024
e1e5380
Merge branch 'release-1.0' into SPSH-1544
DPDS93CT Dec 6, 2024
02fd3fc
Merge branch 'release-1.0' into SPSH-1544
DPDS93CT Dec 9, 2024
7bfa1de
add RollenArt to DBiamPersonenzuordnungResponse
DPDS93CT Dec 9, 2024
8b06215
remove StepUp-Guard for Reset-UEM-password
DPDS93CT Dec 10, 2024
dac23a8
allow Lehrer to use UEM-password-reset for themselves
DPDS93CT Dec 10, 2024
c4da5e5
undo StepUpGuard-disabling for creating person with kontexte via POST
DPDS93CT Dec 10, 2024
e864b06
Merge branch 'release-0101' into SPSH-1544
DPDS93CT Dec 11, 2024
26c1d76
adjust i18 for Person-UEM-Password, adjust test cases
DPDS93CT Dec 11, 2024
131edd5
Merge branch 'release-0101' into SPSH-1544
YoussefBouch Dec 11, 2024
4378eeb
Merge branch 'release-0101' into SPSH-1544
DPDS93CT Dec 12, 2024
ff2e328
Merge branch 'release-0101' into SPSH-1544
YoussefBouch Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
150 changes: 129 additions & 21 deletions src/core/ldap/domain/ldap-client.service.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import { LdapEmailDomainError } from '../error/ldap-email-domain.error.js';
import { LdapEmailAddressError } from '../error/ldap-email-address.error.js';
import { LdapCreateLehrerError } from '../error/ldap-create-lehrer.error.js';
import { LdapModifyEmailError } from '../error/ldap-modify-email.error.js';
import { PersonRepository } from '../../../modules/person/persistence/person.repository.js';
import { LdapInstanceConfig } from '../ldap-instance-config.js';
import { LdapModifyUserPasswordError } from '../error/ldap-modify-user-password.error.js';

describe('LDAP Client Service', () => {
let app: INestApplication;
Expand All @@ -40,7 +40,6 @@ describe('LDAP Client Service', () => {
let loggerMock: DeepMocked<ClassLogger>;
let eventServiceMock: DeepMocked<EventService>;
let clientMock: DeepMocked<Client>;
let personRepoMock: DeepMocked<PersonRepository>;
let instanceConfig: LdapInstanceConfig;

let person: Person<true>;
Expand Down Expand Up @@ -69,8 +68,6 @@ describe('LDAP Client Service', () => {
.useValue(createMock<ClassLogger>())
.overrideProvider(EventService)
.useValue(createMock<EventService>())
.overrideProvider(PersonRepository)
.useValue(createMock<PersonRepository>())
.compile();

orm = module.get(MikroORM);
Expand All @@ -80,7 +77,6 @@ describe('LDAP Client Service', () => {
loggerMock = module.get(ClassLogger);
eventServiceMock = module.get(EventService);
clientMock = createMock<Client>();
personRepoMock = module.get(PersonRepository);
instanceConfig = module.get(LdapInstanceConfig);

person = Person.construct(
Expand Down Expand Up @@ -459,7 +455,6 @@ describe('LDAP Client Service', () => {
clientMock.del.mockResolvedValueOnce();
return clientMock;
});
personRepoMock.findById.mockResolvedValueOnce(person);

const result: Result<PersonID> = await ldapClientService.deleteLehrerByReferrer(person.referrer!);

Expand Down Expand Up @@ -613,13 +608,13 @@ describe('LDAP Client Service', () => {

describe('when bind returns error', () => {
it('should return falsy result', async () => {
personRepoMock.findById.mockResolvedValueOnce(person);
ldapClientMock.getClient.mockImplementation(() => {
clientMock.bind.mockRejectedValueOnce(new Error());
return clientMock;
});
const result: Result<PersonID> = await ldapClientService.changeEmailAddressByPersonId(
faker.string.uuid(),
faker.internet.userName(),
fakeSchuleSHAddress,
);

Expand All @@ -629,9 +624,9 @@ describe('LDAP Client Service', () => {

describe('when person can not be found in DB', () => {
it('should return falsy result', async () => {
personRepoMock.findById.mockResolvedValueOnce(undefined);
const result: Result<PersonID> = await ldapClientService.changeEmailAddressByPersonId(
faker.string.uuid(),
faker.internet.userName(),
fakeSchuleSHAddress,
);

Expand All @@ -641,10 +636,9 @@ describe('LDAP Client Service', () => {

describe('when called with invalid emailDomain', () => {
it('should return LdapEmailDomainError', async () => {
personRepoMock.findById.mockResolvedValueOnce(person);

const result: Result<PersonID> = await ldapClientService.changeEmailAddressByPersonId(
faker.string.uuid(),
faker.internet.userName(),
'[email protected]',
);

Expand All @@ -656,10 +650,9 @@ describe('LDAP Client Service', () => {

describe('when called with newEmailAddress that is not splittable', () => {
it('should return LdapEmailAddressError', async () => {
personRepoMock.findById.mockResolvedValueOnce(person);

const result: Result<PersonID> = await ldapClientService.changeEmailAddressByPersonId(
faker.string.uuid(),
faker.internet.userName(),
'user-at-wrong-email-domain.de',
);

Expand All @@ -671,7 +664,6 @@ describe('LDAP Client Service', () => {

describe('when person cannot be found by personID', () => {
it('should return LdapSearchError', async () => {
personRepoMock.findById.mockResolvedValueOnce(person);
ldapClientMock.getClient.mockImplementation(() => {
clientMock.bind.mockResolvedValueOnce();
clientMock.search.mockResolvedValueOnce(
Expand All @@ -684,6 +676,7 @@ describe('LDAP Client Service', () => {

const result: Result<PersonID> = await ldapClientService.changeEmailAddressByPersonId(
faker.string.uuid(),
faker.internet.userName(),
fakeSchuleSHAddress,
);

Expand All @@ -702,8 +695,6 @@ describe('LDAP Client Service', () => {
const currentEmailAddress: string = '[email protected]';

it('should set mailAlternativeAddress as current mailPrimaryAddress and throw LdapPersonEntryChangedEvent', async () => {
personRepoMock.findById.mockResolvedValueOnce(person);

ldapClientMock.getClient.mockImplementation(() => {
clientMock.bind.mockResolvedValueOnce();
clientMock.search.mockResolvedValueOnce(
Expand All @@ -723,6 +714,7 @@ describe('LDAP Client Service', () => {

const result: Result<PersonID> = await ldapClientService.changeEmailAddressByPersonId(
fakePersonID,
faker.internet.userName(),
newEmailAddress,
);

Expand Down Expand Up @@ -750,8 +742,6 @@ describe('LDAP Client Service', () => {

describe('and already has a mailPrimaryAddress', () => {
it('should set mailAlternativeAddress as current mailPrimaryAddress and throw LdapPersonEntryChangedEvent', async () => {
personRepoMock.findById.mockResolvedValueOnce(person);

ldapClientMock.getClient.mockImplementation(() => {
clientMock.bind.mockResolvedValueOnce();
clientMock.search.mockResolvedValueOnce(
Expand All @@ -771,6 +761,7 @@ describe('LDAP Client Service', () => {

const result: Result<PersonID> = await ldapClientService.changeEmailAddressByPersonId(
fakePersonID,
faker.internet.userName(),
newEmailAddress,
);

Expand Down Expand Up @@ -798,8 +789,6 @@ describe('LDAP Client Service', () => {

describe('and already has a mailPrimaryAddress', () => {
it('should set mailAlternativeAddress as current mailPrimaryAddress and throw LdapPersonEntryChangedEvent', async () => {
personRepoMock.findById.mockResolvedValueOnce(person);

ldapClientMock.getClient.mockImplementation(() => {
clientMock.bind.mockResolvedValueOnce();
clientMock.search.mockResolvedValueOnce(
Expand All @@ -819,6 +808,7 @@ describe('LDAP Client Service', () => {

const result: Result<PersonID> = await ldapClientService.changeEmailAddressByPersonId(
fakePersonID,
faker.internet.userName(),
newEmailAddress,
);

Expand All @@ -839,8 +829,6 @@ describe('LDAP Client Service', () => {

describe('but does NOT have a mailPrimaryAddress', () => {
it('should set mailAlternativeAddress to same value as mailPrimaryAddress and throw LdapPersonEntryChangedEvent', async () => {
personRepoMock.findById.mockResolvedValueOnce(person);

ldapClientMock.getClient.mockImplementation(() => {
clientMock.bind.mockResolvedValueOnce();
clientMock.search.mockResolvedValueOnce(
Expand All @@ -860,6 +848,7 @@ describe('LDAP Client Service', () => {

const result: Result<PersonID> = await ldapClientService.changeEmailAddressByPersonId(
fakePersonID,
faker.internet.userName(),
newEmailAddress,
);

Expand All @@ -878,4 +867,123 @@ describe('LDAP Client Service', () => {
});
});
});

describe('changeUserPasswordByPersonId', () => {
describe('when bind returns error', () => {
it('should return falsy result', async () => {
ldapClientMock.getClient.mockImplementation(() => {
clientMock.bind.mockRejectedValueOnce(new Error());
return clientMock;
});
const result: Result<PersonID> = await ldapClientService.changeUserPasswordByPersonId(
faker.string.uuid(),
faker.internet.userName(),
);

expect(result.ok).toBeFalsy();
});
});

describe('when person cannot be found by personID', () => {
it('should return LdapSearchError', async () => {
ldapClientMock.getClient.mockImplementation(() => {
clientMock.bind.mockResolvedValueOnce();
clientMock.search.mockResolvedValueOnce(
createMock<SearchResult>({
searchEntries: [],
}),
);
return clientMock;
});

const result: Result<PersonID> = await ldapClientService.changeUserPasswordByPersonId(
faker.string.uuid(),
faker.internet.userName(),
);

expect(result.ok).toBeFalsy();
expect(result).toEqual({
ok: false,
error: new LdapSearchError(LdapEntityType.LEHRER),
});
});
});

describe('when person can be found but modification fails', () => {
const fakePersonID: string = faker.string.uuid();
const fakeDN: string = faker.string.alpha();

it('should NOT publish event and throw LdapPersonEntryChangedEvent', async () => {
ldapClientMock.getClient.mockImplementation(() => {
clientMock.bind.mockResolvedValueOnce();
clientMock.search.mockResolvedValueOnce(
createMock<SearchResult>({
searchEntries: [
createMock<Entry>({
dn: fakeDN,
}),
],
}),
);
clientMock.modify.mockRejectedValueOnce(new Error());

return clientMock;
});

const result: Result<PersonID> = await ldapClientService.changeUserPasswordByPersonId(
fakePersonID,
faker.internet.userName(),
);

if (result.ok) throw Error();
expect(result.error).toStrictEqual(new LdapModifyUserPasswordError());
expect(loggerMock.error).toHaveBeenLastCalledWith(
`LDAP: Modifying userPassword (UEM) FAILED, errMsg:{}`,
);
expect(eventServiceMock.publish).toHaveBeenCalledTimes(0);
});
});

describe('when person can be found and userPassword can be modified', () => {
let fakePersonID: string;
let fakeDN: string;

beforeEach(() => {
fakePersonID = faker.string.uuid();
fakeDN = faker.string.alpha();
});

describe('when', () => {
it('should publish event and return new (UEM) userPassword', async () => {
ldapClientMock.getClient.mockImplementation(() => {
clientMock.bind.mockResolvedValueOnce();
clientMock.search.mockResolvedValueOnce(
createMock<SearchResult>({
searchEntries: [
createMock<Entry>({
dn: fakeDN,
}),
],
}),
);
clientMock.modify.mockResolvedValueOnce(undefined);

return clientMock;
});

const result: Result<PersonID> = await ldapClientService.changeUserPasswordByPersonId(
fakePersonID,
faker.internet.userName(),
);

if (!result.ok) throw Error();
expect(result.value).toHaveLength(8);
expect(loggerMock.info).toHaveBeenLastCalledWith(
`LDAP: Successfully modified userPassword (UEM) for personId:${fakePersonID}`,
);
expect(eventServiceMock.publish).toHaveBeenCalledTimes(1);
});
});
});
});
});
Loading
Loading