Mark users blocked pending approval when block_auto_created_users is set
What does this MR do?
This MR changes the user status after LDAP and OAuth single sign on account creations are blocked via block_auto_created_users so signups can be worked via the pending approvals list.
This MR does not introduce support for blocking LDAP/OAuth accounts via require_admin_approval_after_user_signup.
Truth table for the instance setting with respect to block_auto_created_users:
| require_admin_approval_after_user_signup | block_auto_created_users (LDAP/OAuth) | Result |
|---|---|---|
| false | false | active |
| true | false | active |
| false | true | blocked_pending_approval |
| true | true | blocked_pending_approval |
Screenshots (strongly suggested)
Sample OAuth flow
Does this MR meet the acceptance criteria?
Conformity
-
I have included a changelog entry, or it's not needed. (Does this MR need a changelog?) -
I have added/updated documentation, or it's not needed. (Is documentation required?) -
I have properly separated EE content from FOSS, or this MR is FOSS only. (Where should EE code go?) -
I have added information for database reviewers in the MR description, or it's not needed. (Does this MR have database related changes?) -
I have self-reviewed this MR per code review guidelines. -
This MR does not harm performance, or I have asked a reviewer to help assess the performance impact. (Merge request performance guidelines) -
I have followed the style guides. -
This change is backwards compatible across updates, or this does not apply.
Availability and Testing
-
I have added/updated tests following the Testing Guide, or it's not needed. (Consider all test levels. See the Test Planning Process.) -
I have tested this MR in all supported browsers, or it's not needed. -
I have informed the Infrastructure department of a default or new setting change per definition of done, or it's not needed.
Security
Does this MR contain changes to processing or storing of credentials or tokens, authorization and authentication methods or other items described in the security review guidelines? If not, then delete this Security section.
-
Label as security and @ mention @gitlab-com/gl-security/appsec -
The MR includes necessary changes to maintain consistency between UI, API, email, or other methods -
Security reports checked/validated by a reviewer from the AppSec team
Related to #285124 (closed)
Edited by Vincent Fazio