From f58ee7fb52d571e1ac36e6c3128866287a77d064 Mon Sep 17 00:00:00 2001
From: Jens Langhammer <jens.langhammer@beryju.org>
Date: Tue, 19 May 2020 21:53:36 +0200
Subject: [PATCH] sources/oauth: fix handling of sources with spaces in their
 name

---
 passbook/sources/oauth/apps.py             |  1 +
 passbook/sources/oauth/types/manager.py    | 31 +++++++++++++---------
 passbook/sources/oauth/utils.py            |  3 +--
 passbook/sources/oauth/views/dispatcher.py |  4 +++
 4 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/passbook/sources/oauth/apps.py b/passbook/sources/oauth/apps.py
index 360cefcece..e439e70d91 100644
--- a/passbook/sources/oauth/apps.py
+++ b/passbook/sources/oauth/apps.py
@@ -21,5 +21,6 @@ class PassbookSourceOAuthConfig(AppConfig):
         for source_type in settings.PASSBOOK_SOURCES_OAUTH_TYPES:
             try:
                 import_module(source_type)
+                LOGGER.debug("Loaded OAuth Source Type", type=source_type)
             except ImportError as exc:
                 LOGGER.debug(exc)
diff --git a/passbook/sources/oauth/types/manager.py b/passbook/sources/oauth/types/manager.py
index 76d734d873..0900f4d29c 100644
--- a/passbook/sources/oauth/types/manager.py
+++ b/passbook/sources/oauth/types/manager.py
@@ -1,9 +1,11 @@
 """Source type manager"""
 from enum import Enum
+from typing import Callable, Dict, List
 
 from django.utils.text import slugify
 from structlog import get_logger
 
+from passbook.sources.oauth.models import OAuthSource
 from passbook.sources.oauth.views.core import OAuthCallback, OAuthRedirect
 
 LOGGER = get_logger()
@@ -19,18 +21,20 @@ class RequestKind(Enum):
 class SourceTypeManager:
     """Manager to hold all Source types."""
 
-    __source_types = {}
-    __names = []
+    __source_types: Dict[RequestKind, Dict[str, Callable]] = {}
+    __names: List[str] = []
 
-    def source(self, kind, name):
+    def source(self, kind: RequestKind, name: str):
         """Class decorator to register classes inline."""
 
         def inner_wrapper(cls):
-            if kind not in self.__source_types:
-                self.__source_types[kind] = {}
-            self.__source_types[kind][name.lower()] = cls
+            if kind.value not in self.__source_types:
+                self.__source_types[kind.value] = {}
+            self.__source_types[kind.value][slugify(name)] = cls
             self.__names.append(name)
-            LOGGER.debug("Registered source", source_class=cls.__name__, kind=kind)
+            LOGGER.debug(
+                "Registered source", source_class=cls.__name__, kind=kind.value
+            )
             return cls
 
         return inner_wrapper
@@ -39,15 +43,16 @@ class SourceTypeManager:
         """Get list of tuples of all registered names"""
         return [(slugify(x), x) for x in set(self.__names)]
 
-    def find(self, source, kind):
+    def find(self, source: OAuthSource, kind: RequestKind) -> Callable:
         """Find fitting Source Type"""
-        if kind in self.__source_types:
-            if source.provider_type in self.__source_types[kind]:
-                return self.__source_types[kind][source.provider_type]
+        if kind.value in self.__source_types:
+            if source.provider_type in self.__source_types[kind.value]:
+                return self.__source_types[kind.value][source.provider_type]
+            LOGGER.warning("no matching type found, using default")
             # Return defaults
-            if kind == RequestKind.callback:
+            if kind.value == RequestKind.callback:
                 return OAuthCallback
-            if kind == RequestKind.redirect:
+            if kind.value == RequestKind.redirect:
                 return OAuthRedirect
         raise KeyError
 
diff --git a/passbook/sources/oauth/utils.py b/passbook/sources/oauth/utils.py
index a6d19b2e27..a418368c3c 100644
--- a/passbook/sources/oauth/utils.py
+++ b/passbook/sources/oauth/utils.py
@@ -1,11 +1,10 @@
 """OAuth Client User Creation Utils"""
-
 from django.db.utils import IntegrityError
 
 from passbook.core.models import User
 
 
-def user_get_or_create(**kwargs):
+def user_get_or_create(**kwargs: str) -> User:
     """Create user or return existing user"""
     try:
         new_user = User.objects.create_user(**kwargs)
diff --git a/passbook/sources/oauth/views/dispatcher.py b/passbook/sources/oauth/views/dispatcher.py
index a7ce9024d9..110f26eb9c 100644
--- a/passbook/sources/oauth/views/dispatcher.py
+++ b/passbook/sources/oauth/views/dispatcher.py
@@ -2,10 +2,13 @@
 from django.http import Http404
 from django.shortcuts import get_object_or_404
 from django.views import View
+from structlog import get_logger
 
 from passbook.sources.oauth.models import OAuthSource
 from passbook.sources.oauth.types.manager import MANAGER, RequestKind
 
+LOGGER = get_logger()
+
 
 class DispatcherView(View):
     """Dispatch OAuth Redirect/Callback views to their proper class based on URL parameters"""
@@ -19,4 +22,5 @@ class DispatcherView(View):
             raise Http404
         source = get_object_or_404(OAuthSource, slug=slug)
         view = MANAGER.find(source, kind=RequestKind(self.kind))
+        LOGGER.debug("dispatching OAuth2 request to", view=view, kind=self.kind)
         return view.as_view()(*args, **kwargs)