From 73c5440454066ccdcadbc78fc1391eb7eca2e5e2 Mon Sep 17 00:00:00 2001
From: Philipp Rothmann <philipprothmann@posteo.de>
Date: Fri, 29 Apr 2022 14:56:51 +0200
Subject: [PATCH] uff

---
 app/__init__.py                           |  2 --
 app/authentik/models.py                   |  4 ++-
 app/authentik/test_authentik.py           | 14 +++++----
 app/consumer/__init__.py                  |  2 ++
 app/{sink.py => consumer/baseConsumer.py} |  3 +-
 app/{ => consumer}/nextcloud/__init__.py  |  0
 app/{ => consumer}/nextcloud/main.py      |  4 +--
 app/consumer/test_baseConsumer.py         | 16 ++++++++++
 app/{ => consumer}/wekan/__init__.py      |  0
 app/{ => consumer}/wekan/api.py           |  0
 app/{ => consumer}/wekan/main.py          |  4 +--
 app/{ => consumer}/wekan/models.py        |  0
 app/{ => consumer}/wekan/settings.py      |  0
 app/{ => consumer}/wekan/sources.py       |  0
 app/{ => consumer}/wekan/test_wekan.py    | 16 +++++-----
 app/event_controller.py                   | 10 +++---
 app/main.py                               | 11 +++++--
 app/test_dependencies.py                  |  0
 app/test_event_controller.py              | 16 ++++++++--
 app/test_integration.py                   | 37 ++++++++++++-----------
 app/test_main.py                          |  2 +-
 app/test_sink.py                          | 28 -----------------
 requirements.txt                          |  3 ++
 23 files changed, 94 insertions(+), 78 deletions(-)
 create mode 100644 app/consumer/__init__.py
 rename app/{sink.py => consumer/baseConsumer.py} (91%)
 rename app/{ => consumer}/nextcloud/__init__.py (100%)
 rename app/{ => consumer}/nextcloud/main.py (79%)
 create mode 100644 app/consumer/test_baseConsumer.py
 rename app/{ => consumer}/wekan/__init__.py (100%)
 rename app/{ => consumer}/wekan/api.py (100%)
 rename app/{ => consumer}/wekan/main.py (86%)
 rename app/{ => consumer}/wekan/models.py (100%)
 rename app/{ => consumer}/wekan/settings.py (100%)
 rename app/{ => consumer}/wekan/sources.py (100%)
 rename app/{ => consumer}/wekan/test_wekan.py (62%)
 create mode 100644 app/test_dependencies.py
 delete mode 100644 app/test_sink.py

diff --git a/app/__init__.py b/app/__init__.py
index eb79e6a..e69de29 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -1,2 +0,0 @@
-from .wekan import main
-from .nextcloud import main
\ No newline at end of file
diff --git a/app/authentik/models.py b/app/authentik/models.py
index 3d62daa..e70206a 100644
--- a/app/authentik/models.py
+++ b/app/authentik/models.py
@@ -4,6 +4,8 @@ from typing import Any, Dict, List, Optional
 
 from pydantic import BaseModel
 
+from app.consumer.baseConsumer import BaseUser
+
 
 class UsersObjItem(BaseModel):
     pk: int
@@ -26,7 +28,7 @@ class GroupsObjItem(BaseModel):
     attributes: Dict[str, Any]
     users_obj: List[UsersObjItem]
 
-class User(BaseModel):
+class User(BaseUser):
     pk: Optional[str]
     username: str
     name: str
diff --git a/app/authentik/test_authentik.py b/app/authentik/test_authentik.py
index 1583a05..6d54b8b 100644
--- a/app/authentik/test_authentik.py
+++ b/app/authentik/test_authentik.py
@@ -1,17 +1,19 @@
 import email
 import logging
+
+from app.authentik.settings import AuthentikSettings
 from .api import Authentik
 from .models import User
 import pytest
 
+@pytest.fixture()
+def settings() -> AuthentikSettings:
+    return AuthentikSettings(
+        baseurl="http://localhost:9000/", token="foobar123",)
 
 @pytest.fixture
-def api() -> Authentik:
-    try:
-        return Authentik(base="http://localhost:9000/", token="foobar123", )
-    except:
-        pytest.skip("API not reachable? Did you start docker-compose?")
-
+def api(settings: AuthentikSettings) -> Authentik:
+    return Authentik(settings)
 
 
 def test_create_event_transport_already_exists(api: Authentik):
diff --git a/app/consumer/__init__.py b/app/consumer/__init__.py
new file mode 100644
index 0000000..eb79e6a
--- /dev/null
+++ b/app/consumer/__init__.py
@@ -0,0 +1,2 @@
+from .wekan import main
+from .nextcloud import main
\ No newline at end of file
diff --git a/app/sink.py b/app/consumer/baseConsumer.py
similarity index 91%
rename from app/sink.py
rename to app/consumer/baseConsumer.py
index 31051e7..b95e022 100644
--- a/app/sink.py
+++ b/app/consumer/baseConsumer.py
@@ -4,7 +4,6 @@ from pydantic import BaseModel
 
 class BaseUser(BaseModel):
     email: str
-    id: str
     name: str
     username: str
 
@@ -12,7 +11,7 @@ class BaseGroup(BaseModel):
     name: str
 
 
-class Sink(ABC):
+class Consumer(ABC):
 
     @abstractproperty
     def api(self):
diff --git a/app/nextcloud/__init__.py b/app/consumer/nextcloud/__init__.py
similarity index 100%
rename from app/nextcloud/__init__.py
rename to app/consumer/nextcloud/__init__.py
diff --git a/app/nextcloud/main.py b/app/consumer/nextcloud/main.py
similarity index 79%
rename from app/nextcloud/main.py
rename to app/consumer/nextcloud/main.py
index 39b1b52..ca06404 100644
--- a/app/nextcloud/main.py
+++ b/app/consumer/nextcloud/main.py
@@ -1,11 +1,11 @@
 from unittest.mock import MagicMock
-from app.sink import BaseGroup, BaseUser, Sink
+from app.consumer.baseConsumer import BaseGroup, BaseUser, Consumer
 
 class Api:
     def create_user(self):
         pass
 
-class NextcloudSink(Sink):
+class NextcloudConsumer(Consumer):
 
     def __init__(self):
         self._api: Api = Api()
diff --git a/app/consumer/test_baseConsumer.py b/app/consumer/test_baseConsumer.py
new file mode 100644
index 0000000..ab6fc8f
--- /dev/null
+++ b/app/consumer/test_baseConsumer.py
@@ -0,0 +1,16 @@
+from .nextcloud.main import BaseUser, Consumer
+from .wekan import main
+from .nextcloud import main
+from pytest_mock import MockerFixture
+import pytest
+
+@pytest.fixture
+def testUser():
+    return BaseUser(email="foo", id="asd", name="sd", username="sdfsfd")
+
+def test_get_subclasses():
+    l = []
+    for sc in Consumer.__subclasses__():
+        l.append(sc.__name__)
+    assert "NextcloudConsumer" in l
+    assert "WekanConsumer" in l
\ No newline at end of file
diff --git a/app/wekan/__init__.py b/app/consumer/wekan/__init__.py
similarity index 100%
rename from app/wekan/__init__.py
rename to app/consumer/wekan/__init__.py
diff --git a/app/wekan/api.py b/app/consumer/wekan/api.py
similarity index 100%
rename from app/wekan/api.py
rename to app/consumer/wekan/api.py
diff --git a/app/wekan/main.py b/app/consumer/wekan/main.py
similarity index 86%
rename from app/wekan/main.py
rename to app/consumer/wekan/main.py
index 8cd4fd9..ba2f65f 100644
--- a/app/wekan/main.py
+++ b/app/consumer/wekan/main.py
@@ -1,12 +1,12 @@
 
 from unittest.mock import MagicMock
 from .settings import WekanSettings
-from app.sink import BaseGroup, BaseUser, Sink
+from app.consumer.baseConsumer import BaseGroup, BaseUser, Consumer
 from .api import WekanApi
 from .models import User
 
 
-class WekanSink(Sink):
+class WekanConsumer(Consumer):
 
     def __init__(self):
         self._settings = WekanSettings()
diff --git a/app/wekan/models.py b/app/consumer/wekan/models.py
similarity index 100%
rename from app/wekan/models.py
rename to app/consumer/wekan/models.py
diff --git a/app/wekan/settings.py b/app/consumer/wekan/settings.py
similarity index 100%
rename from app/wekan/settings.py
rename to app/consumer/wekan/settings.py
diff --git a/app/wekan/sources.py b/app/consumer/wekan/sources.py
similarity index 100%
rename from app/wekan/sources.py
rename to app/consumer/wekan/sources.py
diff --git a/app/wekan/test_wekan.py b/app/consumer/wekan/test_wekan.py
similarity index 62%
rename from app/wekan/test_wekan.py
rename to app/consumer/wekan/test_wekan.py
index b8eb386..810338e 100644
--- a/app/wekan/test_wekan.py
+++ b/app/consumer/wekan/test_wekan.py
@@ -1,15 +1,17 @@
 import requests
-from app.wekan.models import User, UserBase
+from app.consumer.wekan.models import User, UserBase
+from app.consumer.wekan.settings import WekanSettings
 from .api import WekanApi
 import pytest
 
+@pytest.fixture()
+def settings() -> WekanSettings:
+    return WekanSettings(baseurl="http://localhost:3000", user="api", password="foobar123")
+
 @pytest.fixture
-def api() -> WekanApi:
-    try:
-        r = requests.post("http://localhost:3000/users/register", json={"username": "api", "password": "foobar123", "email": "foo@example.org"})
-        return WekanApi("http://localhost:3000", "api", "foobar123")
-    except:
-        pytest.skip("API not reachable? Did you start docker-compose?")
+def api(settings: WekanSettings) -> WekanApi:
+    r = requests.post("http://localhost:3000/users/register", json={"username": "api", "password": "foobar123", "email": "foo@example.org"})
+    return WekanApi(settings)
 
 
 def test_get_user(api: WekanApi):
diff --git a/app/event_controller.py b/app/event_controller.py
index f1dc924..c1f0565 100644
--- a/app/event_controller.py
+++ b/app/event_controller.py
@@ -4,10 +4,10 @@ from pydantic import BaseModel
 from fastapi import FastAPI, Depends
 from app.authentik.api import Authentik
 from app.authentik.models import User
-from app.sink import Sink
-from app.wekan.api import WekanApi
+from app.consumer.baseConsumer import Consumer
+from app.consumer.wekan.api import WekanApi
+from app.consumer.wekan.main import WekanConsumer
 from app.authentik.settings import AuthentikSettings
-from app.wekan.main import WekanSink
 
 logging = structlog.get_logger()
 
@@ -32,7 +32,7 @@ class EventController:
         # try:
         self._authentik = authentik_api
         self._sinks = []
-        for sc in Sink.__subclasses__():
+        for sc in Consumer.__subclasses__():
             obj = sc()
             self._sinks.append(obj)
 
@@ -42,7 +42,7 @@ class EventController:
         self.jobs = []
         pass
 
-    def register_api(self, authentik: Authentik, sinks: List[Sink]):
+    def register_api(self, authentik: Authentik, sinks: List[Consumer]):
         self._authentik = authentik
         self._sinks = sinks
 
diff --git a/app/main.py b/app/main.py
index 0000070..db3a671 100644
--- a/app/main.py
+++ b/app/main.py
@@ -3,12 +3,12 @@ from unicodedata import name
 from urllib.error import HTTPError
 from fastapi import Depends, FastAPI, Request, BackgroundTasks
 from pydantic import BaseModel
-from app.sink import BaseUser, Sink
+from app.consumer.baseConsumer import BaseUser, Consumer
 from app.authentik.api import Authentik
 from app.authentik.models import User
 from app.event_controller import Authentik_Hook_Model, EventController, Http_request
 from app.authentik.settings import AuthentikSettings
-from .wekan.api import WekanApi
+from .consumer.wekan.api import WekanApi
 from .routers import identityProvider
 import json
 
@@ -22,7 +22,14 @@ app.include_router(identityProvider.router)
 async def root():
     return {'message': 'Hello World'}
 
+@app.get("/consumer/")
+async def get_consumer():
+    l = []
+    for sc in Consumer.__subclasses__():
+        l.append(sc.__name__)
+    return l
 
+    
 ### for testing purposes
 @app.get("/authentik/create_hook/")
 async def hook(request: Request):
diff --git a/app/test_dependencies.py b/app/test_dependencies.py
new file mode 100644
index 0000000..e69de29
diff --git a/app/test_event_controller.py b/app/test_event_controller.py
index 9e13615..4209cee 100644
--- a/app/test_event_controller.py
+++ b/app/test_event_controller.py
@@ -3,19 +3,29 @@ from pytest_mock import MockerFixture
 from .event_controller import Authentik_Hook_Model, EventController
 import pytest
 
+@pytest.fixture()
+def mock_user():
+    return User(pk="5", username="asd", name="asd", email="asd@example.org")
 
-def test_handle_model_created_event(mocker: MockerFixture):
-    mock_user = User(pk="5", username="asd", name="asd", email="asd@example.org")
+
+def test_handle_model_created_event(mocker: MockerFixture, mock_user: User):
     wekan_mock = mocker.MagicMock()
     wekan_mock.get_user.return_value = None
+    nextcloud_mock = mocker.MagicMock()
+    wekan_mock.get_user.return_value = None
     authentik_mock = mocker.MagicMock()
     authentik_mock.get_user_by_pk.return_value = mock_user
+
     model = Authentik_Hook_Model(pk=mock_user.pk, app="authentik_core", name=mock_user.name, model_name="user")
+    
     ec = EventController(authentik_mock)
-    ec.register_api(authentik_mock, [wekan_mock])
+    ec.register_api(authentik_mock, [wekan_mock, nextcloud_mock])
     ec.handle_model_created_event(model)
     ec._authentik.get_user_by_pk.assert_called()
     ec._authentik.get_user_by_pk.assert_called_with("5")
 
     wekan_mock.create_user.assert_called()
     wekan_mock.create_user.assert_called_with(mock_user)
+    
+    nextcloud_mock.create_user.assert_called()
+    nextcloud_mock.create_user.assert_called_with(mock_user)
\ No newline at end of file
diff --git a/app/test_integration.py b/app/test_integration.py
index 691466e..60cd7f7 100644
--- a/app/test_integration.py
+++ b/app/test_integration.py
@@ -1,58 +1,61 @@
-from cmath import log
-from email.mime import base
 import logging
-from re import A
 from time import sleep
 import pytest
 
 import requests
-from app import event_controller
 
 from app.authentik.api import Authentik
 from app.authentik.models import User
 from app.authentik.settings import AuthentikSettings
-from app.wekan.models import User as WekanUser
-from app.wekan.api import WekanApi
+from app.consumer.wekan.models import User as WekanUser
+from app.consumer.wekan.api import WekanApi
 
 
 @pytest.fixture()
 def wekan_api():
     w = None
     try:
-        r = requests.post("http://localhost:3000/users/register", json={"username": "api", "password": "foobar123", "email": "foo@example.org"})
-        w = WekanApi("http://localhost:3000","api", "foobar123")
+        r = requests.post("http://localhost:3000/users/register", json={
+                          "username": "api", "password": "foobar123", "email": "foo@example.org"})
+        w = WekanApi("http://localhost:3000", "api", "foobar123")
     except Exception as e:
         logging.error(e)
     return w
 
-@pytest.fixture()
-def authentik_api():  
 
-    settings = AuthentikSettings(baseurl="http://localhost:9000/", token="foobar123")
+
+@pytest.fixture()
+def authentik_api(settings: AuthentikSettings):
     a = Authentik(settings)
     try:
-        r = a.create_web_hook(hook_endpoint="http://172.17.0.1:8000/authentik/hook/") # docker localhost
+        r = a.create_web_hook(
+            hook_endpoint="http://172.17.0.1:8000/authentik/hook/")  # docker localhost
     except Exception as e:
         logging.info(e)
     return a
 
 
-
+@pytest.mark.skip()
 def test_create_user(wekan_api: WekanApi, authentik_api: Authentik):
-    user = authentik_api.create_user(User(username="banane43", email="banane@example.org", name="Herr Banane"))
+    user = authentik_api.create_user(
+        User(username="banane43", email="banane@example.org", name="Herr Banane"))
     print(user)
     sleep(5)
     authentik_api.delete_user(user)
     # authentik username == wekan username
     # user must be created from authentik user and noch api to trigger the notiftication rule?
-    logging.error("authentik notifcation rule doesn't work with api?? , plz create user in authentik")
+    logging.error(
+        "authentik notifcation rule doesn't work with api?? , plz create user in authentik")
     assert False
 
+
 @pytest.mark.skip()
 def test_create_user_with_same_email(wekan_api, authentik_api):
-    logging.error("authentik notifcation rule doesn't work with api?? , create two user with identical email in authentik")
+    logging.error(
+        "authentik notifcation rule doesn't work with api?? , create two user with identical email in authentik")
     assert False
 
+
 @pytest.mark.skip()
 def test_user_already_exists_excepts():
-    assert False
\ No newline at end of file
+    assert False
diff --git a/app/test_main.py b/app/test_main.py
index 62cc91d..070cda8 100644
--- a/app/test_main.py
+++ b/app/test_main.py
@@ -1,7 +1,7 @@
 from fastapi.testclient import TestClient
 import pytest
 
-from app.wekan.api import WekanApi
+from app.consumer.wekan.api import WekanApi
 
 from .main import Authentik_Hook_Model, app
 
diff --git a/app/test_sink.py b/app/test_sink.py
deleted file mode 100644
index df2c550..0000000
--- a/app/test_sink.py
+++ /dev/null
@@ -1,28 +0,0 @@
-from .nextcloud.main import BaseUser, Sink
-from .wekan import main
-from .nextcloud import main
-from pytest_mock import MockerFixture
-import pytest
-
-# TODO how to import all sink from smth like a "addons" folder?
-
-@pytest.fixture
-def testUser():
-    return BaseUser(email="foo", id="asd", name="sd", username="sdfsfd")
-
-def test_get_subclasses():
-    l = []
-    for sc in Sink.__subclasses__():
-        l.append(sc.__name__)
-    assert "NextcloudSink" in l
-    assert "WekanSink" in l
-
-@pytest.mark.skip()
-def test_create_user(mocker: MockerFixture, testUser: BaseUser):
-    u = []
-    for sc in Sink.__subclasses__():
-        print(sc.__name__)
-        # app = sc()
-        # app.api = mocker.MagicMock()
-        # app.create_user(testUser)
-        # app.api.create_user.assert_called()
diff --git a/requirements.txt b/requirements.txt
index eee6fe5..6d1859d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,7 @@
 anyio==3.5.0
 asgiref==3.5.0
 attrs==21.4.0
+autopep8==1.6.0
 certifi==2021.10.8
 charset-normalizer==2.0.12
 click==8.1.2
@@ -11,6 +12,7 @@ iniconfig==1.1.1
 packaging==21.3
 pluggy==1.0.0
 py==1.11.0
+pycodestyle==2.8.0
 pydantic==1.9.0
 pyparsing==3.0.8
 pytest==7.1.2
@@ -20,6 +22,7 @@ requests==2.27.1
 sniffio==1.2.0
 starlette==0.17.1
 structlog==21.5.0
+toml==0.10.2
 tomli==2.0.1
 typing_extensions==4.2.0
 urllib3==1.26.9