Moved from 'website' to 'web'

app.py

@@ -1,11 +1,4 @@
-from website.app import create_app
+from web.app import create_app
 
 
-app = create_app(
+app = create_app()
-    {
-        "SECRET_KEY": "secret",
-        "OAUTH2_REFRESH_TOKEN_GENERATOR": True,
-        "SQLALCHEMY_TRACK_MODIFICATIONS": False,
-        "SQLALCHEMY_DATABASE_URI": "sqlite:///db.sqlite",
-    }
-)

config.sample.toml

@@ -3,7 +3,7 @@ NAME = MyDomain
 # LOGO = "https://path/to/your/organization/logo.png"
 
 # If unset, language is detected
-LANGUAGE = 'en'
+LANGUAGE = "en"
 
 [LDAP]
 URI = "ldaps://ldap.mydomain.tld"

requirements.txt

@@ -1,5 +1,5 @@
 authlib
 flask
-flask-babel
+flask - babel
-python-ldap
+python - ldap
 toml

web/app.py

@@ -12,8 +12,10 @@ from .routes import bp
 def create_app(config=None):
     app = Flask(__name__)
 
-    config = toml.load(os.environ.get("CONFIG", "config.toml"))
+    app.config.from_mapping(
-    app.config.from_mapping(config)
+        {"OAUTH2_REFRESH_TOKEN_GENERATOR": True,}
+    )
+    app.config.from_mapping(toml.load(os.environ.get("CONFIG", "config.toml")))
 
     app.url_map.strict_slashes = False
 
@@ -25,7 +27,9 @@ def setup_app(app):
     @app.before_request
     def before_request():
         g.ldap = ldap.initialize(app.config["LDAP"]["URI"])
-        g.ldap.simple_bind_s(app.config["LDAP"]["BIND_USER"], app.config["LDAP"]["BIND_PW"])
+        g.ldap.simple_bind_s(
+            app.config["LDAP"]["BIND_USER"], app.config["LDAP"]["BIND_PW"]
+        )
 
     @app.after_request
     def after_request(response):
@@ -47,17 +51,17 @@ def setup_app(app):
 
     @babel.localeselector
     def get_locale():
-        user = getattr(g, 'user', None)
+        user = getattr(g, "user", None)
         if user is not None:
             return user.locale
 
         if app.config.get("LANGUAGE"):
             return app.config.get("LANGUAGE")
 
-        return request.accept_languages.best_match(['fr', 'en'])
+        return request.accept_languages.best_match(["fr", "en"])
 
     @babel.timezoneselector
     def get_timezone():
-        user = getattr(g, 'user', None)
+        user = getattr(g, "user", None)
         if user is not None:
             return user.timezone

web/models.py

@@ -125,10 +125,15 @@ class LDAPObjectHelper:
         ]
 
     def __getattr__(self, name):
-        if (not self.may or name not in self.may) and (not self.must or name not in self.must):
+        if (not self.may or name not in self.may) and (
+            not self.must or name not in self.must
+        ):
             return super().__getattribute__(name)
 
-        if not self.attr_type_by_name() or not self.attr_type_by_name()[name].single_value:
+        if (
+            not self.attr_type_by_name()
+            or not self.attr_type_by_name()[name].single_value
+        ):
             return self.attrs.get(name, [])
 
         return self.attrs.get(name, [None])[0]