Merge branch 'master' into bug/integrity-error-azure

.github/dependabot.yml

@@ -0,0 +1,12 @@
+version: 2
+updates:
+- package-ecosystem: github-actions
+  directory: /
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10
+- package-ecosystem: pip
+  directory: /
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10

.github/workflows/flake8.yml

@@ -9,12 +9,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Setup Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
-        python-version: '3.10'
+        python-version: 3.x
         cache: pip
         cache-dependency-path: requirements*.txt
 

.github/workflows/release.yml

@@ -8,10 +8,10 @@ jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: '3.9'
         cache: pip
@@ -37,7 +37,7 @@ jobs:
       run: python setup.py sdist bdist_wheel --python-tag py3
 
     - name: Archive dist
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: dist
         path: |

.github/workflows/test.yml

@@ -19,10 +19,10 @@ jobs:
       PYTHONUNBUFFERED: 1
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
         cache: pip
@@ -36,12 +36,12 @@ jobs:
     - name: Install Python dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install tox coverage
+        pip install coverage tox
 
     - name: Test with tox
       run: tox -e "py${PYTHON_VERSION/\./}"
 
-    - uses: codecov/codecov-action@v1
+    - uses: codecov/codecov-action@v3
       with:
         flags: unittests
         name: Python ${{ matrix.python-version }}

.pre-commit-config.yaml

@@ -32,7 +32,7 @@ repos:
   - id: check-hooks-apply
   - id: check-useless-excludes
 - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
-  rev: v2.6.0
+  rev: v2.7.0
   hooks:
   - id: pretty-format-yaml
     args: [--autofix, --indent, '2']

CHANGELOG.md

@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Facebook Limited Login backend
 
 ### Changed
+- Removed OpenStackDevOpenId backend
 - 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/

requirements-dev.txt

@@ -1 +1 @@
-pre-commit==2.20.0
+pre-commit==3.1.1

social_core/backends/clef.py

@@ -35,10 +35,7 @@ def get_user_details(self, response):
         )
 
         email = info.get("email", "")
-        if email:
-            username = email.split("@", 1)[0]
-        else:
-            username = info.get("id")
+        username = email.split("@", 1)[0] if email else info.get("id")
 
         return {
             "username": username,

social_core/backends/google.py

@@ -20,10 +20,7 @@ def get_user_id(self, details, response):
 
     def get_user_details(self, response):
         """Return user details from Google API account"""
-        if "email" in response:
-            email = response["email"]
-        else:
-            email = ""
+        email = response.get("email", "")
 
         name, given_name, family_name = (
             response.get("name", ""),

social_core/backends/saml.py

@@ -73,10 +73,7 @@ def get_attr(self, attributes, conf_key, default_attribute):
         key = self.conf.get(conf_key, default_attribute)
         value = attributes[key] if key in attributes else None
         if isinstance(value, list):
-            if len(value):
-                value = value[0]
-            else:
-                value = None
+            value = value[0] if value else None
         return value
 
     @property

social_core/pipeline/user.py

@@ -31,10 +31,7 @@ def identity_func(val):
 
         if do_slugify:
             override_slug = strategy.setting("SLUGIFY_FUNCTION")
-            if override_slug:
-                slug_func = module_member(override_slug)
-            else:
-                slug_func = slugify
+            slug_func = module_member(override_slug) if override_slug else slugify
         else:
             slug_func = identity_func
 

social_core/tests/backends/oauth.py

@@ -32,11 +32,8 @@ def handle_state(self, start_url, target_url):
         start_query = parse_qs(urlparse(start_url).query)
         redirect_uri = start_query.get("redirect_uri")
 
-        if getattr(self.backend, "STATE_PARAMETER", False):
-            if start_query.get("state"):
-                target_url = url_add_parameters(
-                    target_url, {"state": start_query["state"]}
-                )
+        if getattr(self.backend, "STATE_PARAMETER", False) and start_query.get("state"):
+            target_url = url_add_parameters(target_url, {"state": start_query["state"]})
 
         if redirect_uri and getattr(self.backend, "REDIRECT_STATE", False):
             redirect_query = parse_qs(urlparse(redirect_uri).query)

social_core/utils.py

@@ -124,10 +124,7 @@ def user_is_authenticated(user):
 
 def user_is_active(user):
     if user and hasattr(user, "is_active"):
-        if callable(user.is_active):
-            is_active = user.is_active()
-        else:
-            is_active = user.is_active
+        is_active = user.is_active() if callable(user.is_active) else user.is_active
     elif user:
         is_active = True
     else: