Revize 0cf35f70

Re #8579 - Added FlaskInjector dependency and used it the REST API controller

app.py

@@ -2 +2 @@
 
 from flask import Flask, redirect
 from injector import Injector
+from flask_injector import FlaskInjector
 
 from src.config import configuration
 from src.config.connection_provider import ConnectionProvider
@@ -19 +20 @@
 
 
 app = X509ManagementApp(__name__)
-certificate_controller: CertController = None
 
 
 @app.route('/')
@@ -28 +28 @@
 
 
 @app.route('/api/certificates', methods=["POST"])
-def create_certificate():
+def create_certificate(certificate_controller: CertController):
     return certificate_controller.create_certificate()
 
 
 @app.route('/api/certificates', methods=["GET"])
-def get_cert_list():
+def get_cert_list(certificate_controller: CertController):
     return certificate_controller.get_certificate_list()
 
 
 @app.route('/api/certificates/<id>', methods=["GET"])
-def get_cert(id):
+def get_cert(id, certificate_controller: CertController):
     return certificate_controller.get_certificate_by_id(id)
 
 
 @app.route('/api/certificates/<id>/details', methods=["GET"])
-def get_cert_details(id):
+def get_cert_details(id, certificate_controller: CertController):
     return certificate_controller.get_certificate_details_by_id(id)
 
 
 @app.route('/api/certificates/<id>/root', methods=["GET"])
-def get_cert_root(id):
+def get_cert_root(id, certificate_controller: CertController):
     return certificate_controller.get_certificate_root_by_id(id)
 
 
 @app.route('/api/certificates/<id>/chain', methods=["GET"])
-def get_cert_chain(id):
+def get_cert_chain(id, certificate_controller: CertController):
+    print("Get cert chain via flask injector")
     return certificate_controller.get_certificate_trust_chain_by_id(id)
 
 
@@ -64 +65 @@
         -   check whether OpenSSL is on the system
     :return: boolean flag indicating whether initialization was successfull or not
     """
-    global certificate_controller
 
-    injector = Injector([configuration.configure_env_variable, ConnectionProvider])
-    certificate_controller = injector.get(CertController)
+    modules = [configuration.configure_env_variable, ConnectionProvider]
+    injector = Injector(modules)
+    FlaskInjector(app=app, modules=modules)
 
     # There's a little dependency on the CryptoService, which is not a pretty thing from
     # architectural point of view. However it is only a minimal piece of code and

requirements.txt

@@ -1 +1 @@
 Flask==1.1.2
 pytest~=6.2.3
-injector==0.18.4
+injector==0.18.4
+Flask-Injector==0.12.3