Merge branch 'main' of https://github.com/Krios01/dhbw_semester-05_sbd

.gitignore

@@ -2,14 +2,8 @@ __pycache__
 
 .venv
 
-# DB Passwords
-db_password.txt
-db_root_password.txt
-
-# provider portal
-provider_portal/db_data
+provider_portal/db_data/mysql
+provider_portal/db_data/influx/db
+provider_portal/db_data/influx/config/influx-configs
 provider_portal/provider_portal.log
-provider_portal/config/.DS_Store
-provider_portal/config/certificates/.DS_Store
-smart_meter/config/certificates/.DS_Store
-provider_portal/config/certificates/root_ca/ca-private-key.pem
+

admin_cli/config/certificates/root_ca/ca-public-key.pem

@@ -1,20 +1,20 @@
 -----BEGIN CERTIFICATE-----
-MIIDPzCCAiegAwIBAgIUI2J0uBvro8SeX9dpLsvQKegnn6EwDQYJKoZIhvcNAQEL
-BQAwTzELMAkGA1UEBhMCREUxDzANBgNVBAgMBkJlcmxpbjEPMA0GA1UEBwwGQmVy
-bGluMQ8wDQYDVQQKDAZUcnVzdHkxDTALBgNVBAMMBE1haW4wHhcNMjMxMTA0MjA1
-MjEzWhcNMjMxMjA0MjA1MjEzWjBPMQswCQYDVQQGEwJERTEPMA0GA1UECAwGQmVy
-bGluMQ8wDQYDVQQHDAZCZXJsaW4xDzANBgNVBAoMBlRydXN0eTENMAsGA1UEAwwE
-TWFpbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOcZn7l0GHsaKcK2
-RyuS34LTqb8OHmOkktD6YL0Uz2c1jItmP+mzrvhMKfAsUMsivO+rDPVFoZ87gA1j
-zE1heAGAELXKcMWt2MR4lu7bSJRu76IojhdUtM/3S0Nz0fjV93AeizY08g+7/d7P
-FLHAPnnSqe8yfu8Mx7PVcFNyz38AW1g5aNDbghKxBfcmhu+phO8DCCO05+3SWVA1
-2+HHGl4uyTEkIPa0aG175E5/CFdpRATInfRIDNLv4VTVDctIUiTZc72EGap8Cj+I
-uf79vsOoyaxZxbe884R/vLxLbtBfELmKWyKqwvhpgbTJi0dG9kHlkr4oXMEW0xLs
-08fvxwMCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOC
-AQEAGkShC/XPLJ17JvqOEVY7m0uKq3Ho0FiC38PdFrajPf6ZUb3YQDqoIZY5dORQ
-Syqh8+QnQoxQoyeaCNeNDsLZFhBBWMBTOhp6FWwx59nB/mP8wfDmX2n6cTCc70w0
-txoWvUbCXEaioB2mKPcF74A8Tb+2xXmA6jcQJaPI/WxCtdgm4tNoO57tLqprdVWM
-3rQKHvmCuxs0eftEpQfXrkzP/DlXC9yArcCFAUxmZtO6Z4nC4+tVemMptP4amR4D
-fygG5fIHFsWqRF7Yn5QpFM+NM1uxh4nSkhDefhu5N/MtD0q//OyBIbhYzi7/vdw2
-MwW0MOBWyAR19RCvJF560pTvpw==
+MIIDUzCCAjugAwIBAgIUBpxtzEqdW7TCJBEM4R9Iwtr08cwwDQYJKoZIhvcNAQEL
+BQAwOTELMAkGA1UEBhMCRGUxEzARBgNVBAgMClNvbWUtU3RhdGUxFTATBgNVBAoM
+DFRydXN0ZWQgSW5jLjAeFw0yMzEyMDcxNzExNTJaFw0yNDEyMDYxNzExNTJaMDkx
+CzAJBgNVBAYTAkRlMRMwEQYDVQQIDApTb21lLVN0YXRlMRUwEwYDVQQKDAxUcnVz
+dGVkIEluYy4wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3r1rZQnB1
+OOBjiVwgL76Gk7KDJA/Cn84B9eGLAuJI7tfG9gMXJU+9JqN8nc1yW1UzC6mKtwVM
+l0Du2eS4PH45PtrHkl80c9D4x5S+w+NhPlqFF3i8qnWhTYesjb4YThKjGjqSaWRe
+27r57j4iBYtPcbqhbdfY8I1C+mCUg1BZiMTD/475dw0VSAg7fC9SzMxVJ1yBz26u
+THBCyQ6xLSmUbDPuz9riz5oNBoYzNSBaujHBpEtPyLbQCy1B7QRnj4VCD2dqo2gZ
+Fmb44YG6gRRnh8XaA7DtqO51SDLzwvDpF3J+Nkt+QovJS3OVEKdCyMvGoD6gecOj
+so3qjpG5aw/PAgMBAAGjUzBRMB0GA1UdDgQWBBRul5FcVlOrExafpMQehnbgE6ij
+/jAfBgNVHSMEGDAWgBRul5FcVlOrExafpMQehnbgE6ij/jAPBgNVHRMBAf8EBTAD
+AQH/MA0GCSqGSIb3DQEBCwUAA4IBAQAawrPdL8P1zGLmqrFTIFKa2KzOCcBEPT7p
+m2x2mwjiWfqA01jqmnAwit+dgYxB2D0kNoFsBgZYZfMpIa/4gbWCjyar9w51x8MZ
+Yqkx0cA5Tbie1oGVldxup8nA/5sHeQzOksOT5KmeB+Cr58tegg2h3GgbdKtBEEe9
+EBvkGbI8giPu+/RQu1OO+fBL+O2OUVe8Wy2THbdr7chWtUJZe5LJlsV2EZfaGz6V
+asz/un0eHDUQCYtTlSZYo9z2trZlWUEjV2aX3x1XxYo+6rzZ7rXxnPhK1cwBwgQy
+X7mQEbIwvrD4g5wOleXErTpHFTsuEEMpfLgw2GHzl3rDbHfojaSg
 -----END CERTIFICATE-----

compose.yml

@@ -3,6 +3,8 @@ services:
   provider_portal:
     build: ./provider_portal
     container_name: provider_portal
+    ports:
+      - 8100:8100
     volumes:
       - ./provider_portal:/app/provider_portal
       - ./smart_meter/config/certificates/smartmeter_certificates:/app/smart_meter/config/certificates/smartmeter_certificates
@@ -29,6 +31,8 @@ services:
     security_opt:
       - no-new-privileges:true
     restart: unless-stopped
+    ports:
+      - 8086:8086
     environment:
       DOCKER_INFLUXDB_INIT_MODE: "setup"
       DOCKER_INFLUXDB_INIT_USERNAME: "admin"

provider_portal/app/api/customer_api/customer_api.py

@@ -102,22 +102,27 @@ def get_meter_measurements(self, start_time, end_time, data_interval, meter_UID)
         Raises:
             ValueError: If the specified time range is in the future or exceeds the maximum data points allowed.
         """
-        # Check if end_time is in the future
-        current_time = datetime.now(timezone(timedelta(hours=1)))
-        if datetime.fromisoformat(end_time.replace(" ", "+")) > current_time:
-            raise ValueError("error_no_data")
-
-        # Check the number of data points based on the specified time range and data interval
-        time_diff = datetime.fromisoformat(end_time.replace(" ", "+")) - datetime.fromisoformat(
-            start_time.replace(" ", "+"))
-        num_data_points = int(time_diff.total_seconds() / int(data_interval))
-
-        if num_data_points > 3600:
-            raise ValueError("error_over_maximum")
-
-        converted_start_time = start_time.replace(" ", "+")
-        converted_end_time = end_time.replace(" ", "+")
-        converted_data_interval = data_interval + "s"
+        try:
+            # Check if end_time is in the future
+            current_time = datetime.now(timezone(timedelta(hours=1)))
+            if datetime.fromisoformat(end_time.replace(" ", "+")) > current_time:
+                raise ValueError("error_no_data")
+
+            # Check the number of data points based on the specified time range and data interval
+            time_diff = datetime.fromisoformat(end_time.replace(" ", "+")) - datetime.fromisoformat(
+                start_time.replace(" ", "+"))
+            num_data_points = int(time_diff.total_seconds() / int(data_interval))
+
+            if num_data_points > 3600:
+                raise ValueError("error_over_maximum")
+
+            converted_start_time = start_time.replace(" ", "+")
+            converted_end_time = end_time.replace(" ", "+")
+            converted_data_interval = data_interval + "s"
+        except Exception as err:
+            logger.error(f"An exception occurred while decoding time format")
+            raise ValueError("error_decoding")
+
 
         influxdb = InfluxDB()
         reading = influxdb.read(start_time=converted_start_time, end_time=converted_end_time,

provider_portal/app/api/customer_api/response.py

@@ -5,7 +5,7 @@ class Response:
     # Define messages and their corresponding HTTP status codes
     MESSAGES = {
         "success_create_meter": ("Smart Meter wurde erfolgreich angelegt.", 201),
-        "success_delete_meter": ("Smart Meter wurde erfolgreich gelöscht.", 200),
+        "success_delete_meter": ("Smart Meter wurde erfolgreich geloescht.", 200),
 
         "error_create_meter": ("Smart Meter konnte nicht angelegt werden. Die Kombination von Meter UID und Customer UID existiert bereits.", 409),
         "error_meter_customer_combination": ("Die Kombination von Meter UID und Customer UID existiert nicht.", 404),

provider_portal/app/api/customer_api/routes.py

@@ -52,6 +52,8 @@ def create_meter():
     try:
         # Extract API key from headers
         api_key = request.headers['Authorization']
+        if "Bearer " in api_key:
+            api_key = api_key.replace("Bearer ", "")
 
         # Extract data from the request body
         data = json.loads(request.data)
@@ -100,6 +102,8 @@ def meter_measurements():
     try:
         # Extract API key from headers
         api_key = request.headers['Authorization']
+        if "Bearer " in api_key:
+            api_key = api_key.replace("Bearer ", "")
 
         # Extract data from the request query parameters
         customer_UID = request.args.get('customerUID')
@@ -113,9 +117,10 @@ def meter_measurements():
             api = CustomerAPI(customer_UID=customer_UID, api_key=api_key)
             auth_status = api.authenticate_customer_portal()
         else:
+            logger.error(f"An error while authenticating has occurred")
             raise ValueError("error_decoding")
     except Exception as err:
-        logger.error(f"An error has occurred within the get measurements: {err}")
+        logger.error(f"An error has occurred within the get measurements, while validation: {err}")
         res = {"message": "error_decoding"}
         return Response(dict=res).create_response()
 
@@ -152,6 +157,8 @@ def delete_meter():
     try:
         # Extract API key from headers
         api_key = request.headers['Authorization']
+        if "Bearer " in api_key:
+            api_key = api_key.replace("Bearer ", "")
 
         # Extract data from the request body
         data = json.loads(request.data)

provider_portal/config/certificates/root_ca/ca-private-key.pem

@@ -1,27 +1,28 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEAsq2n0SfZdIUbUsYue6xgRQaxtfsIxoAqbrCMGuL1GMqDBswQ
-a/WtIRkPX+Mf2LLFv08I0vPJjUU/WvkgsT5SMzkn9t7RdeHZaMdZvJCp3m8hWAGd
-MYkiuLNo9iVrAGkfsmHDiA1iaFwtMvuyhHFzQ9FdnVTwF6QDODPS65Jlvbeu0Rm2
-rde1zIhOYUcfPX++4M6EhkB/HW3NQD5Tq76kbAiKdSq5LCbT0QU45Cw3xr1KZDZy
-7iYeYjuAZHwoZbPMAaMfw813y/bwaY6lJeOxD5VpIfwKTh9TQLiZVSEiHVCBeXjR
-H4Nb3B3jFDdWN9VabDRmWLuAD4PeIkH/wfId3QIDAQABAoIBAAp+ERtCrE3f3SVk
-tukTS8nx5TCrD65ca2F5o5iWmE7+4WfeRt6YHDUT3CfE1iNrCBq+YOXGZCEUHm7Q
-r19JKhmQ8yxXlFRIUXSKNFZS5m7F9t7MpXb5txzCiFjgBKMPCUn33LwaERvQweS7
-DBYj9WFXo5gwGzNAMeI0hN/Jhoj37Z4d5K+Mjs9Q2XNTg6Y+lqHBphBpCS9ziNn4
-eQWHg+FpmHH7ZNO56tAtnak26pgIInWcwf8zlGYUDYcNN0jiMedDFuxN7TbRi3d8
-e+pZ+6BesbUZFgT8c8C0F8eeyNXxFUSH1xVJNCp8pm9BxkCwK1wafecwl2OSPn44
-jCrPTRECgYEAwKh5MpGU2jaEI563Ge3yxR9SEa5DK6JsX6DlwjyWqEZVFao/nkXs
-8+ypzS9JgZvnVrNsMn88yFipkPbZdGJ2qCtrAxfzCHh77C5qeBCdAhf+wuggcq7T
-SFHiTPG4PaXSx4+KhemEa/h+Ap0qbKHW7jbBfm6AS1kE88ldPXs6WukCgYEA7WyK
-6Q61UFYDlXqOwizpWJbtpLIzKs4B1ye49IxKDIQPdkjAJW9F6XbndG6RxSvAd3t+
-WIQXwo2lyMYGD5HsoeTam0xO4Dn8gsg7duW4swBZA5ELlAaA+e1IvwU2xeLTWyY5
-OGkp2GUmauXspl7au1lHiOnEGP8ozT9QbZLAatUCgYEAngpWCZ6VDgCEmze6mkGw
-0fWkfC6ImYXPAw9ZCuJq8DVp3LDhKTPRcjOlA1WUJgc/WccrrazkrrDUwL9OmQOg
-tMmRKmN+EWfMuG1HF6EBO1N1wGttGsbBOWU6j8YGTkP2SZA9oSZzY6Lfs8M7pwuH
-5bfzOITrJ2QqBNYdb67jqukCgYEAyR/CyMzR4X0LyiupFWpwPcCVDYh7ec5LltSq
-hFb3P4T7iCr2wn9xjOVSCrrDt3BpuY2eqSM08XWGs/60Eap+92HjodzRkHbupmcy
-oHTXsqMfxLqxQTMFPTK6Bj9Hd/i/LJ7DqDrF3O9KzRF7GDCQQFbQF3ZXzQkRqlTx
-L/E6GQUCgYBcDekCLpEGbl7vBnt4jJo1+oSMM3NFa9yRsbTjagUuAzyrPDeBEURO
-9y4Sc5n5f1McRS1Wg+pyULcN6I0aQjvo+JZ3KCuMoWplMkzyHVebGBgN8iudsik4
-meFpKiwCtO7kz7gNMcXaSFA/DfMeoitarPgsy4AExcWfcfiEjYw4ww==
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC3r1rZQnB1OOBj
+iVwgL76Gk7KDJA/Cn84B9eGLAuJI7tfG9gMXJU+9JqN8nc1yW1UzC6mKtwVMl0Du
+2eS4PH45PtrHkl80c9D4x5S+w+NhPlqFF3i8qnWhTYesjb4YThKjGjqSaWRe27r5
+7j4iBYtPcbqhbdfY8I1C+mCUg1BZiMTD/475dw0VSAg7fC9SzMxVJ1yBz26uTHBC
+yQ6xLSmUbDPuz9riz5oNBoYzNSBaujHBpEtPyLbQCy1B7QRnj4VCD2dqo2gZFmb4
+4YG6gRRnh8XaA7DtqO51SDLzwvDpF3J+Nkt+QovJS3OVEKdCyMvGoD6gecOjso3q
+jpG5aw/PAgMBAAECggEARwPfKlcC9ncOXb055mG/FfWdUxFKnJK/CUgAMofjZ5Ib
+z1rGmBi/SuBY3bF+wAMqnekY273lqRZjLtUEFeyhWk2ANR9Ueol6VeyHh/dg/fQm
++AS6k6qNftbkKOTGBUyN7QwTcA6aFQh7sewXjny5PvY30viONlvOKYJ2e4SHOI28
+f8J9KKje4NzW4huscCRCcbpkMXlaItdRpA2XpX3g6DetjV44nqrL2dcciyubEtVH
+7xy+rwtUHR7Y27OazRqlacvB8OZmUBPoxPSCcebm59KfohyU736dzNCOjVn97HAA
+AlipJKU8yJkNzXhQxVp9CNxER8OdyKYrkGTJiHLYzQKBgQC+ptaTcg3bOqdTsNek
+cCLHieYeTW3jleuzay3iHSSGutYNCY8fk7yIz+nA3SAjTUXEmCARb7JNYuiAem6X
+IlsQaXGhqqS0nu4cM4h2hj0dQaEyqodVHzfh95ZMwHGMZ+gJaj+z3h0mrIwVnngO
+BD6VPGMs3a/kTWwy1h6ojVYIhQKBgQD2pTSIIlwE7lkIaX9PbsDtgqWgzAKnfUxU
+HVgJ6sCwfSSMo2j0SMK1Sh24xQNR41gt2VpMVjVod4wv4hOpfFXzHx4UrDQd3kq8
+nqDFLpqdqH6W0LtmScK1SuU8qbdvqi5rvJ2rrE6VQKhJT67zTRD1+sEXeq4h6sSW
+iKkOut4RQwKBgCkvBxkwwReDcxPcFqkZ5Blwi3ouRbes8g5+75lxrCtCfuywDO/I
+TSjMqPUVj1Sw44pVRlAd7clTvV/LksopDLzd2kMPBqdR0aPb6fWYh+ki/Txho/xa
+UwsIHbqUs7Kd23z1K6+iIm/xRA2DfvGgLxizw8S0WsOZie7tXBAS/+u1AoGBAPUG
+7KgtkkMn0nVj8SElgy6xcv/KjPx9ot2RhUvc1m6+9Bdvo63DtwNJTTupJYItnAV4
+f5eEsWxGD5PmQehHaE+uY0DgTqo5kv/NiyQ5B0uG/7OuS+3zayaV8CSS6nRZmeJY
+MD9DX5Iw+L5UFhcJQcdMxJUhwGpbg8+UlnbWuBRnAoGBAIEIbGg91hDmO/QbUn30
+xJwRSv6VQp5MtZHegrZnT++USLg3cdzRKJxP2WFrWj/Wn6aOmSFj3MYclFCdta8t
+2rXLsxWZ/UAxUJvZwh2mwzGGYyiN0bp2FSeWKyGRz1wZug8NNja4PaGAXOBOGwRR
+v6rgo8oGOM/dmckwICrjYbji
+-----END PRIVATE KEY-----

provider_portal/config/certificates/root_ca/ca-public-key.pem

@@ -1,20 +1,20 @@
 -----BEGIN CERTIFICATE-----
-MIIDPzCCAiegAwIBAgIUPOtMpGmLZPaTOF+bI565c8FeV+4wDQYJKoZIhvcNAQEL
-BQAwTzELMAkGA1UEBhMCREUxDzANBgNVBAgMBkJlcmxpbjEPMA0GA1UEBwwGQmVy
-bGluMQ8wDQYDVQQKDAZUcnVzdHkxDTALBgNVBAMMBE1haW4wHhcNMjMxMTA0MjAz
-ODIwWhcNMjMxMjA0MjAzODIwWjBPMQswCQYDVQQGEwJERTEPMA0GA1UECAwGQmVy
-bGluMQ8wDQYDVQQHDAZCZXJsaW4xDzANBgNVBAoMBlRydXN0eTENMAsGA1UEAwwE
-TWFpbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALKtp9En2XSFG1LG
-LnusYEUGsbX7CMaAKm6wjBri9RjKgwbMEGv1rSEZD1/jH9iyxb9PCNLzyY1FP1r5
-ILE+UjM5J/be0XXh2WjHWbyQqd5vIVgBnTGJIrizaPYlawBpH7Jhw4gNYmhcLTL7
-soRxc0PRXZ1U8BekAzgz0uuSZb23rtEZtq3XtcyITmFHHz1/vuDOhIZAfx1tzUA+
-U6u+pGwIinUquSwm09EFOOQsN8a9SmQ2cu4mHmI7gGR8KGWzzAGjH8PNd8v28GmO
-pSXjsQ+VaSH8Ck4fU0C4mVUhIh1QgXl40R+DW9wd4xQ3VjfVWmw0Zli7gA+D3iJB
-/8HyHd0CAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOC
-AQEAdkJ9hLdkdFv1K8Hk7zkQxl78MxuI2XB1rUTfn3QLFWMvSXbrBYudxNk6wTIb
-Jnmrm1LwBfhIv3GAtu5GnvheXpydozieelFRLe6tPwbM5P90GUe0xqEfbX0RWsRH
-AAhNXUvKI7A0/rf8/y2G6goxXjYk7tse7LEjFYhlL930pFSUsHrkBxEIux03eNDi
-sjIjtQeL8sOq1BoLZB0Q5Cg9AzTWpS/+9lsJSQBQURpo27IsX9b7abUtQcXVC9hl
-N/DQek9Z81rkphzKVWjIeSOqDpqV9toT+Zj5hzV3tP0K5D43lXLs6MkqwPlKSL5L
-ekB2YF2RQM5GvsUdBdjEVsvS3Q==
+MIIDUzCCAjugAwIBAgIUBpxtzEqdW7TCJBEM4R9Iwtr08cwwDQYJKoZIhvcNAQEL
+BQAwOTELMAkGA1UEBhMCRGUxEzARBgNVBAgMClNvbWUtU3RhdGUxFTATBgNVBAoM
+DFRydXN0ZWQgSW5jLjAeFw0yMzEyMDcxNzExNTJaFw0yNDEyMDYxNzExNTJaMDkx
+CzAJBgNVBAYTAkRlMRMwEQYDVQQIDApTb21lLVN0YXRlMRUwEwYDVQQKDAxUcnVz
+dGVkIEluYy4wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3r1rZQnB1
+OOBjiVwgL76Gk7KDJA/Cn84B9eGLAuJI7tfG9gMXJU+9JqN8nc1yW1UzC6mKtwVM
+l0Du2eS4PH45PtrHkl80c9D4x5S+w+NhPlqFF3i8qnWhTYesjb4YThKjGjqSaWRe
+27r57j4iBYtPcbqhbdfY8I1C+mCUg1BZiMTD/475dw0VSAg7fC9SzMxVJ1yBz26u
+THBCyQ6xLSmUbDPuz9riz5oNBoYzNSBaujHBpEtPyLbQCy1B7QRnj4VCD2dqo2gZ
+Fmb44YG6gRRnh8XaA7DtqO51SDLzwvDpF3J+Nkt+QovJS3OVEKdCyMvGoD6gecOj
+so3qjpG5aw/PAgMBAAGjUzBRMB0GA1UdDgQWBBRul5FcVlOrExafpMQehnbgE6ij
+/jAfBgNVHSMEGDAWgBRul5FcVlOrExafpMQehnbgE6ij/jAPBgNVHRMBAf8EBTAD
+AQH/MA0GCSqGSIb3DQEBCwUAA4IBAQAawrPdL8P1zGLmqrFTIFKa2KzOCcBEPT7p
+m2x2mwjiWfqA01jqmnAwit+dgYxB2D0kNoFsBgZYZfMpIa/4gbWCjyar9w51x8MZ
+Yqkx0cA5Tbie1oGVldxup8nA/5sHeQzOksOT5KmeB+Cr58tegg2h3GgbdKtBEEe9
+EBvkGbI8giPu+/RQu1OO+fBL+O2OUVe8Wy2THbdr7chWtUJZe5LJlsV2EZfaGz6V
+asz/un0eHDUQCYtTlSZYo9z2trZlWUEjV2aX3x1XxYo+6rzZ7rXxnPhK1cwBwgQy
+X7mQEbIwvrD4g5wOleXErTpHFTsuEEMpfLgw2GHzl3rDbHfojaSg
 -----END CERTIFICATE-----

provider_portal/config/certificates/server_certificates/server-private-key.pem

@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEAxqR3Z7Fu31/S5QQlJm2QKMDRZmK6+4RJpeSNA3D/dKk6WU/I
-WYPRL5xThMSbWmjm0IdwncsczyUVbVCwoD0QedZKQt7fsQPpth+mnTYdbISRD2CY
-j1DMhvxJHSmgNk5UoZLRbfrYOzGXeTjWP/Y57HPu6fRWkEPHbvZbXFMDUtfTbBVo
-Xzv3LflKO0wlWKI+Djwxs9rDrcRMPfijkO+9FDTyt44fZcpLd0B6FJiOaYAjtuk9
-nKVCAcaQet7q1z+lb0wsmOp/kZIy75fdhQKl6UFxMQORsKSAt3EIwdk9+vQNTWNW
-sFJzO0NhHJj824rhyuCMGKvmP49cHnGIjcS+gQIDAQABAoIBAC9bNjw6SLxoE9cV
-TeYDaMLOdR17nCgqOYSbICMZ5Uziq05vfswYaN543lBgrsi3CY/dOjPkIFIh/SG6
-guEwraTeOYYHrDx/OlB46ze/lvQwBoUr+jLwiFIGA0g4jEFmGzcJ0XPuwW4bPIlh
-y3IkOVrtqJ+N6LUr83e4s78m6zvsXKsNexC+Vdv3zlhBL2eFRQht85krGb6BVUzl
-LVd6mbKGMDNp8m4EUgTkpz0ysQIxOCuEQNAxxQKZNI4Nou9+JSXnozMxqrvvbis6
-W+wkx/9HCs0SCMZpP5XVFKwDlb03MvYUTNIx2VxUzEWH+UB/B7Sdc7DKoEPuMzq+
-KktUMqECgYEA3qNZKqRyc2bSF6D5rtJzj193plkqWBQ5HX0cJR9aSLV8asC59m9M
-nPzmHktJDcmG57BX2nt48M7VA4DTwc+4QdrS86DNE3WxXsW17uSeX9Af9zWGdgoo
-5fEQnwFSeA4xd82GuI3VfSJDWaNPCZ99+wZR06iEmnTNpV8dC4ZCZfMCgYEA5Gie
-QSq09UF9R5Me0ql/Wm+JwRyUDylrZhkrPJCmm1kWE+6JFhZ+useUwLAciqNYXDGe
-8toV0TFmW3DEOsW1dAedYfNyhwUI56aplNxqPFTrTmV0GUiYmy7m/drekXrFM+Og
-RfE5Q/09whgWt7dkdbd+/F3Ub5nB/WJfBfveIrsCgYEAmRXKrvaKN+2gUlz+sgXF
-LfVf6ULwScYGC8/F9YScaNhZp3HDrL6U+HEwre3oWpGSsGbh0boKy9H8SD9h26c/
-tBCJ8rlDqbjIcDkUQyJx/8G06R+lyC5uNsXOPvcCxMhFnXH1y5rDDBruIomXRC+l
-yWBsDVSXcTkVWjuPVihIKZ8CgYEAoPv3pniiSEYbNYpE7DeY0jXRArHQzQrlbnWI
-2swdEVrty6iRKGc8dQrcFh9KTpCoY3p5zDLXs7S8rvBA7ieRJ7GCRJpgezeaOiNm
-XMwpeFJl8sBg3r0jCiU5m2xa+HBuc48Y1JMbSIdBsv5lbKEuhiWJs/eyFeJqLtvZ
-m48U1qcCgYAxKoKi9INYI4HKVsYI/6J4F2Ks4k7yjAR2049sDp4ftuPpiQ21+ckh
-U2Q0OTzsa5uBIfRYPFARU03EDJSDbDW3ijMdzW5zBatrlgpG7N8YN9mP1/wRDNhX
-GviuAbDFW9m/mTCCp1d5V228pkVlsHy7xm2wp4CAkdgj0Rh/fgXKwg==
+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
 -----END RSA PRIVATE KEY-----

provider_portal/config/certificates/server_certificates/server-public-key.pem

@@ -1,20 +1,21 @@
 -----BEGIN CERTIFICATE-----
-MIIDQTCCAimgAwIBAgIUCcgu/1ZotBvZY+wp6A7BlBwpcRcwDQYJKoZIhvcNAQEL
-BQAwTzELMAkGA1UEBhMCREUxDzANBgNVBAgMBkJlcmxpbjEPMA0GA1UEBwwGQmVy
-bGluMQ8wDQYDVQQKDAZUcnVzdHkxDTALBgNVBAMMBE1haW4wHhcNMjMxMTA1MTUx
-MDEwWhcNMjgxMDA5MTUxMDEwWjBRMQswCQYDVQQGEwJERTEPMA0GA1UECAwGQmVy
-bGluMQ8wDQYDVQQHDAZCZXJsaW4xDzANBgNVBAoMBlRydXN0eTEPMA0GA1UEAwwG
-U2VydmVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxqR3Z7Fu31/S
-5QQlJm2QKMDRZmK6+4RJpeSNA3D/dKk6WU/IWYPRL5xThMSbWmjm0IdwncsczyUV
-bVCwoD0QedZKQt7fsQPpth+mnTYdbISRD2CYj1DMhvxJHSmgNk5UoZLRbfrYOzGX
-eTjWP/Y57HPu6fRWkEPHbvZbXFMDUtfTbBVoXzv3LflKO0wlWKI+Djwxs9rDrcRM
-PfijkO+9FDTyt44fZcpLd0B6FJiOaYAjtuk9nKVCAcaQet7q1z+lb0wsmOp/kZIy
-75fdhQKl6UFxMQORsKSAt3EIwdk9+vQNTWNWsFJzO0NhHJj824rhyuCMGKvmP49c
-HnGIjcS+gQIDAQABoxMwETAPBgNVHREECDAGhwQKAAEKMA0GCSqGSIb3DQEBCwUA
-A4IBAQCkzBDjap0V585dwja2KV2SUcWM15VgpBkjxOi9MFOb1+1KJNolDTzh+4YM
-8jV+msIYuxrEV0+d6z0i6SJYzRNXfwbECzZBWJSIg1PQAHw6hu/VISV5VyFrMc8a
-d8reyFbPIZQvEMv9uFZouJ9MlrJzNX/mfoZAC7TbArENalUFMqfXpMSl5HeBbke+
-rnfpMt5NqIfXPOhyEvST687zuzVhgKeV64EPYraxcCkFoP3EJh37ncsNRr+JHnNa
-kYspLxEZbKzxDW8PNooq9MdLpDFsfZ+NdjznQUJw4dE0Eovsw7RS1Nd4yrIP80dM
-79WE7Lw3nzKG/rDRW8Zgd968fuB+
+MIIDZTCCAk2gAwIBAgIUQXGTISy9zzMFCh+FUi5vGxn1xLMwDQYJKoZIhvcNAQEL
+BQAwOTELMAkGA1UEBhMCRGUxEzARBgNVBAgMClNvbWUtU3RhdGUxFTATBgNVBAoM
+DFRydXN0ZWQgSW5jLjAeFw0yMzEyMDcxNzE0NDFaFw0yODExMTAxNzE0NDFaMFox
+CzAJBgNVBAYTAkRFMQ8wDQYDVQQIDAZCZXJsaW4xDzANBgNVBAcMBkJlcmxpbjEP
+MA0GA1UECgwGVHJ1c3R5MRgwFgYDVQQDDA9zYmQuamtyaXN0b2YuZGUwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDiWE2Tbtvy32v8phz9CGWigiYN36mh
+79XeVjbwTb2yxKUzSLXUm7guAp+CAm2edSwf6RB6ulpPVVrBYtPc9eDtrFQC6+9k
+EqGbt23ITZCqpyTeZSd5xpNyYmeWYZHZZVb4Mx6MviM3sLkVq9LYePz8R/wWAFSv
+KPip/gepugA5JjFCUglYQfbjc21JrNAD7ThkPtjPMlYaESJha5o4MLCthqXOE04r
+LUZfpUGFGDeBi18yZVcnMU+r0/yz4WvjFWJkScfYYhYfxZCwsiIovKhZyiM/gM7Q
++7RxfvEpn/xwgZaBqpPxXleO2bQzjMnmvCvXiL/dHExX8R6I65ECGz4lAgMBAAGj
+RDBCMEAGA1UdEQQ5MDeCD3NiZC5qa3Jpc3RvZi5kZYISc2JkLmFsZXgtZGl4b24u
+ZGV2hwSAjFm9hwR/AAABhwQKAAEKMA0GCSqGSIb3DQEBCwUAA4IBAQCRyqtmipGq
+vD94hMZBXkapzXLbn7rXLy65DnY3y0yczAIKB/b1A3VqB95wr9czMmk1Xra+2Yxo
+/9CCiFO47VQHivToSMmzPPVVC0js+HWjKkbJhFPyTCuRN8Vh474Onn3l1py4BKpa
+NeEQ1IUv2lWFoH0vZb/1IMMfM/EaJ/UMceGCA/v77abv3LfSod9acMFz5ZaKe1KB
+Bac0vdcFn+dySg8hEN4QzfSnHhf2Jbqm8O69sB4vur9NzOCEuOy/uKvL1ubOfWPG
+CK4rgF/OL5jY3D6hLvnIBjI9PjLguxCTx44xgcGG4d+I0CVKSpELvzMGVwZnJs51
+a8e8fsUj1ivl
 -----END CERTIFICATE-----