Skip to content

Commit

Permalink
Revert "Make Keycloak's ID_KEY configurable"
Browse files Browse the repository at this point in the history
This reverts commit 70d7713.
  • Loading branch information
RJPercival authored and nijel committed Nov 29, 2023
1 parent 51ff887 commit 0925304
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 12 deletions.
1 change: 0 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
### Changed
- Fixed Azure AD Tenant authentication with custom signing keys
- Added CAS OIDC backend
- Made Keycloak `ID_KEY` configurable

## [4.4.1](https://github.com/python-social-auth/social-core/releases/tag/4.4.1) - 2023-03-30

Expand Down
14 changes: 3 additions & 11 deletions social_core/backends/keycloak.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ class KeycloakOAuth2(BaseOAuth2): # pylint: disable=abstract-method
"""

name = "keycloak"
ID_KEY = "username"
ACCESS_TOKEN_METHOD = "POST"
REDIRECT_STATE = False

Expand All @@ -120,9 +121,6 @@ def public_key(self):
]
)

def id_key(self):
return self.setting("ID_KEY", default="username")

def user_data(
self, access_token, *args, **kwargs
): # pylint: disable=unused-argument
Expand Down Expand Up @@ -151,11 +149,5 @@ def get_user_details(self, response):
}

def get_user_id(self, details, response):
"""Get and associate Django User by the field indicated by ID_KEY
The ID_KEY can be any field in the user details or the access token.
"""
id_key = self.id_key()
if id_key in details:
return details[id_key]
return response.get(id_key)
"""Get and associate Django User by the field indicated by ID_KEY"""
return details.get(self.ID_KEY)

0 comments on commit 0925304

Please sign in to comment.