Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions docs/gl_objects/users.rst
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,10 @@ Set an external identity for a user::
user.extern_uid = '3'
user.save()

Delete an external identity by provider name::

user.identityproviders.delete('oauth2_generic')

User custom attributes
======================

Expand Down
17 changes: 17 additions & 0 deletions gitlab/tests/objects/test_users.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,19 @@ def resp_get_user_status():
yield rsps


@pytest.fixture
def resp_delete_user_identity(no_content):
with responses.RequestsMock() as rsps:
rsps.add(
method=responses.DELETE,
url="http://localhost/api/v4/users/1/identities/test_provider",
json=no_content,
content_type="application/json",
status=204,
)
yield rsps


def test_get_user(gl, resp_get_user):
user = gl.users.get(1)
assert isinstance(user, User)
Expand All @@ -118,3 +131,7 @@ def test_user_status(user, resp_get_user_status):
def test_user_activate_deactivate(user, resp_activate):
user.activate()
user.deactivate()


def test_delete_user_identity(user, resp_delete_user_identity):
user.identityproviders.delete("test_provider")
12 changes: 12 additions & 0 deletions gitlab/v4/objects/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,17 @@ class UserStatusManager(GetWithoutIdMixin, RESTManager):
_from_parent_attrs = {"user_id": "id"}


class UserIdentityProviderManager(DeleteMixin, RESTManager):
"""Manager for user identities.

This manager does not actually manage objects but enables
functionality for deletion of user identities by provider.
"""

_path = "/users/%(user_id)s/identities"
_from_parent_attrs = {"user_id": "id"}


class UserImpersonationToken(ObjectDeleteMixin, RESTObject):
pass

Expand Down Expand Up @@ -320,6 +331,7 @@ class User(SaveMixin, ObjectDeleteMixin, RESTObject):
("emails", "UserEmailManager"),
("events", "UserEventManager"),
("gpgkeys", "UserGPGKeyManager"),
("identityproviders", "UserIdentityProviderManager"),
("impersonationtokens", "UserImpersonationTokenManager"),
("keys", "UserKeyManager"),
("memberships", "UserMembershipManager"),
Expand Down
20 changes: 20 additions & 0 deletions tools/functional/api/test_users.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
"""
GitLab API:
https://docs.gitlab.com/ee/api/users.html
https://docs.gitlab.com/ee/api/users.html#delete-authentication-identity-from-user
"""


def test_user_identities(gl, user):
provider = "test_provider"

user.provider = provider
user.extern_uid = "1"
user.save()

assert provider in [item["provider"] for item in user.identities]

user.identityproviders.delete(provider)
user = gl.users.get(user.id)

assert provider not in [item["provider"] for item in user.identities]