Skip to content

Commit

Permalink
rushed update to bs5 and dependcies
Browse files Browse the repository at this point in the history
  • Loading branch information
pvyParts committed Sep 19, 2024
1 parent c0a434e commit 9e692c3
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 17 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends "allianceauth/base.html" %}
{% extends "allianceauth/base-bs5.html" %}

{% load i18n %}
{% block page_title %}{{page_title}}{% endblock %}
Expand Down
2 changes: 1 addition & 1 deletion allianceauth_oidc/templates/allianceauth_oidc/denied.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends 'allianceauth/base.html' %}
{% extends 'allianceauth/base-bs5.html' %}
{% load i18n %}
{% block page_title %}{{page_title}}{% endblock %}
{% block extra_css %}
Expand Down
6 changes: 0 additions & 6 deletions allianceauth_oidc/tests/test_access.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,6 @@

from allianceauth.authentication.models import State

from django.contrib.sessions.middleware import SessionMiddleware
from django.http import (
Http404, HttpResponse, HttpResponseBadRequest, HttpResponseRedirect,
)

from ..views import AuthorizationView, TokenView
from . import OIDCTestCase


Expand Down
9 changes: 3 additions & 6 deletions allianceauth_oidc/views.py
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
import json
import logging

from oauth2_provider.http import OAuth2ResponseRedirect
from oauth2_provider.models import (
get_access_token_model, get_application_model,
get_access_token_model,
)
from oauth2_provider.settings import oauth2_settings
from oauth2_provider.signals import app_authorized
from oauth2_provider.views.base import AuthorizationView
from oauth2_provider.views.mixins import OAuthLibMixin

from django.conf import settings
from django.contrib import messages
from django.contrib.auth.models import Group, User
from django.contrib.auth.models import User
from django.core.exceptions import PermissionDenied
from django.http import HttpResponse
from django.shortcuts import render
Expand Down Expand Up @@ -100,6 +96,7 @@ def get(self, request, *args, **kwargs):
resp = super().get(request, *args, **kwargs)
if hasattr(resp, 'context_data'):
try:
raise PermissionDenied()
check_user_state_and_groups(
request.user, resp.context_data['application'])
except PermissionDenied as e:
Expand Down
6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ classifiers = [
"Programming Language :: Python :: 3.11",
]
dependencies = [
"allianceauth>=3.3.0",
"django-oauth-toolkit>=3.0.1,<4.0.0",
"Pillow"
"allianceauth>=4.0.0",
"django-oauth-toolkit>=3.0.1,<4.0.0"
]

dynamic = ["version", "description"]

[project.urls]
Expand Down

0 comments on commit 9e692c3

Please sign in to comment.