From 3fe6318bb71bd50910b07a53d89c3dd71322dc90 Mon Sep 17 00:00:00 2001
From: Luca Lutz <info@lucalutz.org>
Date: Thu, 3 Nov 2022 21:21:23 +0100
Subject: [PATCH] FIx ENV Variables

---
 README.md                      |  1 +
 fab_access/config.py           | 17 ++++++++++++-----
 fab_access/keycloak_handler.py |  2 +-
 fab_access/mqtt_client.py      |  5 +++--
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index a0879dc..ad8cb98 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,7 @@ DB_USERNAME=postgres
 DB_PASSWORD=postgres
 DB_DATABASE=fab_access
 
+MQTT_PORT=1883
 MQTT_USERNAME=user
 MQTT_PASSWORD=password
 MQTT_BROKER=mqtt
diff --git a/fab_access/config.py b/fab_access/config.py
index e5ab1c0..0910ad8 100644
--- a/fab_access/config.py
+++ b/fab_access/config.py
@@ -1,11 +1,18 @@
 import os
 
 class Config:
-    broker = 'mosquitto'
-    port = 1883
-    client_id = f'FabMan'
+    mqtt_broker = os.getenv('MQTT_BROKER')
+    mqtt_port = os.getenv('MQTT_PORT')
+    mqtt_client_id = os.getenv('MQTT_CLIENT')
+    mqtt_user_name = os.getenv('MQTT_USERNAME')
+    mqtt_password = os.getenv('MQTT_PASSWORD')
 
-    keycloak_url = 'http://keycloak:8080/auth/'
-    keycloak_username = os.getenv('KEYCLOAK_USER_NAME')
+    keycloak_url = os.getenv('KEYCLOAK_URL')
+    keycloak_user_name = os.getenv('KEYCLOAK_USER_NAME')
     keycloak_password = os.getenv('KEYCLOAK_USER_PW')
     keycloak_realm = os.getenv('KEYCLOAK_REALM')
+
+    db_host_name = os.getenv('DB_HOSTNAME')
+    db_user_name = os.getenv('DB_USERNAME')
+    db_password = os.getenv('DB_PASSWORD')
+    db_database = os.getenv('DB_DATABASE')
\ No newline at end of file
diff --git a/fab_access/keycloak_handler.py b/fab_access/keycloak_handler.py
index 02cb661..2428bd7 100644
--- a/fab_access/keycloak_handler.py
+++ b/fab_access/keycloak_handler.py
@@ -9,7 +9,7 @@ class KeycloakHandler:
     def login():
         KeycloakHandler.admin = KeycloakAdmin(
             server_url=Config.keycloak_url,
-            username=Config.keycloak_username,
+            username=Config.keycloak_user_name,
             password=Config.keycloak_password,
             realm_name=Config.keycloak_realm,
             verify=True
diff --git a/fab_access/mqtt_client.py b/fab_access/mqtt_client.py
index 4003232..a287e8d 100644
--- a/fab_access/mqtt_client.py
+++ b/fab_access/mqtt_client.py
@@ -16,10 +16,11 @@ class MqttHandler:
             else:
                 print('Failed to connect, return code %d\n', rc)
 
-        MqttHandler.client = mqtt_client.Client(Config.client_id)
+        MqttHandler.client = mqtt_client.Client(Config.mqtt_client_id)
         MqttHandler.client.username_pw_set('admin', 'user')
         MqttHandler.client.on_connect = on_connect
-        MqttHandler.client.connect(Config.broker, Config.port)
+        MqttHandler.client.username_pw_set(Config.mqtt_user_name, Config.mqtt_password)
+        MqttHandler.client.connect(Config.mqtt_broker, Config.mqtt_port)
 
     @staticmethod
     def publish(topic, msg):