.coveragerc

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

.gitignore

@@ -69,8 +69,11 @@ celerybeat-schedule
 #gitlab configs
 .gitlab/
 
+#transifex
+.tx/
+
 #other
 .flake8
 .pylintrc
 Makefile
-alliance_auth.sqlite3
+.isort.cfg

.gitlab-ci.yml

@@ -5,16 +5,15 @@
     - merge_requests
 
 stages:
-  - pre-commit
+- pre-commit
-  - gitlab
+- gitlab
-  - test
+- test
-  - deploy
+- deploy
-  - docker
+- docker
 
 include:
-  - template: Dependency-Scanning.gitlab-ci.yml
+- template: Dependency-Scanning.gitlab-ci.yml
-  - template: Security/SAST.gitlab-ci.yml
+- template: Security/SAST.gitlab-ci.yml
-  - template: Security/Secret-Detection.gitlab-ci.yml
 
 before_script:
   - apt-get update && apt-get install redis-server -y
@@ -25,12 +24,12 @@ before_script:
 pre-commit-check:
   <<: *only-default
   stage: pre-commit
-  image: python:3.11-bookworm
+  image: python:3.6-buster
-  # variables:
+  variables:
-  #   PRE_COMMIT_HOME: ${CI_PROJECT_DIR}/.cache/pre-commit
+    PRE_COMMIT_HOME: ${CI_PROJECT_DIR}/.cache/pre-commit
-  # cache:
+  cache:
-  #   paths:
+    paths:
-  #     - ${PRE_COMMIT_HOME}
+      - ${PRE_COMMIT_HOME}
   script:
     - pip install pre-commit
     - pre-commit run --all-files
@@ -42,20 +41,28 @@ sast:
 dependency_scanning:
   stage: gitlab
   before_script:
-    - apt-get update && apt-get install redis-server libmariadb-dev -y
+  - apt-get update && apt-get install redis-server libmariadb-dev -y
-    - redis-server --daemonize yes
+  - redis-server --daemonize yes
-    - python -V
+  - python -V
-    - pip install wheel tox
+  - pip install wheel tox
 
-secret_detection:
+test-3.7-core:
-  stage: gitlab
+  <<: *only-default
-  before_script: []
+  image: python:3.7-bullseye
+  script:
+  - tox -e py37-core
+  artifacts:
+    when: always
+    reports:
+      coverage_report:
+        coverage_format: cobertura
+        path: coverage.xml
 
 test-3.8-core:
   <<: *only-default
-  image: python:3.8-bookworm
+  image: python:3.8-bullseye
   script:
-    - tox -e py38-core
+  - tox -e py38-core
   artifacts:
     when: always
     reports:
@@ -65,9 +72,9 @@ test-3.8-core:
 
 test-3.9-core:
   <<: *only-default
-  image: python:3.9-bookworm
+  image: python:3.9-bullseye
   script:
-    - tox -e py39-core
+  - tox -e py39-core
   artifacts:
     when: always
     reports:
@@ -77,9 +84,9 @@ test-3.9-core:
 
 test-3.10-core:
   <<: *only-default
-  image: python:3.10-bookworm
+  image: python:3.10-bullseye
   script:
-    - tox -e py310-core
+  - tox -e py310-core
   artifacts:
     when: always
     reports:
@@ -89,21 +96,22 @@ test-3.10-core:
 
 test-3.11-core:
   <<: *only-default
-  image: python:3.11-bookworm
+  image: python:3.11-rc-bullseye
   script:
-    - tox -e py311-core
+  - tox -e py311-core
   artifacts:
     when: always
     reports:
       coverage_report:
         coverage_format: cobertura
         path: coverage.xml
+  allow_failure: true
 
-test-3.12-core:
+test-3.7-all:
   <<: *only-default
-  image: python:3.12-bookworm
+  image: python:3.7-bullseye
   script:
-    - tox -e py312-core
+  - tox -e py37-all
   artifacts:
     when: always
     reports:
@@ -113,9 +121,9 @@ test-3.12-core:
 
 test-3.8-all:
   <<: *only-default
-  image: python:3.8-bookworm
+  image: python:3.8-bullseye
   script:
-    - tox -e py38-all
+  - tox -e py38-all
   artifacts:
     when: always
     reports:
@@ -125,9 +133,9 @@ test-3.8-all:
 
 test-3.9-all:
   <<: *only-default
-  image: python:3.9-bookworm
+  image: python:3.9-bullseye
   script:
-    - tox -e py39-all
+  - tox -e py39-all
   artifacts:
     when: always
     reports:
@@ -137,9 +145,9 @@ test-3.9-all:
 
 test-3.10-all:
   <<: *only-default
-  image: python:3.10-bookworm
+  image: python:3.10-bullseye
   script:
-    - tox -e py310-all
+  - tox -e py310-all
   artifacts:
     when: always
     reports:
@@ -149,76 +157,43 @@ test-3.10-all:
 
 test-3.11-all:
   <<: *only-default
-  image: python:3.11-bookworm
+  image: python:3.11-rc-bullseye
   script:
-    - tox -e py311-all
+  - tox -e py311-all
   artifacts:
     when: always
     reports:
       coverage_report:
         coverage_format: cobertura
         path: coverage.xml
-  coverage: '/(?i)total.*? (100(?:\.0+)?\%|[1-9]?\d(?:\.\d+)?\%)$/'
+  allow_failure: true
-
-test-3.12-all:
-  <<: *only-default
-  image: python:3.12-bookworm
-  script:
-    - tox -e py312-all
-  artifacts:
-    when: always
-    reports:
-      coverage_report:
-        coverage_format: cobertura
-        path: coverage.xml
-
-build-test:
-  stage: test
-  image: python:3.11-bookworm
-
-  before_script:
-    - python -m pip install --upgrade pip
-    - python -m pip install --upgrade build
-    - python -m pip install --upgrade setuptools wheel
-
-  script:
-    - python -m build
-
-  artifacts:
-    when: always
-    name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
-    paths:
-      - dist/*
-    expire_in: 1 year
 
 test-docs:
   <<: *only-default
-  image: python:3.11-bookworm
+  image: python:3.9-bullseye
   script:
-    - tox -e docs
+  - tox -e docs
 
 deploy_production:
   stage: deploy
-  image: python:3.11-bookworm
+  image: python:3.10-bullseye
 
   before_script:
-    - python -m pip install --upgrade pip
+    - pip install twine wheel
-    - python -m pip install --upgrade build
-    - python -m pip install --upgrade setuptools wheel twine
 
   script:
-    - python -m build
+    - python setup.py sdist bdist_wheel
-    - python -m twine upload dist/*
+    - twine upload dist/*
 
   rules:
     - if: $CI_COMMIT_TAG
 
 build-image:
   before_script: []
-  image: docker:24.0
+  image: docker:20.10.10
   stage: docker
   services:
-    - docker:24.0-dind
+    - docker:20.10.10-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
@@ -228,30 +203,28 @@ build-image:
     LATEST_TAG=$CI_REGISTRY_IMAGE/auth:latest
 
     docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    docker run --privileged --rm tonistiigi/binfmt --uninstall qemu-*
+    docker build . -t $IMAGE_TAG -f docker/Dockerfile --build-arg AUTH_VERSION=$(echo $CI_COMMIT_TAG | cut -c 2-)
-    docker run --privileged --rm tonistiigi/binfmt --install all
+    docker tag $IMAGE_TAG $CURRENT_TAG
-    docker buildx create --use --name new-builder
+    docker tag $IMAGE_TAG $MINOR_TAG
-    docker buildx build . --tag $IMAGE_TAG --tag $CURRENT_TAG --tag $MINOR_TAG --tag $MAJOR_TAG --tag $LATEST_TAG --file docker/Dockerfile --platform linux/amd64,linux/arm64 --push --build-arg AUTH_VERSION=$(echo $CI_COMMIT_TAG | cut -c 2-)
+    docker tag $IMAGE_TAG $MAJOR_TAG
+    docker tag $IMAGE_TAG $LATEST_TAG
+    docker image push --all-tags $CI_REGISTRY_IMAGE/auth
   rules:
     - if: $CI_COMMIT_TAG
-      when: delayed
-      start_in: 10 minutes
 
 build-image-dev:
   before_script: []
-  image: docker:24.0
+  image: docker:20.10.10
   stage: docker
   services:
-    - docker:24.0-dind
+    - docker:20.10.10-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
 
     docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    docker run --privileged --rm tonistiigi/binfmt --uninstall qemu-*
+    docker build . -t $IMAGE_TAG -f docker/Dockerfile --build-arg AUTH_PACKAGE=git+https://gitlab.com/allianceauth/allianceauth@$CI_COMMIT_BRANCH
-    docker run --privileged --rm tonistiigi/binfmt --install all
+    docker push $IMAGE_TAG
-    docker buildx create --use --name new-builder
-    docker buildx build . --tag $IMAGE_TAG --file docker/Dockerfile --platform linux/amd64,linux/arm64 --push --build-arg AUTH_PACKAGE=git+https://gitlab.com/allianceauth/allianceauth@$CI_COMMIT_BRANCH
   rules:
     - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == ""'
       when: manual
@@ -260,19 +233,17 @@ build-image-dev:
 
 build-image-mr:
   before_script: []
-  image: docker:24.0
+  image: docker:20.10.10
   stage: docker
   services:
-    - docker:24.0-dind
+    - docker:20.10.10-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
 
     docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    docker run --privileged --rm tonistiigi/binfmt --uninstall qemu-*
+    docker build . -t $IMAGE_TAG -f docker/Dockerfile --build-arg AUTH_PACKAGE=git+$CI_MERGE_REQUEST_SOURCE_PROJECT_URL@$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
-    docker run --privileged --rm tonistiigi/binfmt --install all
+    docker push $IMAGE_TAG
-    docker buildx create --use --name new-builder
-    docker buildx build . --tag $IMAGE_TAG --file docker/Dockerfile --platform linux/amd64,linux/arm64 --push --build-arg AUTH_PACKAGE=git+$CI_MERGE_REQUEST_SOURCE_PROJECT_URL@$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
   rules:
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
       when: manual

.pre-commit-config.yaml

@@ -3,93 +3,32 @@
 # 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/
-  )
-
 repos:
-  # Code Upgrades
-  - repo: https://github.com/asottile/pyupgrade
-    rev: v3.20.0
-    hooks:
-      - id: pyupgrade
-        args: [--py38-plus]
-  - repo: https://github.com/adamchainz/django-upgrade
-    rev: 1.25.0
-    hooks:
-      - id: django-upgrade
-        args: [--target-version=4.2]
-
-  # Formatting
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v4.0.1
     hooks:
-      # Identify invalid files
-      - id: check-ast
-      - id: check-yaml
-      - id: check-json
-      - id: check-toml
-      - id: check-xml
-      # git checks
-      - id: check-merge-conflict
-      - id: check-added-large-files
-        args: [--maxkb=1000]
-      - id: detect-private-key
       - id: check-case-conflict
-      # Python checks
+      - id: check-json
-#      - id: check-docstring-first
+      - id: check-xml
-      - id: debug-statements
+      - id: check-yaml
-#      - id: requirements-txt-fixer
-      - id: fix-encoding-pragma
-        args: [--remove]
       - id: fix-byte-order-marker
-      # General quality checks
-      - id: mixed-line-ending
-        args: [--fix=lf]
       - id: trailing-whitespace
-        args: [--markdown-linebreak-ext=md]
+        exclude: (\.min\.css|\.min\.js|\.mo|\.po|swagger\.json)$
-      - id: check-executables-have-shebangs
       - id: end-of-file-fixer
+        exclude: (\.min\.css|\.min\.js|\.mo|\.po|swagger\.json)$
+      - id: mixed-line-ending
+        args: [ '--fix=lf' ]
+      - id: fix-encoding-pragma
+        args: [ '--remove' ]
+
   - repo: https://github.com/editorconfig-checker/editorconfig-checker.python
-    rev: 3.2.1
+    rev: 2.3.54
     hooks:
       - id: editorconfig-checker
-  - repo: https://github.com/igorshubovych/markdownlint-cli
+        exclude: ^(LICENSE|allianceauth\/static\/css\/themes\/bootstrap-locals.less|allianceauth\/eveonline\/swagger.json|(.*.po)|(.*.mo))
-    rev: v0.45.0
+
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v2.29.0
     hooks:
-      - id: markdownlint
+      - id: pyupgrade
-        language: node
+        args: [ --py37-plus ]
-        args:
-          - --disable=MD013
-  # Infrastructure
-  - repo: https://github.com/tox-dev/pyproject-fmt
-    rev: v2.6.0
-    hooks:
-      - id: pyproject-fmt
-        name: pyproject.toml formatter
-        description: "Format the pyproject.toml file."
-        args:
-          - --indent=4
-        additional_dependencies:
-          - tox==4.24.1 # https://github.com/tox-dev/tox/releases/latest
-  - repo: https://github.com/abravalheri/validate-pyproject
-    rev: v0.24.1
-    hooks:
-      - id: validate-pyproject
-        name: Validate pyproject.toml
-        description: "Validate the pyproject.toml file."

.readthedocs.yml

@@ -5,28 +5,19 @@
 # Required
 version: 2
 
-# Set the version of Python and other tools you might need
-build:
-  os: ubuntu-22.04
-  apt_packages:
-    - redis
-  tools:
-    python: "3.11"
-  jobs:
-    post_system_dependencies:
-      - redis-server --daemonize yes
-
 # Build documentation in the docs/ directory with Sphinx
 sphinx:
   configuration: docs/conf.py
 
+# Build documentation with MkDocs
+#mkdocs:
+#  configuration: mkdocs.yml
+
 # Optionally build your docs in additional formats such as PDF and ePub
 formats: all
 
-# Python requirements required to build your docs
+# Optionally set the version of Python and requirements required to build your docs
 python:
+  version: 3.7
   install:
-    - method: pip
+    - requirements: docs/requirements.txt
-      path: .
-      extra_requirements:
-        - docs

.tx/transifex.yml

@@ -1,10 +0,0 @@
-filters:
-  - filter_type: file
-    file_format: PO
-    source_file: allianceauth/locale/en/LC_MESSAGES/django.po
-    source_language: en
-    translation_files_expression: allianceauth/locale/<lang>/LC_MESSAGES/django.po
-
-settings:
-  language_mapping:
-    zh-Hans: zh_Hans

MANIFEST.in

@@ -0,0 +1,7 @@
+include LICENSE
+include README.md
+include MANIFEST.in
+graft allianceauth
+
+global-exclude __pycache__
+global-exclude *.py[co]

README.md

@@ -1,56 +1,50 @@
 # Alliance Auth
 
-[![License](https://img.shields.io/badge/license-GPLv2-green)](https://pypi.org/project/allianceauth/)
+[![license](https://img.shields.io/badge/license-GPLv2-green)](https://pypi.org/project/allianceauth/)
-[![Python Versions](https://img.shields.io/pypi/pyversions/allianceauth)](https://pypi.org/project/allianceauth/)
+[![python](https://img.shields.io/pypi/pyversions/allianceauth)](https://pypi.org/project/allianceauth/)
-[![Django Versions](https://img.shields.io/pypi/djversions/allianceauth?label=django)](https://pypi.org/project/allianceauth/)
+[![django](https://img.shields.io/pypi/djversions/allianceauth?label=django)](https://pypi.org/project/allianceauth/)
-[![Stable AA Version](https://img.shields.io/pypi/v/allianceauth?label=release)](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)
+[![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)](https://allianceauth.readthedocs.io/?badge=latest)
+[![Documentation Status](https://readthedocs.org/projects/allianceauth/badge/?version=latest)](http://allianceauth.readthedocs.io/?badge=latest)
-[![Test Coverage Report](https://gitlab.com/allianceauth/allianceauth/badges/master/coverage.svg)](https://gitlab.com/allianceauth/allianceauth/commits/master)
+[![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)
 
-A flexible authentication platform for EVE Online to help in-game organizations manage access to applications and services. AA provides both, a stable core, and a robust framework for community development and custom applications.
+An auth system for EVE Online to help in-game organizations manage online service access.
 
 ## Content
 
 - [Overview](#overview)
-- [Documentation](https://allianceauth.rtfd.io)
+- [Documentation](http://allianceauth.rtfd.io)
 - [Support](#support)
 - [Release Notes](https://gitlab.com/allianceauth/allianceauth/-/releases)
-- [Developer Team](#development-team)
+- [Developer Team](#developer-team)
 - [Contributing](#contributing)
 
 ## Overview
 
-Alliance Auth (AA) is a platform that helps Eve Online organizations efficiently manage access to applications and services.
+Alliance Auth (AA) is a web site that helps Eve Online organizations efficiently manage access to applications and services.
 
 Main features:
 
-- Automatically grants or revokes user access to external services (e.g.: Discord, Mumble) based on the user's current membership to [a variety of EVE Online affiliation](https://allianceauth.readthedocs.io/en/latest/features/core/states/) and [groups](https://allianceauth.readthedocs.io/en/latest/features/core/groups/)
+- Automatically grants or revokes user access to external services (e.g. Discord, Mumble) and web apps (e.g. SRP requests) based on the user's current membership to [in-game organizations](https://allianceauth.readthedocs.io/en/latest/features/core/states/) and [groups](https://allianceauth.readthedocs.io/en/latest/features/core/groups/)
 
 - Provides a central web site where users can directly access web apps (e.g. SRP requests, Fleet Schedule) and manage their access to external services and groups.
 
-- Includes a set of connectors (called ["Services"](https://allianceauth.readthedocs.io/en/latest/features/services/)) for integrating access management with many popular external applications / services like Discord, Mumble, Teamspeak 3, SMF and others
+- Includes a set of connectors (called ["services"](https://allianceauth.readthedocs.io/en/latest/features/services/)) for integrating access management with many popular external applications / services like Discord, Mumble, Teamspeak 3, SMF and others
 
-- Includes a set of web [Apps](https://allianceauth.readthedocs.io/en/latest/features/apps/) which add many useful functions, e.g.: fleet schedule, timer board, SRP request management, fleet activity tracker
+- Includes a set of web [apps](https://allianceauth.readthedocs.io/en/latest/features/apps/) which add many useful functions, e.g.: fleet schedule, timer board, SRP request management, fleet activity tracker
 
 - Can be easily extended with additional services and apps. Many are provided by the community and can be found here: [Community Creations](https://gitlab.com/allianceauth/community-creations)
 
-- 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
+- English :flag_gb:, Chinese :flag_cn:, German :flag_de:, Spanish :flag_es:, Korean :flag_kr: and Russian :flag_ru: 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](https://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](http://allianceauth.rtfd.io).
 
 ## Screenshot
 
-Here is an example of the Alliance Auth web site with a mixture of Services, Apps and Community Creations enabled:
+Here is an example of the Alliance Auth web site with some plug-ins apps and services enabled:
 
-### Flatly Theme
+![screenshot](https://i.imgur.com/2tnX9kD.png)
-
-![Flatly Theme](docs/_static/images/promotion/SampleInstallation-Flatly.png)
-
-### Darkly Theme
-
-![Darkly Theme](docs/_static/images/promotion/SampleInstallation-Darkly.png)
 
 ## Support
 
@@ -62,15 +56,13 @@ Here is an example of the Alliance Auth web site with a mixture of Services, App
 
 - [Aaron Kable](https://gitlab.com/aaronkable/)
 - [Ariel Rin](https://gitlab.com/soratidus999/)
+- [Basraah](https://gitlab.com/basraah/)
 - [Col Crunch](https://gitlab.com/colcrunch/)
 - [Erik Kalkoken](https://gitlab.com/ErikKalkoken/)
-- [Rounon Dax](https://gitlab.com/ppfeufer)
-- [snipereagle1](https://gitlab.com/mckernanin)
 
 ### Former Developers
 
 - [Adarnof](https://gitlab.com/adarnof/)
-- [Basraah](https://gitlab.com/basraah/)
 
 ### Beta Testers / Bug Fixers
 

allianceauth/__init__.py

@@ -1,11 +1,8 @@
-"""An auth system for EVE Online to help in-game organizations
-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.8.0'
+__version__ = '2.15.1'
 __title__ = 'Alliance Auth'
 __url__ = 'https://gitlab.com/allianceauth/allianceauth'
 NAME = f'{__title__} v{__version__}'
+default_app_config = 'allianceauth.apps.AllianceAuthConfig'

allianceauth/analytics/__init__.py

@@ -0,0 +1 @@
+default_app_config = 'allianceauth.analytics.apps.AnalyticsConfig'

allianceauth/analytics/admin.py

@@ -1,16 +1,21 @@
 from django.contrib import admin
 
-from .models import AnalyticsIdentifier, AnalyticsTokens
+from .models import AnalyticsIdentifier, AnalyticsPath, AnalyticsTokens
-from solo.admin import SingletonModelAdmin
 
 
 @admin.register(AnalyticsIdentifier)
-class AnalyticsIdentifierAdmin(SingletonModelAdmin):
+class AnalyticsIdentifierAdmin(admin.ModelAdmin):
     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',)
+
+
+@admin.register(AnalyticsPath)
+class AnalyticsPathAdmin(admin.ModelAdmin):
+    search_fields = ['ignore_path', ]
+    list_display = ('ignore_path',)

allianceauth/analytics/apps.py

@@ -1,8 +1,9 @@
 from django.apps import AppConfig
-from django.utils.translation import gettext_lazy as _
 
 
 class AnalyticsConfig(AppConfig):
     name = 'allianceauth.analytics'
     label = 'analytics'
-    verbose_name = _('Analytics')
+
+    def ready(self):
+        import allianceauth.analytics.signals

allianceauth/analytics/fixtures/disable_analytics.json

@@ -3,10 +3,11 @@
     "model": "analytics.AnalyticsTokens",
     "pk": 1,
     "fields": {
-        "name": "AA Team Public Google Analytics (V4)",
+        "name": "AA Team Public Google Analytics (Universal)",
         "type": "GA-V4",
-        "token": "G-6LYSMYK8DE",
+        "token": "UA-186249766-2",
-        "secret": "KLlpjLZ-SRGozS5f5wb_kw",
+        "send_page_views": "False",
+        "send_celery_tasks": "False",
         "send_stats": "False"
         }
     },

allianceauth/analytics/middleware.py

@@ -0,0 +1,52 @@
+from bs4 import BeautifulSoup
+
+from django.conf import settings
+from django.utils.deprecation import MiddlewareMixin
+from .models import AnalyticsTokens, AnalyticsIdentifier
+from .tasks import send_ga_tracking_web_view
+
+import re
+
+
+class AnalyticsMiddleware(MiddlewareMixin):
+    def process_response(self, request, response):
+        """Django Middleware: Process Page Views and creates Analytics Celery Tasks"""
+        if getattr(settings, "ANALYTICS_DISABLED", False):
+            return response
+        analyticstokens = AnalyticsTokens.objects.all()
+        client_id = AnalyticsIdentifier.objects.get(id=1).identifier.hex
+        try:
+            title = BeautifulSoup(
+                response.content, "html.parser").html.head.title.text
+        except AttributeError:
+            title = ''
+        for token in analyticstokens:
+            # Check if Page View Sending is Disabled
+            if token.send_page_views is False:
+                continue
+            # Check Exclusions
+            ignore = False
+            for ignore_path in token.ignore_paths.values():
+                ignore_path_regex = re.compile(ignore_path["ignore_path"])
+                if re.search(ignore_path_regex, request.path) is not None:
+                    ignore = True
+
+            if ignore is True:
+                continue
+
+            tracking_id = token.token
+            locale = request.LANGUAGE_CODE
+            path = request.path
+            try:
+                useragent = request.headers["User-Agent"]
+            except KeyError:
+                useragent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36"
+
+            send_ga_tracking_web_view.s(tracking_id=tracking_id,
+                                        client_id=client_id,
+                                        page=path,
+                                        title=title,
+                                        locale=locale,
+                                        useragent=useragent).\
+                apply_async(priority=9)
+        return response

allianceauth/analytics/migrations/0007_analyticstokens_secret.py

@@ -1,18 +0,0 @@
-# Generated by Django 4.0.6 on 2022-08-30 05:47
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('analytics', '0006_more_ignore_paths'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='analyticstokens',
-            name='secret',
-            field=models.CharField(blank=True, max_length=254),
-        ),
-    ]

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

@@ -1,64 +0,0 @@
-# Generated by Django 3.1.4 on 2020-12-30 08:53
-
-from django.db import migrations
-from django.core.exceptions import ObjectDoesNotExist
-
-
-def add_aa_team_token(apps, schema_editor):
-    # We can't import the Person model directly as it may be a newer
-    # version than this migration expects. We use the historical version.
-    Tokens = apps.get_model('analytics', 'AnalyticsTokens')
-    AnalyticsPath = apps.get_model('analytics', 'AnalyticsPath')
-    token = Tokens()
-    try:
-        ua_token = Tokens.objects.get(token="UA-186249766-2")
-        original_send_page_views = ua_token.send_page_views
-        original_send_celery_tasks = ua_token.send_celery_tasks
-        original_send_stats = ua_token.send_stats
-    except ObjectDoesNotExist:
-        original_send_page_views = True
-        original_send_celery_tasks = True
-        original_send_stats = True
-
-    try:
-        user_notifications_count = AnalyticsPath.objects.get(ignore_path=r"^\/user_notifications_count\/.*",)
-    except ObjectDoesNotExist:
-        user_notifications_count = AnalyticsPath.objects.create(ignore_path=r"^\/user_notifications_count\/.*")
-
-    try:
-        admin = AnalyticsPath.objects.get(ignore_path=r"^\/admin\/.*")
-    except ObjectDoesNotExist:
-        admin = AnalyticsPath.objects.create(ignore_path=r"^\/admin\/.*")
-
-    try:
-        account_activate = AnalyticsPath.objects.get(ignore_path=r"^\/account\/activate\/.*")
-    except ObjectDoesNotExist:
-        account_activate = AnalyticsPath.objects.create(ignore_path=r"^\/account\/activate\/.*")
-
-    token.type = 'GA-V4'
-    token.token = 'G-6LYSMYK8DE'
-    token.secret = 'KLlpjLZ-SRGozS5f5wb_kw'
-    token.send_page_views = original_send_page_views
-    token.send_celery_tasks = original_send_celery_tasks
-    token.send_stats = original_send_stats
-    token.name = 'AA Team Public Google Analytics (V4)'
-    token.save()
-    token.ignore_paths.add(admin, user_notifications_count, account_activate)
-    token.save()
-
-
-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()
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('analytics', '0007_analyticstokens_secret'),
-    ]
-
-    operations = [migrations.RunPython(
-        add_aa_team_token, remove_aa_team_token)]

allianceauth/analytics/migrations/0009_remove_analyticstokens_ignore_paths_and_more.py

@@ -1,28 +0,0 @@
-# Generated by Django 4.0.10 on 2023-05-08 05:24
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('analytics', '0008_add_AA_GA-4_Team_Token '),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='analyticstokens',
-            name='ignore_paths',
-        ),
-        migrations.RemoveField(
-            model_name='analyticstokens',
-            name='send_celery_tasks',
-        ),
-        migrations.RemoveField(
-            model_name='analyticstokens',
-            name='send_page_views',
-        ),
-        migrations.DeleteModel(
-            name='AnalyticsPath',
-        ),
-    ]

allianceauth/analytics/migrations/0010_alter_analyticsidentifier_options.py

@@ -1,17 +0,0 @@
-# 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,19 +1,26 @@
-from typing import Literal
 from django.db import models
+from django.core.exceptions import ValidationError
 from django.utils.translation import gettext_lazy as _
-from solo.models import SingletonModel
+
 from uuid import uuid4
 
 
-class AnalyticsIdentifier(SingletonModel):
+class AnalyticsIdentifier(models.Model):
 
-    identifier = models.UUIDField(default=uuid4, editable=False)
+    identifier = models.UUIDField(default=uuid4,
+                                  editable=False)
 
-    def __str__(self) -> Literal['Analytics Identifier']:
+    def save(self, *args, **kwargs):
-        return "Analytics Identifier"
+        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 Meta:
+
-        verbose_name = "Analytics Identifier"
+class AnalyticsPath(models.Model):
+    ignore_path = models.CharField(max_length=254, default="/example/", help_text="Regex Expression, If matched no Analytics Page View is sent")
 
 
 class AnalyticsTokens(models.Model):
@@ -25,5 +32,7 @@ class AnalyticsTokens(models.Model):
     name = models.CharField(max_length=254)
     type = models.CharField(max_length=254, choices=Analytics_Type.choices)
     token = models.CharField(max_length=254, blank=False)
-    secret = models.CharField(max_length=254, blank=True)
+    send_page_views = models.BooleanField(default=False)
+    send_celery_tasks = models.BooleanField(default=False)
     send_stats = models.BooleanField(default=False)
+    ignore_paths = models.ManyToManyField(AnalyticsPath, blank=True)

allianceauth/analytics/signals.py

@@ -0,0 +1,55 @@
+import logging
+from celery.signals import task_failure, task_success
+from django.conf import settings
+from allianceauth.analytics.tasks import analytics_event
+
+logger = logging.getLogger(__name__)
+
+
+@task_failure.connect
+def process_failure_signal(
+                        exception, traceback,
+                        sender, task_id, signal,
+                        args, kwargs, einfo, **kw):
+    logger.debug("Celery task_failure signal %s" % sender.__class__.__name__)
+    if getattr(settings, "ANALYTICS_DISABLED", False):
+        return
+
+    category = sender.__module__
+
+    if 'allianceauth.analytics' not in category:
+        if category.endswith(".tasks"):
+            category = category[:-6]
+
+        action = sender.__name__
+
+        label = f"{exception.__class__.__name__}"
+
+        analytics_event(category=category,
+                        action=action,
+                        label=label)
+
+
+@task_success.connect
+def celery_success_signal(sender, result=None, **kw):
+    logger.debug("Celery task_success signal %s" % sender.__class__.__name__)
+    if getattr(settings, "ANALYTICS_DISABLED", False):
+        return
+
+    category = sender.__module__
+
+    if 'allianceauth.analytics' not in category:
+        if category.endswith(".tasks"):
+            category = category[:-6]
+
+        action = sender.__name__
+        label = "Success"
+
+        value = 0
+        if isinstance(result, int):
+            value = result
+
+        analytics_event(category=category,
+                        action=action,
+                        label=label,
+                        value=value)

allianceauth/analytics/tasks.py

@@ -3,25 +3,23 @@ import logging
 from django.conf import settings
 from django.apps import apps
 from celery import shared_task
+from allianceauth import __version__
 from .models import AnalyticsTokens, AnalyticsIdentifier
 from .utils import (
-    existence_baremetal_or_docker,
     install_stat_addons,
     install_stat_tokens,
     install_stat_users)
 
-from allianceauth import __version__
-
 logger = logging.getLogger(__name__)
 
-BASE_URL = "https://www.google-analytics.com"
+BASE_URL = "https://www.google-analytics.com/"
 
-DEBUG_URL = f"{BASE_URL}/debug/mp/collect"
+DEBUG_URL = f"{BASE_URL}debug/collect"
-COLLECTION_URL = f"{BASE_URL}/mp/collect"
+COLLECTION_URL = f"{BASE_URL}collect"
 
 if getattr(settings, "ANALYTICS_ENABLE_DEBUG", False) and settings.DEBUG:
-    # Force sending of analytics data during in a debug/test environment
+    # Force sending of analytics data during in a debug/test environemt
-    # Useful for developers working on this feature.
+    # Usefull for developers working on this feature.
     logger.warning(
         "You have 'ANALYTICS_ENABLE_DEBUG' Enabled! "
         "This debug instance will send analytics data!")
@@ -33,175 +31,177 @@ if settings.DEBUG is True:
     ANALYTICS_URL = DEBUG_URL
 
 
-def analytics_event(namespace: str,
+def analytics_event(category: str,
-                    task: str,
+                    action: str,
-                    label: str = "",
+                    label: str,
-                    result: str = "",
+                    value: int = 0,
-                    value: int = 1,
                     event_type: str = 'Celery'):
     """
     Send a Google Analytics Event for each token stored
     Includes check for if its enabled/disabled
 
     Args:
-        `namespace` (str): Celery Namespace
+        `category` (str): Celery Namespace
-        `task` (str): Task Name
+        `action` (str): Task Name
-        `label` (str): Optional, additional task label
+        `label` (str): Optional, Task Success/Exception
-        `result` (str): Optional, Task Success/Exception
+        `value` (int): Optional, If bulk, Query size, can be a binary True/False
-        `value` (int): Optional, If bulk, Query size, can be a Boolean
         `event_type` (str): Optional, Celery or Stats only, Default to Celery
     """
-    for token in AnalyticsTokens.objects.filter(type='GA-V4'):
+    analyticstokens = AnalyticsTokens.objects.all()
-        if event_type == 'Stats':
+    client_id = AnalyticsIdentifier.objects.get(id=1).identifier.hex
+    for token in analyticstokens:
+        if event_type == 'Celery':
+            allowed = token.send_celery_tasks
+        elif event_type == 'Stats':
             allowed = token.send_stats
         else:
             allowed = False
 
         if allowed is True:
+            tracking_id = token.token
             send_ga_tracking_celery_event.s(
-                measurement_id=token.token,
+                tracking_id=tracking_id,
-                secret=token.secret,
+                client_id=client_id,
-                namespace=namespace,
+                category=category,
-                task=task,
+                action=action,
                 label=label,
-                result=result,
                 value=value).apply_async(priority=9)
 
 
-@shared_task
+@shared_task()
-def analytics_daily_stats() -> None:
+def analytics_daily_stats():
     """Celery Task: Do not call directly
 
-    Gathers a series of daily statistics
+    Gathers a series of daily statistics and sends analytics events containing them
-    Sends analytics events containing them
     """
     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',
+    analytics_event(category='allianceauth.analytics',
-                    task='send_install_stats',
+                    action='send_install_stats',
                     label='existence',
                     value=1,
                     event_type='Stats')
-    analytics_event(namespace='allianceauth.analytics',
+    analytics_event(category='allianceauth.analytics',
-                    task='send_install_stats',
+                    action='send_install_stats',
-                    label=existence_type,
-                    value=1,
-                    event_type='Stats')
-    analytics_event(namespace='allianceauth.analytics',
-                    task='send_install_stats',
                     label='users',
                     value=users,
                     event_type='Stats')
-    analytics_event(namespace='allianceauth.analytics',
+    analytics_event(category='allianceauth.analytics',
-                    task='send_install_stats',
+                    action='send_install_stats',
                     label='tokens',
                     value=tokens,
                     event_type='Stats')
-    analytics_event(namespace='allianceauth.analytics',
+    analytics_event(category='allianceauth.analytics',
-                    task='send_install_stats',
+                    action='send_install_stats',
                     label='addons',
                     value=addons,
                     event_type='Stats')
+
     for appconfig in apps.get_app_configs():
-        if appconfig.label in [
+        analytics_event(category='allianceauth.analytics',
-            "django_celery_beat",
+                        action='send_extension_stats',
-            "bootstrapform",
+                        label=appconfig.label,
-            "messages",
+                        value=1,
-            "sessions",
+                        event_type='Stats')
-            "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(
+def send_ga_tracking_web_view(
-        measurement_id: str,
+                            tracking_id: str,
-        secret: str,
+                            client_id: str,
-        namespace: str,
+                            page: str,
-        task: str,
+                            title: str,
-        label: str = "",
+                            locale: str,
-        result: str = "",
+                            useragent: str) -> requests.Response:
-        value: int = 1):
+
     """Celery Task: Do not call directly
 
-    Sends an events to GA
+    Sends Page View events to GA, Called only via analytics.middleware
 
     Parameters
     ----------
-    `measurement_id` (str): GA Token
+    `tracking_id` (str): Unique Server Identifier
-    `secret` (str): GA Authentication Secret
+    `client_id` (str): GA Token
-    `namespace` (str): Celery Namespace
+    `page` (str): Page Path
-    `task` (str): Task Name
+    `title` (str): Page Title
-    `label` (str): Optional, additional task label
+    `locale` (str): Browser Language
-    `result` (str): Optional, Task Success/Exception
+    `useragent` (str): Browser UserAgent
-    `value` (int): Optional, If bulk, Query size, can be a binary True/False
-    """
 
-    parameters = {
+    Returns
-        'measurement_id': measurement_id,
+    -------
-        'api_secret': secret
+    requests.Reponse Object
-    }
+    """
+    headers = {"User-Agent": useragent}
 
     payload = {
-        'client_id': AnalyticsIdentifier.get_solo().identifier.hex,
+            'v': '1',
-        "user_properties": {
+            'tid': tracking_id,
-            "allianceauth_version": {
+            'cid': client_id,
-                "value": __version__
+            't': 'pageview',
+            'dp': page,
+            'dt': title,
+            'ul': locale,
+            'ua': useragent,
+            'aip': 1,
+            'an': "allianceauth",
+            'av': __version__
             }
-        },
+
-        'non_personalized_ads': True,
+    response = requests.post(
-        "events": [{
+                        ANALYTICS_URL, data=payload,
-            "name": "celery_event",
+                        timeout=5, headers=headers)
-            "params": {
+    logger.debug(f"Analytics Page View HTTP{response.status_code}")
-                    "namespace": namespace,
+    return response
-                    "task": task,
+
-                    'result': result,
+
-                    'label': label,
+@shared_task()
-                    "value": value
+def send_ga_tracking_celery_event(
+                                tracking_id: str,
+                                client_id: str,
+                                category: str,
+                                action: str,
+                                label: str,
+                                value: int) -> requests.Response:
+    """Celery Task: Do not call directly
+
+    Sends Page View events to GA, Called only via analytics.middleware
+
+    Parameters
+    ----------
+    `tracking_id` (str): Unique Server Identifier
+    `client_id` (str): GA Token
+    `category` (str): Celery Namespace
+    `action` (str): Task Name
+    `label` (str): Optional, Task Success/Exception
+    `value` (int): Optional, If bulk, Query size, can be a binary True/False
+
+    Returns
+    -------
+    requests.Reponse Object
+    """
+
+    headers = {
+        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36"}
+
+    payload = {
+            'v': '1',
+            'tid': tracking_id,
+            'cid': client_id,
+            't': 'event',
+            'ec': category,
+            'ea': action,
+            'el': label,
+            'ev': value,
+            'aip': 1,
+            'an': "allianceauth",
+            'av': __version__
             }
-        }]
+
-    }
+    response = requests.post(
-    try:
+                        ANALYTICS_URL, data=payload,
-        response = requests.post(
+                        timeout=5, headers=headers)
-            ANALYTICS_URL,
+    logger.debug(f"Analytics Celery/Stats Event HTTP{response.status_code}")
-            params=parameters,
+    return response
-            json=payload,
-            timeout=10)
-        response.raise_for_status()
-        logger.debug(
-            f"Analytics Celery/Stats Event HTTP{response.status_code}")
-        return response.status_code
-    except requests.exceptions.HTTPError as e:
-        logger.debug(e)
-        return response.status_code
-    except requests.exceptions.ConnectionError as e:
-        logger.debug(e)
-        return "Failed"

allianceauth/analytics/tests/test_integration.py

@@ -0,0 +1,109 @@
+from unittest.mock import patch
+from urllib.parse import parse_qs
+
+import requests_mock
+
+from django.test import override_settings
+
+from allianceauth.analytics.tasks import ANALYTICS_URL
+from allianceauth.eveonline.tasks import update_character
+from allianceauth.tests.auth_utils import AuthUtils
+from allianceauth.utils.testing import NoSocketsTestCase
+
+
+@override_settings(CELERY_ALWAYS_EAGER=True)
+@requests_mock.mock()
+class TestAnalyticsForViews(NoSocketsTestCase):
+    @override_settings(ANALYTICS_DISABLED=False)
+    def test_should_run_analytics(self, requests_mocker):
+        # given
+        requests_mocker.post(ANALYTICS_URL)
+        user = AuthUtils.create_user("Bruce Wayne")
+        self.client.force_login(user)
+        # when
+        response = self.client.get("/dashboard/")
+        # then
+        self.assertEqual(response.status_code, 200)
+        self.assertTrue(requests_mocker.called)
+
+    @override_settings(ANALYTICS_DISABLED=True)
+    def test_should_not_run_analytics(self, requests_mocker):
+        # given
+        requests_mocker.post(ANALYTICS_URL)
+        user = AuthUtils.create_user("Bruce Wayne")
+        self.client.force_login(user)
+        # when
+        response = self.client.get("/dashboard/")
+        # then
+        self.assertEqual(response.status_code, 200)
+        self.assertFalse(requests_mocker.called)
+
+
+@override_settings(CELERY_ALWAYS_EAGER=True)
+@requests_mock.mock()
+class TestAnalyticsForTasks(NoSocketsTestCase):
+    @override_settings(ANALYTICS_DISABLED=False)
+    @patch("allianceauth.eveonline.models.EveCharacter.objects.update_character")
+    def test_should_run_analytics_for_successful_task(
+        self, requests_mocker, mock_update_character
+    ):
+        # given
+        requests_mocker.post(ANALYTICS_URL)
+        user = AuthUtils.create_user("Bruce Wayne")
+        character = AuthUtils.add_main_character_2(user, "Bruce Wayne", 1001)
+        # when
+        update_character.delay(character.character_id)
+        # then
+        self.assertTrue(mock_update_character.called)
+        self.assertTrue(requests_mocker.called)
+        payload = parse_qs(requests_mocker.last_request.text)
+        self.assertListEqual(payload["el"], ["Success"])
+
+    @override_settings(ANALYTICS_DISABLED=True)
+    @patch("allianceauth.eveonline.models.EveCharacter.objects.update_character")
+    def test_should_not_run_analytics_for_successful_task(
+        self, requests_mocker, mock_update_character
+    ):
+        # given
+        requests_mocker.post(ANALYTICS_URL)
+        user = AuthUtils.create_user("Bruce Wayne")
+        character = AuthUtils.add_main_character_2(user, "Bruce Wayne", 1001)
+        # when
+        update_character.delay(character.character_id)
+        # then
+        self.assertTrue(mock_update_character.called)
+        self.assertFalse(requests_mocker.called)
+
+    @override_settings(ANALYTICS_DISABLED=False)
+    @patch("allianceauth.eveonline.models.EveCharacter.objects.update_character")
+    def test_should_run_analytics_for_failed_task(
+        self, requests_mocker, mock_update_character
+    ):
+        # given
+        requests_mocker.post(ANALYTICS_URL)
+        mock_update_character.side_effect = RuntimeError
+        user = AuthUtils.create_user("Bruce Wayne")
+        character = AuthUtils.add_main_character_2(user, "Bruce Wayne", 1001)
+        # when
+        update_character.delay(character.character_id)
+        # then
+        self.assertTrue(mock_update_character.called)
+        self.assertTrue(requests_mocker.called)
+        payload = parse_qs(requests_mocker.last_request.text)
+        self.assertNotEqual(payload["el"], ["Success"])
+
+    @override_settings(ANALYTICS_DISABLED=True)
+    @patch("allianceauth.eveonline.models.EveCharacter.objects.update_character")
+    def test_should_not_run_analytics_for_failed_task(
+        self, requests_mocker, mock_update_character
+    ):
+        # given
+        requests_mocker.post(ANALYTICS_URL)
+        mock_update_character.side_effect = RuntimeError
+        user = AuthUtils.create_user("Bruce Wayne")
+        character = AuthUtils.add_main_character_2(user, "Bruce Wayne", 1001)
+        # when
+        update_character.delay(character.character_id)
+        # then
+        self.assertTrue(mock_update_character.called)
+        self.assertFalse(requests_mocker.called)

allianceauth/analytics/tests/test_middleware.py

@@ -0,0 +1,23 @@
+from allianceauth.analytics.middleware import AnalyticsMiddleware
+from unittest.mock import Mock
+
+from django.test.testcases import TestCase
+
+
+class TestAnalyticsMiddleware(TestCase):
+
+    def setUp(self):
+        self.middleware = AnalyticsMiddleware()
+        self.request = Mock()
+        self.request.headers = {
+                "User-Agent": "AUTOMATED TEST"
+            }
+        self.request.path = '/testURL/'
+        self.request.session = {}
+        self.request.LANGUAGE_CODE = 'en'
+        self.response = Mock()
+        self.response.content = 'hello world'
+
+    def test_middleware(self):
+        response = self.middleware.process_response(self.request, self.response)
+        self.assertEqual(self.response, response)

allianceauth/analytics/tests/test_models.py

@@ -1,8 +1,9 @@
 from allianceauth.analytics.models import AnalyticsIdentifier
+from django.core.exceptions import ValidationError
 
 from django.test.testcases import TestCase
 
-from uuid import uuid4
+from uuid import UUID, uuid4
 
 
 # Identifiers
@@ -13,4 +14,13 @@ uuid_2 = "7aa6bd70701f44729af5e3095ff4b55c"
 class TestAnalyticsIdentifier(TestCase):
 
     def test_identifier_random(self):
-        self.assertNotEqual(AnalyticsIdentifier.get_solo(), uuid4)
+        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))

allianceauth/analytics/tests/test_tasks.py

@@ -4,11 +4,12 @@ from django.test.utils import override_settings
 
 from allianceauth.analytics.tasks import (
     analytics_event,
-    send_ga_tracking_celery_event)
+    send_ga_tracking_celery_event,
+    send_ga_tracking_web_view)
 from allianceauth.utils.testing import NoSocketsTestCase
 
 
-GOOGLE_ANALYTICS_DEBUG_URL = 'https://www.google-analytics.com/debug/mp/collect'
+GOOGLE_ANALYTICS_DEBUG_URL = 'https://www.google-analytics.com/debug/collect'
 
 
 @override_settings(CELERY_ALWAYS_EAGER=True, CELERY_EAGER_PROPAGATES_EXCEPTIONS=True)
@@ -17,53 +18,195 @@ class TestAnalyticsTasks(NoSocketsTestCase):
     def test_analytics_event(self, requests_mocker):
         requests_mocker.register_uri('POST', GOOGLE_ANALYTICS_DEBUG_URL)
         analytics_event(
-            namespace='allianceauth.analytics',
+                        category='allianceauth.analytics',
-            task='send_tests',
+                        action='send_tests',
-            label='test',
+                        label='test',
-            value=1,
+                        value=1,
-            result="Success",
+                        event_type='Stats')
-            event_type='Stats')
+
+    def test_send_ga_tracking_web_view_sent(self, requests_mocker):
+        """This test sends if the event SENDS to google.
+        Not if it was successful.
+        """
+        # given
+        requests_mocker.register_uri('POST', GOOGLE_ANALYTICS_DEBUG_URL)
+        tracking_id = 'UA-186249766-2'
+        client_id = 'ab33e241fbf042b6aa77c7655a768af7'
+        page = '/index/'
+        title = 'Hello World'
+        locale = 'en'
+        useragent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36"
+        # when
+        response = send_ga_tracking_web_view(
+                                            tracking_id,
+                                            client_id,
+                                            page,
+                                            title,
+                                            locale,
+                                            useragent)
+        # then
+        self.assertEqual(response.status_code, 200)
+
+    def test_send_ga_tracking_web_view_success(self, requests_mocker):
+        # given
+        requests_mocker.register_uri(
+            'POST',
+            GOOGLE_ANALYTICS_DEBUG_URL,
+            json={"hitParsingResult":[{'valid': True}]}
+        )
+        tracking_id = 'UA-186249766-2'
+        client_id = 'ab33e241fbf042b6aa77c7655a768af7'
+        page = '/index/'
+        title = 'Hello World'
+        locale = 'en'
+        useragent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36"
+        # when
+        json_response = send_ga_tracking_web_view(
+                                                tracking_id,
+                                                client_id,
+                                                page,
+                                                title,
+                                                locale,
+                                                useragent).json()
+        # then
+        self.assertTrue(json_response["hitParsingResult"][0]["valid"])
+
+    def test_send_ga_tracking_web_view_invalid_token(self, requests_mocker):
+        # given
+        requests_mocker.register_uri(
+            'POST',
+            GOOGLE_ANALYTICS_DEBUG_URL,
+            json={
+                "hitParsingResult":[
+                    {
+                        'valid': False,
+                        'parserMessage': [
+                            {
+                                'messageType': 'INFO',
+                                'description': 'IP Address from this hit was anonymized to 1.132.110.0.',
+                                'messageCode': 'VALUE_MODIFIED'
+                            },
+                            {
+                                'messageType': 'ERROR',
+                                'description': "The value provided for parameter 'tid' is invalid. Please see http://goo.gl/a8d4RP#tid for details.",
+                                'messageCode': 'VALUE_INVALID', 'parameter': 'tid'
+                            }
+                        ],
+                        'hit': '/debug/collect?v=1&tid=UA-IntentionallyBadTrackingID-2&cid=ab33e241fbf042b6aa77c7655a768af7&t=pageview&dp=/index/&dt=Hello World&ul=en&ua=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36&aip=1&an=allianceauth&av=2.9.0a2'
+                    }
+                ]
+            }
+        )
+        tracking_id = 'UA-IntentionallyBadTrackingID-2'
+        client_id = 'ab33e241fbf042b6aa77c7655a768af7'
+        page = '/index/'
+        title = 'Hello World'
+        locale = 'en'
+        useragent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36"
+        # when
+        json_response = send_ga_tracking_web_view(
+                                            tracking_id,
+                                            client_id,
+                                            page,
+                                            title,
+                                            locale,
+                                            useragent).json()
+        # then
+        self.assertFalse(json_response["hitParsingResult"][0]["valid"])
+        self.assertEqual(
+            json_response["hitParsingResult"][0]["parserMessage"][1]["description"],
+            "The value provided for parameter 'tid' is invalid. Please see http://goo.gl/a8d4RP#tid for details."
+        )
+
+        # [{'valid': False, 'parserMessage': [{'messageType': 'INFO', 'description': 'IP Address from this hit was anonymized to 1.132.110.0.', 'messageCode': 'VALUE_MODIFIED'}, {'messageType': 'ERROR', 'description': "The value provided for parameter 'tid' is invalid. Please see http://goo.gl/a8d4RP#tid for details.", 'messageCode': 'VALUE_INVALID', 'parameter': 'tid'}], 'hit': '/debug/collect?v=1&tid=UA-IntentionallyBadTrackingID-2&cid=ab33e241fbf042b6aa77c7655a768af7&t=pageview&dp=/index/&dt=Hello World&ul=en&ua=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36&aip=1&an=allianceauth&av=2.9.0a2'}]
 
     def test_send_ga_tracking_celery_event_sent(self, requests_mocker):
         # given
         requests_mocker.register_uri('POST', GOOGLE_ANALYTICS_DEBUG_URL)
-        token = 'G-6LYSMYK8DE'
+        tracking_id = 'UA-186249766-2'
-        secret = 'KLlpjLZ-SRGozS5f5wb_kw',
+        client_id = 'ab33e241fbf042b6aa77c7655a768af7'
         category = 'test'
         action = 'test'
         label = 'test'
         value = '1'
         # when
-        task = send_ga_tracking_celery_event(
+        response = send_ga_tracking_celery_event(
-            token,
+                                                tracking_id,
-            secret,
+                                                client_id,
-            category,
+                                                category,
-            action,
+                                                action,
-            label,
+                                                label,
-            value)
+                                                value)
         # then
-        self.assertEqual(task, 200)
+        self.assertEqual(response.status_code, 200)
 
     def test_send_ga_tracking_celery_event_success(self, requests_mocker):
         # given
         requests_mocker.register_uri(
             'POST',
             GOOGLE_ANALYTICS_DEBUG_URL,
-            json={"validationMessages": []}
+            json={"hitParsingResult":[{'valid': True}]}
         )
-        token = 'G-6LYSMYK8DE'
+        tracking_id = 'UA-186249766-2'
-        secret = 'KLlpjLZ-SRGozS5f5wb_kw',
+        client_id = 'ab33e241fbf042b6aa77c7655a768af7'
         category = 'test'
         action = 'test'
         label = 'test'
         value = '1'
         # when
-        task = send_ga_tracking_celery_event(
+        json_response = send_ga_tracking_celery_event(
-            token,
+                                                    tracking_id,
-            secret,
+                                                    client_id,
-            category,
+                                                    category,
-            action,
+                                                    action,
-            label,
+                                                    label,
-            value)
+                                                    value).json()
         # then
-        self.assertTrue(task, 200)
+        self.assertTrue(json_response["hitParsingResult"][0]["valid"])
+
+    def test_send_ga_tracking_celery_event_invalid_token(self, requests_mocker):
+        # given
+        requests_mocker.register_uri(
+            'POST',
+            GOOGLE_ANALYTICS_DEBUG_URL,
+            json={
+                "hitParsingResult":[
+                    {
+                        'valid': False,
+                        'parserMessage': [
+                            {
+                                'messageType': 'INFO',
+                                'description': 'IP Address from this hit was anonymized to 1.132.110.0.',
+                                'messageCode': 'VALUE_MODIFIED'
+                            },
+                            {
+                                'messageType': 'ERROR',
+                                'description': "The value provided for parameter 'tid' is invalid. Please see http://goo.gl/a8d4RP#tid for details.",
+                                'messageCode': 'VALUE_INVALID', 'parameter': 'tid'
+                            }
+                        ],
+                        'hit': '/debug/collect?v=1&tid=UA-IntentionallyBadTrackingID-2&cid=ab33e241fbf042b6aa77c7655a768af7&t=pageview&dp=/index/&dt=Hello World&ul=en&ua=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36&aip=1&an=allianceauth&av=2.9.0a2'
+                    }
+                ]
+            }
+        )
+        tracking_id = 'UA-IntentionallyBadTrackingID-2'
+        client_id = 'ab33e241fbf042b6aa77c7655a768af7'
+        category = 'test'
+        action = 'test'
+        label = 'test'
+        value = '1'
+        # when
+        json_response = send_ga_tracking_celery_event(
+                                                    tracking_id,
+                                                    client_id,
+                                                    category,
+                                                    action,
+                                                    label,
+                                                    value).json()
+        # then
+        self.assertFalse(json_response["hitParsingResult"][0]["valid"])
+        self.assertEqual(
+            json_response["hitParsingResult"][0]["parserMessage"][1]["description"],
+            "The value provided for parameter 'tid' is invalid. Please see http://goo.gl/a8d4RP#tid for details."
+        )

allianceauth/analytics/tests/test_utils.py

@@ -18,17 +18,17 @@ def create_testdata():
         'abc@example.com',
         'password'
     )
-    # Token.objects.all().delete()
+    #Token.objects.all().delete()
-    # Token.objects.create(
+    #Token.objects.create(
     #            character_id=101,
     #            character_name='character1',
     #            access_token='my_access_token'
-    # )
+    #)
-    # Token.objects.create(
+    #Token.objects.create(
     #            character_id=102,
     #            character_name='character2',
     #            access_token='my_access_token'
-    # )
+    #)
 
 
 class TestAnalyticsUtils(TestCase):
@@ -40,7 +40,7 @@ class TestAnalyticsUtils(TestCase):
         users = install_stat_users()
         self.assertEqual(users, expected)
 
-    # def test_install_stat_tokens(self):
+    #def test_install_stat_tokens(self):
     #    create_testdata()
     #    expected = 2
     #

allianceauth/analytics/utils.py

@@ -1,4 +1,3 @@
-import os
 from django.apps import apps
 from allianceauth.authentication.models import User
 from esi.models import Token
@@ -35,16 +34,3 @@ 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

@@ -3,6 +3,3 @@ from django.apps import AppConfig
 
 class AllianceAuthConfig(AppConfig):
     name = 'allianceauth'
-
-    def ready(self) -> None:
-        import allianceauth.checks # noqa

allianceauth/authentication/__init__.py

@@ -0,0 +1 @@
+default_app_config = 'allianceauth.authentication.apps.AuthenticationConfig'

allianceauth/authentication/admin.py

@@ -288,7 +288,7 @@ class UserAdmin(BaseUserAdmin):
     Behavior of groups and characters columns can be configured via settings
     """
 
-    inlines = [UserProfileInline]
+    inlines = BaseUserAdmin.inlines + [UserProfileInline]
     ordering = ('username', )
     list_select_related = ('profile__state', 'profile__main_character')
     show_full_result_count = True
@@ -322,7 +322,7 @@ class UserAdmin(BaseUserAdmin):
 
     class Media:
         css = {
-            "all": ("allianceauth/authentication/css/admin.css",)
+            "all": ("authentication/css/admin.css",)
         }
 
     def get_queryset(self, request):
@@ -542,7 +542,7 @@ class BaseOwnershipAdmin(admin.ModelAdmin):
 
     class Media:
         css = {
-            "all": ("allianceauth/authentication/css/admin.css",)
+            "all": ("authentication/css/admin.css",)
         }
 
     def get_readonly_fields(self, request, obj=None):

allianceauth/authentication/apps.py

@@ -1,12 +1,10 @@
 from django.apps import AppConfig
 from django.core.checks import register, Tags
-from django.utils.translation import gettext_lazy as _
 
 
 class AuthenticationConfig(AppConfig):
     name = "allianceauth.authentication"
     label = "authentication"
-    verbose_name = _("Authentication")
 
     def ready(self):
         from allianceauth.authentication import checks, signals  # noqa: F401

allianceauth/authentication/auth_hooks.py

@@ -1,59 +0,0 @@
-from allianceauth.hooks import DashboardItemHook
-from allianceauth import hooks
-from .views import dashboard_characters, dashboard_esi_check, dashboard_groups, dashboard_admin
-
-
-class UserCharactersHook(DashboardItemHook):
-    def __init__(self):
-        DashboardItemHook.__init__(
-            self,
-            dashboard_characters,
-            5
-        )
-
-
-class UserGroupsHook(DashboardItemHook):
-    def __init__(self):
-        DashboardItemHook.__init__(
-            self,
-            dashboard_groups,
-            5
-        )
-
-
-class AdminHook(DashboardItemHook):
-    def __init__(self):
-        DashboardItemHook.__init__(
-            self,
-            dashboard_admin,
-            1
-        )
-
-
-class ESICheckHook(DashboardItemHook):
-    def __init__(self):
-        DashboardItemHook.__init__(
-            self,
-            dashboard_esi_check,
-            0
-        )
-
-
-@hooks.register('dashboard_hook')
-def register_character_hook():
-    return UserCharactersHook()
-
-
-@hooks.register('dashboard_hook')
-def register_groups_hook():
-    return UserGroupsHook()
-
-
-@hooks.register('dashboard_hook')
-def register_admin_hook():
-    return AdminHook()
-
-
-@hooks.register('dashboard_hook')
-def register_esi_hook():
-    return ESICheckHook()

allianceauth/authentication/backends.py

@@ -37,11 +37,7 @@ class StateBackend(ModelBackend):
             ownership = CharacterOwnership.objects.get(character__character_id=token.character_id)
             if ownership.owner_hash == token.character_owner_hash:
                 logger.debug(f'Authenticating {ownership.user} by ownership of character {token.character_name}')
-                if ownership.user.profile.main_character:
+                return ownership.user
-                    if ownership.user.profile.main_character.character_id == token.character_id:
-                        return ownership.user
-                    else:  # this is an alt, enforce main only.
-                        return None
             else:
                 logger.debug(f'{token.character_name} has changed ownership. Creating new user account.')
                 ownership.delete()
@@ -61,18 +57,13 @@ class StateBackend(ModelBackend):
                 if records.exists():
                     # we've seen this character owner before. Re-attach to their old user account
                     user = records[0].user
-                    if user.profile.main_character:
-                        if user.profile.main_character.character_id != token.character_id:
-                            # this is an alt, enforce main only due to trust issues in SSO.
-                            return None
-
                     token.user = user
                     co = CharacterOwnership.objects.create_by_token(token)
                     logger.debug(f'Authenticating {user} by matching owner hash record of character {co.character}')
-
+                    if not user.profile.main_character:
-                    # set this as their main by default as they have none
+                        # set this as their main by default if they have none
-                    user.profile.main_character = co.character
+                        user.profile.main_character = co.character
-                    user.profile.save()
+                        user.profile.save()
                     return user
             logger.debug(f'Unable to authenticate character {token.character_name}. Creating new user.')
             return self.create_user(token)

allianceauth/authentication/constants.py

@@ -1,12 +0,0 @@
-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

@@ -1,48 +0,0 @@
-"""API for interacting with celery workers."""
-
-import itertools
-import logging
-from typing import Optional
-
-from amqp.exceptions import ChannelError
-from celery import current_app
-
-from django.conf import settings
-
-logger = logging.getLogger(__name__)
-
-
-def active_tasks_count() -> Optional[int]:
-    """Return count of currently active tasks
-    or None if celery workers are not online.
-    """
-    inspect = current_app.control.inspect()
-    return _tasks_count(inspect.active())
-
-
-def _tasks_count(data: dict) -> Optional[int]:
-    """Return count of tasks in data from celery inspect API."""
-    try:
-        tasks = itertools.chain(*data.values())
-    except AttributeError:
-        return None
-    return len(list(tasks))
-
-
-def queued_tasks_count() -> Optional[int]:
-    """Return count of queued tasks. Return None if there was an error."""
-    try:
-        with current_app.connection_or_acquire() as conn:
-            result = conn.default_channel.queue_declare(
-                queue=getattr(settings, "CELERY_DEFAULT_QUEUE", "celery"), passive=True
-            )
-            return result.message_count
-
-    except ChannelError:
-        # Queue doesn't exist, probably empty
-        return 0
-
-    except Exception:
-        logger.exception("Failed to get celery queue length")
-
-    return None

allianceauth/authentication/decorators.py

@@ -1,31 +1,18 @@
-from django.urls import include
+from django.conf.urls import include
 from django.contrib.auth.decorators import user_passes_test
 from django.core.exceptions import PermissionDenied
 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.contrib import messages
 from django.utils.translation import gettext_lazy as _
+from django.contrib.auth.decorators import login_required
 
 
 def user_has_main_character(user):
     return bool(user.profile.main_character)
 
 
-def decorate_url_patterns(
+def decorate_url_patterns(urls, decorator):
-    urls, decorator: Callable, excluded_views: Optional[Iterable] = None
-):
-    """Decorate views given in url patterns except when they are explicitly excluded.
-
-    Args:
-        - urls: Django URL patterns
-        - decorator: Decorator to be added to each view
-        - exclude_views: Optional iterable of view names to be excluded
-    """
     url_list, app_name, namespace = include(urls)
 
     def process_patterns(url_patterns):
@@ -35,8 +22,6 @@ def decorate_url_patterns(
                 process_patterns(pattern.url_patterns)
             else:
                 # this is a pattern
-                if excluded_views and pattern.lookup_str in excluded_views:
-                    return
                 pattern.callback = decorator(pattern.callback)
 
     process_patterns(url_list)

allianceauth/authentication/hmac_urls.py

@@ -1,13 +1,14 @@
+from django.conf.urls import url, include
+
 from allianceauth.authentication import views
-from django.urls import include, re_path, path
 
 urlpatterns = [
-    path('activate/complete/', views.activation_complete, name='registration_activation_complete'),
+    url(r'^activate/complete/$', views.activation_complete, name='registration_activation_complete'),
     # The activation key can make use of any character from the
     # URL-safe base64 alphabet, plus the colon as a separator.
-    re_path(r'^activate/(?P<activation_key>[-:\w]+)/$', views.ActivationView.as_view(), name='registration_activate'),
+    url(r'^activate/(?P<activation_key>[-:\w]+)/$', views.ActivationView.as_view(), name='registration_activate'),
-    path('register/', views.RegistrationView.as_view(), name='registration_register'),
+    url(r'^register/$', views.RegistrationView.as_view(), name='registration_register'),
-    path('register/complete/', views.registration_complete, name='registration_complete'),
+    url(r'^register/complete/$', views.registration_complete, name='registration_complete'),
-    path('register/closed/', views.registration_closed, name='registration_disallowed'),
+    url(r'^register/closed/$', views.registration_closed, name='registration_disallowed'),
-    path('', include('django.contrib.auth.urls')),
+    url(r'', include('django.contrib.auth.urls')),
 ]

allianceauth/authentication/middleware.py

@@ -1,55 +0,0 @@
-from django.conf import settings
-from django.utils.deprecation import MiddlewareMixin
-
-import logging
-
-logger = logging.getLogger(__name__)
-
-
-class UserSettingsMiddleware(MiddlewareMixin):
-    def process_response(self, request, response):
-        """Django Middleware: User Settings."""
-
-        # Intercept the built in django /setlang/ view and also save it to Database.
-        # Note the annoymous user check, only logged in users will ever hit the DB here
-        if request.path == '/i18n/setlang/' and not request.user.is_anonymous:
-            try:
-                request.user.profile.language = request.POST['language']
-                request.user.profile.save()
-            except Exception as e:
-                logger.exception(e)
-
-        # Only act during the login flow, _after_ user is activated (step 2: post-sso)
-        elif request.path == '/sso/login' and not request.user.is_anonymous:
-            # Set the Language Cookie, if it doesnt match the DB
-            # Null = hasnt been set by the user ever, dont act.
-            try:
-                if request.user.profile.language != request.LANGUAGE_CODE and request.user.profile.language is not None:
-                    response.set_cookie(key=settings.LANGUAGE_COOKIE_NAME,
-                                        value=request.user.profile.language,
-                                        max_age=settings.LANGUAGE_COOKIE_AGE)
-            except Exception as e:
-                logger.exception(e)
-
-            # AA v3 NIGHT_MODE
-            # Set our Night mode flag from the DB
-            # Null = hasnt been set by the user ever, dont act.
-            #
-            # Night mode intercept is not needed in this middleware.
-            # is saved direct to DB in NightModeRedirectView
-            try:
-                if request.user.profile.night_mode is not None:
-                    request.session["NIGHT_MODE"] = request.user.profile.night_mode
-            except Exception as e:
-                logger.exception(e)
-
-            # AA v4 Themes
-            # Null = has not been set by the user ever, dont act
-            # DEFAULT_THEME or DEFAULT_THEME_DARK will be used in get_theme()
-            try:
-                if request.user.profile.theme is not None:
-                    request.session["THEME"] = request.user.profile.theme
-            except Exception as e:
-                logger.exception(e)
-
-        return response

allianceauth/authentication/migrations/0020_userprofile_language_userprofile_night_mode.py

@@ -1,23 +0,0 @@
-# Generated by Django 4.0.2 on 2022-02-26 03:45
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('authentication', '0019_merge_20211026_0919'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            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')], default='', max_length=10, verbose_name='Language'),
-        ),
-        migrations.AddField(
-            model_name='userprofile',
-            name='night_mode',
-            field=models.BooleanField(blank=True, null=True, verbose_name='Night Mode'),
-        ),
-    ]

allianceauth/authentication/migrations/0021_alter_userprofile_language.py

@@ -1,34 +0,0 @@
-# Generated by Django 4.0.10 on 2023-05-28 15:36
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("authentication", "0020_userprofile_language_userprofile_night_mode"),
-    ]
-
-    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"),
-                ],
-                default="",
-                max_length=10,
-                verbose_name="Language",
-            ),
-        ),
-    ]

allianceauth/authentication/migrations/0022_userprofile_theme.py

@@ -1,18 +0,0 @@
-# Generated by Django 4.0.10 on 2023-10-07 07:59
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('authentication', '0021_alter_userprofile_language'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='userprofile',
-            name='theme',
-            field=models.CharField(blank=True, help_text='Bootstrap 5 Themes from https://bootswatch.com/ or Community Apps', max_length=200, null=True, verbose_name='Theme'),
-        ),
-    ]

allianceauth/authentication/migrations/0023_alter_userprofile_language.py

@@ -1,18 +0,0 @@
-# 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

@@ -1,18 +0,0 @@
-# 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,12 +1,10 @@
 import logging
-from typing import ClassVar
 
 from django.contrib.auth.models import User, Permission
 from django.db import models, transaction
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ugettext_lazy as _
 from allianceauth.eveonline.models import EveCharacter, EveCorporationInfo, EveAllianceInfo, EveFactionInfo
 from allianceauth.notifications import notify
-from django.conf import settings
 
 from .managers import CharacterOwnershipManager, StateManager
 
@@ -19,16 +17,16 @@ class State(models.Model):
     priority = models.IntegerField(unique=True, help_text="Users get assigned the state with the highest priority available to them.")
 
     member_characters = models.ManyToManyField(EveCharacter, blank=True,
-                                                help_text="Characters to which this state is available.")
+                                               help_text="Characters to which this state is available.")
     member_corporations = models.ManyToManyField(EveCorporationInfo, blank=True,
-                                                help_text="Corporations to whose members this state is available.")
+                                                 help_text="Corporations to whose members this state is available.")
     member_alliances = models.ManyToManyField(EveAllianceInfo, blank=True,
-                                            help_text="Alliances to whose members this state is available.")
+                                              help_text="Alliances to whose members this state is available.")
     member_factions = models.ManyToManyField(EveFactionInfo, blank=True,
-                                            help_text="Factions to whose members this state is available.")
+                                             help_text="Factions to whose members this state is available.")
     public = models.BooleanField(default=False, help_text="Make this state available to any character.")
 
-    objects: ClassVar[StateManager] = StateManager()
+    objects = StateManager()
 
     class Meta:
         ordering = ['-priority']
@@ -64,54 +62,9 @@ class UserProfile(models.Model):
     class Meta:
         default_permissions = ('change',)
 
-    class Language(models.TextChoices):
+    user = models.OneToOneField(User, related_name='profile', on_delete=models.CASCADE)
-        """
+    main_character = models.OneToOneField(EveCharacter, blank=True, null=True, on_delete=models.SET_NULL)
-        Choices for UserProfile.language
+    state = models.ForeignKey(State, on_delete=models.SET_DEFAULT, default=get_guest_state_pk)
-        """
-        # 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')
-        ITALIAN = 'it-it', _('Italian')
-        JAPANESE = 'ja', _('Japanese')
-        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,
-        related_name='profile',
-        on_delete=models.CASCADE)
-    main_character = models.OneToOneField(
-        EveCharacter,
-        blank=True,
-        null=True,
-        on_delete=models.SET_NULL)
-    state = models.ForeignKey(
-        State,
-        on_delete=models.SET_DEFAULT,
-        default=get_guest_state_pk)
-    language = models.CharField(
-        _("Language"), max_length=10,
-        choices=Language.choices,
-        blank=True,
-        default='')
-    night_mode = models.BooleanField(
-        _("Night Mode"),
-        blank=True,
-        null=True)
-    theme = models.CharField(
-        _("Theme"),
-        max_length=200,
-        blank=True,
-        null=True,
-        help_text="Bootstrap 5 Themes from https://bootswatch.com/ or Community Apps"
-    )
 
     def assign_state(self, state=None, commit=True):
         if not state:
@@ -138,7 +91,7 @@ class UserProfile(models.Model):
                     sender=self.__class__, user=self.user, state=self.state
                 )
 
-    def __str__(self) -> str:
+    def __str__(self):
         return str(self.user)
 
 
@@ -151,7 +104,7 @@ class CharacterOwnership(models.Model):
     owner_hash = models.CharField(max_length=28, unique=True)
     user = models.ForeignKey(User, on_delete=models.CASCADE, related_name='character_ownerships')
 
-    objects: ClassVar[CharacterOwnershipManager] = CharacterOwnershipManager()
+    objects = CharacterOwnershipManager()
 
     def __str__(self):
         return f"{self.user}: {self.character}"

allianceauth/authentication/signals.py

@@ -1,11 +1,6 @@
 import logging
 
-from .models import (
+from .models import CharacterOwnership, UserProfile, get_guest_state, State, OwnershipRecord
-    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
@@ -16,7 +11,7 @@ from allianceauth.eveonline.models import EveCharacter
 
 logger = logging.getLogger(__name__)
 
-state_changed = Signal()
+state_changed = Signal(providing_args=['user', 'state'])
 
 
 def trigger_state_check(state):
@@ -76,7 +71,7 @@ def reassess_on_profile_save(sender, instance, created, *args, **kwargs):
 
 @receiver(post_save, sender=User)
 def create_required_models(sender, instance, created, *args, **kwargs):
-    # ensure all users have our Sub-Models
+    # ensure all users have a model
     if created:
         logger.debug(f'User {instance} created. Creating default UserProfile.')
         UserProfile.objects.get_or_create(user=instance)

allianceauth/authentication/static/allianceauth/authentication/css/admin.css

@@ -1,31 +0,0 @@
-/*
-CSS for allianceauth admin site
-*/
-
-/* styling for profile pic */
-.img-circle {
-    border-radius: 50%;
-}
-
-.column-user_profile_pic {
-    white-space: nowrap;
-    width: 1px;
-}
-
-/* tooltip */
-.tooltip {
-    position: relative;
-}
-
-.tooltip:hover::after {
-    background-color: rgb(255 255 204);
-    border: 1px rgb(128 128 128) solid;
-    color: rgb(0 0 0);
-    content: attr(data-tooltip);
-    left: 1em;
-    min-width: 200px;
-    padding: 8px;
-    position: absolute;
-    top: 1.1em;
-    z-index: 1;
-}

allianceauth/authentication/static/authentication/css/admin.css

@@ -0,0 +1,29 @@
+/*
+CSS for allianceauth admin site
+*/
+
+/* styling for profile pic */
+.img-circle {
+    border-radius: 50%;
+}
+.column-user_profile_pic {
+    width: 1px;
+    white-space: nowrap;
+}
+
+/* tooltip */
+.tooltip {
+    position: relative ;
+}
+.tooltip:hover::after {
+    content: attr(data-tooltip) ;
+    position: absolute ;
+    top: 1.1em ;
+    left: 1em ;
+    min-width: 200px ;
+    border: 1px #808080 solid ;
+    padding: 8px ;
+    color: black ;
+    background-color: rgb(255, 255, 204) ;
+    z-index: 1 ;
+}

allianceauth/authentication/task_statistics/counters.py

@@ -1,34 +1,29 @@
-"""Counters for Task Statistics."""
+from collections import namedtuple
-
 import datetime as dt
-from typing import NamedTuple, Optional
 
 from .event_series import EventSeries
 
-# Global series for counting task events.
+
+"""Global series for counting task events."""
 succeeded_tasks = EventSeries("SUCCEEDED_TASKS")
 retried_tasks = EventSeries("RETRIED_TASKS")
 failed_tasks = EventSeries("FAILED_TASKS")
 
 
-class _TaskCounts(NamedTuple):
+_TaskCounts = namedtuple(
-    succeeded: int
+    "_TaskCounts", ["succeeded", "retried", "failed", "total", "earliest_task", "hours"]
-    retried: int
+)
-    failed: int
-    total: int
-    earliest_task: Optional[dt.datetime]
-    hours: int
 
 
 def dashboard_results(hours: int) -> _TaskCounts:
-    """Counts of all task events within the given time frame."""
+    """Counts of all task events within the given timeframe."""
 
     def earliest_if_exists(events: EventSeries, earliest: dt.datetime) -> list:
         my_earliest = events.first_event(earliest=earliest)
         return [my_earliest] if my_earliest else []
 
     earliest = dt.datetime.utcnow() - dt.timedelta(hours=hours)
-    earliest_events = []
+    earliest_events = list()
     succeeded_count = succeeded_tasks.count(earliest=earliest)
     earliest_events += earliest_if_exists(succeeded_tasks, earliest)
     retried_count = retried_tasks.count(earliest=earliest)

allianceauth/authentication/task_statistics/event_series.py

@@ -1,31 +1,61 @@
-"""Event series for Task Statistics."""
-
 import datetime as dt
 import logging
 from typing import List, Optional
 
 from pytz import utc
-from redis import Redis
+from redis import Redis, RedisError
 
-from .helpers import get_redis_client_or_stub
+from allianceauth.utils.cache import get_redis_client
 
 logger = logging.getLogger(__name__)
 
 
+class _RedisStub:
+    """Stub of a Redis client.
+
+    It's purpose is to prevent EventSeries objects from trying to access Redis
+    when it is not available. e.g. when the Sphinx docs are rendered by readthedocs.org.
+    """
+
+    def delete(self, *args, **kwargs):
+        pass
+
+    def incr(self, *args, **kwargs):
+        return 0
+
+    def zadd(self, *args, **kwargs):
+        pass
+
+    def zcount(self, *args, **kwargs):
+        pass
+
+    def zrangebyscore(self, *args, **kwargs):
+        pass
+
+
 class EventSeries:
     """API for recording and analyzing a series of events."""
 
     _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:
-        self._redis = get_redis_client_or_stub() if not redis else redis
+        self._redis = get_redis_client() if not redis else redis
+        try:
+            if not self._redis.ping():
+                raise RuntimeError()
+        except (AttributeError, RedisError, RuntimeError):
+            logger.exception(
+                "Failed to establish a connection with Redis. "
+                "This EventSeries object is disabled.",
+            )
+            self._redis = _RedisStub()
         self._key_id = str(key_id)
         self.clear()
 
     @property
     def is_disabled(self):
         """True when this object is disabled, e.g. Redis was not available at startup."""
-        return hasattr(self._redis, "IS_STUB")
+        return isinstance(self._redis, _RedisStub)
 
     @property
     def _key_counter(self):
@@ -43,8 +73,8 @@ class EventSeries:
         """
         if not event_time:
             event_time = dt.datetime.utcnow()
-        my_id = self._redis.incr(self._key_counter)
+        id = self._redis.incr(self._key_counter)
-        self._redis.zadd(self._key_sorted_set, {my_id: event_time.timestamp()})
+        self._redis.zadd(self._key_sorted_set, {id: event_time.timestamp()})
 
     def all(self) -> List[dt.datetime]:
         """List of all known events."""
@@ -65,15 +95,15 @@ class EventSeries:
         self._redis.delete(self._key_counter)
 
     def count(self, earliest: dt.datetime = None, latest: dt.datetime = None) -> int:
-        """Count of events, can be restricted to given time frame.
+        """Count of events, can be restricted to given timeframe.
 
         Args:
         - earliest: Date of first events to count(inclusive), or -infinite if not specified
         - latest: Date of last events to count(inclusive), or +infinite if not specified
         """
-        minimum = "-inf" if not earliest else earliest.timestamp()
+        min = "-inf" if not earliest else earliest.timestamp()
-        maximum = "+inf" if not latest else latest.timestamp()
+        max = "+inf" if not latest else latest.timestamp()
-        return self._redis.zcount(self._key_sorted_set, min=minimum, max=maximum)
+        return self._redis.zcount(self._key_sorted_set, min=min, max=max)
 
     def first_event(self, earliest: dt.datetime = None) -> Optional[dt.datetime]:
         """Date/Time of first event. Returns `None` if series has no events.
@@ -81,10 +111,10 @@ class EventSeries:
         Args:
         - earliest: Date of first events to count(inclusive), or any if not specified
         """
-        minimum = "-inf" if not earliest else earliest.timestamp()
+        min = "-inf" if not earliest else earliest.timestamp()
         event = self._redis.zrangebyscore(
             self._key_sorted_set,
-            minimum,
+            min,
             "+inf",
             withscores=True,
             start=0,

allianceauth/authentication/task_statistics/helpers.py

@@ -1,49 +0,0 @@
-"""Helpers for Task Statistics."""
-
-import logging
-
-from redis import Redis, RedisError
-
-from allianceauth.utils.cache import get_redis_client
-
-logger = logging.getLogger(__name__)
-
-
-class _RedisStub:
-    """Stub of a Redis client.
-
-    It's purpose is to prevent EventSeries objects from trying to access Redis
-    when it is not available. e.g. when the Sphinx docs are rendered by readthedocs.org.
-    """
-
-    IS_STUB = True
-
-    def delete(self, *args, **kwargs):
-        pass
-
-    def incr(self, *args, **kwargs):
-        return 0
-
-    def zadd(self, *args, **kwargs):
-        pass
-
-    def zcount(self, *args, **kwargs):
-        pass
-
-    def zrangebyscore(self, *args, **kwargs):
-        pass
-
-
-def get_redis_client_or_stub() -> Redis:
-    """Return AA's default cache client or a stub if Redis is not available."""
-    redis = get_redis_client()
-    try:
-        if not redis.ping():
-            raise RuntimeError()
-    except (AttributeError, RedisError, RuntimeError):
-        logger.exception(
-            "Failed to establish a connection with Redis. "
-            "This EventSeries object is disabled.",
-        )
-        return _RedisStub()
-    return redis

allianceauth/authentication/task_statistics/signals.py

@@ -1,7 +1,9 @@
-"""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
@@ -17,7 +19,6 @@ def reset_counters():
 
 
 def is_enabled() -> bool:
-    """Return True if task statistics are enabled, else return False."""
     return not bool(
         getattr(settings, "ALLIANCEAUTH_DASHBOARD_TASK_STATISTICS_DISABLED", False)
     )

allianceauth/authentication/task_statistics/tests/test_counters.py

@@ -4,30 +4,29 @@ 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,
+    succeeded_tasks,
+    retried_tasks,
+    failed_tasks,
 )
 
 
 class TestDashboardResults(TestCase):
-    def test_should_return_counts_for_given_time_frame_only(self):
+    def test_should_return_counts_for_given_timeframe_only(self):
         # given
         earliest_task = now() - dt.timedelta(minutes=15)
-
         succeeded_tasks.clear()
         succeeded_tasks.add(now() - dt.timedelta(hours=1, seconds=1))
         succeeded_tasks.add(earliest_task)
         succeeded_tasks.add()
         succeeded_tasks.add()
-
         retried_tasks.clear()
         retried_tasks.add(now() - dt.timedelta(hours=1, seconds=1))
         retried_tasks.add(now() - dt.timedelta(seconds=30))
         retried_tasks.add()
-
         failed_tasks.clear()
         failed_tasks.add(now() - dt.timedelta(hours=1, seconds=1))
         failed_tasks.add()
-
         # when
         results = dashboard_results(hours=1)
         # then

allianceauth/authentication/task_statistics/tests/test_event_series.py

@@ -1,19 +1,48 @@
 import datetime as dt
+from unittest.mock import patch
 
 from pytz import utc
+from redis import RedisError
 
 from django.test import TestCase
 from django.utils.timezone import now
 
 from allianceauth.authentication.task_statistics.event_series import (
     EventSeries,
+    _RedisStub,
 )
-from allianceauth.authentication.task_statistics.helpers import _RedisStub
 
 MODULE_PATH = "allianceauth.authentication.task_statistics.event_series"
 
 
 class TestEventSeries(TestCase):
+    def test_should_abort_without_redis_client(self):
+        # when
+        with patch(MODULE_PATH + ".get_redis_client") as mock:
+            mock.return_value = None
+            events = EventSeries("dummy")
+        # then
+        self.assertTrue(events._redis, _RedisStub)
+        self.assertTrue(events.is_disabled)
+
+    def test_should_disable_itself_if_redis_not_available_1(self):
+        # when
+        with patch(MODULE_PATH + ".get_redis_client") as mock_get_master_client:
+            mock_get_master_client.return_value.ping.side_effect = RedisError
+            events = EventSeries("dummy")
+        # then
+        self.assertIsInstance(events._redis, _RedisStub)
+        self.assertTrue(events.is_disabled)
+
+    def test_should_disable_itself_if_redis_not_available_2(self):
+        # when
+        with patch(MODULE_PATH + ".get_redis_client") as mock_get_master_client:
+            mock_get_master_client.return_value.ping.return_value = False
+            events = EventSeries("dummy")
+        # then
+        self.assertIsInstance(events._redis, _RedisStub)
+        self.assertTrue(events.is_disabled)
+
     def test_should_add_event(self):
         # given
         events = EventSeries("dummy")
@@ -137,15 +166,3 @@ class TestEventSeries(TestCase):
         results = events.all()
         # then
         self.assertEqual(len(results), 2)
-
-    def test_should_not_report_as_disabled_when_initialized_normally(self):
-        # given
-        events = EventSeries("dummy")
-        # when/then
-        self.assertFalse(events.is_disabled)
-
-    def test_should_report_as_disabled_when_initialized_with_redis_stub(self):
-        # given
-        events = EventSeries("dummy", redis=_RedisStub())
-        # when/then
-        self.assertTrue(events.is_disabled)

allianceauth/authentication/task_statistics/tests/test_helpers.py

@@ -1,28 +0,0 @@
-from unittest import TestCase
-from unittest.mock import patch
-
-from redis import RedisError
-
-from allianceauth.authentication.task_statistics.helpers import (
-    _RedisStub, get_redis_client_or_stub,
-)
-
-MODULE_PATH = "allianceauth.authentication.task_statistics.helpers"
-
-
-class TestGetRedisClient(TestCase):
-    def test_should_return_mock_if_redis_not_available_1(self):
-        # when
-        with patch(MODULE_PATH + ".get_redis_client") as mock_get_master_client:
-            mock_get_master_client.return_value.ping.side_effect = RedisError
-            result = get_redis_client_or_stub()
-        # then
-        self.assertIsInstance(result, _RedisStub)
-
-    def test_should_return_mock_if_redis_not_available_2(self):
-        # when
-        with patch(MODULE_PATH + ".get_redis_client") as mock_get_master_client:
-            mock_get_master_client.return_value.ping.return_value = False
-            result = get_redis_client_or_stub()
-        # then
-        self.assertIsInstance(result, _RedisStub)

allianceauth/authentication/task_statistics/tests/test_signals.py

@@ -17,17 +17,16 @@ from allianceauth.eveonline.tasks import update_character
 
 
 @override_settings(
-    CELERY_ALWAYS_EAGER=True, ALLIANCEAUTH_DASHBOARD_TASK_STATISTICS_DISABLED=False
+    CELERY_ALWAYS_EAGER=True,ALLIANCEAUTH_DASHBOARD_TASK_STATISTICS_DISABLED=False
 )
 class TestTaskSignals(TestCase):
     fixtures = ["disable_analytics"]
 
-    def setUp(self) -> None:
+    def test_should_record_successful_task(self):
+        # given
         succeeded_tasks.clear()
         retried_tasks.clear()
         failed_tasks.clear()
-
-    def test_should_record_successful_task(self):
         # when
         with patch(
             "allianceauth.eveonline.tasks.EveCharacter.objects.update_character"
@@ -40,6 +39,10 @@ class TestTaskSignals(TestCase):
         self.assertEqual(failed_tasks.count(), 0)
 
     def test_should_record_retried_task(self):
+        # given
+        succeeded_tasks.clear()
+        retried_tasks.clear()
+        failed_tasks.clear()
         # when
         with patch(
             "allianceauth.eveonline.tasks.EveCharacter.objects.update_character"
@@ -52,6 +55,10 @@ class TestTaskSignals(TestCase):
         self.assertEqual(retried_tasks.count(), 1)
 
     def test_should_record_failed_task(self):
+        # given
+        succeeded_tasks.clear()
+        retried_tasks.clear()
+        failed_tasks.clear()
         # when
         with patch(
             "allianceauth.eveonline.tasks.EveCharacter.objects.update_character"

allianceauth/authentication/templates/authentication/dashboard.html

@@ -1,15 +1,186 @@
-{% extends "allianceauth/base-bs5.html" %}
+{% extends "allianceauth/base.html" %}
 {% load static %}
 {% load i18n %}
 
 {% block page_title %}{% translate "Dashboard" %}{% endblock %}
-{% block header_nav_brand %}
+
-    {% translate "Dashboard" %}
-{% endblock %}
 {% block content %}
-    <div class="row">
+    <h1 class="page-header text-center">{% translate "Dashboard" %}</h1>
-        {% for dash in views %}
+    {% if user.is_staff %}
-            {{ dash | safe }}
+        {% include 'allianceauth/admin-status/include.html' %}
-        {% endfor %}
+    {% endif %}
+    <div class="col-sm-12">
+        <div class="row vertical-flexbox-row2">
+            <div class="col-sm-6 text-center">
+                <div class="panel panel-primary" style="height:100%">
+                    <div class="panel-heading">
+                        <h3 class="panel-title">
+                            {% blocktrans with state=request.user.profile.state %}
+                                Main Character (State: {{ state }})
+                            {% endblocktrans %}
+                        </h3>
+                    </div>
+                    <div class="panel-body">
+                        {% if request.user.profile.main_character %}
+                            {% with request.user.profile.main_character as main %}
+                                <div class="hidden-xs">
+                                    <div class="col-lg-4 col-sm-2">
+                                        <table class="table">
+                                            <tr>
+                                                <td class="text-center">
+                                                    <img class="ra-avatar"src="{{ main.portrait_url_128 }}">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td class="text-center">{{ main.character_name }}</td>
+                                            </tr>
+                                        </table>
+                                    </div>
+                                    <div class="col-lg-4 col-sm-2">
+                                        <table class="table">
+                                            <tr>
+                                                <td class="text-center">
+                                                    <img class="ra-avatar"src="{{ main.corporation_logo_url_128 }}">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td class="text-center">{{ main.corporation_name }}</td>
+                                            </tr>
+                                        </table>
+                                    </div>
+                                    <div class="col-lg-4 col-sm-2">
+                                        {% if main.alliance_id %}
+                                            <table class="table">
+                                                <tr>
+                                                    <td class="text-center">
+                                                        <img class="ra-avatar"src="{{ main.alliance_logo_url_128 }}">
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="text-center">{{ main.alliance_name }}</td>
+                                                <tr>
+                                            </table>
+                                        {% elif main.faction_id %}
+                                            <table class="table">
+                                                <tr>
+                                                    <td class="text-center">
+                                                        <img class="ra-avatar"src="{{ main.faction_logo_url_128 }}">
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="text-center">{{ main.faction_name }}</td>
+                                                <tr>
+                                            </table>
+                                        {% endif %}
+                                    </div>
+                                </div>
+                                <div class="table visible-xs-block">
+                                    <p>
+                                        <img class="ra-avatar" src="{{ main.portrait_url_64 }}">
+                                        <img class="ra-avatar" src="{{ main.corporation_logo_url_64 }}">
+                                        {% if main.alliance_id %}
+                                            <img class="ra-avatar" src="{{ main.alliance_logo_url_64 }}">
+                                        {% endif %}
+                                        {% if main.faction_id %}
+                                            <img class="ra-avatar" src="{{ main.faction_logo_url_64 }}">
+                                        {% endif %}
+                                    </p>
+                                    <p>
+                                        <strong>{{ main.character_name }}</strong><br>
+                                        {{ main.corporation_name }}<br>
+                                        {% if main.alliance_id %}
+                                            {{ main.alliance_name }}<br>
+                                        {% endif %}
+                                        {% if main.faction_id %}
+                                            {{ main.faction_name }}
+                                        {% endif %}
+                                    </p>
+                                </div>
+                            {% endwith %}
+                        {% else %}
+                            <div class="alert alert-danger" role="alert">
+                                {% translate "No main character set." %}
+                            </div>
+                        {% endif %}
+                        <div class="clearfix"></div>
+                        <div class="row">
+                            <div class="col-sm-6 button-wrapper">
+                                <a href="{% url 'authentication:add_character' %}" class="btn btn-block btn-info"
+                                title="Add Character">{% translate 'Add Character' %}</a>
+                            </div>
+                            <div class="col-sm-6 button-wrapper">
+                                <a href="{% url 'authentication:change_main_character' %}" class="btn btn-block btn-info"
+                                title="Change Main Character">{% translate "Change Main" %}</a>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="col-sm-6 text-center">
+                <div class="panel panel-success" style="height:100%">
+                    <div class="panel-heading">
+                        <h3 class="panel-title">{% translate "Group Memberships" %}</h3>
+                    </div>
+                    <div class="panel-body">
+                        <div style="height: 240px;overflow:-moz-scrollbars-vertical;overflow-y:auto;">
+                            <table class="table table-aa">
+                                {% for group in groups %}
+                                    <tr>
+                                        <td>{{ group.name }}</td>
+                                    </tr>
+                                {% endfor %}
+                            </table>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="clearfix"></div>
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <h3 class="panel-title text-center" style="text-align: center">
+                    {% translate 'Characters' %}
+                </h3>
+            </div>
+            <div class="panel-body">
+                <table class="table table-aa hidden-xs">
+                    <thead>
+                        <tr>
+                            <th class="text-center"></th>
+                            <th class="text-center">{% translate 'Name' %}</th>
+                            <th class="text-center">{% translate 'Corp' %}</th>
+                            <th class="text-center">{% translate 'Alliance' %}</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        {% for char in characters %}
+                            <tr>
+                                <td class="text-center"><img class="ra-avatar img-circle" src="{{ char.portrait_url_32 }}">
+                                </td>
+                                <td class="text-center">{{ char.character_name }}</td>
+                                <td class="text-center">{{ char.corporation_name }}</td>
+                                <td class="text-center">{{ char.alliance_name }}</td>
+                            </tr>
+                        {% endfor %}
+                    </tbody>
+                </table>
+                <table class="table table-aa visible-xs-block" style="width: 100%">
+                    <tbody>
+                        {% for char in characters %}
+                            <tr>
+                                <td class="text-center" style="vertical-align: middle">
+                                    <img class="ra-avatar img-circle" src="{{ char.portrait_url_32 }}">
+                                </td>
+                                <td class="text-center" style="vertical-align: middle; width: 100%">
+                                    <strong>{{ char.character_name }}</strong><br>
+                                    {{ char.corporation_name }}<br>
+                                    {{ char.alliance_name|default:"" }}
+                                </td>
+                            </tr>
+                        {% endfor %}
+                    </tbody>
+                </table>
+            </div>
+        </div>
     </div>
 {% endblock %}

allianceauth/authentication/templates/authentication/dashboard_bs3.html

@@ -1,10 +0,0 @@
-{% extends 'allianceauth/base.html' %}
-
-
-{% block page_title %}Dashboard{% endblock page_title %}
-
-{% block content %}
-    <div>
-        <h1>Dashboard Dummy</h1>
-    </div>
-{% endblock %}

allianceauth/authentication/templates/authentication/dashboard_characters.html

@@ -1,44 +0,0 @@
-{% load i18n %}
-<div id="aa-dashboard-panel-characters" class="col-12 col-xl-8 mb-3">
-    <div class="card h-100">
-        <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' %}">
-                            <span class="d-md-inline m-2">{% translate 'Add Character' %}</span>
-                        </a>
-                        <a href="{% url 'authentication:change_main_character' %}" class="btn btn-primary flex-fill m-1" title="{% translate 'Change Main' %}">
-                            <span class="d-md-inline m-2">{% translate 'Change Main' %}</span>
-                        </a>
-                    </div>
-                    <table class="table">
-                        <thead>
-                            <tr>
-                                <th class="text-center"></th>
-                                <th class="text-center">{% translate "Name" %}</th>
-                                <th class="text-center">{% translate "Corp" %}</th>
-                                <th class="text-center">{% translate "Alliance" %}</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            {% for char in characters %}
-                                <tr>
-                                    <td class="text-center">
-                                        <img class="ra-avatar rounded-circle" src="{{ char.portrait_url_32 }}" alt="{{ char.character_name }}">
-                                    </td>
-                                    <td class="text-center">{{ char.character_name }}</td>
-                                    <td class="text-center">{{ char.corporation_name }}</td>
-                                    <td class="text-center">{{ char.alliance_name|default_if_none:"" }}</td>
-                                </tr>
-                            {% endfor %}
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>

allianceauth/authentication/templates/authentication/dashboard_groups.html

@@ -1,22 +0,0 @@
-{% load i18n %}
-<div id="aa-dashboard-panel-membership" class="col-12 col-xl-4 mb-3">
-    <div class="card h-100">
-        <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">
-                        {% for group in groups %}
-                            <tr>
-                                <td class="text-center">{{ group.name }}</td>
-                            </tr>
-                        {% endfor %}
-                    </table>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>

allianceauth/authentication/templates/authentication/tokens.html

@@ -1,89 +0,0 @@
-{% extends "allianceauth/base-bs5.html" %}
-
-{% load aa_i18n %}
-{% load i18n %}
-
-{% block page_title %}
-    {% translate "Token Management" %}
-{% endblock page_title %}
-
-{% block header_nav_brand %}
-    {% translate "Token Management" %}
-{% endblock header_nav_brand %}
-
-{% 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://developers.eveonline.com/authorized-apps where possible."|urlize %}
-        </p>
-
-        <table class="table w-100" id="table_tokens">
-            <thead>
-                <tr>
-                    <th>{% translate "Scopes" %}</th>
-                    <th class="text-end">{% translate "Actions" %}</th>
-                    <th>{% translate "Character" %}</th>
-                </tr>
-            </thead>
-
-            <tbody>
-                {% for t in tokens %}
-                    <tr>
-                        <td style="white-space:initial;">
-                            {% for s in t.scopes.all %}
-                                <span class="badge text-bg-secondary">{{ s.name }}</span>
-                            {% endfor %}
-                        </td>
-
-                        <td nowrap class="text-end">
-                            <a href="{% url 'authentication:token_delete' t.id %}" class="btn btn-danger"><i class="fa-solid fa-trash-can"></i></a>
-                            <a href="{% url 'authentication:token_refresh' t.id %}" class="btn btn-success"><i class="fa-solid fa-rotate"></i></a>
-                        </td>
-
-                        <td>{{ t.character_name }}</td>
-                    </tr>
-                {% endfor %}
-            </tbody>
-        </table>
-    </div>
-{% endblock content %}
-
-{% 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;
-
-            $('#table_tokens').DataTable({
-                "language": {"url": '{{ DT_LANG_PATH }}'},
-                'columnDefs': [{orderable: false, targets: [0, 1]}, {
-                    'visible': false,
-                    'targets': grp
-                }],
-                'order': [[grp, 'asc']],
-                'drawCallback': function (settings) {
-                    const api = this.api();
-                    const rows = api.rows({page: 'current'}).nodes();
-                    let last = null;
-                    api.column(grp, {page: 'current'})
-                        .data()
-                        .each((group, i) => {
-                            if (last !== group) {
-                                $(rows).eq(i).before(`<tr class="h5 table-primary"><td colspan="3">${group}</td></tr>`);
-
-                                last = group;
-                            }
-                        });
-                },
-                'stateSave': true
-            });
-        });
-    </script>
-{% endblock extra_javascript %}
-
-{% block extra_css %}
-    {% include "bundles/datatables-css-bs5.html" %}
-{% endblock extra_css %}

allianceauth/authentication/templates/public/base.html

@@ -1,41 +1,40 @@
-{% load theme_tags %}
 {% load static %}
-<!DOCTYPE html>
+<html lang="en">
-<html lang="en" {% theme_html_tags %}>
     <head>
-        <!-- Required meta tags -->
         <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
         <meta name="viewport" content="width=device-width, initial-scale=1">
-        <!-- End Required meta tags -->
+        <meta name="description" content="">
+        <meta name="author" content="">
+        <meta property="og:title" content="{{ SITE_NAME }}">
+        <meta property="og:image" content="{{ request.scheme }}://{{ request.get_host }}{% static 'icons/apple-touch-icon.png' %}">
+        <meta property="og:description" content="Alliance Auth - An auth system for EVE Online to help in-game organizations manage online service access.">
 
-        <!-- Meta tags -->
-        {% include 'allianceauth/opengraph.html' %}
         {% include 'allianceauth/icons.html' %}
-        <!-- Meta tags -->
 
         <title>{% block title %}{% block page_title %}{% endblock page_title %} - {{ SITE_NAME }}{% endblock title %}</title>
 
-        {% theme_css %}
+        {% include 'bundles/bootstrap-css.html' %}
-
         {% include 'bundles/fontawesome.html' %}
-        {% include 'bundles/auth-framework-css.html' %}
-
         {% block extra_include %}
         {% endblock %}
 
         <style>
             body {
-                background: url('{% static 'allianceauth/authentication/img/background.jpg' %}') no-repeat center center fixed;
+                background: url('{% static 'authentication/img/background.jpg' %}') no-repeat center center fixed;
                 -webkit-background-size: cover;
                 -moz-background-size: cover;
                 -o-background-size: cover;
                 background-size: cover;
             }
 
-            .card-login {
+            .panel-transparent {
-                background: rgba(48 48 48 / 0.7);
+                background: rgba(48, 48, 48, 0.7);
-                color: rgb(255 255 255);
+                color: #ffffff;
-                padding-bottom: 21px;
+            }
+
+            .panel-body {
+
             }
 
             #lang-select {
@@ -43,14 +42,12 @@
                 margin-left: auto;
                 margin-right: auto;
             }
-
             {% block extra_style %}
             {% endblock %}
         </style>
     </head>
-
     <body>
-        <div class="container" style="margin-top:150px;">
+        <div class="container" style="margin-top:150px">
             {% block content %}
             {% endblock %}
         </div>

allianceauth/authentication/templates/public/lang_select.html

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

allianceauth/authentication/templates/public/login.html

@@ -6,7 +6,7 @@
 {% block page_title %}{% translate "Login" %}{% endblock %}
 
 {% block middle_box_content %}
-    <a href="{% url 'auth_sso_login' %}{% if request.GET.next %}?next={{request.GET.next | urlencode}}{%endif%}">
+    <a href="{% url 'auth_sso_login' %}{% if request.GET.next %}?next={{request.GET.next}}{%endif%}">
-        <img class="img-responsive center-block" src="{% static 'allianceauth/authentication/img/sso/EVE_SSO_Login_Buttons_Large_Black.png' %}" alt="{% translate 'Login with Eve SSO' %}">
+        <img class="img-responsive center-block" src="{% static 'img/sso/EVE_SSO_Login_Buttons_Large_Black.png' %}" border=0>
     </a>
 {% endblock %}

allianceauth/authentication/templates/public/middle_box.html

@@ -1,43 +1,23 @@
 {% extends 'public/base.html' %}
-
+{% load static %}
-{% load i18n %}
-
 {% block content %}
-    <div class="row justify-content-center">
+    <div class="col-md-4 col-md-offset-4">
-        <div class="col-md-6">
+        {% if messages %}
-            {% if messages %}
+            {% for message in messages %}
-                {% for message in messages %}
+                <div class="alert alert-{{ message.level_tag}}">{{ message }}</div>
-                    <div class="alert alert-{{ message.level_tag}}">{{ message }}</div>
+            {% endfor %}
-                {% endfor %}
+        {% endif %}
-            {% endif %}
+        <div class="panel panel-default panel-transparent">
-
+            <div class="panel-body">
-            <div class="card card-login border-secondary p-3">
+                <div class="col-md-12">
-                <div class="card-body">
+                    {% block middle_box_content %}
-                    <div class="text-center">
+                    {% endblock %}
-                        {% block middle_box_content %}
-                        {% endblock %}
-                    </div>
                 </div>
-
-                {% include 'public/lang_select.html' %}
-
-                <p class="text-center mt-3">
-                    {% translate "For information on SSO, ESI and security read the CCP Dev Blog" %}<br>
-                    <a class="text-reset" href="https://www.eveonline.com/news/view/introducing-esi" target="_blank" rel="noopener noreferrer">
-                        {% translate "Introducing ESI - A New API For EVE Online" %}
-                    </a>
-                </p>
-
-                <p class="text-center">
-                    <a class="text-reset" href="https://developers.eveonline.com/authorized-apps" target="_blank" rel="noopener noreferrer">
-                        {% translate "Manage ESI Applications" %}
-                    </a>
-                </p>
             </div>
+            {% include 'public/lang_select.html' %}
         </div>
     </div>
 {% endblock %}
-
 {% block extra_include %}
-    {% include 'bundles/bootstrap-js-bs5.html' %}
+    {% include 'bundles/bootstrap-js.html' %}
 {% endblock %}

allianceauth/authentication/templates/public/register.html

@@ -1,31 +1,28 @@
 {% extends 'public/base.html' %}
 
-{% load django_bootstrap5 %}
+{% load static %}
+{% load bootstrap %}
 {% load i18n %}
 
 {% block page_title %}{% translate "Registration" %}{% endblock %}
 
 {% block extra_include %}
-    {% include 'bundles/bootstrap-css-bs5.html' %}
+    {% include 'bundles/bootstrap-css.html' %}
     {% include 'bundles/fontawesome.html' %}
-    {% include 'bundles/bootstrap-js-bs5.html' %}
+    {% include 'bundles/bootstrap-js.html' %}
 {% endblock %}
 
 {% block content %}
-    <div class="row justify-content-center">
+    <div class="col-md-4 col-md-offset-4">
-        <div class="col-md-6">
+        <div class="panel panel-default panel-transparent">
-            <div class="card card-login border-secondary p-3">
+            <div class="panel-body">
-                <div class="card-body">
+                <form method="POST">
-                    <form method="POST">
+                    {% csrf_token %}
-                        {% csrf_token %}
+                    {{ form|bootstrap }}
-                        {% bootstrap_form form %}
+                    <button class="btn btn-lg btn-primary btn-block" type="submit">{% translate "Register" %}</button>
-
+                </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/templates/registration/activate.html

@@ -1,7 +1,5 @@
 {% extends 'public/middle_box.html' %}
-
 {% load i18n %}
-
 {% block middle_box_content %}
     <div class="alert alert-danger">{% translate 'Invalid or expired activation link.' %}</div>
 {% endblock %}

allianceauth/authentication/templates/registration/password_reset_email.html

@@ -0,0 +1,15 @@
+{% load i18n %}{% autoescape off %}
+    {% blocktrans trimmed %}You're receiving this email because you requested a password reset for your
+        user account.{% endblocktrans %}
+
+    {% translate "Please go to the following page and choose a new password:" %}
+    {% block reset_link %}
+        {{domain}}{% url 'password_reset_confirm' uidb64=uid token=token %}
+    {% endblock %}
+    {% translate "Your username, in case you've forgotten:" %} {{ user.get_username }}
+
+    {% translate "Thanks for using our site!" %}
+
+    {% blocktrans %}Your IT Team{% endblocktrans %}
+
+{% endautoescape %}

allianceauth/authentication/templates/registration/registration_form.html

@@ -0,0 +1,14 @@
+{% extends 'public/middle_box.html' %}
+{% load bootstrap %}
+{% load i18n %}
+{% load static %}
+{% block page_title %}{% translate "Register" %}{% endblock %}
+{% block middle_box_content %}
+    <form class="form-signin" role="form" action="" method="POST">
+        {% csrf_token %}
+        {{ form|bootstrap }}
+        <br/>
+        <button class="btn btn-lg btn-primary btn-block" type="submit">{% translate "Submit" %}</button>
+        <br/>
+    </form>
+{% endblock %}

allianceauth/authentication/tests/__init__.py

@@ -1,17 +1,4 @@
-from django.db.models.signals import (
-    m2m_changed,
-    post_save,
-    pre_delete,
-    pre_save
-)
 from django.urls import reverse
-from unittest import mock
-
-MODULE_PATH = 'allianceauth.authentication'
-
-
-def patch(target, *args, **kwargs):
-    return mock.patch(f'{MODULE_PATH}{target}', *args, **kwargs)
 
 
 def get_admin_change_view_url(obj: object) -> str:

allianceauth/authentication/tests/core/test_celery_workers.py

@@ -1,85 +0,0 @@
-from unittest.mock import patch
-
-from amqp.exceptions import ChannelError
-
-from django.test import TestCase
-
-from allianceauth.authentication.core.celery_workers import (
-    active_tasks_count, queued_tasks_count,
-)
-
-MODULE_PATH = "allianceauth.authentication.core.celery_workers"
-
-
-@patch(MODULE_PATH + ".current_app")
-class TestActiveTasksCount(TestCase):
-    def test_should_return_correct_count_when_no_active_tasks(self, mock_current_app):
-        # given
-        mock_current_app.control.inspect.return_value.active.return_value = {
-            "queue": []
-        }
-        # when
-        result = active_tasks_count()
-        # then
-        self.assertEqual(result, 0)
-
-    def test_should_return_correct_task_count_for_active_tasks(self, mock_current_app):
-        # given
-        mock_current_app.control.inspect.return_value.active.return_value = {
-            "queue": [1, 2, 3]
-        }
-        # when
-        result = active_tasks_count()
-        # then
-        self.assertEqual(result, 3)
-
-    def test_should_return_correct_task_count_for_multiple_queues(
-        self, mock_current_app
-    ):
-        # given
-        mock_current_app.control.inspect.return_value.active.return_value = {
-            "queue_1": [1, 2],
-            "queue_2": [3, 4],
-        }
-        # when
-        result = active_tasks_count()
-        # then
-        self.assertEqual(result, 4)
-
-    def test_should_return_none_when_celery_not_available(self, mock_current_app):
-        # given
-        mock_current_app.control.inspect.return_value.active.return_value = None
-        # when
-        result = active_tasks_count()
-        # then
-        self.assertIsNone(result)
-
-
-@patch(MODULE_PATH + ".current_app")
-class TestQueuedTasksCount(TestCase):
-    def test_should_return_queue_length_when_queue_exists(self, mock_current_app):
-        # given
-        mock_conn = (
-            mock_current_app.connection_or_acquire.return_value.__enter__.return_value
-        )
-        mock_conn.default_channel.queue_declare.return_value.message_count = 7
-        # when
-        result = queued_tasks_count()
-        # then
-        self.assertEqual(result, 7)
-
-    def test_should_return_0_when_queue_does_not_exists(self, mock_current_app):
-        # given
-        mock_current_app.connection_or_acquire.side_effect = ChannelError
-        # when
-        result = queued_tasks_count()
-        # then
-        self.assertEqual(result, 0)
-
-    def test_should_return_None_on_other_errors(self, mock_current_app):
-        # given
-        mock_current_app.connection_or_acquire.side_effect = RuntimeError
-        # when
-        result = queued_tasks_count()
-        # then
-        self.assertIsNone(result)

allianceauth/authentication/tests/test_backend.py

@@ -116,17 +116,10 @@ class TestAuthenticate(TestCase):
         user = StateBackend().authenticate(token=t)
         self.assertEqual(user, self.user)
 
-    """ Alt Login disabled
     def test_authenticate_alt_character(self):
         t = Token(character_id=self.alt_character.character_id, character_owner_hash='2')
         user = StateBackend().authenticate(token=t)
         self.assertEqual(user, self.user)
-    """
-
-    def test_authenticate_alt_character_fail(self):
-        t = Token(character_id=self.alt_character.character_id, character_owner_hash='2')
-        user = StateBackend().authenticate(token=t)
-        self.assertEqual(user, None)
 
     def test_authenticate_unclaimed_character(self):
         t = Token(character_id=self.unclaimed_character.character_id, character_name=self.unclaimed_character.character_name, character_owner_hash='3')
@@ -135,7 +128,6 @@ class TestAuthenticate(TestCase):
         self.assertEqual(user.username, 'Unclaimed_Character')
         self.assertEqual(user.profile.main_character, self.unclaimed_character)
 
-    """ Alt Login disabled
     def test_authenticate_character_record(self):
         t = Token(character_id=self.unclaimed_character.character_id, character_name=self.unclaimed_character.character_name, character_owner_hash='4')
         OwnershipRecord.objects.create(user=self.old_user, character=self.unclaimed_character, owner_hash='4')
@@ -143,15 +135,6 @@ class TestAuthenticate(TestCase):
         self.assertEqual(user, self.old_user)
         self.assertTrue(CharacterOwnership.objects.filter(owner_hash='4', user=self.old_user).exists())
         self.assertTrue(user.profile.main_character)
-    """
-
-    def test_authenticate_character_record_fails(self):
-        t = Token(character_id=self.unclaimed_character.character_id, character_name=self.unclaimed_character.character_name, character_owner_hash='4')
-        OwnershipRecord.objects.create(user=self.old_user, character=self.unclaimed_character, owner_hash='4')
-        user = StateBackend().authenticate(token=t)
-        self.assertEqual(user, self.old_user)
-        self.assertTrue(CharacterOwnership.objects.filter(owner_hash='4', user=self.old_user).exists())
-        self.assertTrue(user.profile.main_character)
 
     def test_iterate_username(self):
         t = Token(character_id=self.unclaimed_character.character_id,

allianceauth/authentication/tests/test_decorators.py

@@ -4,17 +4,17 @@ from urllib import parse
 from django.conf import settings
 from django.contrib.auth.models import AnonymousUser
 from django.http.response import HttpResponse
+from django.shortcuts import reverse
 from django.test import TestCase
 from django.test.client import RequestFactory
-from django.urls import reverse, URLPattern
 
 from allianceauth.eveonline.models import EveCharacter
 from allianceauth.tests.auth_utils import AuthUtils
 
-
+from ..decorators import main_character_required
-from ..decorators import decorate_url_patterns, main_character_required
 from ..models import CharacterOwnership
 
+
 MODULE_PATH = 'allianceauth.authentication'
 
 
@@ -66,33 +66,3 @@ class DecoratorTestCase(TestCase):
         setattr(self.request, 'user', self.main_user)
         response = self.dummy_view(self.request)
         self.assertEqual(response.status_code, 200)
-
-
-class TestDecorateUrlPatterns(TestCase):
-    def test_should_add_decorator_by_default(self):
-        # given
-        decorator = mock.MagicMock(name="decorator")
-        view = mock.MagicMock(name="view")
-        path = mock.MagicMock(spec=URLPattern, name="path")
-        path.callback = view
-        path.lookup_str = "my_lookup_str"
-        urls = [path]
-        urlconf_module = urls
-        # when
-        decorate_url_patterns(urlconf_module, decorator)
-        # then
-        self.assertEqual(path.callback, decorator(view))
-
-    def test_should_not_add_decorator_when_excluded(self):
-        # given
-        decorator = mock.MagicMock(name="decorator")
-        view = mock.MagicMock(name="view")
-        path = mock.MagicMock(spec=URLPattern, name="path")
-        path.callback = view
-        path.lookup_str = "my_lookup_str"
-        urls = [path]
-        urlconf_module = urls
-        # when
-        decorate_url_patterns(urlconf_module, decorator, excluded_views=["my_lookup_str"])
-        # then
-        self.assertEqual(path.callback, view)

allianceauth/authentication/tests/test_middleware.py

@@ -1,175 +0,0 @@
-from unittest import mock
-from allianceauth.authentication.middleware import UserSettingsMiddleware
-from unittest.mock import Mock
-from django.http import HttpResponse
-
-from django.test.testcases import TestCase
-
-
-class TestUserSettingsMiddlewareSaveLang(TestCase):
-
-    def setUp(self):
-        self.middleware = UserSettingsMiddleware(HttpResponse)
-        self.request = Mock()
-        self.request.headers = {
-                "User-Agent": "AUTOMATED TEST"
-            }
-        self.request.path = '/i18n/setlang/'
-        self.request.POST = {
-            'language': 'fr'
-        }
-        self.request.user.profile.language = 'de'
-        self.request.user.is_anonymous = False
-        self.response = Mock()
-        self.response.content = 'hello world'
-
-    def test_middleware_passthrough(self):
-        """
-        Simply tests the middleware runs cleanly
-        """
-        response = self.middleware.process_response(
-            self.request,
-            self.response
-            )
-        self.assertEqual(self.response, response)
-
-    def test_middleware_save_language_false_anonymous(self):
-        """
-        Ensures the middleware wont change the usersettings
-        of a non-existent (anonymous) user
-        """
-        self.request.user.is_anonymous = True
-        response = self.middleware.process_response(
-            self.request,
-            self.response
-            )
-        self.assertEqual(self.request.user.profile.language, 'de')
-        self.assertFalse(self.request.user.profile.save.called)
-        self.assertEqual(self.request.user.profile.save.call_count, 0)
-
-    def test_middleware_save_language_new(self):
-        """
-        does the middleware change a language not set in the DB
-        """
-        self.request.user.profile.language = None
-        response = self.middleware.process_response(
-            self.request,
-            self.response
-            )
-        self.assertEqual(self.request.user.profile.language, 'fr')
-        self.assertTrue(self.request.user.profile.save.called)
-        self.assertEqual(self.request.user.profile.save.call_count, 1)
-
-    def test_middleware_save_language_changed(self):
-        """
-        Tests the middleware will change a language setting
-        """
-        response = self.middleware.process_response(
-            self.request,
-            self.response
-            )
-        self.assertEqual(self.request.user.profile.language, 'fr')
-        self.assertTrue(self.request.user.profile.save.called)
-        self.assertEqual(self.request.user.profile.save.call_count, 1)
-
-
-class TestUserSettingsMiddlewareLoginFlow(TestCase):
-
-    def setUp(self):
-        self.middleware = UserSettingsMiddleware(HttpResponse)
-        self.request = Mock()
-        self.request.headers = {
-                "User-Agent": "AUTOMATED TEST"
-            }
-        self.request.path = '/sso/login'
-        self.request.session = {
-            'NIGHT_MODE': False
-        }
-        self.request.LANGUAGE_CODE = 'en'
-        self.request.user.profile.language = 'de'
-        self.request.user.profile.night_mode = True
-        self.request.user.is_anonymous = False
-        self.response = Mock()
-        self.response.content = 'hello world'
-
-    def test_middleware_passthrough(self):
-        """
-        Simply tests the middleware runs cleanly
-        """
-        middleware_response = self.middleware.process_response(
-            self.request,
-            self.response
-            )
-        self.assertEqual(self.response, middleware_response)
-
-    def test_middleware_sets_language_cookie_true_no_cookie(self):
-        """
-        tests the middleware will set a cookie, while none is set
-        """
-        self.request.LANGUAGE_CODE = None
-        middleware_response = self.middleware.process_response(
-            self.request,
-            self.response
-            )
-        self.assertTrue(middleware_response.set_cookie.called)
-        self.assertEqual(middleware_response.set_cookie.call_count, 1)
-        args, kwargs = middleware_response.set_cookie.call_args
-        self.assertEqual(kwargs['value'], 'de')
-
-    def test_middleware_sets_language_cookie_true_wrong_cookie(self):
-        """
-        tests the middleware will set a cookie, while a different value is set
-        """
-        middleware_response = self.middleware.process_response(
-            self.request,
-            self.response
-            )
-        self.assertTrue(middleware_response.set_cookie.called)
-        self.assertEqual(middleware_response.set_cookie.call_count, 1)
-        args, kwargs = middleware_response.set_cookie.call_args
-        self.assertEqual(kwargs['value'], 'de')
-
-    def test_middleware_sets_language_cookie_false_anonymous(self):
-        """
-        ensures the middleware wont set a value for a non existent user (anonymous)
-        """
-        self.request.user.is_anonymous = True
-        middleware_response = self.middleware.process_response(
-            self.request,
-            self.response
-            )
-        self.assertFalse = middleware_response.set_cookie.called
-        self.assertEqual(middleware_response.set_cookie.call_count, 0)
-
-    def test_middleware_sets_language_cookie_false_already_set(self):
-        """
-        tests the middleware skips setting the cookie, if its already set correctly
-        """
-        self.request.user.profile.language = 'en'
-        middleware_response = self.middleware.process_response(
-            self.request,
-            self.response
-            )
-        self.assertFalse = middleware_response.set_cookie.called
-        self.assertEqual(middleware_response.set_cookie.call_count, 0)
-
-    def test_middleware_sets_night_mode_not_set(self):
-        """
-        tests the middleware will set night_mode if not set
-        """
-        self.request.session = {}
-        response = self.middleware.process_response(
-            self.request,
-            self.response
-            )
-        self.assertEqual(self.request.session["NIGHT_MODE"], True)
-
-    def test_middleware_sets_night_mode_set(self):
-        """
-        tests the middleware will set night_mode if set.
-        """
-        response = self.middleware.process_response(
-            self.request,
-            self.response
-            )
-        self.assertEqual(self.request.session["NIGHT_MODE"], True)

allianceauth/authentication/tests/test_signals.py

@@ -1,94 +0,0 @@
-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.tests.auth_utils import AuthUtils
-
-from django.test.testcases import TestCase
-from unittest.mock import Mock
-from . import patch
-
-
-class TestUserProfileSignals(TestCase):
-
-    def setUp(self):
-        state = AuthUtils.get_member_state()
-
-        self.char = EveCharacter.objects.create(
-            character_id='1234',
-            character_name='test character',
-            corporation_id='2345',
-            corporation_name='test corp',
-            corporation_ticker='tickr',
-            alliance_id='3456',
-            alliance_name='alliance name',
-        )
-
-        self.alliance = EveAllianceInfo.objects.create(
-            alliance_id='3456',
-            alliance_name='alliance name',
-            alliance_ticker='TIKR',
-            executor_corp_id='2345',
-        )
-
-        self.corp = EveCorporationInfo.objects.create(
-            corporation_id='2345',
-            corporation_name='corp name',
-            corporation_ticker='TIKK',
-            member_count=10,
-            alliance=self.alliance,
-        )
-
-        state.member_alliances.add(self.alliance)
-        state.member_corporations.add(self.corp)
-
-        self.member = AuthUtils.create_user('test user')
-        self.member.profile.main_character = self.char
-        self.member.profile.save()
-
-    @patch('.signals.create_required_models')
-    def test_create_required_models_triggered_true(
-            self, create_required_models):
-        """
-        Create a User object here,
-        to generate UserProfile models
-        """
-        post_save.connect(create_required_models, sender=User)
-        AuthUtils.create_user('test_create_required_models_triggered')
-        self.assertTrue = create_required_models.called
-        self.assertEqual(create_required_models.call_count, 1)
-
-        user = User.objects.get(username='test_create_required_models_triggered')
-        self.assertIsNot(UserProfile.objects.get(user=user), False)
-
-    @patch('.signals.create_required_models')
-    def test_create_required_models_triggered_false(
-            self, create_required_models):
-        """
-        Only call a User object Update here,
-        which does not need to generate UserProfile models
-        """
-        post_save.connect(create_required_models, sender=User)
-        char = EveCharacter.objects.create(
-            character_id='1266',
-            character_name='test character2',
-            corporation_id='2345',
-            corporation_name='test corp',
-            corporation_ticker='tickr',
-            alliance_id='3456',
-            alliance_name='alliance name',
-        )
-        self.member.profile.main_character = char
-        self.member.profile.save()
-
-        self.assertTrue = create_required_models.called
-        self.assertEqual(create_required_models.call_count, 0)
-        self.assertIsNot(UserProfile.objects.get(user=self.member), False)

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,
+    status_overview,
-    _fetch_notification_issues_from_gitlab, _latests_versions, status_overview,
+    _fetch_list_from_gitlab,
+    _current_notifications,
+    _current_version_summary,
+    _fetch_notification_issues_from_gitlab,
+    _latests_versions
 )
 
 MODULE_PATH = 'allianceauth.templatetags'
@@ -52,10 +56,14 @@ TEST_VERSION = '2.6.5'
 
 class TestStatusOverviewTag(TestCase):
     @patch(MODULE_PATH + '.admin_status.__version__', TEST_VERSION)
+    @patch(MODULE_PATH + '.admin_status._fetch_celery_queue_length')
     @patch(MODULE_PATH + '.admin_status._current_version_summary')
     @patch(MODULE_PATH + '.admin_status._current_notifications')
     def test_status_overview(
-        self, mock_current_notifications, mock_current_version_info
+        self,
+        mock_current_notifications,
+        mock_current_version_info,
+        mock_fetch_celery_queue_length
     ):
         # given
         notifications = {
@@ -74,6 +82,7 @@ class TestStatusOverviewTag(TestCase):
             'latest_beta_version': '2.4.4a1',
         }
         mock_current_version_info.return_value = version_info
+        mock_fetch_celery_queue_length.return_value = 3
         # when
         result = status_overview()
         # then
@@ -87,6 +96,7 @@ class TestStatusOverviewTag(TestCase):
         self.assertEqual(result["latest_minor_version"], '2.4.0')
         self.assertEqual(result["latest_patch_version"], '2.4.5')
         self.assertEqual(result["latest_beta_version"], '2.4.4a1')
+        self.assertEqual(result["task_queue_length"], 3)
 
 
 class TestNotifications(TestCase):

allianceauth/authentication/tests/test_views.py

@@ -1,202 +0,0 @@
-import json
-import requests_mock
-from unittest.mock import patch
-
-from django.test import RequestFactory, TestCase
-
-from allianceauth.authentication.views import task_counts, esi_check
-from allianceauth.tests.auth_utils import AuthUtils
-from allianceauth.authentication.constants import ESI_ERROR_MESSAGE_OVERRIDES
-
-MODULE_PATH = "allianceauth.authentication.views"
-
-
-def jsonresponse_to_dict(response) -> dict:
-    return json.loads(response.content)
-
-
-@patch(MODULE_PATH + ".queued_tasks_count")
-@patch(MODULE_PATH + ".active_tasks_count")
-class TestRunningTasksCount(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()
-
-    def test_should_return_data(
-        self, mock_active_tasks_count, mock_queued_tasks_count
-    ):
-        # 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, 200)
-        self.assertDictEqual(
-            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

@@ -1,4 +1,5 @@
-from django.urls import path
+from django.conf.urls import url
+from django.contrib.auth.decorators import login_required
 from django.views.generic.base import TemplateView
 
 from . import views
@@ -6,39 +7,21 @@ from . import views
 app_name = 'authentication'
 
 urlpatterns = [
-    path('', views.index, name='index'),
+    url(r'^$', views.index, name='index'),
-    path(
+    url(
-        'account/login/',
+        r'^account/login/$',
         TemplateView.as_view(template_name='public/login.html'),
         name='login'
     ),
-    path(
+    url(
-        'account/characters/main/',
+        r'^account/characters/main/$',
         views.main_character_change,
         name='change_main_character'
     ),
-    path(
+    url(
-        'account/characters/add/',
+        r'^account/characters/add/$',
         views.add_character,
         name='add_character'
     ),
-    path(
+    url(r'^dashboard/$', views.dashboard, name='dashboard'),
-        'account/tokens/manage/',
-        views.token_management,
-        name='token_management'
-    ),
-    path(
-        'account/tokens/delete/<int:token_id>',
-        views.token_delete,
-        name='token_delete'
-    ),
-    path(
-        'account/tokens/refresh/<int:token_id>',
-        views.token_refresh,
-        name='token_refresh'
-    ),
-    path('dashboard/', views.dashboard, name='dashboard'),
-    path('dashboard_bs3/', views.dashboard_bs3, name='dashboard_bs3'),
-    path('task-counts/', views.task_counts, name='task_counts'),
-    path('esi-check/', views.esi_check, name='esi_check'),
 ]

allianceauth/authentication/views.py

@@ -1,38 +1,35 @@
 import logging
 
-import requests
-from django_registration.backends.activation.views import (
-    REGISTRATION_SALT, ActivationView as BaseActivationView,
-    RegistrationView as BaseRegistrationView,
-)
-from django_registration.signals import user_registered
-
 from django.conf import settings
 from django.contrib import messages
-from django.contrib.auth import authenticate, login
+from django.contrib.auth import login, authenticate
-from django.contrib.auth.decorators import login_required, user_passes_test
+from django.contrib.auth.decorators import login_required
 from django.contrib.auth.models import User
 from django.core import signing
+from django.core.mail import EmailMultiAlternatives
 from django.http import JsonResponse
 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 allianceauth.eveonline.models import EveCharacter
 from esi.decorators import token_required
 from esi.models import Token
 
-from allianceauth.eveonline.models import EveCharacter
+from django_registration.backends.activation.views import (
-from allianceauth.hooks import get_hooks
+    RegistrationView as BaseRegistrationView,
+    ActivationView as BaseActivationView,
+    REGISTRATION_SALT
+)
+from django_registration.signals import user_registered
 
-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
+from .forms import RegistrationForm
 
 if 'allianceauth.eveonline.autogroups' in settings.INSTALLED_APPS:
     _has_auto_groups = True
-    from allianceauth.eveonline.autogroups.models import *  # noqa: F401, F403
+    from allianceauth.eveonline.autogroups.models import *
 else:
     _has_auto_groups = False
 
@@ -45,129 +42,46 @@ def index(request):
     return redirect('authentication:dashboard')
 
 
-def dashboard_groups(request):
+@login_required
+def dashboard(request):
     groups = request.user.groups.all()
     if _has_auto_groups:
         groups = groups\
             .filter(managedalliancegroup__isnull=True)\
             .filter(managedcorpgroup__isnull=True)
     groups = groups.order_by('name')
-
-    context = {
-        'groups': groups,
-    }
-    return render_to_string('authentication/dashboard_groups.html', context=context, request=request)
-
-
-def dashboard_characters(request):
     characters = EveCharacter.objects\
         .filter(character_ownership__user=request.user)\
         .select_related()\
         .order_by('character_name')
 
     context = {
+        'groups': groups,
         'characters': characters
     }
-    return render_to_string('authentication/dashboard_characters.html', context=context, request=request)
-
-
-def dashboard_admin(request):
-    if request.user.is_superuser:
-        return render_to_string('allianceauth/admin-status/include.html', request=request)
-    else:
-        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()
-    hooks = get_hooks('dashboard_hook')
-    items = [fn() for fn in hooks]
-    items.sort(key=lambda i: i.order)
-    for item in items:
-        _dash_items.append(item.render(request))
-
-    context = {
-        'views': _dash_items,
-    }
     return render(request, 'authentication/dashboard.html', context)
 
 
-@login_required
-def token_management(request):
-    tokens = request.user.token_set.all()
-
-    context = {
-        'tokens': tokens
-    }
-    return render(request, 'authentication/tokens.html', context)
-
-
-@login_required
-def token_delete(request, token_id=None):
-    try:
-        token = Token.objects.get(id=token_id)
-        if request.user == token.user:
-            token.delete()
-            messages.success(request, "Token Deleted.")
-        else:
-            messages.error(request, "This token does not belong to you.")
-    except Token.DoesNotExist:
-        messages.warning(request, "Token does not exist")
-    return redirect('authentication:token_management')
-
-
-@login_required
-def token_refresh(request, token_id=None):
-    try:
-        token = Token.objects.get(id=token_id)
-        if request.user == token.user:
-            try:
-                token.refresh()
-                messages.success(request, "Token refreshed.")
-            except Exception as e:
-                messages.warning(request, f"Failed to refresh token. {e}")
-        else:
-            messages.error(request, "This token does not belong to you.")
-    except Token.DoesNotExist:
-        messages.warning(request, "Token does not exist")
-    return redirect('authentication:token_management')
-
-
 @login_required
 @token_required(scopes=settings.LOGIN_TOKEN_SCOPES)
 def main_character_change(request, token):
-    logger.debug(
+    logger.debug(f"main_character_change called by user {request.user} for character {token.character_name}")
-        f"main_character_change called by user {request.user} for character {token.character_name}")
     try:
-        co = CharacterOwnership.objects.get(
+        co = CharacterOwnership.objects.get(character__character_id=token.character_id, user=request.user)
-            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.') % (
+                _('Cannot change main character to %(char)s: character owned by a different account.') % ({'char': token.character_name})
-                    {'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 %s') % co.character)
+        messages.success(request, _('Changed main character to %(char)s') % {"char": co.character})
-        logger.info(
+        logger.info('Changed user %(user)s main character to %(char)s' % ({'user': request.user, 'char': co.character}))
-            'Changed user {user} main character to {char}'.format(
-                user=request.user, char=co.character
-            )
-        )
     return redirect("authentication:dashboard")
 
 
@@ -175,11 +89,9 @@ 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, _(
+        messages.success(request, _('Added %(name)s to your account.'% ({'name': token.character_name})))
-            'Added %(name)s to your account.' % ({'name': token.character_name})))
     else:
-        messages.error(request, _('Failed to add %(name)s to your account: they already have an account.' % (
+        messages.error(request, _('Failed to add %(name)s to your account: they already have an account.' % ({'name': token.character_name})))
-            {'name': token.character_name})))
     return redirect('authentication:dashboard')
 
 
@@ -218,15 +130,7 @@ def sso_login(request, token):
             request.session['registration_uid'] = user.pk
             # Go to Step 2
             return redirect('registration_register')
-    # Logging in with an alt is not allowed due to security concerns.
+    messages.error(request, _('Unable to authenticate as the selected character.'))
-    token.delete()
-    messages.error(
-        request,
-        _(
-            'Unable to authenticate as the selected character. '
-            'Please log in with the main character associated with this account.'
-        )
-    )
     return redirect(settings.LOGIN_URL)
 
 
@@ -298,8 +202,7 @@ class RegistrationView(BaseRegistrationView):
         return super().dispatch(request, *args, **kwargs)
 
     def register(self, form):
-        user = User.objects.get(
+        user = User.objects.get(pk=self.request.session.get('registration_uid'))
-            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):
@@ -316,8 +219,7 @@ class RegistrationView(BaseRegistrationView):
 
     def get_email_context(self, activation_key):
         context = super().get_email_context(activation_key)
-        context['url'] = context['site'].domain + \
+        context['url'] = context['site'].domain + reverse('registration_activate', args=[activation_key])
-            reverse('registration_activate', args=[activation_key])
         return context
 
 
@@ -328,11 +230,8 @@ class ActivationView(BaseActivationView):
 
     def validate_key(self, activation_key):
         try:
-            dump = signing.loads(
+            dump = signing.loads(activation_key, salt=REGISTRATION_SALT,
-                activation_key,
+                                max_age=settings.ACCOUNT_ACTIVATION_DAYS * 86400)
-                salt=REGISTRATION_SALT,
-                max_age=settings.ACCOUNT_ACTIVATION_DAYS * 86400
-            )
             return dump
         except signing.BadSignature:
             return None
@@ -350,56 +249,15 @@ class ActivationView(BaseActivationView):
 
 
 def registration_complete(request):
-    messages.success(request, _(
+    messages.success(request, _('Sent confirmation email. Please follow the link to confirm your email address.'))
-        'Sent confirmation email. Please follow the link to confirm your email address.'))
     return redirect('authentication:login')
 
 
 def activation_complete(request):
-    messages.success(request, _(
+    messages.success(request, _('Confirmed your email address. Please login to continue.'))
-        'Confirmed your email address. Please login to continue.'))
     return redirect('authentication:dashboard')
 
 
 def registration_closed(request):
-    messages.error(request, _(
+    messages.error(request, _('Registration of new accounts is not allowed at this time.'))
-        '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 = {
-        "tasks_running": active_tasks_count(),
-        "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)
-
-
-@login_required
-def dashboard_bs3(request):
-    """Render dashboard view with BS3 theme.
-
-    This is an internal view used for testing BS3 backward compatibility in AA4 only.
-    """
-    return render(request, 'authentication/dashboard_bs3.html')

allianceauth/bin/allianceauth.py

@@ -12,14 +12,13 @@ class StartProject(BaseStartProject):
         parser.add_argument('--python', help='The path to the python executable.')
         parser.add_argument('--celery', help='The path to the celery executable.')
         parser.add_argument('--gunicorn', help='The path to the gunicorn executable.')
-        parser.add_argument('--memmon', help='The path to the memmon executable.')
 
 
 def create_project(parser, options, args):
     # Validate args
     if len(args) < 2:
         parser.error("Please specify a name for your Alliance Auth installation.")
-    elif len(args) > 4:
+    elif len(args) > 3:
         parser.error("Too many arguments.")
 
     # First find the path to Alliance Auth
@@ -33,7 +32,6 @@ def create_project(parser, options, args):
         'python': shutil.which('python'),
         'gunicorn': shutil.which('gunicorn'),
         'celery': shutil.which('celery'),
-        'memmon': shutil.which('memmon'),
         'extensions': ['py', 'conf', 'json'],
     }
 

allianceauth/checks.py

@@ -1,562 +0,0 @@
-"""
-Django system checks for Alliance Auth
-"""
-
-from typing import List
-from django import db
-from django.core.checks import CheckMessage, Error, register, Warning
-from allianceauth.utils.cache import get_redis_client
-from django.utils import timezone
-from packaging.version import InvalidVersion, Version as Pep440Version
-from celery import current_app
-from django.conf import settings
-from sqlite3.dbapi2 import sqlite_version_info
-
-"""
-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 timezone.now()
-        > timezone.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 timezone.now() > timezone.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",
-                        )
-                    )
-                elif mysql_version.minor == 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 == 2:
-                    errors.append(
-                        Warning(
-                            msg=f"MySQL {mysql_version.public} Non LTS",
-                            hint=mysql_quick_guide_link,
-                            id="allianceauth.checks.A006",
-                        )
-                    )
-                elif mysql_version.minor == 1:
-                    errors.append(
-                        Error(
-                            msg=f"MySQL {mysql_version.public} EOL",
-                            hint=mysql_quick_guide_link,
-                            id="allianceauth.checks.A007",
-                        )
-                    )
-                elif mysql_version.minor == 0 and timezone.now() > timezone.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]:
-    """
-    Check that MariaDB is a supported version
-
-    :param app_configs:
-    :type app_configs:
-    :param kwargs:
-    :type kwargs:
-    :return:
-    :rtype:
-    """
-
-    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 timezone.now() > timezone.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",
-                        )
-                    )
-                elif mariadb_version.minor == 2:
-                    errors.append(
-                        Warning(
-                            msg=f"MariaDB {mariadb_version.public} Non LTS",
-                            hint=mariadb_download_link,
-                            id="allianceauth.checks.A018",
-                        )
-                    )
-
-                    if timezone.now() > timezone.datetime(
-                        year=2024, month=11, day=21, tzinfo=timezone.utc
-                    ):
-                        errors.append(
-                            Error(
-                                msg=f"MariaDB {mariadb_version.public} EOL",
-                                hint=mariadb_download_link,
-                                id="allianceauth.checks.A011",
-                            )
-                        )
-                elif mariadb_version.minor == 1:
-                    errors.append(
-                        Warning(
-                            msg=f"MariaDB {mariadb_version.public} Non LTS",
-                            hint=mariadb_download_link,
-                            id="allianceauth.checks.A019",
-                        )
-                    )
-
-                    if timezone.now() > timezone.datetime(
-                        year=2024, month=8, day=21, tzinfo=timezone.utc
-                    ):
-                        errors.append(
-                            Error(
-                                msg=f"MariaDB {mariadb_version.public} EOL",
-                                hint=mariadb_download_link,
-                                id="allianceauth.checks.A012",
-                            )
-                        )
-                # Demote versions down here once EOL
-                elif mariadb_version.minor in [0, 3]:
-                    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 timezone.now() > timezone.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 timezone.now() > timezone.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 timezone.now() > timezone.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

@@ -5,6 +5,5 @@ from .views import NightModeRedirectView
 def auth_settings(request):
     return {
         'SITE_NAME': settings.SITE_NAME,
-        'SITE_URL': settings.SITE_URL,
         'NIGHT_MODE': NightModeRedirectView.night_mode_state(request),
     }

allianceauth/corputils/__init__.py

@@ -0,0 +1 @@
+default_app_config = 'allianceauth.corputils.apps.CorpUtilsConfig'

allianceauth/corputils/apps.py

@@ -1,8 +1,6 @@
 from django.apps import AppConfig
-from django.utils.translation import gettext_lazy as _
 
 
 class CorpUtilsConfig(AppConfig):
     name = 'allianceauth.corputils'
     label = 'corputils'
-    verbose_name = _('Corporation Stats')

allianceauth/corputils/auth_hooks.py

@@ -1,6 +1,5 @@
-from allianceauth.menu.hooks import MenuItemHook
+from allianceauth.services.hooks import MenuItemHook, UrlHook
-from allianceauth.services.hooks import UrlHook
+from django.utils.translation import ugettext_lazy as _
-from django.utils.translation import gettext_lazy as _
 from allianceauth import hooks
 from allianceauth.corputils import urls
 
@@ -10,7 +9,7 @@ class CorpStats(MenuItemHook):
         MenuItemHook.__init__(
             self,
             _('Corporation Stats'),
-            'fa-solid fa-share-nodes',
+            'fas fa-share-alt fa-fw',
             'corputils:view',
             navactive=['corputils:']
         )

allianceauth/corputils/models.py

@@ -1,6 +1,5 @@
 import logging
 import os
-from typing import ClassVar
 
 from allianceauth.authentication.models import CharacterOwnership, UserProfile
 from bravado.exception import HTTPForbidden
@@ -41,9 +40,9 @@ class CorpStats(models.Model):
         verbose_name = "corp stats"
         verbose_name_plural = "corp stats"
 
-    objects: ClassVar[CorpStatsManager] = CorpStatsManager()
+    objects = CorpStatsManager()
 
-    def __str__(self) -> str:
+    def __str__(self):
         return f"{self.__class__.__name__} for {self.corp}"
 
     def update(self):

allianceauth/corputils/templates/corputils/base.html

@@ -1,63 +1,37 @@
-{% extends "allianceauth/base-bs5.html" %}
+{% extends 'allianceauth/base.html' %}
-
 {% load i18n %}
-
+{% block page_title %}{% translate "Corporation Member Data" %}{% endblock %}
-{% block page_title %}
-    {% translate "Corporation Member Data" %}
-{% endblock page_title %}
-
-{% block header_nav_brand %}
-    {% translate "Corporation Member Data" %}
-{% endblock header_nav_brand %}
-
-{% block header_nav_collapse_left %}
-    <li class="nav-item dropdown">
-        <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#" role="button" aria-expanded="false">
-            {% translate "Corporations" %}
-        </a>
-
-        <ul class="dropdown-menu">
-            {% for corpstat in available %}
-                <li>
-                    <a class="dropdown-item" href="{% url 'corputils:view_corp' corpstat.corp.corporation_id %}">
-                        {{ corpstat.corp.corporation_name }}
-                    </a>
-                </li>
-            {% endfor %}
-
-            {% if perms.corputils.add_corpstats %}
-                {% if available.count >= 1 %}
-                    <li>&nbsp;</li>
-                {% endif %}
-
-                <li>
-                    <a class="dropdown-item" href="{% url 'corputils:add' %}">
-                        {% translate "Add corporation" %}
-                    </a>
-                </li>
-            {% endif %}
-        </ul>
-    </li>
-{% endblock %}
-
-{% block header_nav_collapse_right %}
-    <li class="nav-item">
-        <form class="navbar-form navbar-right" role="search" action="{% url 'corputils:search' %}" method="GET">
-            <div class="form-group">
-                <input
-                    type="text"
-                    class="form-control"
-                    name="search_string"
-                    placeholder="{% if search_string %}{{ search_string }}{% else %}{% translate 'Search all corporations...' %}{% endif %}"
-                >
-            </div>
-        </form>
-    </li>
-{% endblock %}
-
 {% block content %}
-    <div>
+    <div class="col-lg-12">
-        {% block member_data %}
+        <h1 class="page-header text-center">{% translate "Corporation Member Data" %}</h1>
-        {% endblock member_data %}
+        <div class="col-lg-10 col-lg-offset-1 container">
+            <nav class="navbar navbar-default">
+                <div class="container-fluid">
+                    <ul class="nav navbar-nav">
+                        <li class="dropdown">
+                            <a href="#" id="dLabel" class="dropdown-toggle" role="button" data-toggle="dropdown" aria-haspopup="false" aria-expanded="false">{% translate "Corporations" %}<span class="caret"></span></a>
+                            <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
+                                {% for corpstat in available %}
+                                    <li>
+                                        <a href="{% url 'corputils:view_corp' corpstat.corp.corporation_id %}">{{ corpstat.corp.corporation_name }}</a>
+                                    </li>
+                                {% endfor %}
+                            </ul>
+                        </li>
+                        {% if perms.corputils.add_corpstats %}
+                            <li>
+                                <a href="{% url 'corputils:add' %}">{% translate "Add" %}</a>
+                            </li>
+                        {% endif %}
+                    </ul>
+                    <form class="navbar-form navbar-right" role="search" action="{% url 'corputils:search' %}" method="GET">
+                        <div class="form-group">
+                            <input type="text" class="form-control" name="search_string" placeholder="{% if search_string %}{{ search_string }}{% else %}{% translate "Search all corporations..." %}{% endif %}">
+                        </div>
+                    </form>
+                </div>
+            </nav>
+            {% block member_data %}{% endblock %}
+        </div>
     </div>
-{% endblock content %}
+{% endblock %}

allianceauth/corputils/templates/corputils/corpstats.html

@@ -1,282 +1,219 @@
 {% extends 'corputils/base.html' %}
-
-{% load aa_i18n %}
 {% load i18n %}
 {% load humanize %}
-
 {% block member_data %}
     {% if corpstats %}
-        <div>
+        <div class="row">
-            <table class="table text-center">
+            <div class="col-lg-12 text-center">
-                <tr>
+                <table class="table">
-                    <td>
+                    <tr>
-                        <img class="ra-avatar" src="{{ corpstats.corp.logo_url_64 }}" alt="{{ corpstats.corp.corporation_name }}">
+                        <td class="text-center col-lg-6{% if corpstats.corp.alliance %}{% else %}col-lg-offset-3{% endif %}">
-                    </td>
+                                <img class="ra-avatar" src="{{ corpstats.corp.logo_url_64 }}">
-
+                            </td>
-                    {% if corpstats.corp.alliance %}
+                        {% if corpstats.corp.alliance %}
-                        <td>
+                            <td class="text-center col-lg-6">
-                            <img class="ra-avatar" src="{{ corpstats.corp.alliance.logo_url_64 }}" alt="{{ corpstats.corp.alliance.alliance_name }}">
+                                <img class="ra-avatar" src="{{ corpstats.corp.alliance.logo_url_64 }}">
-                        </td>
+                            </td>
-                    {% endif %}
+                        {% endif %}
-                </tr>
+                    </tr>
-
+                    <tr>
-                <tr>
+                        <td class="text-center"><h4>{{ corpstats.corp.corporation_name }}</h4></td>
-                    <td><p class="h4">{{ corpstats.corp.corporation_name }}</p></td>
+                        {% if corpstats.corp.alliance %}
-
+                            <td class="text-center"><h4>{{ corpstats.corp.alliance.alliance_name }}</h4></td>
-                    {% if corpstats.corp.alliance %}
+                        {% endif %}
-                        <td><p class="h4">{{ corpstats.corp.alliance.alliance_name }}</p></td>
+                    </tr>
-                    {% endif %}
+                </table>
-                </tr>
-            </table>
-        </div>
-
-        <div class="card card-default mt-4">
-            <div class="card-header clearfix" role="tablist">
-                <ul class="nav nav-pills float-start">
-                    <li class="nav-item" role="presentation">
-                        <a
-                            class="nav-link active"
-                            id="mains"
-                            data-bs-toggle="tab"
-                            href="#tab-mains"
-                            role="tab"
-                            aria-controls="tab-mains"
-                            aria-selected="true"
-                        >
-                            {% translate 'Mains' %} ({{ total_mains }})
-                        </a>
-                    </li>
-
-                    <li class="nav-item" role="presentation">
-                        <a
-                            class="nav-link"
-                            id="members"
-                            data-bs-toggle="tab"
-                            href="#tab-members"
-                            role="tab"
-                            aria-controls="tab-members"
-                            aria-selected="false"
-                        >
-                            {% translate 'Members' %} ({{ corpstats.member_count }})
-                        </a>
-                    </li>
-
-                    <li class="nav-item">
-                        <a
-                            class="nav-link"
-                            id="unregistered"
-                            data-bs-toggle="tab"
-                            href="#tab-unregistered"
-                            role="tab"
-                            aria-controls="tab-unregistered"
-                            aria-selected="false"
-                        >
-                            {% translate 'Unregistered' %} ({{ unregistered.count }})
-                        </a>
-                    </li>
-                </ul>
-
-                <div class="float-end d-none d-sm-block">
-                    {% translate "Last update:" %} {{ corpstats.last_update|naturaltime }}
-
-                    <a
-                        class="btn btn-success btn-sm ms-2"
-                        type="button"
-                        href="{% url 'corputils:update' corpstats.corp.corporation_id %}"
-                        title="{% translate 'Update Now' %}"
-                    >
-                        <i class="fa-solid fa-rotate"></i>
-                    </a>
-                </div>
             </div>
-
+        </div>
-            <div class="card-body">
+        <div class="row">
-                <div class="tab-content">
+            <div class="col-lg-12">
-                    <div class="tab-pane fade show active" id="tab-mains" role="tabpanel" aria-labelledby="tab-mains">
+                <div class="panel panel-default">
-                        {% if mains %}
+                    <div class="panel-heading">
-                            <div class="table-responsive">
+                        <ul class="nav nav-pills pull-left">
-                                <table class="table table-hover" id="table-mains">
+                            <li class="active"><a href="#mains" data-toggle="pill">{% translate 'Mains' %} ({{ total_mains }})</a></li>
-                                    <thead>
+                            <li><a href="#members" data-toggle="pill">{% translate 'Members' %} ({{ corpstats.member_count }})</a></li>
-                                        <tr>
+                            <li><a href="#unregistered" data-toggle="pill">{% translate 'Unregistered' %} ({{ unregistered.count }})</a></li>
-                                            <th>{% translate "Main character" %}</th>
+                        </ul>
-                                            <th>{% translate "Registered characters" %}</th>
+                        <div class="pull-right hidden-xs">
-                                        </tr>
+                            {% translate "Last update:" %} {{ corpstats.last_update|naturaltime }}&nbsp;
-                                    </thead>
+                            <a class="btn btn-success" type="button" href="{% url 'corputils:update' corpstats.corp.corporation_id %}" title="Update Now">
-
+                                <span class="glyphicon glyphicon-refresh"></span>
-                                    <tbody>
+                            </a>
-                                        {% for id, main in mains.items %}
+                        </div>
-                                            <tr>
+                        <div class="clearfix"></div>
-                                                <td class="text-center" style="vertical-align: middle;">
-                                                    <div class="thumbnail" style="border: 0 none; box-shadow: none; background: transparent;">
-                                                        <img src="{{ main.main.portrait_url_64 }}" class="img-circle" alt="{{ main.main }}">
-                                                        <div class="caption">
-                                                            {{ main.main }}
-                                                        </div>
-                                                    </div>
-                                                </td>
-
-                                                <td>
-                                                    <table class="table table-hover">
-                                                        {% for alt in main.alts|dictsort:"character_name" %}
-                                                            {% if forloop.first %}
-                                                                <tr>
-                                                                    <th></th>
-                                                                    <th>{% translate "Character" %}</th>
-                                                                    <th>{% translate "Corporation" %}</th>
-                                                                    <th>{% translate "Alliance" %}</th>
-                                                                    <th></th>
-                                                                </tr>
-                                                            {% endif %}
-
-                                                            <tr>
-                                                                <td style="width: 5%;">
-                                                                    <div class="thumbnail" style="border: 0 none; box-shadow: none; background: transparent;">
-                                                                        <img src="{{ alt.portrait_url_32 }}" class="img-circle" alt="{{ alt.character_name }}">
-                                                                    </div>
-                                                                </td>
-                                                                <td style="width: 30%;">{{ alt.character_name }}</td>
-                                                                <td style="width: 30%;">{{ alt.corporation_name }}</td>
-                                                                <td style="width: 30%;">{{ alt.alliance_name|default_if_none:"" }}</td>
-                                                                <td style="width: 5%;">
-                                                                    <a href="https://zkillboard.com/character/{{ alt.character_id }}/" class="badge text-bg-danger" target="_blank">
-                                                                        {% translate "Killboard" %}
-                                                                    </a>
-                                                                </td>
-                                                            </tr>
-                                                        {% endfor %}
-                                                    </table>
-                                                </td>
-                                            </tr>
-                                        {% endfor %}
-                                    </tbody>
-                                </table>
-                            </div>
-                        {% endif %}
                     </div>
-
+                    <div class="panel-body">
-                    <div class="tab-pane fade" id="tab-members" role="tabpanel" aria-labelledby="tab-members">
+                        <div class="tab-content">
-                        {% if members %}
+                            <div class="tab-pane fade in active" id="mains">
-                            <div class="table-responsive">
+                                {% if mains %}
-                                <table class="table table-hover" id="table-members">
+                                    <div class="table-responsive">
-                                    <thead>
+                                        <table class="table table-hover" id="table-mains">
-                                        <tr>
+                                            <thead>
-                                            <th></th>
+                                                <tr>
-                                            <th>{% translate "Character" %}</th>
+                                                    <th style="height:1em;"><!-- Must have text or height to prevent clipping --></th>
-                                            <th></th>
+                                                    <th></th>
-                                            <th>{% translate "Main Character" %}</th>
+                                                </tr>
-                                            <th>{% translate "Main Corporation" %}</th>
+                                            </thead>
-                                            <th>{% translate "Main Alliance" %}</th>
+                                            <tbody>
-                                        </tr>
+                                                {% for id, main in mains.items %}
-                                    </thead>
+                                                    <tr>
-
+                                                        <td class="text-center" style="vertical-align:middle">
-                                    <tbody>
+                                                            <div class="thumbnail" style="border: 0 none; box-shadow: none; background: transparent;">
-                                        {% for member in members %}
+                                                                <img src="{{ main.main.portrait_url_64 }}" class="img-circle">
-                                            <tr>
+                                                                <div class="caption text-center">
-                                                <td><img src="{{ member.portrait_url }}" class="img-circle" alt="{{ member }}"></td>
+                                                                    {{ main.main }}
-                                                <td>{{ member }}</td>
+                                                                </div>
-                                                <td>
+                                                            </div>
-                                                    <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="badge text-bg-danger" target="_blank">{% translate "Killboard" %}</a>
+                                                        </td>
-                                                </td>
+                                                        <td>
-                                                <td>{{ member.character_ownership.user.profile.main_character.character_name }}</td>
+                                                            <table class="table table-hover">
-                                                <td>{{ member.character_ownership.user.profile.main_character.corporation_name }}</td>
+                                                                {% for alt in main.alts %}
-                                                <td>{{ member.character_ownership.user.profile.main_character.alliance_name|default_if_none:""  }}</td>
+                                                                    {% if forloop.first %}
-                                            </tr>
+                                                                        <tr>
-                                        {% endfor %}
+                                                                            <th></th>
-
+                                                                            <th class="text-center">{% translate "Character" %}</th>
-                                        {% for member in unregistered %}
+                                                                            <th class="text-center">{% translate "Corporation" %}</th>
-                                            <tr class="table-danger">
+                                                                            <th class="text-center">{% translate "Alliance" %}</th>
-                                                <td><img src="{{ member.portrait_url }}" class="img-circle" alt="{{ member.character_name }}"></td>
+                                                                            <th class="text-center"></th>
-                                                <td>{{ member.character_name }}</td>
+                                                                        </tr>
-                                                <td>
+                                                                    {% endif %}
-                                                    <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="badge text-bg-danger" target="_blank">{% translate "Killboard" %}</a>
+                                                                    <tr>
-                                                </td>
+                                                                        <td class="text-center" style="width:5%">
-                                                <td></td>
+                                                                            <div class="thumbnail" style="border: 0 none; box-shadow: none; background: transparent;">
-                                                <td></td>
+                                                                                <img src="{{ alt.portrait_url_32 }}" class="img-circle">
-                                                <td></td>
+                                                                            </div>
-                                            </tr>
+                                                                        </td>
-                                        {% endfor %}
+                                                                        <td class="text-center" style="width:30%">{{ alt.character_name }}</td>
-                                    </tbody>
+                                                                        <td class="text-center" style="width:30%">{{ alt.corporation_name }}</td>
-                                </table>
+                                                                        <td class="text-center" style="width:30%">{{ alt.alliance_name }}</td>
+                                                                        <td class="text-center" style="width:5%">
+                                                                            <a href="https://zkillboard.com/character/{{ alt.character_id }}/" class="label label-danger" target="_blank">
+                                                                                {% translate "Killboard" %}
+                                                                            </a>
+                                                                        </td>
+                                                                    </tr>
+                                                                {% endfor %}
+                                                            </table>
+                                                        </td>
+                                                    </tr>
+                                                {% endfor %}
+                                            </tbody>
+                                        </table>
+                                    </div>
+                                {% endif %}
                             </div>
-                        {% endif %}
+                            <div class="tab-pane fade" id="members">
-                    </div>
+                                {% if members %}
-
+                                    <div class="table-responsive">
-                    <div class="tab-pane fade" id="tab-unregistered" role="tabpanel" aria-labelledby="tab-unregistered">
+                                        <table class="table table-hover" id="table-members">
-                        {% if unregistered %}
+                                            <thead>
-                            <div class="table-responsive">
+                                                <tr>
-                                <table class="table table-hover" id="table-unregistered">
+                                                    <th></th>
-                                    <thead>
+                                                    <th class="text-center">{% translate "Character" %}</th>
-                                        <tr>
+                                                    <th class="text-center"></th>
-                                            <th></th>
+                                                    <th class="text-center">{% translate "Main Character" %}</th>
-                                            <th>{% translate "Character" %}</th>
+                                                    <th class="text-center">{% translate "Main Corporation" %}</th>
-                                            <th></th>
+                                                    <th class="text-center">{% translate "Main Alliance" %}</th>
-                                        </tr>
+                                                </tr>
-                                    </thead>
+                                            </thead>
-
+                                            <tbody>
-                                    <tbody>
+                                                {% for member in members %}
-                                        {% for member in unregistered %}
+                                                    <tr>
-                                            <tr class="table-danger">
+                                                        <td><img src="{{ member.portrait_url }}" class="img-circle"></td>
-                                                <td><img src="{{ member.portrait_url }}" class="img-circle" alt="{{ member.character_name }}"></td>
+                                                        <td class="text-center">{{ member }}</td>
-                                                <td>{{ member.character_name }}</td>
+                                                        <td class="text-center">
-                                                <td>
+                                                            <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="label label-danger" target="_blank">{% translate "Killboard" %}</a>
-                                                    <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="badge text-bg-danger" target="_blank">
+                                                        </td>
-                                                        {% translate "Killboard" %}
+                                                        <td class="text-center">{{ member.character_ownership.user.profile.main_character.character_name }}</td>
-                                                    </a>
+                                                        <td class="text-center">{{ member.character_ownership.user.profile.main_character.corporation_name }}</td>
-                                                </td>
+                                                        <td class="text-center">{{ member.character_ownership.user.profile.main_character.alliance_name }}</td>
-                                            </tr>
+                                                    </tr>
-                                        {% endfor %}
+                                                {% endfor %}
-                                    </tbody>
+                                                {% for member in unregistered %}
-                                </table>
+                                                    <tr class="danger">
+                                                        <td><img src="{{ member.portrait_url }}" class="img-circle"></td>
+                                                        <td class="text-center">{{ member.character_name }}</td>
+                                                        <td class="text-center">
+                                                            <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="label label-danger" target="_blank">{% translate "Killboard" %}</a>
+                                                        </td>
+                                                        <td class="text-center"></td>
+                                                        <td class="text-center"></td>
+                                                        <td class="text-center"></td>
+                                                    </tr>
+                                                {% endfor %}
+                                            </tbody>
+                                        </table>
+                                    </div>
+                                {% endif %}
                             </div>
-                        {% endif %}
+                            <div class="tab-pane fade" id="unregistered">
+                                {% if unregistered %}
+                                    <div class="table-responsive">
+                                        <table class="table table-hover" id="table-unregistered">
+                                            <thead>
+                                                <tr>
+                                                    <th></th>
+                                                    <th class="text-center">{% translate "Character" %}</th>
+                                                    <th class="text-center"></th>
+                                                </tr>
+                                            </thead>
+                                            <tbody>
+                                                {% for member in unregistered %}
+                                                    <tr class="danger">
+                                                        <td><img src="{{ member.portrait_url }}" class="img-circle"></td>
+                                                        <td class="text-center">{{ member.character_name }}</td>
+                                                        <td class="text-center">
+                                                            <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="label label-danger" target="_blank">
+                                                                {% translate "Killboard" %}
+                                                            </a>
+                                                        </td>
+                                                    </tr>
+                                                {% endfor %}
+                                            </tbody>
+                                        </table>
+                                    </div>
+                                {% endif %}
+                            </div>
+                        </div>
                     </div>
                 </div>
             </div>
         </div>
     {% endif %}
 {% endblock %}
-
 {% block extra_javascript %}
-    {% include 'bundles/datatables-js-bs5.html' %}
+    {% include 'bundles/datatables-js.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] },
-                ],
-                "stateSave": true,
-                "stateDuration": 0
-            });
-
-            $('#table-members').DataTable({
-                "language": {"url": '{{ DT_LANG_PATH }}'},
-                "columnDefs": [
-                    { "searchable": false, "targets": [0, 2] },
-                    { "sortable": false, "targets": [0, 2] },
-                ],
-                "order": [[ 1, "asc" ]],
-                "stateSave": true,
-                "stateDuration": 0
-            });
-
-            $('#table-unregistered').DataTable({
-                "language": {"url": '{{ DT_LANG_PATH }}'},
-                "columnDefs": [
-                    { "searchable": false, "targets": [0, 2] },
-                    { "sortable": false, "targets": [0, 2] },
-                ],
-                "order": [[ 1, "asc" ]],
-                "stateSave": true,
-                "stateDuration": 0
-            });
-        });
-    </script>
 {% endblock %}
-
 {% block extra_css %}
-    {% include 'bundles/datatables-css-bs5.html' %}
+    {% include 'bundles/datatables-css.html' %}
+{% endblock %}
+{% block extra_script %}
+    $(document).ready(function(){
+        $('#table-mains').DataTable({
+            "columnDefs": [
+                { "sortable": false, "targets": [1] },
+            ],
+            "stateSave": true,
+            "stateDuration": 0
+        });
+        $('#table-members').DataTable({
+            "columnDefs": [
+                { "searchable": false, "targets": [0, 2] },
+                { "sortable": false, "targets": [0, 2] },
+            ],
+            "order": [[ 1, "asc" ]],
+            "stateSave": true,
+            "stateDuration": 0
+        });
+        $('#table-unregistered').DataTable({
+            "columnDefs": [
+                { "searchable": false, "targets": [0, 2] },
+                { "sortable": false, "targets": [0, 2] },
+            ],
+            "order": [[ 1, "asc" ]],
+            "stateSave": true,
+            "stateDuration": 0
+        });
+
+    });
 {% endblock %}

allianceauth/corputils/templates/corputils/search.html

@@ -1,37 +1,33 @@
 {% extends "corputils/base.html" %}
-
-{% load aa_i18n %}
 {% load i18n %}
-
 {% block member_data %}
-    <div class="card card-default">
+    <div class="panel panel-default">
-        <div class="card-header clearfix">
+        <div class="panel-heading clearfix">
-            <div class="card-title">{% translate "Search Results" %}</div>
+            <div class="panel-title pull-left">{% translate "Search Results" %}</div>
         </div>
-
+        <div class="panel-body">
-        <div class="card-body mt-2">
             <table class="table table-hover" id="table-search">
                 <thead>
                     <tr>
-                        <th></th>
+                        <th class="text-center"></th>
-                        <th>{% translate "Character" %}</th>
+                        <th class="text-center">{% translate "Character" %}</th>
-                        <th>{% translate "Corporation" %}</th>
+                        <th class="text-center">{% translate "Corporation" %}</th>
-                        <th>{% translate "zKillboard" %}</th>
+                        <th class="text-center">{% translate "zKillboard" %}</th>
-                        <th>{% translate "Main Character" %}</th>
+                        <th class="text-center">{% translate "Main Character" %}</th>
-                        <th>{% translate "Main Corporation" %}</th>
+                        <th class="text-center">{% translate "Main Corporation" %}</th>
-                        <th>{% translate "Main Alliance" %}</th>
+                        <th class="text-center">{% translate "Main Alliance" %}</th>
                     </tr>
                 </thead>
                 <tbody>
                     {% for result in results %}
                         <tr {% if not result.1.registered %}class="danger"{% endif %}>
-                            <td><img src="{{ result.1.portrait_url }}" class="img-circle" alt="{{ result.1.character_name }}"></td>
+                            <td class="text-center"><img src="{{ result.1.portrait_url }}" class="img-circle"></td>
-                            <td>{{ result.1.character_name }}</td>
+                            <td class="text-center">{{ result.1.character_name }}</td>
-                            <td >{{ result.0.corp.corporation_name }}</td>
+                            <td class="text-center">{{ result.0.corp.corporation_name }}</td>
-                            <td><a href="https://zkillboard.com/character/{{ result.1.character_id }}/" class="badge text-bg-danger" target="_blank">{% translate "Killboard" %}</a></td>
+                            <td class="text-center"><a href="https://zkillboard.com/character/{{ result.1.character_id }}/" class="label label-danger" target="_blank">{% translate "Killboard" %}</a></td>
-                            <td>{{ result.1.main_character.character_name }}</td>
+                            <td class="text-center">{{ result.1.main_character.character_name }}</td>
-                            <td>{{ result.1.main_character.corporation_name }}</td>
+                            <td class="text-center">{{ result.1.main_character.corporation_name }}</td>
-                            <td>{{ result.1.main_character.alliance_name }}</td>
+                            <td class="text-center">{{ result.1.main_character.alliance_name }}</td>
                         </tr>
                     {% endfor %}
                 </tbody>
@@ -39,23 +35,17 @@
         </div>
     </div>
 {% endblock %}
-
 {% block extra_javascript %}
-    {% include 'bundles/datatables-js-bs5.html' %}
+    {% include 'bundles/datatables-js.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
-            });
-        });
-    </script>
 {% endblock %}
-
 {% block extra_css %}
-    {% include 'bundles/datatables-css-bs5.html' %}
+    {% include 'bundles/datatables-css.html' %}
+{% endblock %}
+{% block extra_script %}
+    $(document).ready(function(){
+        $('#table-search').DataTable({
+            "stateSave": true,
+            "stateDuration": 0
+        });
+    });
 {% endblock %}

allianceauth/corputils/urls.py

@@ -1,11 +1,12 @@
-from django.urls import path
+from django.conf.urls import url
+
 from . import views
 
 app_name = 'corputils'
 urlpatterns = [
-    path('', views.corpstats_view, name='view'),
+    url(r'^$', views.corpstats_view, name='view'),
-    path('add/', views.corpstats_add, name='add'),
+    url(r'^add/$', views.corpstats_add, name='add'),
-    path('<int:corp_id>/', views.corpstats_view, name='view_corp'),
+    url(r'^(?P<corp_id>(\d)*)/$', views.corpstats_view, name='view_corp'),
-    path('<int:corp_id>/update/', views.corpstats_update, name='update'),
+    url(r'^(?P<corp_id>(\d)+)/update/$', views.corpstats_update, name='update'),
-    path('search/', views.corpstats_search, name='search'),
+    url(r'^search/$', views.corpstats_search, name='search'),
-]
+    ]

allianceauth/corputils/views.py

@@ -6,7 +6,7 @@ from django.contrib.auth.decorators import login_required, permission_required,
 from django.core.exceptions import PermissionDenied, ObjectDoesNotExist
 from django.db import IntegrityError
 from django.shortcuts import render, redirect, get_object_or_404
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ugettext_lazy as _
 from esi.decorators import token_required
 from allianceauth.eveonline.models import EveCharacter, EveCorporationInfo
 

allianceauth/crontab/__init__.py

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

allianceauth/crontab/apps.py

@@ -1,16 +0,0 @@
-"""
-Crontab App Config
-"""
-
-from django.apps import AppConfig
-from django.utils.translation import gettext_lazy as _
-
-
-class CrontabConfig(AppConfig):
-    """
-    Crontab App Config
-    """
-
-    name = "allianceauth.crontab"
-    label = "crontab"
-    verbose_name = _("Crontab")

allianceauth/crontab/migrations/0001_initial.py

@@ -1,29 +0,0 @@
-# Generated by Django 4.2.16 on 2025-01-20 06:16
-
-import allianceauth.crontab.models
-from django.db import migrations, 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

@@ -1,23 +0,0 @@
-from random import random
-from django.db import models
-from django.utils.translation import gettext_lazy as _
-from solo.models import SingletonModel
-
-
-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"