Merge dependabot/github_actions/actions/checkout-4.2.1 into combined-…

…prs-branch

.github/workflows/ci.yml

@@ -54,7 +54,7 @@ jobs:
     steps:
 
       - name: Checkout Code Repository
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.2.1
 
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/[email protected]
@@ -111,7 +111,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.2.1
 
       - name: Set up Python
         uses: actions/[email protected]

.github/workflows/gitleaks.yml

@@ -10,7 +10,7 @@ jobs:
     name: gitleaks
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.7
+      - uses: actions/checkout@v4.2.1
         with:
           fetch-depth: 0
       - uses: gitleaks/[email protected]

.github/workflows/pip-compile.yml

@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - name: Checkout Code Repository
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.2.1
         with:
           ref: ${{ github.head_ref }}
 

.pre-commit-config.yaml

@@ -1,18 +1,18 @@
 exclude: 'docs|node_modules|migrations|.git|.tox'
-default_stages: [commit]
+default_stages: [pre-commit]
 fail_fast: true
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
       - id: check-yaml
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.6.5
+    rev: v0.6.9
     hooks:
       # Run the linter.
       - id: ruff
@@ -21,7 +21,7 @@ repos:
       - id: ruff-format
 
   - repo: https://github.com/gitleaks/gitleaks
-    rev: v8.19.2
+    rev: v8.20.0
     hooks:
       - id: gitleaks
 

gregor_django/templates/socialaccount/authentication_error.html

@@ -0,0 +1,15 @@
+{% extends "socialaccount/base.html" %}
+
+{% load i18n %}
+
+{% block head_title %}{% trans "Social Network Login Failure" %}{% endblock %}
+
+{% block content %}
+<h1>{% trans "Social Network Login Failure" %}</h1>
+
+<p>{% trans "Sorry. An error occurred while attempting to login via your social network account." %}</p>
+
+<p class='alert alert-error'>
+    Authentication error code: {{ auth_error.code }}, Error: {{ auth_error.exception }}
+</p>
+{% endblock %}

gregor_django/users/adapters.py

@@ -185,3 +185,11 @@ def update_user_data(self, sociallogin: Any):
         self.update_user_research_centers(user, extra_data)
         self.update_user_partner_groups(user, extra_data)
         self.update_user_groups(user, extra_data)
+
+    def authentication_error(self, request, provider_id, error, exception, extra_context):
+        """
+        Invoked when there is an error in auth cycle.
+        Log so we know what is going on.
+        """
+        logger.error(f"[SocialAccountAdapter:authentication_error] Error {error} Exception: {exception}")
+        super().authentication_error(request, provider_id, error, exception, extra_context)