Skip to content
Snippets Groups Projects
Commit d15aaf84 authored by Bert Palm's avatar Bert Palm :bug:
Browse files

fixed missing decrypt key when calling decrypt in some sync scripts

parent e9a9d9d3
No related branches found
No related tags found
1 merge request!289some generic fixes and cleanup
Pipeline #497719 passed
......@@ -9,7 +9,7 @@ import requests
from datetime import datetime, timedelta, timezone
from urllib.request import Request, urlopen
from timeio.crypto import decrypt
from timeio.crypto import decrypt, get_crypt_key
import timeio.mqtt as mqtt
from timeio.journaling import Journal
......@@ -96,7 +96,7 @@ def main(thing_uuid, parameters, target_uri):
logger.info(f"Start fetching Bosch data for thing {thing_uuid}")
params = json.loads(parameters.replace("'", '"'))
pw_dec = decrypt(params["password"])
pw_dec = decrypt(params["password"], get_crypt_key())
timestamp_from, timestamp_to = get_utc_timestamps(params["period"])
url = f"""{params["endpoint"]}/{params["sensor_id"]}/{timestamp_from}/{timestamp_to}"""
response = make_request(url, params["username"], pw_dec)
......
......@@ -5,10 +5,9 @@ import click
import logging
import json
import os
import sys
from datetime import datetime, timedelta, timezone
from timeio.crypto import decrypt
from timeio.crypto import decrypt, get_crypt_key
import timeio.mqtt as mqtt
from timeio.journaling import Journal
......@@ -100,7 +99,7 @@ def main(thing_uuid, parameters, target_uri):
logger.info(f"Start fetching TSystems data for thing {thing_uuid}")
params = json.loads(parameters.replace("'", '"'))
pw_dec = decrypt(params["password"])
pw_dec = decrypt(params["password"], get_crypt_key())
response = request_tsystems_api(
params["group"], params["station_id"], params["username"], pw_dec
)
......
......@@ -7,7 +7,7 @@ import logging
import requests
import click
from timeio.crypto import decrypt
from timeio.crypto import decrypt, get_crypt_key
import timeio.mqtt as mqtt
from timeio.journaling import Journal
......@@ -34,7 +34,7 @@ def main(thing_uuid: str, parameters: str, target_uri: str):
logger.info(f"Start fetching TTN data for thing {thing_uuid}")
params = json.loads(parameters.replace("'", '"'))
api_key_dec = decrypt(params["api_key"])
api_key_dec = decrypt(params["api_key"], get_crypt_key())
res = requests.get(
params["endpoint_uri"],
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment