Skip to content

[stable26] Do not override stored credentials when login in with SAML - #37900

Merged
artonge merged 2 commits into
stable26from
backport/stable26/artonge/fix/dont_override_stored_credentials_with_saml
Apr 26, 2023
Merged

[stable26] Do not override stored credentials when login in with SAML#37900
artonge merged 2 commits into
stable26from
backport/stable26/artonge/fix/dont_override_stored_credentials_with_saml

Conversation

@artonge

Copy link
Copy Markdown
Collaborator

Manual backport of #37717

@artongeartonge added this to the Nextcloud 26.0.2 milestone Apr 24, 2023
@artonge
artonge requested a review from a teamApril 24, 2023 13:13
@artongeartonge self-assigned this Apr 24, 2023
@artonge
artonge requested review from ArtificialOwl, blizzz and icewind1991 and removed request for a teamApril 24, 2023 13:13
@artonge

Copy link
Copy Markdown
CollaboratorAuthor

/rebase

When login in with SAML, the password from `$event->getPassword()` is `null`.
This PR makes sure that this `null` value won't be used to override the stored password even though it is different.
This PR also allow for the password and user to be updated even though they were not set before.
Signed-off-by: Louis Chemineau <louis@chmn.me>
Signed-off-by: Louis Chemineau <louis@chmn.me>
@nextcloud-command
nextcloud-commandforce-pushed the backport/stable26/artonge/fix/dont_override_stored_credentials_with_saml branch from 81cfb98 to a395cdeCompareApril 25, 2023 07:50
@artonge
artonge requested review from a team and come-ncApril 25, 2023 09:07
@artonge
artonge enabled auto-merge April 26, 2023 07:45
@artonge
artonge merged commit 748f960 into stable26Apr 26, 2023
@artonge
artonge deleted the backport/stable26/artonge/fix/dont_override_stored_credentials_with_saml branch April 26, 2023 17:08
@blizzzblizzz mentioned this pull request May 16, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@artonge@icewind1991@Pytal