Version Bump 5.0.0a3

This reverts commit f497c18e5b.

.coveragerc

@@ -19,5 +19,6 @@ exclude_lines =
     if __name__ == .__main__.:
     def __repr__
     raise AssertionError
+    if TYPE_CHECKING:
 
 ignore_errors = True

.git-blame-ignore-revs

@@ -0,0 +1,6 @@
+# git config blame.ignoreRevsFile .git-blame-ignore-revs
+
+
+
+# Ruff initial formatting storm
+a99315ea55339f0b6010b5c9d8703e51278fcf29

.gitignore

@@ -71,6 +71,7 @@ celerybeat-schedule
 
 #other
 .flake8
+.ruff_cache
 .pylintrc
 Makefile
 alliance_auth.sqlite3

.gitlab-ci.yml

@@ -25,12 +25,12 @@ before_script:
 pre-commit-check:
   <<: *only-default
   stage: pre-commit
-  image: python:3.11-bullseye
-  variables:
-    PRE_COMMIT_HOME: ${CI_PROJECT_DIR}/.cache/pre-commit
-  cache:
-    paths:
-      - ${PRE_COMMIT_HOME}
+  image: python:3.12-bookworm
+  # variables:
+  #   PRE_COMMIT_HOME: ${CI_PROJECT_DIR}/.cache/pre-commit
+  # cache:
+  #   paths:
+  #     - ${PRE_COMMIT_HOME}
   script:
     - pip install pre-commit
     - pre-commit run --all-files
@@ -51,33 +51,9 @@ secret_detection:
   stage: gitlab
   before_script: []
 
-test-3.8-core:
-  <<: *only-default
-  image: python:3.8-bullseye
-  script:
-    - tox -e py38-core
-  artifacts:
-    when: always
-    reports:
-      coverage_report:
-        coverage_format: cobertura
-        path: coverage.xml
-
-test-3.9-core:
-  <<: *only-default
-  image: python:3.9-bullseye
-  script:
-    - tox -e py39-core
-  artifacts:
-    when: always
-    reports:
-      coverage_report:
-        coverage_format: cobertura
-        path: coverage.xml
-
 test-3.10-core:
   <<: *only-default
-  image: python:3.10-bullseye
+  image: python:3.10-bookworm
   script:
     - tox -e py310-core
   artifacts:
@@ -89,7 +65,7 @@ test-3.10-core:
 
 test-3.11-core:
   <<: *only-default
-  image: python:3.11-bullseye
+  image: python:3.11-bookworm
   script:
     - tox -e py311-core
   artifacts:
@@ -101,7 +77,7 @@ test-3.11-core:
 
 test-3.12-core:
   <<: *only-default
-  image: python:3.12-rc-bullseye
+  image: python:3.12-bookworm
   script:
     - tox -e py312-core
   artifacts:
@@ -111,23 +87,11 @@ test-3.12-core:
         coverage_format: cobertura
         path: coverage.xml
 
-test-3.8-all:
+test-3.13-core:
   <<: *only-default
-  image: python:3.8-bullseye
+  image: python:3.13-rc-bookworm
   script:
-    - tox -e py38-all
-  artifacts:
-    when: always
-    reports:
-      coverage_report:
-        coverage_format: cobertura
-        path: coverage.xml
-
-test-3.9-all:
-  <<: *only-default
-  image: python:3.9-bullseye
-  script:
-    - tox -e py39-all
+    - tox -e py313-core
   artifacts:
     when: always
     reports:
@@ -137,7 +101,7 @@ test-3.9-all:
 
 test-3.10-all:
   <<: *only-default
-  image: python:3.10-bullseye
+  image: python:3.10-bookworm
   script:
     - tox -e py310-all
   artifacts:
@@ -149,7 +113,7 @@ test-3.10-all:
 
 test-3.11-all:
   <<: *only-default
-  image: python:3.11-bullseye
+  image: python:3.11-bookworm
   script:
     - tox -e py311-all
   artifacts:
@@ -162,7 +126,7 @@ test-3.11-all:
 
 test-3.12-all:
   <<: *only-default
-  image: python:3.12-rc-bullseye
+  image: python:3.12-bookworm
   script:
     - tox -e py312-all
   artifacts:
@@ -172,9 +136,21 @@ test-3.12-all:
         coverage_format: cobertura
         path: coverage.xml
 
+test-3.13-all:
+  <<: *only-default
+  image: python:3.13-rc-bookworm
+  script:
+    - tox -e py313-all
+  artifacts:
+    when: always
+    reports:
+      coverage_report:
+        coverage_format: cobertura
+        path: coverage.xml
+
 build-test:
   stage: test
-  image: python:3.11-bullseye
+  image: python:3.12-bookworm
 
   before_script:
     - python -m pip install --upgrade pip
@@ -193,13 +169,13 @@ build-test:
 
 test-docs:
   <<: *only-default
-  image: python:3.11-bullseye
+  image: python:3.12-bookworm
   script:
     - tox -e docs
 
 deploy_production:
   stage: deploy
-  image: python:3.11-bullseye
+  image: python:3.12-bookworm
 
   before_script:
     - python -m pip install --upgrade pip
@@ -215,10 +191,10 @@ deploy_production:
 
 build-image:
   before_script: []
-  image: docker:24.0
+  image: docker:27
   stage: docker
   services:
-    - docker:24.0-dind
+    - docker:27-dind
   script: |
     CURRENT_DATE=$(echo $CI_COMMIT_TIMESTAMP | head -c 10 | tr -d -)
     IMAGE_TAG=$CI_REGISTRY_IMAGE/auth:$CURRENT_DATE-$CI_COMMIT_SHORT_SHA
@@ -239,10 +215,10 @@ build-image:
 
 build-image-dev:
   before_script: []
-  image: docker:24.0
+  image: docker:27
   stage: docker
   services:
-    - docker:24.0-dind
+    - docker:27-dind
   script: |
     CURRENT_DATE=$(echo $CI_COMMIT_TIMESTAMP | head -c 10 | tr -d -)
     IMAGE_TAG=$CI_REGISTRY_IMAGE/auth:$CURRENT_DATE-$CI_COMMIT_BRANCH-$CI_COMMIT_SHORT_SHA
@@ -260,10 +236,10 @@ build-image-dev:
 
 build-image-mr:
   before_script: []
-  image: docker:24.0
+  image: docker:27
   stage: docker
   services:
-    - docker:24.0-dind
+    - docker:27-dind
   script: |
     CURRENT_DATE=$(echo $CI_COMMIT_TIMESTAMP | head -c 10 | tr -d -)
     IMAGE_TAG=$CI_REGISTRY_IMAGE/auth:$CURRENT_DATE-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME-$CI_COMMIT_SHORT_SHA

.pre-commit-config.yaml

@@ -3,9 +3,42 @@
 # Update this file:
 #   pre-commit autoupdate
 
+# Set the default language versions for the hooks
+default_language_version:
+  python: python3  # Force all Python hooks to use Python 3
+  node: 22.12.0  # Force all Node hooks to use Node 22.12.0
+
+# Globally exclude files
+# https://pre-commit.com/#top_level-exclude
+exclude: |
+  (?x)(
+    LICENSE|
+    allianceauth\/static\/allianceauth\/css\/themes\/bootstrap-locals.less|
+    \.min\.css|
+    \.min\.js|
+    \.po|
+    \.mo|
+    swagger\.json|
+    static/(.*)/libs/|
+    telnetlib\.py
+  )
+
 repos:
+  # Code Upgrades
+  - repo: https://github.com/adamchainz/django-upgrade
+    rev: 1.25.0
+    hooks:
+      - id: django-upgrade
+        args: [--target-version=5.2]
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v3.20.0
+    hooks:
+      - id: pyupgrade
+        args: [--py310-plus]
+
+  # Formatting
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v5.0.0
     hooks:
       # Identify invalid files
       - id: check-ast
@@ -13,73 +46,52 @@ repos:
       - id: check-json
       - id: check-toml
       - id: check-xml
-
       # git checks
       - id: check-merge-conflict
       - id: check-added-large-files
-        args: [ --maxkb=1000 ]
+        args: [--maxkb=1000]
       - id: detect-private-key
       - id: check-case-conflict
-
       # Python checks
 #      - id: check-docstring-first
       - id: debug-statements
 #      - id: requirements-txt-fixer
       - id: fix-encoding-pragma
-        args: [ --remove ]
+        args: [--remove]
       - id: fix-byte-order-marker
-
       # General quality checks
       - id: mixed-line-ending
-        args: [ --fix=lf ]
+        args: [--fix=lf]
       - id: trailing-whitespace
-        args: [ --markdown-linebreak-ext=md ]
-        exclude: |
-          (?x)(
-            \.min\.css|
-            \.min\.js|
-            \.po|
-            \.mo|
-            swagger\.json
-          )
+        args: [--markdown-linebreak-ext=md]
       - id: check-executables-have-shebangs
       - id: end-of-file-fixer
-        exclude: |
-          (?x)(
-            \.min\.css|
-            \.min\.js|
-            \.po|
-            \.mo|
-            swagger\.json
-          )
-
   - repo: https://github.com/editorconfig-checker/editorconfig-checker.python
-    rev: 2.7.2
+    rev: 3.2.1
     hooks:
       - id: editorconfig-checker
-        exclude: |
-          (?x)(
-            LICENSE|
-            allianceauth\/static\/allianceauth\/css\/themes\/bootstrap-locals.less|
-            \.po|
-            \.mo|
-            swagger\.json
-          )
-
-  - repo: https://github.com/asottile/pyupgrade
-    rev: v3.10.1
+  - repo: https://github.com/igorshubovych/markdownlint-cli
+    rev: v0.45.0
     hooks:
-      - id: pyupgrade
-        args: [ --py38-plus ]
+      - id: markdownlint
+        language: node
+        args:
+          - --disable=MD013
 
-  - repo: https://github.com/adamchainz/django-upgrade
-    rev: 1.14.0
+  # Infrastructure
+  - repo: https://github.com/tox-dev/pyproject-fmt
+    rev: v2.6.0
     hooks:
-      - id: django-upgrade
-        args: [--target-version=4.2]
-
-  - repo: https://github.com/asottile/setup-cfg-fmt
-    rev: v2.3.0
+      - id: pyproject-fmt
+        args:
+          - --indent=4
+        additional_dependencies:
+          - tox==4.26.0 # https://github.com/tox-dev/tox/releases/latest
+  - repo: https://github.com/tox-dev/tox-ini-fmt
+    rev: 1.5.0
     hooks:
-      - id: setup-cfg-fmt
-        args: [ --include-version-classifiers ]
+      - id: tox-ini-fmt
+  - repo: https://github.com/abravalheri/validate-pyproject
+    rev: v0.24.1
+    hooks:
+      - id: validate-pyproject

.readthedocs.yml

@@ -7,11 +7,11 @@ version: 2
 
 # Set the version of Python and other tools you might need
 build:
-  os: ubuntu-22.04
+  os: ubuntu-24.04
   apt_packages:
     - redis
   tools:
-    python: "3.11"
+    python: "3.12"
   jobs:
     post_system_dependencies:
       - redis-server --daemonize yes

.tx/config

@@ -1,10 +0,0 @@
-[main]
-host     = https://app.transifex.com
-lang_map = zh-Hans: zh_Hans
-
-[o:alliance-auth:p:alliance-auth:r:django-po]
-file_filter  = allianceauth/locale/<lang>/LC_MESSAGES/django.po
-source_file  = allianceauth/locale/en/LC_MESSAGES/django.po
-source_lang  = en
-type         = PO
-minimum_perc = 0

README.md

@@ -5,7 +5,7 @@
 [![django](https://img.shields.io/pypi/djversions/allianceauth?label=django)](https://pypi.org/project/allianceauth/)
 [![version](https://img.shields.io/pypi/v/allianceauth?label=release)](https://pypi.org/project/allianceauth/)
 [![pipeline status](https://gitlab.com/allianceauth/allianceauth/badges/master/pipeline.svg)](https://gitlab.com/allianceauth/allianceauth/commits/master)
-[![Documentation Status](https://readthedocs.org/projects/allianceauth/badge/?version=latest)](http://allianceauth.readthedocs.io/?badge=latest)
+[![Documentation Status](https://readthedocs.org/projects/allianceauth/badge/?version=latest)](https://allianceauth.readthedocs.io/?badge=latest)
 [![coverage report](https://gitlab.com/allianceauth/allianceauth/badges/master/coverage.svg)](https://gitlab.com/allianceauth/allianceauth/commits/master)
 [![Chat on Discord](https://img.shields.io/discord/399006117012832262.svg)](https://discord.gg/fjnHAmk)
 
@@ -14,7 +14,7 @@ An auth system for EVE Online to help in-game organizations manage online servic
 ## Content
 
 - [Overview](#overview)
-- [Documentation](http://allianceauth.rtfd.io)
+- [Documentation](https://allianceauth.rtfd.io)
 - [Support](#support)
 - [Release Notes](https://gitlab.com/allianceauth/allianceauth/-/releases)
 - [Developer Team](#development-team)
@@ -38,7 +38,7 @@ Main features:
 
 - English :flag_gb:, Chinese :flag_cn:, German :flag_de:, Spanish :flag_es:, Korean :flag_kr:, Russian :flag_ru:, Italian :flag_it:, French :flag_fr:, Japanese :flag_jp: and Ukrainian :flag_ua: Localization
 
-For further details about AA - including an installation guide and a full list of included services and plugin apps - please see the [official documentation](http://allianceauth.rtfd.io).
+For further details about AA - including an installation guide and a full list of included services and plugin apps - please see the [official documentation](https://allianceauth.rtfd.io).
 
 ## Screenshot
 

allianceauth/__init__.py

@@ -5,7 +5,7 @@ manage online service access.
 # This will make sure the app is always imported when
 # Django starts so that shared_task will use this app.
 
-__version__ = '4.0.0a5'
-__title__ = 'Alliance Auth'
+__version__ = '5.0.0a3'
+__title__ = 'AllianceAuth'
 __url__ = 'https://gitlab.com/allianceauth/allianceauth'
 NAME = f'{__title__} v{__version__}'

allianceauth/analytics/admin.py

@@ -1,15 +1,17 @@
+from solo.admin import SingletonModelAdmin
+
 from django.contrib import admin
 
 from .models import AnalyticsIdentifier, AnalyticsTokens
 
 
 @admin.register(AnalyticsIdentifier)
-class AnalyticsIdentifierAdmin(admin.ModelAdmin):
+class AnalyticsIdentifierAdmin(SingletonModelAdmin):
     search_fields = ['identifier', ]
-    list_display = ('identifier',)
+    list_display = ['identifier', ]
 
 
 @admin.register(AnalyticsTokens)
 class AnalyticsTokensAdmin(admin.ModelAdmin):
     search_fields = ['name', ]
-    list_display = ('name', 'type',)
+    list_display = ['name', 'type', ]

allianceauth/analytics/migrations/0001_initial.py

@@ -1,8 +1,9 @@
 # Generated by Django 3.1.4 on 2020-12-30 13:11
 
-from django.db import migrations, models
 import uuid
 
+from django.db import migrations, models
+
 
 class Migration(migrations.Migration):
 

allianceauth/analytics/migrations/0002_add_AA_Team_Token.py

@@ -21,7 +21,7 @@ def remove_aa_team_token(apps, schema_editor):
     # Have to define some code to remove this identifier
     # In case of migration rollback?
     Tokens = apps.get_model('analytics', 'AnalyticsTokens')
-    token = Tokens.objects.filter(token="UA-186249766-2").delete()
+    Tokens.objects.filter(token="UA-186249766-2").delete()
 
 
 class Migration(migrations.Migration):

allianceauth/analytics/migrations/0003_Generate_Identifier.py

@@ -1,6 +1,5 @@
 # Generated by Django 3.1.4 on 2020-12-30 08:53
 
-from uuid import uuid4
 from django.db import migrations
 
 

allianceauth/analytics/migrations/0008_add_AA_GA-4_Team_Token .py

@@ -1,7 +1,7 @@
 # Generated by Django 3.1.4 on 2020-12-30 08:53
 
-from django.db import migrations
 from django.core.exceptions import ObjectDoesNotExist
+from django.db import migrations
 
 
 def add_aa_team_token(apps, schema_editor):
@@ -51,7 +51,7 @@ def remove_aa_team_token(apps, schema_editor):
     # Have to define some code to remove this identifier
     # In case of migration rollback?
     Tokens = apps.get_model('analytics', 'AnalyticsTokens')
-    token = Tokens.objects.filter(token="G-6LYSMYK8DE").delete()
+    Tokens.objects.filter(token="G-6LYSMYK8DE").delete()
 
 
 class Migration(migrations.Migration):

allianceauth/analytics/migrations/0010_alter_analyticsidentifier_options.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.2.16 on 2024-12-11 02:17
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('analytics', '0009_remove_analyticstokens_ignore_paths_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='analyticsidentifier',
+            options={'verbose_name': 'Analytics Identifier'},
+        ),
+    ]

allianceauth/analytics/models.py

@@ -1,24 +1,21 @@
-from django.db import models
-from django.core.exceptions import ValidationError
-from django.utils.translation import gettext_lazy as _
-
+from typing import Literal
 from uuid import uuid4
 
+from solo.models import SingletonModel
 
-class AnalyticsIdentifier(models.Model):
+from django.db import models
+from django.utils.translation import gettext_lazy as _
 
-    identifier = models.UUIDField(
-        default=uuid4,
-        editable=False)
 
-    def save(self, *args, **kwargs):
-        if not self.pk and AnalyticsIdentifier.objects.exists():
-            # Force a single object
-            raise ValidationError('There is can be only one \
-                                    AnalyticsIdentifier instance')
-        self.pk = self.id = 1  # If this happens to be deleted and recreated, force it to be 1
-        return super().save(*args, **kwargs)
+class AnalyticsIdentifier(SingletonModel):
 
+    identifier = models.UUIDField(default=uuid4, editable=False)
+
+    def __str__(self) -> Literal['Analytics Identifier']:
+        return "Analytics Identifier"
+
+    class Meta:
+        verbose_name = "Analytics Identifier"
 
 class AnalyticsTokens(models.Model):
 
@@ -31,3 +28,6 @@ class AnalyticsTokens(models.Model):
     token = models.CharField(max_length=254, blank=False)
     secret = models.CharField(max_length=254, blank=True)
     send_stats = models.BooleanField(default=False)
+
+    def __str__(self) -> str:
+        return self.name

allianceauth/analytics/tasks.py

@@ -1,13 +1,15 @@
-import requests
 import logging
-from django.conf import settings
-from django.apps import apps
+
+import requests
 from celery import shared_task
-from .models import AnalyticsTokens, AnalyticsIdentifier
-from .utils import (
-    install_stat_addons,
-    install_stat_tokens,
-    install_stat_users)
+
+from django.apps import apps
+from django.conf import settings
+
+from allianceauth import __version__
+
+from .models import AnalyticsIdentifier, AnalyticsTokens
+from .utils import existence_baremetal_or_docker, install_stat_addons, install_stat_tokens, install_stat_users
 
 logger = logging.getLogger(__name__)
 
@@ -65,8 +67,8 @@ def analytics_event(namespace: str,
                 value=value).apply_async(priority=9)
 
 
-@shared_task()
-def analytics_daily_stats():
+@shared_task
+def analytics_daily_stats() -> None:
     """Celery Task: Do not call directly
 
     Gathers a series of daily statistics
@@ -75,6 +77,7 @@ def analytics_daily_stats():
     users = install_stat_users()
     tokens = install_stat_tokens()
     addons = install_stat_addons()
+    existence_type = existence_baremetal_or_docker()
     logger.debug("Running Daily Analytics Upload")
 
     analytics_event(namespace='allianceauth.analytics',
@@ -82,6 +85,11 @@ def analytics_daily_stats():
                     label='existence',
                     value=1,
                     event_type='Stats')
+    analytics_event(namespace='allianceauth.analytics',
+                    task='send_install_stats',
+                    label=existence_type,
+                    value=1,
+                    event_type='Stats')
     analytics_event(namespace='allianceauth.analytics',
                     task='send_install_stats',
                     label='users',
@@ -97,16 +105,42 @@ def analytics_daily_stats():
                     label='addons',
                     value=addons,
                     event_type='Stats')
-
     for appconfig in apps.get_app_configs():
-        analytics_event(namespace='allianceauth.analytics',
-                        task='send_extension_stats',
-                        label=appconfig.label,
-                        value=1,
-                        event_type='Stats')
+        if appconfig.label in [
+            "django_celery_beat",
+            "bootstrapform",
+            "messages",
+            "sessions",
+            "auth",
+            "staticfiles",
+            "users",
+            "addons",
+            "admin",
+            "humanize",
+            "contenttypes",
+            "sortedm2m",
+            "django_bootstrap5",
+            "tokens",
+            "authentication",
+            "services",
+            "framework",
+            "notifications"
+            "eveonline",
+            "navhelper",
+            "analytics",
+            "menu",
+            "theme"
+        ]:
+            pass
+        else:
+            analytics_event(namespace='allianceauth.analytics',
+                            task='send_extension_stats',
+                            label=appconfig.label,
+                            value=1,
+                            event_type='Stats')
 
 
-@shared_task()
+@shared_task
 def send_ga_tracking_celery_event(
         measurement_id: str,
         secret: str,
@@ -136,10 +170,10 @@ def send_ga_tracking_celery_event(
     }
 
     payload = {
-        'client_id': AnalyticsIdentifier.objects.get(id=1).identifier.hex,
+        'client_id': AnalyticsIdentifier.get_solo().identifier.hex,
         "user_properties": {
             "allianceauth_version": {
-                "value": "allianceauth_version"
+                "value": __version__
             }
         },
         'non_personalized_ads': True,

allianceauth/analytics/tests/test_models.py

@@ -1,10 +1,8 @@
-from allianceauth.analytics.models import AnalyticsIdentifier
-from django.core.exceptions import ValidationError
+from uuid import uuid4
 
 from django.test.testcases import TestCase
 
-from uuid import UUID, uuid4
-
+from allianceauth.analytics.models import AnalyticsIdentifier
 
 # Identifiers
 uuid_1 = "ab33e241fbf042b6aa77c7655a768af7"
@@ -14,14 +12,4 @@ uuid_2 = "7aa6bd70701f44729af5e3095ff4b55c"
 class TestAnalyticsIdentifier(TestCase):
 
     def test_identifier_random(self):
-        self.assertNotEqual(AnalyticsIdentifier.objects.get(), uuid4)
-
-    def test_identifier_singular(self):
-        AnalyticsIdentifier.objects.all().delete()
-        AnalyticsIdentifier.objects.create(identifier=uuid_1)
-        # Yeah i have multiple asserts here, they all do the same thing
-        with self.assertRaises(ValidationError):
-            AnalyticsIdentifier.objects.create(identifier=uuid_2)
-        self.assertEqual(AnalyticsIdentifier.objects.count(), 1)
-        self.assertEqual(AnalyticsIdentifier.objects.get(
-            pk=1).identifier, UUID(uuid_1))
+        self.assertNotEqual(AnalyticsIdentifier.get_solo(), uuid4)

allianceauth/analytics/tests/test_tasks.py

@@ -2,12 +2,9 @@ import requests_mock
 
 from django.test.utils import override_settings
 
-from allianceauth.analytics.tasks import (
-    analytics_event,
-    send_ga_tracking_celery_event)
+from allianceauth.analytics.tasks import analytics_event, send_ga_tracking_celery_event
 from allianceauth.utils.testing import NoSocketsTestCase
 
-
 GOOGLE_ANALYTICS_DEBUG_URL = 'https://www.google-analytics.com/debug/mp/collect'
 
 

allianceauth/analytics/tests/test_utils.py

@@ -1,10 +1,9 @@
 from django.apps import apps
-from allianceauth.authentication.models import User
-from esi.models import Token
-from allianceauth.analytics.utils import install_stat_users, install_stat_tokens, install_stat_addons
-
 from django.test.testcases import TestCase
 
+from allianceauth.analytics.utils import install_stat_addons, install_stat_users
+from allianceauth.authentication.models import User
+
 
 def create_testdata():
     User.objects.all().delete()

allianceauth/analytics/utils.py

@@ -1,7 +1,11 @@
+import os
+
 from django.apps import apps
-from allianceauth.authentication.models import User
+
 from esi.models import Token
 
+from allianceauth.authentication.models import User
+
 
 def install_stat_users() -> int:
     """Count and Return the number of User accounts
@@ -34,3 +38,16 @@ def install_stat_addons() -> int:
         The Number of Installed Apps"""
     addons = len(list(apps.get_app_configs()))
     return addons
+
+
+def existence_baremetal_or_docker() -> str:
+    """Checks the Installation Type of an install
+
+    Returns
+    -------
+    str
+        existence_baremetal or existence_docker"""
+    docker_tag = os.getenv('AA_DOCKER_TAG')
+    if docker_tag:
+        return "existence_docker"
+    return "existence_baremetal"

allianceauth/apps.py

@@ -1,30 +1,8 @@
 from django.apps import AppConfig
-from django.core.checks import Warning, Error, register
 
 
 class AllianceAuthConfig(AppConfig):
     name = 'allianceauth'
 
-
-@register()
-def check_settings(app_configs, **kwargs):
-    from django.conf import settings
-
-    errors = []
-    if hasattr(settings, "SITE_URL"):
-        if settings.SITE_URL[-1] == "/":
-            errors.append(Warning(
-                "'SITE_URL' Has a trailing slash. This may lead to incorrect links being generated by Auth."))
-    else:
-        errors.append(Error(
-            "No 'SITE_URL' found is settings. This may lead to incorrect links being generated by Auth or Errors in 3rd party modules."))
-    if hasattr(settings, "CSRF_TRUSTED_ORIGINS"):
-        if hasattr(settings, "SITE_URL"):
-            if settings.SITE_URL not in settings.CSRF_TRUSTED_ORIGINS:
-                errors.append(Warning(
-                    "'SITE_URL' not found in 'CSRF_TRUSTED_ORIGINS'. Auth may not load pages correctly until this is rectified."))
-    else:
-        errors.append(Error(
-            "No 'CSRF_TRUSTED_ORIGINS' found is settings, Auth may not load pages correctly until this is rectified"))
-
-    return errors
+    def ready(self) -> None:
+        import allianceauth.checks # noqa

allianceauth/authentication/admin.py

@@ -1,43 +1,21 @@
 from django.contrib import admin
 from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
-from django.contrib.auth.models import Group
-from django.contrib.auth.models import Permission as BasePermission
-from django.contrib.auth.models import User as BaseUser
+from django.contrib.auth.models import Group, Permission as BasePermission, User as BaseUser
 from django.db.models import Count, Q
 from django.db.models.functions import Lower
-from django.db.models.signals import (
-    m2m_changed,
-    post_delete,
-    post_save,
-    pre_delete,
-    pre_save
-)
+from django.db.models.signals import m2m_changed, post_delete, post_save, pre_delete, pre_save
 from django.dispatch import receiver
 from django.urls import reverse
 from django.utils.html import format_html
 from django.utils.text import slugify
 
-from allianceauth.authentication.models import (
-    CharacterOwnership,
-    OwnershipRecord,
-    State,
-    UserProfile,
-    get_guest_state
-)
-from allianceauth.eveonline.models import (
-    EveAllianceInfo,
-    EveCharacter,
-    EveCorporationInfo,
-    EveFactionInfo
-)
+from allianceauth.authentication.models import CharacterOwnership, OwnershipRecord, State, UserProfile, get_guest_state
+from allianceauth.eveonline.models import EveAllianceInfo, EveCharacter, EveCorporationInfo, EveFactionInfo
 from allianceauth.eveonline.tasks import update_character
 from allianceauth.hooks import get_hooks
 from allianceauth.services.hooks import ServicesHook
 
-from .app_settings import (
-    AUTHENTICATION_ADMIN_USERS_MAX_CHARS,
-    AUTHENTICATION_ADMIN_USERS_MAX_GROUPS
-)
+from .app_settings import AUTHENTICATION_ADMIN_USERS_MAX_CHARS, AUTHENTICATION_ADMIN_USERS_MAX_GROUPS
 from .forms import UserChangeForm, UserProfileForm
 
 
@@ -132,10 +110,7 @@ def user_username(obj):
     To be used for all user based admin lists
     """
     link = reverse(
-        'admin:{}_{}_change'.format(
-            obj._meta.app_label,
-            type(obj).__name__.lower()
-        ),
+        f'admin:{obj._meta.app_label}_{type(obj).__name__.lower()}_change',
         args=(obj.pk,)
     )
     user_obj = obj.user if hasattr(obj, 'user') else obj
@@ -548,7 +523,7 @@ class BaseOwnershipAdmin(admin.ModelAdmin):
     def get_readonly_fields(self, request, obj=None):
         if obj and obj.pk:
             return 'owner_hash', 'character'
-        return tuple()
+        return ()
 
 
 @admin.register(OwnershipRecord)

allianceauth/authentication/app_settings.py

@@ -25,7 +25,7 @@ def _clean_setting(
     if not required_type:
         required_type = type(default_value)
 
-    if min_value is None and required_type == int:
+    if min_value is None and required_type is int:
         min_value = 0
 
     if (hasattr(settings, name)

allianceauth/authentication/apps.py

@@ -1,5 +1,5 @@
 from django.apps import AppConfig
-from django.core.checks import register, Tags
+from django.core.checks import Tags, register
 
 
 class AuthenticationConfig(AppConfig):

allianceauth/authentication/auth_hooks.py

@@ -1,6 +1,7 @@
-from allianceauth.hooks import DashboardItemHook
 from allianceauth import hooks
-from .views import dashboard_characters, dashboard_groups, dashboard_admin
+from allianceauth.hooks import DashboardItemHook
+
+from .views import dashboard_admin, dashboard_characters, dashboard_esi_check, dashboard_groups
 
 
 class UserCharactersHook(DashboardItemHook):
@@ -26,6 +27,15 @@ class AdminHook(DashboardItemHook):
         DashboardItemHook.__init__(
             self,
             dashboard_admin,
+            1
+        )
+
+
+class ESICheckHook(DashboardItemHook):
+    def __init__(self):
+        DashboardItemHook.__init__(
+            self,
+            dashboard_esi_check,
             0
         )
 
@@ -43,3 +53,8 @@ def register_groups_hook():
 @hooks.register('dashboard_hook')
 def register_admin_hook():
     return AdminHook()
+
+
+@hooks.register('dashboard_hook')
+def register_esi_hook():
+    return ESICheckHook()

allianceauth/authentication/backends.py

@@ -1,10 +1,9 @@
 import logging
 
 from django.contrib.auth.backends import ModelBackend
-from django.contrib.auth.models import User, Permission
-
-from .models import UserProfile, CharacterOwnership, OwnershipRecord
+from django.contrib.auth.models import Permission, User
 
+from .models import CharacterOwnership, OwnershipRecord, UserProfile
 
 logger = logging.getLogger(__name__)
 

allianceauth/authentication/checks.py

@@ -1,5 +1,5 @@
-from django.core.checks import Error
 from django.conf import settings
+from django.core.checks import Error
 
 
 def check_login_scopes_setting(*args, **kwargs):

allianceauth/authentication/constants.py

@@ -0,0 +1,12 @@
+from django.utils.translation import gettext_lazy as _
+
+# Overide ESI messages in the dashboard widget
+# when the returned messages are not helpful or out of date
+ESI_ERROR_MESSAGE_OVERRIDES = {
+    420: _("This software has exceeded the error limit for ESI. "
+            "If you are a user, please contact the maintainer of this software."
+            " If you are a developer/maintainer, please make a greater "
+            "effort in the future to receive valid responses. For tips on how, "
+            "come have a chat with us in ##3rd-party-dev-and-esi on the EVE "
+            "Online Discord. https://www.eveonline.com/discord")
+}

allianceauth/authentication/core/celery_workers.py

@@ -2,7 +2,6 @@
 
 import itertools
 import logging
-from typing import Optional
 
 from amqp.exceptions import ChannelError
 from celery import current_app
@@ -12,7 +11,7 @@ from django.conf import settings
 logger = logging.getLogger(__name__)
 
 
-def active_tasks_count() -> Optional[int]:
+def active_tasks_count() -> int | None:
     """Return count of currently active tasks
     or None if celery workers are not online.
     """
@@ -20,7 +19,7 @@ def active_tasks_count() -> Optional[int]:
     return _tasks_count(inspect.active())
 
 
-def _tasks_count(data: dict) -> Optional[int]:
+def _tasks_count(data: dict) -> int | None:
     """Return count of tasks in data from celery inspect API."""
     try:
         tasks = itertools.chain(*data.values())
@@ -29,7 +28,7 @@ def _tasks_count(data: dict) -> Optional[int]:
     return len(list(tasks))
 
 
-def queued_tasks_count() -> Optional[int]:
+def queued_tasks_count() -> int | None:
     """Return count of queued tasks. Return None if there was an error."""
     try:
         with current_app.connection_or_acquire() as conn:

allianceauth/authentication/decorators.py

@@ -1,14 +1,11 @@
-from django.urls import include
-from django.contrib.auth.decorators import user_passes_test
-from django.core.exceptions import PermissionDenied
+from collections.abc import Callable, Iterable
 from functools import wraps
-from typing import Callable, Iterable, Optional
 
-from django.urls import include
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required, user_passes_test
 from django.core.exceptions import PermissionDenied
 from django.shortcuts import redirect
+from django.urls import include
 from django.utils.translation import gettext_lazy as _
 
 
@@ -17,7 +14,7 @@ def user_has_main_character(user):
 
 
 def decorate_url_patterns(
-    urls, decorator: Callable, excluded_views: Optional[Iterable] = None
+    urls, decorator: Callable, excluded_views: Iterable | None = None
 ):
     """Decorate views given in url patterns except when they are explicitly excluded.
 

allianceauth/authentication/forms.py

@@ -60,7 +60,7 @@ class UserChangeForm(BaseUserChangeForm):
                     {
                         "groups": _(
                             "You are not allowed to add or remove these "
-                            "restricted groups: %s" % restricted_names
+                            "restricted groups: {}".format(restricted_names)
                         )
                     }
                 )

allianceauth/authentication/hmac_urls.py

@@ -1,5 +1,6 @@
+from django.urls import include, path, re_path
+
 from allianceauth.authentication import views
-from django.urls import include, re_path, path
 
 urlpatterns = [
     path('activate/complete/', views.activation_complete, name='registration_activation_complete'),

allianceauth/authentication/management/commands/checkmains.py

@@ -1,4 +1,5 @@
 from django.core.management.base import BaseCommand
+
 from allianceauth.authentication.models import UserProfile
 
 
@@ -11,8 +12,7 @@ class Command(BaseCommand):
         if profiles.exists():
             for profile in profiles:
                 self.stdout.write(self.style.ERROR(
-                    '{} does not have an ownership. Resetting user {} main character.'.format(profile.main_character,
-                                                                                                profile.user)))
+                    f'{profile.main_character} does not have an ownership. Resetting user {profile.user} main character.'))
                 profile.main_character = None
                 profile.save()
             self.stdout.write(self.style.WARNING(f'Reset {profiles.count()} main characters.'))

allianceauth/authentication/managers.py

@@ -1,7 +1,7 @@
 import logging
 
 from django.db import transaction
-from django.db.models import Manager, QuerySet, Q
+from django.db.models import Manager, Q, QuerySet
 
 from allianceauth.eveonline.models import EveCharacter
 

allianceauth/authentication/middleware.py

@@ -1,8 +1,8 @@
+import logging
+
 from django.conf import settings
 from django.utils.deprecation import MiddlewareMixin
 
-import logging
-
 logger = logging.getLogger(__name__)
 
 

allianceauth/authentication/migrations/0001_initial.py

@@ -1,8 +1,8 @@
 # Generated by Django 1.10.1 on 2016-09-05 21:38
 
+import django.db.models.deletion
 from django.conf import settings
 from django.db import migrations, models
-import django.db.models.deletion
 
 
 class Migration(migrations.Migration):

allianceauth/authentication/migrations/0004_create_permissions.py

@@ -2,6 +2,7 @@
 
 from django.db import migrations
 
+
 def create_permissions(apps, schema_editor):
     User = apps.get_model('auth', 'User')
     ContentType = apps.get_model('contenttypes', 'ContentType')

allianceauth/authentication/migrations/0005_delete_perms.py

@@ -2,6 +2,7 @@
 
 from django.db import migrations
 
+
 def delete_permissions(apps, schema_editor):
     User = apps.get_model('auth', 'User')
     ContentType = apps.get_model('contenttypes', 'ContentType')

allianceauth/authentication/migrations/0010_only_one_authservicesinfo.py

@@ -2,6 +2,7 @@
 
 from django.db import migrations
 
+
 def count_completed_fields(model):
     return len([True for key, value in model.__dict__.items() if bool(value)])
 

allianceauth/authentication/migrations/0011_authservicesinfo_user_onetoonefield.py

@@ -1,8 +1,8 @@
 # Generated by Django 1.10.1 on 2017-01-07 07:11
 
+import django.db.models.deletion
 from django.conf import settings
 from django.db import migrations, models
-import django.db.models.deletion
 
 
 class Migration(migrations.Migration):

allianceauth/authentication/migrations/0012_remove_add_delete_authservicesinfo_permissions.py

@@ -1,6 +1,7 @@
 # Generated by Django 1.10.5 on 2017-01-12 00:59
 
-from django.db import migrations, models
+from django.db import migrations
+
 
 def remove_permissions(apps, schema_editor):
     ContentType = apps.get_model('contenttypes', 'ContentType')

allianceauth/authentication/migrations/0013_service_modules.py

@@ -1,9 +1,9 @@
 # Generated by Django 1.10.2 on 2016-12-11 23:14
 
-from django.db import migrations
-
 import logging
 
+from django.db import migrations
+
 logger = logging.getLogger(__name__)
 
 

allianceauth/authentication/migrations/0015_user_profiles.py

@@ -1,11 +1,12 @@
 # Generated by Django 1.10.5 on 2017-03-22 23:09
 
-import allianceauth.authentication.models
 import django.db.models.deletion
 from django.conf import settings
 from django.contrib.auth.hashers import make_password
 from django.db import migrations, models
 
+import allianceauth.authentication.models
+
 
 def create_guest_state(apps, schema_editor):
     State = apps.get_model('authentication', 'State')

allianceauth/authentication/migrations/0016_ownershiprecord.py

@@ -1,8 +1,8 @@
 # Generated by Django 2.0.4 on 2018-04-14 18:28
 
+import django.db.models.deletion
 from django.conf import settings
 from django.db import migrations, models
-import django.db.models.deletion
 
 
 def create_initial_records(apps, schema_editor):

allianceauth/authentication/migrations/0023_alter_userprofile_language.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.13 on 2024-05-12 09:44
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('authentication', '0022_userprofile_theme'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='userprofile',
+            name='language',
+            field=models.CharField(blank=True, choices=[('en', 'English'), ('de', 'German'), ('es', 'Spanish'), ('zh-hans', 'Chinese Simplified'), ('ru', 'Russian'), ('ko', 'Korean'), ('fr', 'French'), ('ja', 'Japanese'), ('it', 'Italian'), ('uk', 'Ukrainian'), ('pl', 'Polish')], default='', max_length=10, verbose_name='Language'),
+        ),
+    ]

allianceauth/authentication/migrations/0024_alter_userprofile_language.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2 on 2024-09-13 09:46
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('authentication', '0023_alter_userprofile_language'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='userprofile',
+            name='language',
+            field=models.CharField(blank=True, choices=[('en', 'English'), ('cs-cz', 'Czech'), ('de', 'German'), ('es', 'Spanish'), ('it-it', 'Italian'), ('ja', 'Japanese'), ('ko-kr', 'Korean'), ('fr-fr', 'French'), ('ru', 'Russian'), ('nl-nl', 'Dutch'), ('pl-pl', 'Polish'), ('uk', 'Ukrainian'), ('zh-hans', 'Simplified Chinese')], default='', max_length=10, verbose_name='Language'),
+        ),
+    ]

allianceauth/authentication/models.py

@@ -1,11 +1,11 @@
 import logging
 
-from django.contrib.auth.models import User, Permission
+from django.contrib.auth.models import Permission, User
 from django.db import models, transaction
 from django.utils.translation import gettext_lazy as _
-from allianceauth.eveonline.models import EveCharacter, EveCorporationInfo, EveAllianceInfo, EveFactionInfo
+
+from allianceauth.eveonline.models import EveAllianceInfo, EveCharacter, EveCorporationInfo, EveFactionInfo
 from allianceauth.notifications import notify
-from django.conf import settings
 
 from .managers import CharacterOwnershipManager, StateManager
 
@@ -32,7 +32,7 @@ class State(models.Model):
     class Meta:
         ordering = ['-priority']
 
-    def __str__(self):
+    def __str__(self) -> str:
         return self.name
 
     def available_to_character(self, character):
@@ -60,24 +60,26 @@ def get_guest_state_pk():
 
 
 class UserProfile(models.Model):
-    class Meta:
-        default_permissions = ('change',)
+
 
     class Language(models.TextChoices):
         """
         Choices for UserProfile.language
         """
-
+        # Sorted by Language Code alphabetical order + English at top
         ENGLISH = 'en', _('English')
+        CZECH = 'cs-cz', _("Czech")  # Not yet at 50% translated
         GERMAN = 'de', _('German')
         SPANISH = 'es', _('Spanish')
-        CHINESE = 'zh-hans', _('Chinese Simplified')
-        RUSSIAN = 'ru', _('Russian')
-        KOREAN = 'ko', _('Korean')
-        FRENCH = 'fr', _('French')
+        ITALIAN = 'it-it', _('Italian')
         JAPANESE = 'ja', _('Japanese')
-        ITALIAN = 'it', _('Italian')
+        KOREAN = 'ko-kr', _('Korean')
+        FRENCH = 'fr-fr', _('French')
+        RUSSIAN = 'ru', _('Russian')
+        DUTCH = 'nl-nl', _("Dutch")
+        POLISH = 'pl-pl', _("Polish")
         UKRAINIAN = 'uk', _('Ukrainian')
+        CHINESE = 'zh-hans', _('Simplified Chinese')
 
     user = models.OneToOneField(
         User,
@@ -105,10 +107,15 @@ class UserProfile(models.Model):
         _("Theme"),
         max_length=200,
         blank=True,
-        null=True,
         help_text="Bootstrap 5 Themes from https://bootswatch.com/ or Community Apps"
     )
 
+    class Meta:
+        default_permissions = ('change',)
+
+    def __str__(self) -> str:
+        return str(self.user)
+
     def assign_state(self, state=None, commit=True):
         if not state:
             state = State.objects.get_for_user(self.user)
@@ -119,7 +126,7 @@ class UserProfile(models.Model):
                 self.save(update_fields=['state'])
                 notify(
                     self.user,
-                    _('State changed to: %s' % state),
+                    _(f'State changed to: {state}'),
                     _('Your user\'s state is now: %(state)s')
                     % ({'state': state}),
                     'info'
@@ -134,20 +141,19 @@ class UserProfile(models.Model):
                     sender=self.__class__, user=self.user, state=self.state
                 )
 
-    def __str__(self):
-        return str(self.user)
+
 class CharacterOwnership(models.Model):
-    class Meta:
-        default_permissions = ('change', 'delete')
-        ordering = ['user', 'character__character_name']
+
 
     character = models.OneToOneField(EveCharacter, on_delete=models.CASCADE, related_name='character_ownership')
     owner_hash = models.CharField(max_length=28, unique=True)
     user = models.ForeignKey(User, on_delete=models.CASCADE, related_name='character_ownerships')
 
     objects = CharacterOwnershipManager()
-
-    def __str__(self):
+    class Meta:
+        default_permissions = ('change', 'delete')
+        ordering = ['user', 'character__character_name']
+    def __str__(self) -> str:
         return f"{self.user}: {self.character}"
 
 
@@ -160,5 +166,5 @@ class OwnershipRecord(models.Model):
     class Meta:
         ordering = ['-created']
 
-    def __str__(self):
+    def __str__(self) -> str:
         return f"{self.user}: {self.character} on {self.created}"

allianceauth/authentication/signals.py

@@ -1,19 +1,16 @@
 import logging
 
-from .models import (
-    CharacterOwnership,
-    UserProfile,
-    get_guest_state,
-    State,
-    OwnershipRecord)
 from django.contrib.auth.models import User
 from django.db.models import Q
-from django.db.models.signals import pre_save, post_save, pre_delete, post_delete, m2m_changed
-from django.dispatch import receiver, Signal
+from django.db.models.signals import m2m_changed, post_delete, post_save, pre_delete, pre_save
+from django.dispatch import Signal, receiver
+
 from esi.models import Token
 
 from allianceauth.eveonline.models import EveCharacter
 
+from .models import CharacterOwnership, OwnershipRecord, State, UserProfile, get_guest_state
+
 logger = logging.getLogger(__name__)
 
 state_changed = Signal()
@@ -108,8 +105,7 @@ def record_character_ownership(sender, instance, created, *args, **kwargs):
 def validate_main_character(sender, instance, *args, **kwargs):
     try:
         if instance.user.profile.main_character == instance.character:
-            logger.info("Ownership of a main character {} has been revoked. Resetting {} main character.".format(
-                instance.character, instance.user))
+            logger.info(f"Ownership of a main character {instance.character} has been revoked. Resetting {instance.user} main character.")
             # clear main character as user no longer owns them
             instance.user.profile.main_character = None
             instance.user.profile.save()

allianceauth/authentication/task_statistics/counters.py

@@ -1,7 +1,7 @@
 """Counters for Task Statistics."""
 
 import datetime as dt
-from typing import NamedTuple, Optional
+from typing import NamedTuple
 
 from .event_series import EventSeries
 
@@ -16,7 +16,7 @@ class _TaskCounts(NamedTuple):
     retried: int
     failed: int
     total: int
-    earliest_task: Optional[dt.datetime]
+    earliest_task: dt.datetime | None
     hours: int
 
 

allianceauth/authentication/task_statistics/event_series.py

@@ -2,7 +2,6 @@
 
 import datetime as dt
 import logging
-from typing import List, Optional
 
 from pytz import utc
 from redis import Redis
@@ -17,7 +16,7 @@ class EventSeries:
 
     _ROOT_KEY = "ALLIANCEAUTH_EVENT_SERIES"
 
-    def __init__(self, key_id: str, redis: Optional[Redis] = None) -> None:
+    def __init__(self, key_id: str, redis: Redis | None = None) -> None:
         self._redis = get_redis_client_or_stub() if not redis else redis
         self._key_id = str(key_id)
         self.clear()
@@ -46,7 +45,7 @@ class EventSeries:
         my_id = self._redis.incr(self._key_counter)
         self._redis.zadd(self._key_sorted_set, {my_id: event_time.timestamp()})
 
-    def all(self) -> List[dt.datetime]:
+    def all(self) -> list[dt.datetime]:
         """List of all known events."""
         return [
             event[1]
@@ -75,7 +74,7 @@ class EventSeries:
         maximum = "+inf" if not latest else latest.timestamp()
         return self._redis.zcount(self._key_sorted_set, min=minimum, max=maximum)
 
-    def first_event(self, earliest: dt.datetime = None) -> Optional[dt.datetime]:
+    def first_event(self, earliest: dt.datetime = None) -> dt.datetime | None:
         """Date/Time of first event. Returns `None` if series has no events.
 
         Args:

allianceauth/authentication/task_statistics/signals.py

@@ -1,7 +1,11 @@
 """Signals for Task Statistics."""
 
 from celery.signals import (
-    task_failure, task_internal_error, task_retry, task_success, worker_ready,
+    task_failure,
+    task_internal_error,
+    task_retry,
+    task_success,
+    worker_ready,
 )
 
 from django.conf import settings

allianceauth/authentication/task_statistics/tests/test_counters.py

@@ -4,7 +4,10 @@ from django.test import TestCase
 from django.utils.timezone import now
 
 from allianceauth.authentication.task_statistics.counters import (
-    dashboard_results, failed_tasks, retried_tasks, succeeded_tasks,
+    dashboard_results,
+    failed_tasks,
+    retried_tasks,
+    succeeded_tasks,
 )
 
 

allianceauth/authentication/task_statistics/tests/test_helpers.py

@@ -4,7 +4,8 @@ from unittest.mock import patch
 from redis import RedisError
 
 from allianceauth.authentication.task_statistics.helpers import (
-    _RedisStub, get_redis_client_or_stub,
+    _RedisStub,
+    get_redis_client_or_stub,
 )
 
 MODULE_PATH = "allianceauth.authentication.task_statistics.helpers"

allianceauth/authentication/task_statistics/tests/test_signals.py

@@ -10,8 +10,8 @@ from allianceauth.authentication.task_statistics.counters import (
     succeeded_tasks,
 )
 from allianceauth.authentication.task_statistics.signals import (
-    reset_counters,
     is_enabled,
+    reset_counters,
 )
 from allianceauth.eveonline.tasks import update_character
 

allianceauth/authentication/tasks.py

@@ -1,9 +1,10 @@
 import logging
 
-from esi.errors import TokenExpiredError, TokenInvalidError, IncompleteResponseError
-from esi.models import Token
 from celery import shared_task
 
+from esi.errors import IncompleteResponseError, TokenExpiredError, TokenInvalidError
+from esi.models import Token
+
 from allianceauth.authentication.models import CharacterOwnership
 
 logger = logging.getLogger(__name__)
@@ -22,8 +23,7 @@ def check_character_ownership(owner_hash):
                 continue
             except (KeyError, IncompleteResponseError):
                 # We can't validate the hash hasn't changed but also can't assume it has. Abort for now.
-                logger.warning("Failed to validate owner hash of {} due to problems contacting SSO servers.".format(
-                    tokens[0].character_name))
+                logger.warning(f"Failed to validate owner hash of {tokens[0].character_name} due to problems contacting SSO servers.")
                 break
 
             if not t.character_owner_hash == old_hash:
@@ -33,7 +33,7 @@ def check_character_ownership(owner_hash):
             break
 
     if not Token.objects.filter(character_owner_hash=owner_hash).exists():
-        logger.info('No tokens found with owner hash %s. Revoking ownership.' % owner_hash)
+        logger.info(f'No tokens found with owner hash {owner_hash}. Revoking ownership.')
         CharacterOwnership.objects.filter(owner_hash=owner_hash).delete()
 
 

allianceauth/authentication/templates/authentication/dashboard.html

@@ -7,7 +7,7 @@
     {% translate "Dashboard" %}
 {% endblock %}
 {% block content %}
-    <div class="d-flex justify-content-around align-self-center flex-wrap">
+    <div class="row">
         {% for dash in views %}
             {{ dash | safe }}
         {% endfor %}

allianceauth/authentication/templates/authentication/dashboard_characters.html

@@ -1,13 +1,11 @@
 {% load i18n %}
-<div class="col-12 col-xl-8 align-self-stretch p-2 ps-0 pe-0 ps-xl-0 pe-xl-2">
-    <div class="card">
+<div id="aa-dashboard-panel-characters" class="col-12 col-xl-8 mb-3">
+    <div class="card h-100">
         <div class="card-body">
-            <div class="d-flex align-items-center">
-                <h4 class="ms-auto me-auto">
-                    {% translate "Characters" %}
-                </h4>
-            </div>
-            <div class="card-body">
+            {% translate "Characters" as widget_title %}
+            {% include "framework/dashboard/widget-title.html" with title=widget_title %}
+
+            <div>
                 <div style="height: 300px; overflow-y:auto;">
                     <div class="d-flex">
                         <a href="{% url 'authentication:add_character' %}" class="btn btn-primary flex-fill m-1" title="{% translate 'Add Character' %}">

allianceauth/authentication/templates/authentication/dashboard_groups.html

@@ -1,9 +1,11 @@
 {% load i18n %}
-<div class="col-12 col-xl-4 align-self-stretch py-2 ps-xl-2">
+<div id="aa-dashboard-panel-membership" class="col-12 col-xl-4 mb-3">
     <div class="card h-100">
         <div class="card-body">
-            <h4 class="card-title text-center">{% translate "Membership" %}</h4>
-            <div class="card-body">
+            {% translate "Membership" as widget_title %}
+            {% include "framework/dashboard/widget-title.html" with title=widget_title %}
+
+            <div>
                 <div style="height: 300px; overflow-y:auto;">
                     <h5 class="text-center">{% translate "State:" %} {{ request.user.profile.state }}</h5>
                     <table class="table">

allianceauth/authentication/templates/authentication/tokens.html

@@ -1,5 +1,6 @@
 {% extends "allianceauth/base-bs5.html" %}
 
+{% load aa_i18n %}
 {% load i18n %}
 
 {% block page_title %}
@@ -13,10 +14,10 @@
 {% block content %}
     <div>
         <p class="mb-3">
-            {% translate "This page is a best attempt, but backups or database logs can still contain your tokens. Always revoke tokens on https://community.eveonline.com/support/third-party-applications/ where possible."|urlize %}
+            {% translate "This page is a best attempt, but backups or database logs can still contain your tokens. Always revoke tokens on https://developers.eveonline.com/authorized-apps where possible."|urlize %}
         </p>
 
-        <table class="table" id="table_tokens" style="width: 100%;">
+        <table class="table w-100" id="table_tokens">
             <thead>
                 <tr>
                     <th>{% translate "Scopes" %}</th>
@@ -50,20 +51,23 @@
 {% block extra_javascript %}
     {% include "bundles/datatables-js-bs5.html" %}
 
+    {% get_datatables_language_static LANGUAGE_CODE as DT_LANG_PATH %}
+
     <script>
         $(document).ready(() => {
             let grp = 2;
 
-            const table = $('#table_tokens').DataTable({
+            $('#table_tokens').DataTable({
+                "language": {"url": '{{ DT_LANG_PATH }}'},
                 'columnDefs': [{orderable: false, targets: [0, 1]}, {
                     'visible': false,
                     'targets': grp
                 }],
                 'order': [[grp, 'asc']],
                 'drawCallback': function (settings) {
-                    var api = this.api();
-                    var rows = api.rows({page: 'current'}).nodes();
-                    var last = null;
+                    const api = this.api();
+                    const rows = api.rows({page: 'current'}).nodes();
+                    let last = null;
                     api.column(grp, {page: 'current'})
                         .data()
                         .each((group, i) => {

allianceauth/authentication/templates/public/base.html

@@ -1,3 +1,4 @@
+{% load theme_tags %}
 {% load static %}
 <!DOCTYPE html>
 <html lang="en">
@@ -16,7 +17,7 @@
 
         <title>{% block title %}{% block page_title %}{% endblock page_title %} - {{ SITE_NAME }}{% endblock title %}</title>
 
-        {% include 'bundles/bootstrap-css-bs5.html' %}
+        {% theme_css %}
         {% include 'bundles/fontawesome.html' %}
 
         {% block extra_include %}

allianceauth/authentication/templates/public/lang_select.html

@@ -4,12 +4,12 @@
     <form action="{% url 'set_language' %}" method="post">
         {% csrf_token %}
 
-        <select onchange="this.form.submit()" class="form-control" id="lang-select" name="language">
-            {% get_language_info_list for LANGUAGES as languages %}
+        <select class="form-select" onchange="this.form.submit()" class="form-control" id="lang-select" name="language">
+            {% get_available_languages as LANGUAGES %}
 
-            {% for language in languages %}
-                <option lang="{{ language.code }}" value="{{ language.code }}"{% if language.code == LANGUAGE_CODE %} selected="selected"{% endif %}>
-                    {{ language.name_local|capfirst }} ({{ language.code }})
+            {% for lang_code, lang_name in LANGUAGES %}
+                <option lang="{{ lang_code }}" value="{{ lang_code }}"{% if lang_code == LANGUAGE_CODE %} selected{% endif %}>
+                    {{ lang_code|language_name_local|capfirst }} ({{ lang_code }})
                 </option>
             {% endfor %}
         </select>

allianceauth/authentication/templates/public/middle_box.html

@@ -4,7 +4,7 @@
 
 {% block content %}
     <div class="row justify-content-center">
-        <div class="col-md-4">
+        <div class="col-md-6">
             {% if messages %}
                 {% for message in messages %}
                     <div class="alert alert-{{ message.level_tag}}">{{ message }}</div>
@@ -29,7 +29,7 @@
                 </p>
 
                 <p class="text-center">
-                    <a class="text-reset" href="https://community.eveonline.com/support/third-party-applications/" target="_blank" rel="noopener noreferrer">
+                    <a class="text-reset" href="https://developers.eveonline.com/authorized-apps" target="_blank" rel="noopener noreferrer">
                         {% translate "Manage ESI Applications" %}
                     </a>
                 </p>

allianceauth/authentication/templates/public/register.html

@@ -1,6 +1,6 @@
 {% extends 'public/base.html' %}
 
-{% load bootstrap %}
+{% load django_bootstrap5 %}
 {% load i18n %}
 
 {% block page_title %}{% translate "Registration" %}{% endblock %}
@@ -12,16 +12,20 @@
 {% endblock %}
 
 {% block content %}
-    <div class="col-md-4 col-md-offset-4">
-        <div class="panel panel-default panel-transparent">
-            <div class="panel-body">
-                <form method="POST">
-                    {% csrf_token %}
-                    {{ form|bootstrap }}
-                    <button class="btn btn-lg btn-primary btn-block" type="submit">{% translate "Register" %}</button>
-                </form>
+    <div class="row justify-content-center">
+        <div class="col-md-6">
+            <div class="card card-login border-secondary p-3">
+                <div class="card-body">
+                    <form method="POST">
+                        {% csrf_token %}
+                        {% bootstrap_form form %}
+
+                        <button class="btn btn-primary btn-block" type="submit">{% translate "Register" %}</button>
+                    </form>
+
+                    {% include 'public/lang_select.html' %}
+                </div>
             </div>
         </div>
-        {% include 'public/lang_select.html' %}
     </div>
 {% endblock %}

allianceauth/authentication/tests/__init__.py

@@ -1,12 +1,7 @@
-from django.db.models.signals import (
-    m2m_changed,
-    post_save,
-    pre_delete,
-    pre_save
-)
-from django.urls import reverse
 from unittest import mock
 
+from django.urls import reverse
+
 MODULE_PATH = 'allianceauth.authentication'
 
 
@@ -17,9 +12,7 @@ def patch(target, *args, **kwargs):
 def get_admin_change_view_url(obj: object) -> str:
     """returns URL to admin change view for given object"""
     return reverse(
-        'admin:{}_{}_change'.format(
-            obj._meta.app_label, type(obj).__name__.lower()
-        ),
+        f'admin:{obj._meta.app_label}_{type(obj).__name__.lower()}_change',
         args=(obj.pk,)
     )
 

allianceauth/authentication/tests/core/test_celery_workers.py

@@ -5,7 +5,8 @@ from amqp.exceptions import ChannelError
 from django.test import TestCase
 
 from allianceauth.authentication.core.celery_workers import (
-    active_tasks_count, queued_tasks_count,
+    active_tasks_count,
+    queued_tasks_count,
 )
 
 MODULE_PATH = "allianceauth.authentication.core.celery_workers"

allianceauth/authentication/tests/test_admin.py

@@ -1,42 +1,37 @@
-from bs4 import BeautifulSoup
+from unittest.mock import MagicMock, patch
 from urllib.parse import quote
-from unittest.mock import patch, MagicMock
 
+from bs4 import BeautifulSoup
 from django_webtest import WebTest
 
 from django.contrib.admin.sites import AdminSite
 from django.contrib.auth.models import Group
-from django.test import TestCase, RequestFactory, Client
+from django.test import Client, RequestFactory, TestCase
 
-from allianceauth.authentication.models import (
-    CharacterOwnership, State, OwnershipRecord
-)
-from allianceauth.eveonline.models import (
-    EveCharacter, EveCorporationInfo, EveAllianceInfo, EveFactionInfo
-)
+from allianceauth.authentication.models import CharacterOwnership, OwnershipRecord, State
+from allianceauth.eveonline.models import EveAllianceInfo, EveCharacter, EveCorporationInfo, EveFactionInfo
 from allianceauth.services.hooks import ServicesHook
 from allianceauth.tests.auth_utils import AuthUtils
 
 from ..admin import (
     BaseUserAdmin,
     CharacterOwnershipAdmin,
-    StateAdmin,
-    MainCorporationsFilter,
     MainAllianceFilter,
+    MainCorporationsFilter,
     MainFactionFilter,
     OwnershipRecordAdmin,
+    StateAdmin,
     User,
     UserAdmin,
+    make_service_hooks_sync_nickname_action,
+    make_service_hooks_update_groups_action,
+    update_main_character_model,
     user_main_organization,
     user_profile_pic,
     user_username,
-    update_main_character_model,
-    make_service_hooks_update_groups_action,
-    make_service_hooks_sync_nickname_action
 )
 from . import get_admin_change_view_url, get_admin_search_url
 
-
 MODULE_PATH = 'allianceauth.authentication.admin'
 
 
@@ -327,15 +322,15 @@ class TestUserAdmin(TestCaseWithTestData):
 
     def test_user_username_u1(self):
         expected = (
-            '<strong><a href="/admin/authentication/user/{}/change/">'
-            'Bruce_Wayne</a></strong><br>Bruce Wayne'.format(self.user_1.pk)
+            f'<strong><a href="/admin/authentication/user/{self.user_1.pk}/change/">'
+            'Bruce_Wayne</a></strong><br>Bruce Wayne'
         )
         self.assertEqual(user_username(self.user_1), expected)
 
     def test_user_username_u3(self):
         expected = (
-            '<strong><a href="/admin/authentication/user/{}/change/">'
-            'Lex_Luthor</a></strong>'.format(self.user_3.pk)
+            f'<strong><a href="/admin/authentication/user/{self.user_3.pk}/change/">'
+            'Lex_Luthor</a></strong>'
         )
         self.assertEqual(user_username(self.user_3), expected)
 

allianceauth/authentication/tests/test_app_settings.py

@@ -1,4 +1,5 @@
 from unittest.mock import Mock, patch
+
 from django.test import TestCase
 
 from .. import app_settings
@@ -83,7 +84,7 @@ class TestSetAppSetting(TestCase):
         self.assertEqual(result, 50)
 
     @patch(MODULE_PATH + '.app_settings.settings')
-    def test_default_for_invalid_type_int(self, mock_settings):
+    def test_default_for_outofrange_int(self, mock_settings):
         mock_settings.TEST_SETTING_DUMMY = 1000
         result = app_settings._clean_setting(
             'TEST_SETTING_DUMMY',
@@ -96,7 +97,7 @@ class TestSetAppSetting(TestCase):
     def test_default_is_none_needs_required_type(self, mock_settings):
         mock_settings.TEST_SETTING_DUMMY = 'invalid type'
         with self.assertRaises(ValueError):
-            result = app_settings._clean_setting(
+            app_settings._clean_setting(
                 'TEST_SETTING_DUMMY',
                 default_value=None
             )

allianceauth/authentication/tests/test_backend.py

@@ -1,13 +1,13 @@
-from django.contrib.auth.models import User, Group
+from django.contrib.auth.models import Group, User
 from django.test import TestCase
 
+from esi.models import Token
+
 from allianceauth.eveonline.models import EveCharacter
 from allianceauth.tests.auth_utils import AuthUtils
 
-from esi.models import Token
-
 from ..backends import StateBackend
-from ..models import CharacterOwnership, UserProfile, OwnershipRecord
+from ..models import CharacterOwnership, OwnershipRecord, UserProfile
 
 MODULE_PATH = 'allianceauth.authentication'
 

allianceauth/authentication/tests/test_decorators.py

@@ -6,12 +6,11 @@ from django.contrib.auth.models import AnonymousUser
 from django.http.response import HttpResponse
 from django.test import TestCase
 from django.test.client import RequestFactory
-from django.urls import reverse, URLPattern
+from django.urls import URLPattern, reverse
 
 from allianceauth.eveonline.models import EveCharacter
 from allianceauth.tests.auth_utils import AuthUtils
 
-
 from ..decorators import decorate_url_patterns, main_character_required
 from ..models import CharacterOwnership
 
@@ -47,7 +46,7 @@ class DecoratorTestCase(TestCase):
 
     @mock.patch(MODULE_PATH + '.decorators.messages')
     def test_login_redirect(self, m):
-        setattr(self.request, 'user', AnonymousUser())
+        self.request.user = AnonymousUser()
         response = self.dummy_view(self.request)
         self.assertEqual(response.status_code, 302)
         url = getattr(response, 'url', None)
@@ -55,7 +54,7 @@ class DecoratorTestCase(TestCase):
 
     @mock.patch(MODULE_PATH + '.decorators.messages')
     def test_main_character_redirect(self, m):
-        setattr(self.request, 'user', self.no_main_user)
+        self.request.user = self.no_main_user
         response = self.dummy_view(self.request)
         self.assertEqual(response.status_code, 302)
         url = getattr(response, 'url', None)
@@ -63,7 +62,7 @@ class DecoratorTestCase(TestCase):
 
     @mock.patch(MODULE_PATH + '.decorators.messages')
     def test_successful_request(self, m):
-        setattr(self.request, 'user', self.main_user)
+        self.request.user = self.main_user
         response = self.dummy_view(self.request)
         self.assertEqual(response.status_code, 200)
 

allianceauth/authentication/tests/test_middleware.py

@@ -1,10 +1,10 @@
-from unittest import mock
-from allianceauth.authentication.middleware import UserSettingsMiddleware
 from unittest.mock import Mock
-from django.http import HttpResponse
 
+from django.http import HttpResponse
 from django.test.testcases import TestCase
 
+from allianceauth.authentication.middleware import UserSettingsMiddleware
+
 
 class TestUserSettingsMiddlewareSaveLang(TestCase):
 
@@ -39,7 +39,7 @@ class TestUserSettingsMiddlewareSaveLang(TestCase):
         of a non-existent (anonymous) user
         """
         self.request.user.is_anonymous = True
-        response = self.middleware.process_response(
+        self.middleware.process_response(
             self.request,
             self.response
             )
@@ -52,7 +52,7 @@ class TestUserSettingsMiddlewareSaveLang(TestCase):
         does the middleware change a language not set in the DB
         """
         self.request.user.profile.language = None
-        response = self.middleware.process_response(
+        self.middleware.process_response(
             self.request,
             self.response
             )
@@ -64,7 +64,7 @@ class TestUserSettingsMiddlewareSaveLang(TestCase):
         """
         Tests the middleware will change a language setting
         """
-        response = self.middleware.process_response(
+        self.middleware.process_response(
             self.request,
             self.response
             )
@@ -158,7 +158,7 @@ class TestUserSettingsMiddlewareLoginFlow(TestCase):
         tests the middleware will set night_mode if not set
         """
         self.request.session = {}
-        response = self.middleware.process_response(
+        self.middleware.process_response(
             self.request,
             self.response
             )
@@ -168,7 +168,7 @@ class TestUserSettingsMiddlewareLoginFlow(TestCase):
         """
         tests the middleware will set night_mode if set.
         """
-        response = self.middleware.process_response(
+        self.middleware.process_response(
             self.request,
             self.response
             )

allianceauth/authentication/tests/test_models.py

@@ -3,12 +3,12 @@ from unittest import mock
 from django.contrib.auth.models import User
 from django.test import TestCase
 
-from allianceauth.eveonline.models import EveCharacter, EveCorporationInfo,\
-    EveAllianceInfo, EveFactionInfo
-from allianceauth.tests.auth_utils import AuthUtils
 from esi.errors import IncompleteResponseError
 from esi.models import Token
 
+from allianceauth.eveonline.models import EveAllianceInfo, EveCharacter, EveCorporationInfo, EveFactionInfo
+from allianceauth.tests.auth_utils import AuthUtils
+
 from ..models import CharacterOwnership, State, get_guest_state
 from ..tasks import check_character_ownership
 

allianceauth/authentication/tests/test_signals.py

@@ -1,19 +1,10 @@
+from django.db.models.signals import post_save
+from django.test.testcases import TestCase
+
 from allianceauth.authentication.models import User, UserProfile
-from allianceauth.eveonline.models import (
-    EveCharacter,
-    EveCorporationInfo,
-    EveAllianceInfo
-)
-from django.db.models.signals import (
-    pre_save,
-    post_save,
-    pre_delete,
-    m2m_changed
-)
+from allianceauth.eveonline.models import EveAllianceInfo, EveCharacter, EveCorporationInfo
 from allianceauth.tests.auth_utils import AuthUtils
 
-from django.test.testcases import TestCase
-from unittest.mock import Mock
 from . import patch
 
 

allianceauth/authentication/tests/test_templatetags.py

@@ -9,8 +9,12 @@ from django.core.cache import cache
 from django.test import TestCase
 
 from allianceauth.templatetags.admin_status import (
-    _current_notifications, _current_version_summary, _fetch_list_from_gitlab,
-    _fetch_notification_issues_from_gitlab, _latests_versions, status_overview,
+    _current_notifications,
+    _current_version_summary,
+    _fetch_list_from_gitlab,
+    _fetch_notification_issues_from_gitlab,
+    _latests_versions,
+    status_overview,
 )
 
 MODULE_PATH = 'allianceauth.templatetags'
@@ -127,7 +131,7 @@ class TestNotifications(TestCase):
         # when
         result = _current_notifications()
         # then
-        self.assertEqual(result['notifications'], list())
+        self.assertEqual(result['notifications'], [])
 
     @patch(MODULE_PATH + '.admin_status.cache')
     def test_current_notifications_is_none(self, mock_cache):
@@ -136,7 +140,7 @@ class TestNotifications(TestCase):
         # when
         result = _current_notifications()
         # then
-        self.assertEqual(result['notifications'], list())
+        self.assertEqual(result['notifications'], [])
 
 
 class TestCeleryQueueLength(TestCase):

allianceauth/authentication/tests/test_views.py

@@ -1,9 +1,12 @@
 import json
 from unittest.mock import patch
 
+import requests_mock
+
 from django.test import RequestFactory, TestCase
 
-from allianceauth.authentication.views import task_counts
+from allianceauth.authentication.constants import ESI_ERROR_MESSAGE_OVERRIDES
+from allianceauth.authentication.views import esi_check, task_counts
 from allianceauth.tests.auth_utils import AuthUtils
 
 MODULE_PATH = "allianceauth.authentication.views"
@@ -21,6 +24,8 @@ class TestRunningTasksCount(TestCase):
         super().setUpClass()
         cls.factory = RequestFactory()
         cls.user = AuthUtils.create_user("bruce_wayne")
+        cls.user.is_superuser = True
+        cls.user.save()
 
     def test_should_return_data(
         self, mock_active_tasks_count, mock_queued_tasks_count
@@ -35,5 +40,164 @@ class TestRunningTasksCount(TestCase):
         # then
         self.assertEqual(response.status_code, 200)
         self.assertDictEqual(
-            jsonresponse_to_dict(response), {"tasks_running": 2, "tasks_queued": 3}
+            jsonresponse_to_dict(response), {
+                "tasks_running": 2, "tasks_queued": 3}
         )
+
+    def test_su_only(
+        self, mock_active_tasks_count, mock_queued_tasks_count
+    ):
+        self.user.is_superuser = False
+        self.user.save()
+        self.user.refresh_from_db()
+        # given
+        mock_active_tasks_count.return_value = 2
+        mock_queued_tasks_count.return_value = 3
+        request = self.factory.get("/")
+        request.user = self.user
+        # when
+        response = task_counts(request)
+        # then
+        self.assertEqual(response.status_code, 302)
+
+
+class TestEsiCheck(TestCase):
+    @classmethod
+    def setUpClass(cls) -> None:
+        super().setUpClass()
+        cls.factory = RequestFactory()
+        cls.user = AuthUtils.create_user("bruce_wayne")
+        cls.user.is_superuser = True
+        cls.user.save()
+
+    @requests_mock.Mocker()
+    def test_401_data_returns_200(
+        self, m
+    ):
+        error_json = {
+            "error": "You have been banned from using ESI. Please contact Technical Support. (support@eveonline.com)"
+        }
+        status_code = 401
+        m.get(
+            "https://esi.evetech.net/latest/status/?datasource=tranquility",
+            text=json.dumps(error_json),
+            status_code=status_code
+        )
+        # given
+        request = self.factory.get("/")
+        request.user = self.user
+        # when
+        response = esi_check(request)
+        # then
+        self.assertEqual(response.status_code, 200)
+        self.assertDictEqual(
+            jsonresponse_to_dict(response), {
+                "status": status_code,
+                "data": error_json
+            }
+        )
+
+    @requests_mock.Mocker()
+    def test_504_data_returns_200(
+        self, m
+    ):
+        error_json = {
+            "error": "Gateway timeout message",
+            "timeout": 5000
+        }
+        status_code = 504
+        m.get(
+            "https://esi.evetech.net/latest/status/?datasource=tranquility",
+            text=json.dumps(error_json),
+            status_code=status_code
+        )
+        # given
+        request = self.factory.get("/")
+        request.user = self.user
+        # when
+        response = esi_check(request)
+        # then
+        self.assertEqual(response.status_code, 200)
+        self.assertDictEqual(
+            jsonresponse_to_dict(response), {
+                "status": status_code,
+                "data": error_json
+            }
+        )
+
+    @requests_mock.Mocker()
+    def test_420_data_override(
+        self, m
+    ):
+        error_json = {
+            "error": "message from CCP",
+        }
+        status_code = 420
+        m.get(
+            "https://esi.evetech.net/latest/status/?datasource=tranquility",
+            text=json.dumps(error_json),
+            status_code=status_code
+        )
+        # given
+        request = self.factory.get("/")
+        request.user = self.user
+        # when
+        response = esi_check(request)
+        # then
+        self.assertEqual(response.status_code, 200)
+        self.assertNotEqual(
+            jsonresponse_to_dict(response)["data"],
+            error_json
+        )
+        self.assertDictEqual(
+            jsonresponse_to_dict(response), {
+                "status": status_code,
+                "data": {
+                    "error": ESI_ERROR_MESSAGE_OVERRIDES.get(status_code)
+                }
+            }
+        )
+
+    @requests_mock.Mocker()
+    def test_200_data_returns_200(
+        self, m
+    ):
+        good_json = {
+            "players": 5,
+            "server_version": "69420",
+            "start_time": "2030-01-01T23:59:59Z"
+        }
+        status_code = 200
+
+        m.get(
+            "https://esi.evetech.net/latest/status/?datasource=tranquility",
+            text=json.dumps(good_json),
+            status_code=status_code
+        )
+        # given
+        request = self.factory.get("/")
+        request.user = self.user
+        # when
+        response = esi_check(request)
+        # then
+        self.assertEqual(response.status_code, 200)
+        self.assertDictEqual(
+            jsonresponse_to_dict(response), {
+                "status": status_code,
+                "data": good_json
+            }
+        )
+
+    def test_su_only(
+        self,
+    ):
+        self.user.is_superuser = False
+        self.user.save()
+        self.user.refresh_from_db()
+        # given
+        request = self.factory.get("/")
+        request.user = self.user
+        # when
+        response = esi_check(request)
+        # then
+        self.assertEqual(response.status_code, 302)

allianceauth/authentication/urls.py

@@ -39,4 +39,5 @@ urlpatterns = [
     ),
     path('dashboard/', views.dashboard, name='dashboard'),
     path('task-counts/', views.task_counts, name='task_counts'),
+    path('esi-check/', views.esi_check, name='esi_check'),
 ]

allianceauth/authentication/views.py

@@ -1,16 +1,11 @@
 import logging
-from allianceauth.hooks import get_hooks
 
-from django_registration.backends.activation.views import (
-    REGISTRATION_SALT, ActivationView as BaseActivationView,
-    RegistrationView as BaseRegistrationView,
-)
-from django_registration.signals import user_registered
+import requests
 
 from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth import authenticate, login
-from django.contrib.auth.decorators import login_required
+from django.contrib.auth.decorators import login_required, user_passes_test
 from django.contrib.auth.models import User
 from django.core import signing
 from django.http import JsonResponse
@@ -18,19 +13,27 @@ from django.shortcuts import redirect, render
 from django.template.loader import render_to_string
 from django.urls import reverse, reverse_lazy
 from django.utils.translation import gettext_lazy as _
+from django_registration.backends.activation.views import (
+    REGISTRATION_SALT,
+    ActivationView as BaseActivationView,
+    RegistrationView as BaseRegistrationView,
+)
+from django_registration.signals import user_registered
 
 from esi.decorators import token_required
 from esi.models import Token
 
 from allianceauth.eveonline.models import EveCharacter
+from allianceauth.hooks import get_hooks
 
+from .constants import ESI_ERROR_MESSAGE_OVERRIDES
 from .core.celery_workers import active_tasks_count, queued_tasks_count
 from .forms import RegistrationForm
 from .models import CharacterOwnership
 
 if 'allianceauth.eveonline.autogroups' in settings.INSTALLED_APPS:
     _has_auto_groups = True
-    from allianceauth.eveonline.autogroups.models import *
+    from allianceauth.eveonline.autogroups.models import *  # noqa: F403
 else:
     _has_auto_groups = False
 
@@ -54,7 +57,7 @@ def dashboard_groups(request):
     context = {
         'groups': groups,
     }
-    return render_to_string('authentication/dashboard.groups.html', context=context, request=request)
+    return render_to_string('authentication/dashboard_groups.html', context=context, request=request)
 
 
 def dashboard_characters(request):
@@ -66,7 +69,7 @@ def dashboard_characters(request):
     context = {
         'characters': characters
     }
-    return render_to_string('authentication/dashboard.characters.html', context=context, request=request)
+    return render_to_string('authentication/dashboard_characters.html', context=context, request=request)
 
 
 def dashboard_admin(request):
@@ -76,9 +79,16 @@ def dashboard_admin(request):
         return ""
 
 
+def dashboard_esi_check(request):
+    if request.user.is_superuser:
+        return render_to_string('allianceauth/admin-status/esi_check.html', request=request)
+    else:
+        return ""
+
+
 @login_required
 def dashboard(request):
-    _dash_items = list()
+    _dash_items = []
     hooks = get_hooks('dashboard_hook')
     items = [fn() for fn in hooks]
     items.sort(key=lambda i: i.order)
@@ -135,23 +145,28 @@ def token_refresh(request, token_id=None):
 @login_required
 @token_required(scopes=settings.LOGIN_TOKEN_SCOPES)
 def main_character_change(request, token):
-    logger.debug(f"main_character_change called by user {request.user} for character {token.character_name}")
+    logger.debug(
+        f"main_character_change called by user {request.user} for character {token.character_name}")
     try:
-        co = CharacterOwnership.objects.get(character__character_id=token.character_id, user=request.user)
+        co = CharacterOwnership.objects.get(
+            character__character_id=token.character_id, user=request.user)
     except CharacterOwnership.DoesNotExist:
         if not CharacterOwnership.objects.filter(character__character_id=token.character_id).exists():
             co = CharacterOwnership.objects.create_by_token(token)
         else:
             messages.error(
                 request,
-                _('Cannot change main character to %(char)s: character owned by a different account.') % ({'char': token.character_name})
+                _('Cannot change main character to %(char)s: character owned by a different account.') % (
+                    {'char': token.character_name})
             )
             co = None
     if co:
         request.user.profile.main_character = co.character
         request.user.profile.save(update_fields=['main_character'])
-        messages.success(request, _('Changed main character to %(char)s') % {"char": co.character})
-        logger.info('Changed user %(user)s main character to %(char)s' % ({'user': request.user, 'char': co.character}))
+        messages.success(request, _('Changed main character to %s') % co.character)
+        logger.info(
+            f'Changed user {request.user} main character to {co.character}'
+        )
     return redirect("authentication:dashboard")
 
 
@@ -159,9 +174,10 @@ def main_character_change(request, token):
 def add_character(request, token):
     if CharacterOwnership.objects.filter(character__character_id=token.character_id).filter(
             owner_hash=token.character_owner_hash).filter(user=request.user).exists():
-        messages.success(request, _('Added %(name)s to your account.' % ({'name': token.character_name})))
+        messages.success(request, _(
+            f'Added {token.character_name} to your account.'))
     else:
-        messages.error(request, _('Failed to add %(name)s to your account: they already have an account.' % ({'name': token.character_name})))
+        messages.error(request, _(f'Failed to add {token.character_name} to your account: they already have an account.'))
     return redirect('authentication:dashboard')
 
 
@@ -204,8 +220,10 @@ def sso_login(request, token):
     token.delete()
     messages.error(
         request,
-        _('Unable to authenticate as the selected character. '
-        'Please log in with the main character associated with this account.')
+        _(
+            'Unable to authenticate as the selected character. '
+            'Please log in with the main character associated with this account.'
+        )
     )
     return redirect(settings.LOGIN_URL)
 
@@ -274,11 +292,12 @@ class RegistrationView(BaseRegistrationView):
             return redirect(settings.LOGIN_URL)
         if not getattr(settings, 'REGISTRATION_VERIFY_EMAIL', True):
             # Keep the request so the user can be automagically logged in.
-            setattr(self, 'request', request)
+            self.request = request
         return super().dispatch(request, *args, **kwargs)
 
     def register(self, form):
-        user = User.objects.get(pk=self.request.session.get('registration_uid'))
+        user = User.objects.get(
+            pk=self.request.session.get('registration_uid'))
         user.email = form.cleaned_data['email']
         user_registered.send(self.__class__, user=user, request=self.request)
         if getattr(settings, 'REGISTRATION_VERIFY_EMAIL', True):
@@ -295,7 +314,8 @@ class RegistrationView(BaseRegistrationView):
 
     def get_email_context(self, activation_key):
         context = super().get_email_context(activation_key)
-        context['url'] = context['site'].domain + reverse('registration_activate', args=[activation_key])
+        context['url'] = context['site'].domain + \
+            reverse('registration_activate', args=[activation_key])
         return context
 
 
@@ -328,20 +348,24 @@ class ActivationView(BaseActivationView):
 
 
 def registration_complete(request):
-    messages.success(request, _('Sent confirmation email. Please follow the link to confirm your email address.'))
+    messages.success(request, _(
+        'Sent confirmation email. Please follow the link to confirm your email address.'))
     return redirect('authentication:login')
 
 
 def activation_complete(request):
-    messages.success(request, _('Confirmed your email address. Please login to continue.'))
+    messages.success(request, _(
+        'Confirmed your email address. Please login to continue.'))
     return redirect('authentication:dashboard')
 
 
 def registration_closed(request):
-    messages.error(request, _('Registration of new accounts is not allowed at this time.'))
+    messages.error(request, _(
+        'Registration of new accounts is not allowed at this time.'))
     return redirect('authentication:login')
 
 
+@user_passes_test(lambda u: u.is_superuser)
 def task_counts(request) -> JsonResponse:
     """Return task counts as JSON for an AJAX call."""
     data = {
@@ -349,3 +373,22 @@ def task_counts(request) -> JsonResponse:
         "tasks_queued": queued_tasks_count()
     }
     return JsonResponse(data)
+
+
+def check_for_override_esi_error_message(response):
+    if response.status_code in ESI_ERROR_MESSAGE_OVERRIDES:
+        return {"error": ESI_ERROR_MESSAGE_OVERRIDES.get(response.status_code)}
+    else:
+        return response.json()
+
+
+@user_passes_test(lambda u: u.is_superuser)
+def esi_check(request) -> JsonResponse:
+    """Return if ESI ok With error messages and codes as JSON"""
+    _r = requests.get("https://esi.evetech.net/latest/status/?datasource=tranquility")
+
+    data = {
+        "status": _r.status_code,
+        "data": check_for_override_esi_error_message(_r)
+    }
+    return JsonResponse(data)

allianceauth/bin/allianceauth.py

@@ -2,6 +2,7 @@
 import os
 import shutil
 from optparse import OptionParser
+
 from django.core.management import call_command
 from django.core.management.commands.startproject import Command as BaseStartProject
 
@@ -43,7 +44,7 @@ def create_project(parser, options, args):
     # Call the command with extra context
     call_command(StartProject(), *args, **command_options)
 
-    print(f"Success! {args[0]} has been created.")  # noqa
+    print(f"Success! {args[0]} has been created.")
 
 
 def update_settings(parser, options, args):
@@ -62,7 +63,7 @@ def update_settings(parser, options, args):
         # next check if given path is to the project, so the app is within it
         settings_path = os.path.join(project_path, project_name, 'settings/base.py')
         if not os.path.exists(settings_path):
-            parser.error("Unable to locate the Alliance Auth project at %s" % project_path)
+            parser.error(f"Unable to locate the Alliance Auth project at {project_path}")
 
     # first find the path to the Alliance Auth template settings
     import allianceauth

allianceauth/checks.py

@@ -0,0 +1,504 @@
+"""
+Django system checks for Alliance Auth
+"""
+
+from datetime import datetime, timezone
+from sqlite3.dbapi2 import sqlite_version_info
+
+from celery import current_app
+from packaging.version import InvalidVersion, Version as Pep440Version
+
+from django import db
+from django.conf import settings
+from django.core.checks import CheckMessage, Error, Warning, register
+
+from allianceauth.utils.cache import get_redis_client
+
+"""
+A = System Packages
+B = Configuration
+"""
+
+
+@register()
+def django_settings(app_configs, **kwargs) -> list[CheckMessage]:
+    """
+    Check that Django settings are correctly configured
+
+    :param app_configs:
+    :type app_configs:
+    :param kwargs:
+    :type kwargs:
+    :return:
+    :rtype:
+    """
+
+    errors: list[CheckMessage] = []
+
+    # Check for SITE_URL
+    if hasattr(settings, "SITE_URL"):
+        # Check if SITE_URL is empty
+        if settings.SITE_URL == "":
+            errors.append(
+                Error(
+                    msg="'SITE_URL' is empty.",
+                    hint="Make sure to set 'SITE_URL' to the URL of your Auth instance. (Without trailing slash)",
+                    id="allianceauth.checks.B011",
+                )
+            )
+        # Check if SITE_URL has a trailing slash
+        elif settings.SITE_URL[-1] == "/":
+            errors.append(
+                Warning(
+                    msg="'SITE_URL' has a trailing slash. This may lead to incorrect links being generated by Auth.",
+                    hint="",
+                    id="allianceauth.checks.B005",
+                )
+            )
+    # SITE_URL not found
+    else:
+        errors.append(
+            Error(
+                msg="No 'SITE_URL' found is settings. This may lead to incorrect links being generated by Auth or Errors in 3rd party modules.",
+                hint="",
+                id="allianceauth.checks.B006",
+            )
+        )
+
+    # Check for CSRF_TRUSTED_ORIGINS
+    if hasattr(settings, "CSRF_TRUSTED_ORIGINS") and hasattr(settings, "SITE_URL"):
+        # Check if SITE_URL is not in CSRF_TRUSTED_ORIGINS
+        if settings.SITE_URL not in settings.CSRF_TRUSTED_ORIGINS:
+            errors.append(
+                Warning(
+                    msg="'SITE_URL' not found in 'CSRF_TRUSTED_ORIGINS'. Auth may not load pages correctly until this is rectified.",
+                    hint="",
+                    id="allianceauth.checks.B007",
+                )
+            )
+    # CSRF_TRUSTED_ORIGINS not found
+    else:
+        errors.append(
+            Error(
+                msg="No 'CSRF_TRUSTED_ORIGINS' found is settings, Auth may not load pages correctly until this is rectified",
+                hint="",
+                id="allianceauth.checks.B008",
+            )
+        )
+
+    # Check for ESI_USER_CONTACT_EMAIL
+    if hasattr(settings, "ESI_USER_CONTACT_EMAIL"):
+        # Check if ESI_USER_CONTACT_EMAIL is empty
+        if settings.ESI_USER_CONTACT_EMAIL == "":
+            errors.append(
+                Error(
+                    msg="'ESI_USER_CONTACT_EMAIL' is empty. A valid email is required as maintainer contact for CCP.",
+                    hint="",
+                    id="allianceauth.checks.B009",
+                )
+            )
+    # ESI_USER_CONTACT_EMAIL not found
+    else:
+        errors.append(
+            Error(
+                msg="No 'ESI_USER_CONTACT_EMAIL' found is settings. A valid email is required as maintainer contact for CCP.",
+                hint="",
+                id="allianceauth.checks.B010",
+            )
+        )
+
+    return errors
+
+
+@register()
+def system_package_redis(app_configs, **kwargs) -> list[CheckMessage]:
+    """
+    Check that Redis is a supported version
+
+    :param app_configs:
+    :type app_configs:
+    :param kwargs:
+    :type kwargs:
+    :return:
+    :rtype:
+    """
+
+    allianceauth_redis_install_link = "https://allianceauth.readthedocs.io/en/latest/installation/allianceauth.html#redis-and-other-tools"
+
+    errors: list[CheckMessage] = []
+
+    try:
+        redis_version = Pep440Version(get_redis_client().info()["redis_version"])
+    except InvalidVersion:
+        errors.append(Warning("Unable to confirm Redis Version"))
+
+        return errors
+
+    if (
+        redis_version.major == 7
+        and redis_version.minor == 2
+        and datetime.now(timezone.utc)
+        > datetime(year=2025, month=8, day=31, tzinfo=timezone.utc)
+    ):
+        errors.append(
+            Error(
+                msg=f"Redis {redis_version.public} in Security Support only, Updating Suggested",
+                hint=allianceauth_redis_install_link,
+                id="allianceauth.checks.A001",
+            )
+        )
+    elif redis_version.major == 7 and redis_version.minor == 0:
+        errors.append(
+            Warning(
+                msg=f"Redis {redis_version.public} in Security Support only, Updating Suggested",
+                hint=allianceauth_redis_install_link,
+                id="allianceauth.checks.A002",
+            )
+        )
+    elif redis_version.major == 6 and redis_version.minor == 2:
+        errors.append(
+            Warning(
+                msg=f"Redis {redis_version.public} in Security Support only, Updating Suggested",
+                hint=allianceauth_redis_install_link,
+                id="allianceauth.checks.A018",
+            )
+        )
+    elif redis_version.major in [6, 5]:
+        errors.append(
+            Error(
+                msg=f"Redis {redis_version.public} EOL",
+                hint=allianceauth_redis_install_link,
+                id="allianceauth.checks.A003",
+            )
+        )
+
+    return errors
+
+
+@register()
+def system_package_mysql(app_configs, **kwargs) -> list[CheckMessage]:
+    """
+    Check that MySQL is a supported version
+
+    :param app_configs:
+    :type app_configs:
+    :param kwargs:
+    :type kwargs:
+    :return:
+    :rtype:
+    """
+
+    mysql_quick_guide_link = "https://dev.mysql.com/doc/mysql-apt-repo-quick-guide/en/"
+
+    errors: list[CheckMessage] = []
+
+    for connection in db.connections.all():
+        if connection.vendor == "mysql":
+            try:
+                mysql_version = Pep440Version(
+                    ".".join(str(i) for i in connection.mysql_version)
+                )
+            except InvalidVersion:
+                errors.append(Warning("Unable to confirm MySQL Version"))
+
+                return errors
+
+            #  MySQL 8
+            if mysql_version.major == 8:
+                if mysql_version.minor == 4 and datetime.now(timezone.utc) > datetime(
+                    year=2032, month=4, day=30, tzinfo=timezone.utc
+                ):
+                    errors.append(
+                        Error(
+                            msg=f"MySQL {mysql_version.public} EOL",
+                            hint=mysql_quick_guide_link,
+                            id="allianceauth.checks.A004",
+                        )
+                    )
+                # Demote versions down here once EOL
+                elif mysql_version.minor in [1, 2, 3]:
+                    errors.append(
+                        Warning(
+                            msg=f"MySQL {mysql_version.public} Non LTS",
+                            hint=mysql_quick_guide_link,
+                            id="allianceauth.checks.A005",
+                        )
+                    )
+                elif mysql_version.minor == 0 and datetime.now(timezone.utc) > datetime(
+                    year=2026, month=4, day=30, tzinfo=timezone.utc
+                ):
+                    errors.append(
+                        Error(
+                            msg=f"MySQL {mysql_version.public} EOL",
+                            hint=mysql_quick_guide_link,
+                            id="allianceauth.checks.A008",
+                        )
+                    )
+
+            # MySQL below 8
+            # This will also catch Mariadb 5.x
+            elif mysql_version.major < 8:
+                errors.append(
+                    Error(
+                        msg=f"MySQL or MariaDB {mysql_version.public} EOL",
+                        hint=mysql_quick_guide_link,
+                        id="allianceauth.checks.A009",
+                    )
+                )
+
+    return errors
+
+
+@register()
+def system_package_mariadb(app_configs, **kwargs) -> list[CheckMessage]:  # noqa: C901
+    """
+    Check that MariaDB is a supported version
+    """
+
+    mariadb_download_link = "https://mariadb.org/download/?t=repo-config"
+
+    errors: list[CheckMessage] = []
+
+    for connection in db.connections.all():
+        # TODO: Find a way to determine MySQL vs. MariaDB
+        if connection.vendor == "mysql":
+            try:
+                mariadb_version = Pep440Version(
+                    ".".join(str(i) for i in connection.mysql_version)
+                )
+            except InvalidVersion:
+                errors.append(Warning("Unable to confirm MariaDB Version"))
+
+                return errors
+
+            # MariaDB 11
+            if mariadb_version.major == 11:
+                if mariadb_version.minor == 4 and datetime.now(timezone.utc) > datetime(
+                    year=2029, month=5, day=19, tzinfo=timezone.utc
+                ):
+                    errors.append(
+                        Error(
+                            msg=f"MariaDB {mariadb_version.public} EOL",
+                            hint=mariadb_download_link,
+                            id="allianceauth.checks.A010",
+                        )
+                    )
+                # Demote versions down here once EOL
+                elif mariadb_version.minor in [0, 1, 2, 3, 5, 6]:
+                    errors.append(
+                        Error(
+                            msg=f"MariaDB {mariadb_version.public} EOL",
+                            hint=mariadb_download_link,
+                            id="allianceauth.checks.A013",
+                        )
+                    )
+
+            # MariaDB 10
+            elif mariadb_version.major == 10:
+                if mariadb_version.minor == 11 and datetime.now(timezone.utc) > datetime(
+                    year=2028, month=2, day=10, tzinfo=timezone.utc
+                ):
+                    errors.append(
+                        Error(
+                            msg=f"MariaDB {mariadb_version.public} EOL",
+                            hint=mariadb_download_link,
+                            id="allianceauth.checks.A014",
+                        )
+                    )
+                elif mariadb_version.minor == 6 and datetime.now(timezone.utc) > datetime(
+                    year=2026, month=7, day=6, tzinfo=timezone.utc
+                ):
+                    errors.append(
+                        Error(
+                            msg=f"MariaDB {mariadb_version.public} EOL",
+                            hint=mariadb_download_link,
+                            id="allianceauth.checks.A0015",
+                        )
+                    )
+                elif mariadb_version.minor == 5 and datetime.now(timezone.utc) > datetime(
+                    year=2025, month=6, day=24, tzinfo=timezone.utc
+                ):
+                    errors.append(
+                        Error(
+                            msg=f"MariaDB {mariadb_version.public} EOL",
+                            hint=mariadb_download_link,
+                            id="allianceauth.checks.A016",
+                        )
+                    )
+                # Demote versions down here once EOL
+                elif mariadb_version.minor in [0, 1, 2, 3, 4, 7, 9, 10]:
+                    errors.append(
+                        Error(
+                            msg=f"MariaDB {mariadb_version.public} EOL",
+                            hint=mariadb_download_link,
+                            id="allianceauth.checks.A017",
+                        )
+                    )
+
+    return errors
+
+
+@register()
+def system_package_sqlite(app_configs, **kwargs) -> list[CheckMessage]:
+    """
+    Check that SQLite is a supported version
+
+    :param app_configs:
+    :type app_configs:
+    :param kwargs:
+    :type kwargs:
+    :return:
+    :rtype:
+    """
+
+    errors: list[CheckMessage] = []
+
+    for connection in db.connections.all():
+        if connection.vendor == "sqlite":
+            try:
+                sqlite_version = Pep440Version(
+                    ".".join(str(i) for i in sqlite_version_info)
+                )
+            except InvalidVersion:
+                errors.append(Warning("Unable to confirm SQLite Version"))
+
+                return errors
+            if sqlite_version.major == 3 and sqlite_version.minor < 27:
+                errors.append(
+                    Error(
+                        msg=f"SQLite {sqlite_version.public} Unsupported by Django",
+                        hint="https://pkgs.org/download/sqlite3",
+                        id="allianceauth.checks.A020",
+                    )
+                )
+
+    return errors
+
+
+@register()
+def sql_settings(app_configs, **kwargs) -> list[CheckMessage]:
+    """
+    Check that SQL settings are correctly configured
+
+    :param app_configs:
+    :type app_configs:
+    :param kwargs:
+    :type kwargs:
+    :return:
+    :rtype:
+    """
+
+    errors: list[CheckMessage] = []
+
+    for connection in db.connections.all():
+        if connection.vendor == "mysql":
+            try:
+                if connection.settings_dict["OPTIONS"]["charset"] != "utf8mb4":
+                    errors.append(
+                        Error(
+                            msg=f"SQL Charset is not set to utf8mb4 DB: {connection.alias}",
+                            hint="https://gitlab.com/allianceauth/allianceauth/-/commit/89be2456fb2d741b86417e889da9b6129525bec8",
+                            id="allianceauth.checks.B001",
+                        )
+                    )
+            except KeyError:
+                errors.append(
+                    Error(
+                        msg=f"SQL Charset is not set to utf8mb4 DB: {connection.alias}",
+                        hint="https://gitlab.com/allianceauth/allianceauth/-/commit/89be2456fb2d741b86417e889da9b6129525bec8",
+                        id="allianceauth.checks.B001",
+                    )
+                )
+
+            # This hasn't actually been set on AA yet
+            # try:
+            #     if (
+            #         connection.settings_dict["OPTIONS"]["collation"]
+            #         != "utf8mb4_unicode_ci"
+            #     ):
+            #         errors.append(
+            #             Error(
+            #                 msg=f"SQL Collation is not set to utf8mb4_unicode_ci DB:{connection.alias}",
+            #                 hint="https://gitlab.com/allianceauth/allianceauth/-/commit/89be2456fb2d741b86417e889da9b6129525bec8",
+            #                 id="allianceauth.checks.B001",
+            #             )
+            #         )
+            # except KeyError:
+            #     errors.append(
+            #         Error(
+            #             msg=f"SQL Collation is not set to utf8mb4_unicode_ci DB:{connection.alias}",
+            #             hint="https://gitlab.com/allianceauth/allianceauth/-/commit/89be2456fb2d741b86417e889da9b6129525bec8",
+            #             id="allianceauth.checks.B001",
+            #         )
+            #     )
+
+        # if connection.vendor == "sqlite":
+
+    return errors
+
+
+@register()
+def celery_settings(app_configs, **kwargs) -> list[CheckMessage]:
+    """
+    Check that Celery settings are correctly configured
+
+    :param app_configs:
+    :type app_configs:
+    :param kwargs:
+    :type kwargs:
+    :return:
+    :rtype:
+    """
+
+    errors: list[CheckMessage] = []
+
+    try:
+        if current_app.conf.broker_transport_options != {
+            "priority_steps": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9],
+            "queue_order_strategy": "priority",
+        }:
+            errors.append(
+                Error(
+                    msg="Celery Priorities are not set correctly",
+                    hint="https://gitlab.com/allianceauth/allianceauth/-/commit/8861ec0a61790eca0261f1adc1cc04ca5f243cbc",
+                    id="allianceauth.checks.B003",
+                )
+            )
+    except KeyError:
+        errors.append(
+            Error(
+                msg="Celery Priorities are not set",
+                hint="https://gitlab.com/allianceauth/allianceauth/-/commit/8861ec0a61790eca0261f1adc1cc04ca5f243cbc",
+                id="allianceauth.checks.B003",
+            )
+        )
+
+    try:
+        if not current_app.conf.broker_connection_retry_on_startup:
+            errors.append(
+                Error(
+                    msg="Celery broker_connection_retry_on_startup not set correctly",
+                    hint="https://gitlab.com/allianceauth/allianceauth/-/commit/380c41400b535447839e5552df2410af35a75280",
+                    id="allianceauth.checks.B004",
+                )
+            )
+    except KeyError:
+        errors.append(
+            Error(
+                msg="Celery broker_connection_retry_on_startup not set",
+                hint="https://gitlab.com/allianceauth/allianceauth/-/commit/380c41400b535447839e5552df2410af35a75280",
+                id="allianceauth.checks.B004",
+            )
+        )
+
+    return errors
+
+
+# IDEAS
+
+# Any other celery things weve manually changed over the years
+# I'd be happy to add Community App checks, old versions the owners dont want to support etc.
+
+
+# Check Default Collation on DB
+# Check Charset Collation on all tables

allianceauth/context_processors.py

@@ -1,4 +1,5 @@
 from django.conf import settings
+
 from .views import NightModeRedirectView
 
 

allianceauth/corputils/admin.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from .models import CorpStats, CorpMember
+from .models import CorpMember, CorpStats
 
 admin.site.register(CorpStats)
 admin.site.register(CorpMember)

allianceauth/corputils/auth_hooks.py

@@ -1,8 +1,9 @@
-from allianceauth.menu.hooks import MenuItemHook
-from allianceauth.services.hooks import UrlHook
 from django.utils.translation import gettext_lazy as _
+
 from allianceauth import hooks
 from allianceauth.corputils import urls
+from allianceauth.menu.hooks import MenuItemHook
+from allianceauth.services.hooks import UrlHook
 
 
 class CorpStats(MenuItemHook):

allianceauth/corputils/managers.py

@@ -1,6 +1,7 @@
-from django.db import models
 import logging
 
+from django.db import models
+
 logger = logging.getLogger(__name__)
 
 
@@ -8,7 +9,7 @@ class CorpStatsQuerySet(models.QuerySet):
     def visible_to(self, user):
         # superusers get all visible
         if user.is_superuser:
-            logger.debug('Returning all corpstats for superuser %s.' % user)
+            logger.debug(f'Returning all corpstats for superuser {user}.')
             return self
 
         try:
@@ -36,7 +37,7 @@ class CorpStatsQuerySet(models.QuerySet):
                 query |= q
             return self.filter(query)
         except AssertionError:
-            logger.debug('User %s has no main character. No corpstats visible.' % user)
+            logger.debug(f'User {user} has no main character. No corpstats visible.')
             return self.none()
 
 

allianceauth/corputils/migrations/0001_initial.py

@@ -1,7 +1,7 @@
 # Generated by Django 1.10.1 on 2016-12-14 21:36
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

allianceauth/corputils/migrations/0002_migrate_permissions.py

@@ -66,11 +66,11 @@ def forward(apps, schema_editor):
         g.permissions.add(perm_dict['corpstats']['alliance_apis'].pk)
         g.permissions.add(perm_dict['corpstats']['view_alliance_corpstats'].pk)
 
-    for name, perm in perm_dict['user'].items():
+    for _name, perm in perm_dict['user'].items():
         perm.delete()
 
 
-def reverse(apps, schema_editor):
+def reverse(apps, schema_editor):  # noqa: C901
     perm_dict = user_permissions_dict(apps)
 
     corp_users = users_with_permission(apps, perm_dict['corpstats']['view_corp_corpstats'])

allianceauth/corputils/migrations/0004_member_models.py

@@ -1,9 +1,10 @@
 # Generated by Django 1.10.5 on 2017-03-26 20:13
 
-from django.db import migrations, models
-import django.db.models.deletion
 import json
 
+import django.db.models.deletion
+from django.db import migrations, models
+
 
 def convert_json_to_members(apps, schema_editor):
     CorpStats = apps.get_model('corputils', 'CorpStats')

allianceauth/corputils/models.py

@@ -1,15 +1,17 @@
 import logging
 import os
 
-from allianceauth.authentication.models import CharacterOwnership, UserProfile
 from bravado.exception import HTTPForbidden
+
 from django.db import models
+
 from esi.errors import TokenError
 from esi.models import Token
-from allianceauth.eveonline.models import EveCorporationInfo, EveCharacter, EveAllianceInfo
-from allianceauth.notifications import notify
 
+from allianceauth.authentication.models import CharacterOwnership, UserProfile
 from allianceauth.corputils.managers import CorpStatsManager
+from allianceauth.eveonline.models import EveAllianceInfo, EveCharacter, EveCorporationInfo
+from allianceauth.notifications import notify
 
 SWAGGER_SPEC_PATH = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'swagger.json')
 """
@@ -31,6 +33,7 @@ class CorpStats(models.Model):
     corp = models.OneToOneField(EveCorporationInfo, on_delete=models.CASCADE)
     last_update = models.DateTimeField(auto_now=True)
 
+    objects = CorpStatsManager()
     class Meta:
         permissions = (
             ('view_corp_corpstats', 'Can view corp stats of their corporation.'),
@@ -40,9 +43,9 @@ class CorpStats(models.Model):
         verbose_name = "corp stats"
         verbose_name_plural = "corp stats"
 
-    objects = CorpStatsManager()
 
-    def __str__(self):
+
+    def __str__(self) -> str:
         return f"{self.__class__.__name__} for {self.corp}"
 
     def update(self):
@@ -76,21 +79,21 @@ class CorpStats(models.Model):
             logger.warning(f"{self} failed to update: {e}")
             if self.token.user:
                 notify(
-                    self.token.user, "%s failed to update with your ESI token." % self,
+                    self.token.user, f"{self} failed to update with your ESI token.",
                     message="Your token has expired or is no longer valid. Please add a new one to create a new CorpStats.",
                     level="error")
             self.delete()
         except HTTPForbidden as e:
             logger.warning(f"{self} failed to update: {e}")
             if self.token.user:
-                notify(self.token.user, "%s failed to update with your ESI token." % self, message=f"{e.status_code}: {e.message}", level="error")
+                notify(self.token.user, f"{self} failed to update with your ESI token.", message=f"{e.status_code}: {e.message}", level="error")
             self.delete()
         except AssertionError:
-            logger.warning("%s token character no longer in corp." % self)
+            logger.warning(f"{self} token character no longer in corp.")
             if self.token.user:
                 notify(
-                    self.token.user, "%s cannot update with your ESI token." % self,
-                    message="%s cannot update with your ESI token as you have left corp." % self, level="error")
+                    self.token.user, f"{self} cannot update with your ESI token.",
+                    message=f"{self} cannot update with your ESI token as you have left corp.", level="error")
             self.delete()
 
     @property
@@ -151,7 +154,7 @@ class CorpMember(models.Model):
         unique_together = ('corpstats', 'character_id')
         ordering = ['character_name']
 
-    def __str__(self):
+    def __str__(self) -> str:
         return self.character_name
 
     @property

allianceauth/corputils/tasks.py

@@ -1,4 +1,5 @@
 from celery import shared_task
+
 from allianceauth.corputils.models import CorpStats
 
 

allianceauth/corputils/templates/corputils/corpstats.html

@@ -1,5 +1,6 @@
 {% extends 'corputils/base.html' %}
 
+{% load aa_i18n %}
 {% load i18n %}
 {% load humanize %}
 
@@ -31,7 +32,7 @@
 
         <div class="card card-default mt-4">
             <div class="card-header clearfix" role="tablist">
-                <ul class="nav nav-pills text-right float-start">
+                <ul class="nav nav-pills float-start">
                     <li class="nav-item" role="presentation">
                         <a
                             class="nav-link active"
@@ -238,9 +239,12 @@
 {% block extra_javascript %}
     {% include 'bundles/datatables-js-bs5.html' %}
 
+    {% get_datatables_language_static LANGUAGE_CODE as DT_LANG_PATH %}
+
     <script>
         $(document).ready(() => {
             $('#table-mains').DataTable({
+                "language": {"url": '{{ DT_LANG_PATH }}'},
                 "columnDefs": [
                     { "sortable": false, "targets": [1] },
                 ],
@@ -249,6 +253,7 @@
             });
 
             $('#table-members').DataTable({
+                "language": {"url": '{{ DT_LANG_PATH }}'},
                 "columnDefs": [
                     { "searchable": false, "targets": [0, 2] },
                     { "sortable": false, "targets": [0, 2] },
@@ -259,6 +264,7 @@
             });
 
             $('#table-unregistered').DataTable({
+                "language": {"url": '{{ DT_LANG_PATH }}'},
                 "columnDefs": [
                     { "searchable": false, "targets": [0, 2] },
                     { "sortable": false, "targets": [0, 2] },

allianceauth/corputils/templates/corputils/search.html

@@ -1,5 +1,6 @@
 {% extends "corputils/base.html" %}
 
+{% load aa_i18n %}
 {% load i18n %}
 
 {% block member_data %}
@@ -42,9 +43,12 @@
 {% block extra_javascript %}
     {% include 'bundles/datatables-js-bs5.html' %}
 
+    {% get_datatables_language_static LANGUAGE_CODE as DT_LANG_PATH %}
+
     <script>
         $(document).ready(() => {
             $('#table-search').DataTable({
+                "language": {"url": '{{ DT_LANG_PATH }}'},
                 "stateSave": true,
                 "stateDuration": 0
             });

allianceauth/corputils/tests.py

@@ -1,14 +1,18 @@
 from unittest import mock
 
-from django.test import TestCase
-from allianceauth.tests.auth_utils import AuthUtils
-from .models import CorpStats, CorpMember
-from allianceauth.eveonline.models import EveCorporationInfo, EveAllianceInfo, EveCharacter
-from esi.models import Token
-from esi.errors import TokenError
 from bravado.exception import HTTPForbidden
+
 from django.contrib.auth.models import Permission
+from django.test import TestCase
+
+from esi.errors import TokenError
+from esi.models import Token
+
 from allianceauth.authentication.models import CharacterOwnership
+from allianceauth.eveonline.models import EveAllianceInfo, EveCharacter, EveCorporationInfo
+from allianceauth.tests.auth_utils import AuthUtils
+
+from .models import CorpMember, CorpStats
 
 
 class CorpStatsManagerTestCase(TestCase):

allianceauth/corputils/urls.py

@@ -1,4 +1,5 @@
 from django.urls import path
+
 from . import views
 
 app_name = 'corputils'

allianceauth/corputils/views.py

@@ -1,16 +1,19 @@
 import os
 
 from bravado.exception import HTTPError
+
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required, permission_required, user_passes_test
-from django.core.exceptions import PermissionDenied, ObjectDoesNotExist
+from django.core.exceptions import ObjectDoesNotExist, PermissionDenied
 from django.db import IntegrityError
-from django.shortcuts import render, redirect, get_object_or_404
+from django.shortcuts import get_object_or_404, redirect, render
 from django.utils.translation import gettext_lazy as _
+
 from esi.decorators import token_required
+
 from allianceauth.eveonline.models import EveCharacter, EveCorporationInfo
 
-from .models import CorpStats, CorpMember
+from .models import CorpMember, CorpStats
 
 SWAGGER_SPEC_PATH = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'swagger.json')
 """
@@ -59,7 +62,7 @@ def corpstats_add(request, token):
 
 @login_required
 @user_passes_test(access_corpstats_test)
-def corpstats_view(request, corp_id=None):
+def corpstats_view(request, corp_id=None):  # noqa: C901
     corpstats = None
 
     # get requested model

allianceauth/crontab/__init__.py

@@ -0,0 +1,3 @@
+"""
+Alliance Auth Crontab Utilities
+"""

allianceauth/crontab/apps.py

@@ -0,0 +1,14 @@
+"""
+Crontab App Config
+"""
+
+from django.apps import AppConfig
+
+
+class CrontabConfig(AppConfig):
+    """
+    Crontab App Config
+    """
+
+    name = "allianceauth.crontab"
+    label = "crontab"

allianceauth/crontab/migrations/0001_initial.py

@@ -0,0 +1,30 @@
+# Generated by Django 4.2.16 on 2025-01-20 06:16
+
+from django.db import migrations, models
+
+import allianceauth.crontab.models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='CronOffset',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('minute', models.FloatField(default=allianceauth.crontab.models.random_default, verbose_name='Minute Offset')),
+                ('hour', models.FloatField(default=allianceauth.crontab.models.random_default, verbose_name='Hour Offset')),
+                ('day_of_month', models.FloatField(default=allianceauth.crontab.models.random_default, verbose_name='Day of Month Offset')),
+                ('month_of_year', models.FloatField(default=allianceauth.crontab.models.random_default, verbose_name='Month of Year Offset')),
+                ('day_of_week', models.FloatField(default=allianceauth.crontab.models.random_default, verbose_name='Day of Week Offset')),
+            ],
+            options={
+                'verbose_name': 'Cron Offsets',
+            },
+        ),
+    ]

allianceauth/crontab/models.py

@@ -0,0 +1,25 @@
+from random import random
+
+from solo.models import SingletonModel
+
+from django.db import models
+from django.utils.translation import gettext_lazy as _
+
+
+def random_default() -> float:
+    return random()
+
+
+class CronOffset(SingletonModel):
+
+    minute = models.FloatField(_("Minute Offset"), default=random_default)
+    hour = models.FloatField(_("Hour Offset"), default=random_default)
+    day_of_month = models.FloatField(_("Day of Month Offset"), default=random_default)
+    month_of_year = models.FloatField(_("Month of Year Offset"), default=random_default)
+    day_of_week = models.FloatField(_("Day of Week Offset"), default=random_default)
+
+    def __str__(self) -> str:
+        return "Cron Offsets"
+
+    class Meta:
+        verbose_name = "Cron Offsets"

allianceauth/crontab/schedulers.py

@@ -0,0 +1,68 @@
+from celery import schedules
+from celery.utils.log import get_logger
+from django_celery_beat.models import CrontabSchedule
+from django_celery_beat.schedulers import DatabaseScheduler
+
+from django.core.exceptions import ObjectDoesNotExist
+from django.db.utils import OperationalError, ProgrammingError
+
+from allianceauth.crontab.models import CronOffset
+from allianceauth.crontab.utils import offset_cron
+
+logger = get_logger(__name__)
+
+
+class OffsetDatabaseScheduler(DatabaseScheduler):
+    """
+    Customization of Django Celery Beat, Database Scheduler
+    Takes the Celery Schedule from local.py and applies our AA Framework Cron Offset, if apply_offset is true
+    Otherwise it passes it through as normal
+    """
+
+    def __init__(self, *args, **kwargs) -> None:
+        super().__init__(*args, **kwargs)
+
+    def update_from_dict(self, mapping):
+        s = {}
+
+        try:
+            cron_offset = CronOffset.get_solo()  # noqa: F841
+        except (OperationalError, ProgrammingError, ObjectDoesNotExist) as exc:
+            # This is just incase we haven't migrated yet or something
+            logger.warning(
+                "OffsetDatabaseScheduler: Could not fetch CronOffset (%r). "
+                "Defering to DatabaseScheduler",
+                exc
+            )
+            return super().update_from_dict(mapping)
+
+        for name, entry_fields in mapping.items():
+            try:
+                apply_offset = entry_fields.pop("apply_offset", False)  # Ensure this pops before django tries to save to ORM
+                entry = self.Entry.from_entry(name, app=self.app, **entry_fields)
+
+                if apply_offset:
+                    entry_fields.update({"apply_offset": apply_offset})  # Reapply this as its gets pulled from config inconsistently.
+                    schedule_obj = entry.schedule
+                    if isinstance(schedule_obj, schedules.crontab):
+                        offset_cs = CrontabSchedule.from_schedule(offset_cron(schedule_obj))
+                        offset_cs, created = CrontabSchedule.objects.get_or_create(
+                            minute=offset_cs.minute,
+                            hour=offset_cs.hour,
+                            day_of_month=offset_cs.day_of_month,
+                            month_of_year=offset_cs.month_of_year,
+                            day_of_week=offset_cs.day_of_week,
+                            timezone=offset_cs.timezone,
+                        )
+                        entry.schedule = offset_cron(schedule_obj)  # This gets passed into Celery Beats Memory, important to keep it in sync with the model/DB
+                        entry.model.crontab = offset_cs
+                        entry.model.save()
+                        logger.debug(f"Offset applied for '{name}' due to 'apply_offset' = True.")
+
+                if entry.model.enabled:
+                    s[name] = entry
+
+            except Exception as e:
+                logger.exception("Error updating schedule for %s: %r", name, e)
+
+        self.schedule.update(s)