From f1755598016bc6a8d2f284a518e0844bb359f4f5 Mon Sep 17 00:00:00 2001 From: tiago-peres Date: Wed, 8 Feb 2023 18:15:52 +0000 Subject: [PATCH 1/2] fix integrityerror during azure auth --- CHANGELOG.md | 2 +- social_core/backends/azuread.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f2aefb9d..ed677f48 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ### Changed - Updated `user_data` method in `StripeOAuth2` to return `email` in `get_user_details` - Removes fixed version of `lxml` - +- Updated Azure to fix IntegrityError at /social-auth/complete/azuread-oauth2/ ## [4.3.0](https://github.com/python-social-auth/social-core/releases/tag/4.3.0) - 2022-06-13 diff --git a/social_core/backends/azuread.py b/social_core/backends/azuread.py index 837d2c54..7d22a64b 100644 --- a/social_core/backends/azuread.py +++ b/social_core/backends/azuread.py @@ -79,8 +79,8 @@ def access_token_url(self): return self.ACCESS_TOKEN_URL.format(base_url=self.base_url) def get_user_id(self, details, response): - """Use upn as unique id""" - return response.get("upn") + """Use subject (sub) claim as unique id.""" + return response.get('sub') def get_user_details(self, response): """Return user details from Azure AD account""" From 0e8ddacccce5c818a691e0a4c168a2452fbbcbd3 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 8 Feb 2023 18:20:16 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- social_core/backends/azuread.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/social_core/backends/azuread.py b/social_core/backends/azuread.py index 7d22a64b..c9370fcf 100644 --- a/social_core/backends/azuread.py +++ b/social_core/backends/azuread.py @@ -80,7 +80,7 @@ def access_token_url(self): def get_user_id(self, details, response): """Use subject (sub) claim as unique id.""" - return response.get('sub') + return response.get("sub") def get_user_details(self, response): """Return user details from Azure AD account"""