Skip to content

Commit

Permalink
add headers / isort / black
Browse files Browse the repository at this point in the history
  • Loading branch information
woutervh committed Mar 25, 2024
1 parent b3edeb1 commit 81087ba
Show file tree
Hide file tree
Showing 118 changed files with 263 additions and 63 deletions.
1 change: 1 addition & 0 deletions scouts_kampvisum_api/scouts_auth/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
"""apps.scouts_auth."""

default_app_config = "scouts_auth.apps.ScoutsAuthConfig"
1 change: 1 addition & 0 deletions scouts_kampvisum_api/scouts_auth/apps.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""apps.scouts_auth.apps"""

from django.apps import AppConfig


Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
"""apps.scouts_auth.auth.exceptions."""

from .exceptions import InvalidArgumentException, ScoutsAuthException, TokenRefreshException, TokenRequestException
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""apps.scouts_auth.auth.exceptions.exceptions."""

from requests.exceptions import HTTPError
from rest_framework.exceptions import APIException

Expand Down
1 change: 1 addition & 0 deletions scouts_kampvisum_api/scouts_auth/auth/models/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
"""apps.scouts_auth.models."""

from .user import User
1 change: 1 addition & 0 deletions scouts_kampvisum_api/scouts_auth/auth/models/user.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""apps.scouts_auth.models.user"""

import logging
import uuid

Expand Down
1 change: 1 addition & 0 deletions scouts_kampvisum_api/scouts_auth/auth/oidc/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""apps.scouts_auth.oidc."""

from .oidc_authentication_backend import InuitsOIDCAuthenticationBackend
from .oidc_service import OIDCService
from .oidc_session_refresh import InuitsOIDCSessionRefresh
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""apps.scouts_auth.oidc.oidc_authentication_backend."""

import logging

from mozilla_django_oidc.auth import OIDCAuthenticationBackend
Expand Down
1 change: 1 addition & 0 deletions scouts_kampvisum_api/scouts_auth/auth/oidc/oidc_service.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""apps.scouts_auth.oidc.oidc_service."""

import logging

from django.conf import settings
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""apps.scouts_auth.oidc.oidc_session_refresh."""

import logging

from mozilla_django_oidc.middleware import SessionRefresh
Expand Down
1 change: 1 addition & 0 deletions scouts_kampvisum_api/scouts_auth/auth/oidc_auth.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""apps.scouts_auth.oidc_auth."""

import logging
from typing import Tuple

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""apps.scouts_auth.permissions."""

from .custom_django_permission import CustomDjangoPermission
from .extended_django_model_permission import ExtendedDjangoModelPermission
from .group_membership_permission import GroupMembershipPermission
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""apps.scouts_auth.permissions.custom_django_permission."""

from rest_framework import permissions


Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""apps.scouts_auth.permissions.extended_django_model_permission."""

from rest_framework import permissions


Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""apps.scouts_auth.permissions.group_membership_permission."""

from rest_framework import permissions


Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""apps.scouts_auth.serializers."""

from .auth_code_serializer import AuthCodeSerializer
from .refresh_serializer import RefreshSerializer
from .token_serializer import TokenSerializer
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""apps.scouts_auth.serializers.auth_code_serializer."""

from rest_framework import serializers


Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""apps.scouts_auth.serializers.refresh_serializer."""

from rest_framework import serializers


Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""apps.scouts_auth.serializers.token_serializer."""

from rest_framework import serializers


Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""apps.scouts_auth.serializers.user_serializer."""

import logging

from rest_framework import serializers
Expand Down
1 change: 1 addition & 0 deletions scouts_kampvisum_api/scouts_auth/auth/services/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
"""apps.scouts_auth.services."""

from .permission_service import PermissionService
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""apps.scouts_auth.services.permission_service."""

import importlib
import logging
from typing import List
Expand Down
1 change: 1 addition & 0 deletions scouts_kampvisum_api/scouts_auth/auth/settings/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
"""apps.scouts_auth.settings."""

from .oidc_settings import InuitsOIDCSettings
1 change: 1 addition & 0 deletions scouts_kampvisum_api/scouts_auth/auth/urls.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""apps.scouts_auth.urls."""

from django.urls import path

from scouts_auth.auth.views import CurrentUserView, LogoutView, OIDCAuthCodeView, OIDCRefreshView, PermissionsViewSet
Expand Down
1 change: 1 addition & 0 deletions scouts_kampvisum_api/scouts_auth/auth/views/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""apps.scouts_auth.views."""

from .current_user_view import CurrentUserView
from .logout_view import LogoutView
from .oidc_auth_code_view import OIDCAuthCodeView
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""apps.scouts_auth.views.current_user_view."""

import logging
from typing import List

Expand Down
1 change: 1 addition & 0 deletions scouts_kampvisum_api/scouts_auth/auth/views/logout_view.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""apps.scouts_auth.views.logout_view."""

import logging

from drf_yasg.utils import swagger_auto_schema
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""apps.scouts_auth.views.oidc_auth_code_view."""

import logging

from drf_yasg.utils import swagger_auto_schema
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""apps.scouts_auth.views.oidc_refresh_view."""

import logging

from drf_yasg.utils import swagger_auto_schema
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""apps.scouts_auth.views.permissions_view."""

import logging

from django.conf import settings
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""apps.scouts_auth.groupadmin.models."""

from .enums import AbstractScoutsFunctionCode
from .scouts_function import ScoutsFunction
from .scouts_group import ScoutsGroup
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
"""app.scouts_auth.groupadmin.models.enums."""

from .scouts_function_code import AbstractScoutsFunctionCode
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
"""app.scouts_auth.groupadmin.models.scouts_function_code."""


class AbstractScoutsFunctionCode:
GROUP_LEADER = "GRL"
ADJUNCT_GROUP_LEADER = "AGRL"
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
"""app.scouts_auth.groupadmin.models.fields."""

from .group_admin_id_field import GroupAdminIdField, OptionalGroupAdminIdField
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
"""app.scouts_auth.groupadmin.models.fields.group_admin_id_field."""

from scouts_auth.inuits.models.fields import OptionalCharField, RequiredCharField


Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
"""app.scouts_auth.groupadmin.models.mixins."""

from .group_admin_id_mixin import GroupAdminIdMixin
from .group_name_mixin import GroupNameMixin
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
"""app.scouts_auth.groupadmin.models.mixins.group_admin_id_mixin."""

from django.db import models

from scouts_auth.groupadmin.models.fields import GroupAdminIdField
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
"""app.scouts_auth.groupadmin.models.mixins.group_name_mixin."""

from django.db import models

from scouts_auth.groupadmin.models.fields import GroupAdminIdField
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
"""apps.scouts_auth.groupadmin.models."""

import logging
from datetime import datetime
from typing import List
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
"""apps.scouts_auth.groupadmin.models.scouts_group."""

import logging
from typing import List
import typing as tp

from scouts_auth.auth.exceptions import ScoutsAuthException
from scouts_auth.groupadmin.models import AbstractScoutsGroup
Expand Down Expand Up @@ -34,7 +36,7 @@ def __init__(
website: str = None,
parent_group: str = None,
type: str = None,
_child_group_names: List[str] = None,
_child_group_names: tp.List[str] = None,
):
self.group_admin_id = group_admin_id
self.number = number
Expand Down Expand Up @@ -69,7 +71,7 @@ def has_child_groups(self) -> bool:
self._child_group_names and isinstance(self._child_group_names, list) and len(self._child_group_names) > 0
)

def get_child_groups(self) -> List[str]:
def get_child_groups(self) -> tp.List[str]:
return self._child_group_names

def is_admin_group(self) -> bool:
Expand Down
28 changes: 15 additions & 13 deletions scouts_kampvisum_api/scouts_auth/groupadmin/models/scouts_token.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
"""apps.scouts_auth.groupadmin.models.scouts_token."""

import datetime as dt
import logging
from datetime import datetime
from typing import List
import typing as tp

import jwt
from django.utils.timezone import make_aware, now
Expand All @@ -24,9 +26,9 @@ class ScoutsToken:
access_token: str = None

# rfc7519: expiration time of the jwt
_exp: datetime = TimezoneAwareDateTimeField()
_exp: dt.datetime = TimezoneAwareDateTimeField()
# rfc7519: time of issuance
_iat: datetime = TimezoneAwareDateTimeField()
_iat: dt.datetime = TimezoneAwareDateTimeField()
# rfc7519: optional string identifying this jwt
jti: str = OptionalCharField()
# rfc7519: string or uri identifying the issuer of the jwt
Expand All @@ -36,7 +38,7 @@ class ScoutsToken:
# rfc7519: identifies the media type that is prepended in the Authorization header, e.g. Bearer
typ: str = OptionalCharField()
# time of authentication
_auth_time: datetime = TimezoneAwareDateTimeField()
_auth_time: dt.datetime = TimezoneAwareDateTimeField()
# keycloak client id
azp: str = OptionalCharField()
# session identifier
Expand Down Expand Up @@ -68,35 +70,35 @@ def validate(self) -> bool:
raise ScoutsAuthException("JWT token does not contain the preferred_username or expiration time")

@property
def exp(self) -> datetime:
def exp(self) -> dt.datetime:
return self._exp

@exp.setter
def exp(self, exp: int):
self._exp = make_aware(datetime.fromtimestamp(exp)) if exp else None
self._exp = make_aware(dt.datetime.fromtimestamp(exp)) if exp else None

@property
def iat(self) -> datetime:
def iat(self) -> dt.datetime:
return self._iat

@iat.setter
def iat(self, iat: int):
self._iat = make_aware(datetime.fromtimestamp(iat)) if iat else None
self._iat = make_aware(dt.datetime.fromtimestamp(iat)) if iat else None

@property
def auth_time(self) -> datetime:
def auth_time(self) -> dt.datetime:
return self._auth_time

@auth_time.setter
def auth_time(self, auth_time: int):
self._auth_time = make_aware(datetime.fromtimestamp(auth_time)) if auth_time else None
self._auth_time = make_aware(dt.datetime.fromtimestamp(auth_time)) if auth_time else None

@property
def allowed_origins(self) -> List[str]:
def allowed_origins(self) -> tp.List[str]:
return self._allowed_origins.split(",") if self.allowed_origins else []

@allowed_origins.setter
def allowed_origins(self, allowed_origins: List[str]):
def allowed_origins(self, allowed_origins: tp.List[str]):
self._allowed_origins = (
",".join(allowed_origin for allowed_origin in allowed_origins) if allowed_origins else ""
)
Expand Down
Loading

0 comments on commit 81087ba

Please sign in to comment.