Skip to content

make ILDAPProviderFactory usable when there is no ldap setup - #25326

Merged
MorrisJobke merged 1 commit into
masterfrom
ldap-factory-no-ldap
Mar 31, 2021
Merged

make ILDAPProviderFactory usable when there is no ldap setup#25326
MorrisJobke merged 1 commit into
masterfrom
ldap-factory-no-ldap

Conversation

@icewind1991

@icewind1991icewind1991 commented Jan 25, 2021

Copy link
Copy Markdown
Member

Currently there is no nice way to inject an LDAPProvider into a class that has optional ldap support, by adding a dummy ILDAPProviderFactory one can be injected even if no ldap is setup, ILDAPProviderFactory::isAvailable can then be used to determine if ldap is available.

@icewind1991icewind1991 added the 3. to review Waiting for reviews label Jan 25, 2021
@icewind1991icewind1991 added this to the Nextcloud 21 milestone Jan 25, 2021
blizzz
blizzz approved these changes Jan 25, 2021
View reviewed changes

@blizzzblizzz left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good one. API change should be reflected in critical changes, but I don't expect (and am not aware) that there is any custom implementation out there.

@icewind1991

icewind1991 commented Jan 25, 2021

Copy link
Copy Markdown
MemberAuthor

I was also considering not having the isAvailable method and instead throwing an exception, that would remove the api break but using exceptions for expected behaviour isn't great.

@nextcloudnextcloud deleted a comment from faily-botBotJan 25, 2021
@blizzz

blizzz commented Jan 25, 2021

Copy link
Copy Markdown
Member

I was also considering not having the isAvailable method and instead throwing an exception, that would remove the api break but using exceptions for expected behaviour isn't great.

No, I agree with you. That was not ideally implemented, and my memory tricked me into thinking: it's a factory, that would not throw Exceptions unnecessarily. Thanks for taking care!

@icewind1991
icewind1991force-pushed the ldap-factory-no-ldap branch 2 times, most recently from 0d7d69a to 3d7d7b2CompareJanuary 26, 2021 18:04
@nextcloudnextcloud deleted a comment from faily-botBotJan 26, 2021
This was referenced Jan 27, 2021
Merged
Merged
@rullzerrullzer modified the milestones: Nextcloud 21, Nextcloud 22Feb 2, 2021
@rullzer

rullzer commented Feb 2, 2021

Copy link
Copy Markdown
Member

Master is Nextcloud 22 now.
If this should go into 21 it should be backported.

@icewind1991
make ILDAPProviderFactory usable when there is no ldap setup
65b7851
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991

icewind1991 commented Mar 31, 2021

Copy link
Copy Markdown
MemberAuthor

Rebased

@icewind1991icewind1991 mentioned this pull request Mar 31, 2021
Merged
1 task
MorrisJobke
MorrisJobke reviewed Mar 31, 2021
View reviewed changes
Comment threadlib/private/Server.php
$factory = new $factoryClass($this);
return new $factoryClass($this);
});
$this->registerService(ILDAPProvider::class, function (ContainerInterface $c) {

@MorrisJobkeMorrisJobkeMar 31, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would not allow this. That leads to a direct exception if LDAP is not enabled. I would only allow the way via the factory.

@icewind1991icewind1991Mar 31, 2021

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This exists for BC reasons, mirroring the previous behavior when apps tried to query LDAPProvider

@MorrisJobkeMorrisJobkeMar 31, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it. I didn't noticed it because of the diff 🙈

MorrisJobke
MorrisJobke requested changes Mar 31, 2021
View reviewed changes

@MorrisJobkeMorrisJobke left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See inline.

MorrisJobke
MorrisJobke approved these changes Mar 31, 2021
View reviewed changes

@MorrisJobkeMorrisJobke left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@MorrisJobke
MorrisJobke merged commit 6a81477 into masterMar 31, 2021
@MorrisJobke
MorrisJobke deleted the ldap-factory-no-ldap branch March 31, 2021 19:23
@icewind1991icewind1991 mentioned this pull request Apr 1, 2021
Merged
@MorrisJobkeMorrisJobke mentioned this pull request Apr 1, 2021
Closed
@MorrisJobke

MorrisJobke commented Apr 1, 2021

Copy link
Copy Markdown
Member

Good one. API change should be reflected in critical changes, but I don't expect (and am not aware) that there is any custom implementation out there.

Done.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@MorrisJobkeMorrisJobkeMorrisJobke approved these changes
@blizzzblizzzblizzz approved these changes
@rullzerrullzerAwaiting requested review from rullzer

Assignees

No one assigned

Labels

3. to reviewWaiting for reviews

Projects

None yet

Milestone

Nextcloud 22

Development

Successfully merging this pull request may close these issues.

4 participants

@icewind1991@blizzz@rullzer@MorrisJobke