Skip to content

Do not try to recreate ldap user if they are already created#9900

Merged
zeripath merged 5 commits into
go-gitea:masterfrom
zeripath:fix-9897
Jan 21, 2020
Merged

Do not try to recreate ldap user if they are already created#9900
zeripath merged 5 commits into
go-gitea:masterfrom
zeripath:fix-9897

Conversation

@zeripath
Copy link
Copy Markdown
Contributor

@zeripath zeripath commented Jan 20, 2020

FIx #9897

@zeripath zeripath added this to the 1.12.0 milestone Jan 20, 2020
@codecov-io
Copy link
Copy Markdown

codecov-io commented Jan 20, 2020 •
edited
Loading

Codecov Report

❗ No coverage uploaded for pull request base (master@6b4791c). Click here to learn what that means.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff            @@
##             master   #9900   +/-   ##
========================================
  Coverage          ?   42.3%           
========================================
  Files             ?     607           
  Lines             ?   79357           
  Branches          ?       0           
========================================
  Hits              ?   33570           
  Misses            ?   41646           
  Partials          ?    4141

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6b4791c...fcd9994. Read the comment docs.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jan 20, 2020
@lafriks
Copy link
Copy Markdown
Member

lafriks commented Jan 20, 2020

ExternalUserLogin also does need to remove autocreate param then

@zeripath
Copy link
Copy Markdown
Contributor Author

zeripath commented Jan 20, 2020 •
edited
Loading

I agree - but I'm intending this to be backported and don't want to completely restructure all of this code.

Ah screw it. It's a small change anyway. Done.

@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Jan 20, 2020
@zeripath
Copy link
Copy Markdown
Contributor Author

zeripath commented Jan 20, 2020

I've just done the slight refactor that removes the autoregister bit.

@iamdoubz iamdoubz mentioned this pull request Jan 21, 2020
Closed
7 tasks
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Jan 21, 2020
@zeripath zeripath merged commit a315e09 into go-gitea:master Jan 21, 2020
@zeripath zeripath deleted the fix-9897 branch January 21, 2020 18:49
zeripath added a commit to zeripath/gitea that referenced this pull request Jan 21, 2020
@zeripath @techknowlogick
Do not try to recreate ldap user if they are already created (go-gite…
0155fb6 
…a#9900)

* Do not try to recreate ldap user if they are already created

* just remove autoregister

Co-authored-by: techknowlogick <matti@mdranta.net>
sapk pushed a commit that referenced this pull request Jan 21, 2020
@zeripath @techknowlogick @sapk
Do not try to recreate ldap user if they are already created (#9900) (#…
79c1d48 
…9919)

* Do not try to recreate ldap user if they are already created

* just remove autoregister

Co-authored-by: techknowlogick <matti@mdranta.net>

Co-authored-by: techknowlogick <matti@mdranta.net>
@zeripath zeripath mentioned this pull request Jan 22, 2020
Merged
@zeripath zeripath added the backport/done All backports for this PR have been created label Jan 22, 2020
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@lafriks lafriks lafriks approved these changes

+1 more reviewer

@guillep2k guillep2k guillep2k approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

backport/done All backports for this PR have been created lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug

Projects

None yet

Milestone

1.12.0

Development

Successfully merging this pull request may close these issues.

LDAP BindDN Multiple Log In Options Results in user already exists error

6 participants

@zeripath @codecov-io @lafriks @guillep2k @GiteaBot @techknowlogick