From 4b9f23adf1301467b911ad144564ea8fea51ad20 Mon Sep 17 00:00:00 2001 From: Andrey Egorov Date: Tue, 7 Oct 2025 17:44:56 +0300 Subject: [PATCH] chore: better login --- req.sh | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/req.sh b/req.sh index 2634b36..1ca1794 100755 --- a/req.sh +++ b/req.sh @@ -8,6 +8,7 @@ PASSWORD=admin #PASSWORD=ra8KvcMxS2baUxe* #MASTER_CODE=685658 MASTER_CODE=111111 +MFA_OFF="YES" #set -x @@ -17,16 +18,18 @@ H="-H \"Authorization: Bearer $(cat tmp.token)\"" if [[ $1 == "login" ]]; then # Login RESP=$(curl -X POST -H "Content-Type: application/json" -d "{ \"login\": \"$LOGIN\", \"password\": \"$PASSWORD\" }" "$ADDR/auth/signin") -# if [[ $(echo $RESP | jq '.message') != "\"OK\"" ]]; then -# echo "Failed to login" -# echo $RESP | jq '.error' -# exit 1 -# fi -# -# # 2FA -# RESP=$(curl -X POST -H "Content-Type: application/json" "$ADDR/auth/2fa?login=$LOGIN&code=$MASTER_CODE") + if [ "$MFA_OFF" != "YES" ]; then + if [[ $(echo $RESP | jq '.message') != "\"OK\"" ]]; then + echo "Failed to login1" + echo $RESP | jq '.error' + exit 1 + fi + # 2FA + RESP=$(curl -X POST -H "Content-Type: application/json" "$ADDR/auth/2fa?login=$LOGIN&code=$MASTER_CODE") + fi + if [[ $(echo $RESP | jq '.message') != "\"OK\"" ]]; then - echo "Failed to login" + echo "Failed to login2" echo $RESP | jq '.error' exit 1 fi @@ -49,7 +52,7 @@ elif [[ $1 == "devices-status" ]]; then curl -X GET -H "Content-Type: application/json" -H "Authorization: Bearer $(cat tmp.token)" "$ADDR/data/getDevices" | jq ".devices[] | (.SERIAL) +\" -- \"+ (.IS_CONNECTED|tostring)+\" -- \"+ (.REG_NUMBER)" | tr -d "\"" elif [[ $1 == "export-backup" ]]; then curl -X POST -H "Content-Type: application/json" -H "Authorization: Bearer $(cat tmp.token)" \ - -d '{ "startTime": 1758880189, "endTime": 1753024741 }' \ + -d "{ \"startTime\": $(($(date +%s)-20000)), \"endTime\": $(date +%s) }" \ "$ADDR/data/backup/export" --output export.zip elif [[ $1 == "export-logs" ]]; then curl -X POST -H "Content-Type: application/json" -H "Authorization: Bearer $(cat tmp.token)" \ @@ -68,7 +71,7 @@ elif [[ $1 == "alarms" ]]; then "$ADDR/data/alarms/getAlarms" | jq elif [[ $1 == "sensor-data" ]]; then curl -X POST -H "Content-Type: application/json" -H "Authorization: Bearer $(cat tmp.token)" \ - -d "{ \"device\": \"A56AF66F17D902B8\", \"sensor\": \"TEMPERATURE/85\", \"start\": $(($(date +%s)-1000)), \"end\": $(date +%s), \"skip\": 1 }" \ + -d "{ \"device\": \"2025082700003820\", \"sensor\": \"TEMPERATURE/PIIZI_TEMPERATURE_1\", \"start\": $(($(date +%s)-5000)), \"end\": $(date +%s), \"skip\": 1 }" \ "$ADDR/data/sensors/getDeviceSensorData" | jq elif [[ $1 == "factory-models" ]]; then if [[ $2 == "" ]]; then @@ -111,7 +114,9 @@ elif [[ $1 == "device-params" ]]; then echo "No serial presented" exit 1 fi - curl -X POST -s -H "Content-Type: application/json" -H "Authorization: Bearer $(cat tmp.token)" -d "{ \"serial\": \"$2\" }" "$ADDR/settings/deviceSettings" | jq + curl -X POST -s -H "Content-Type: application/json" -H "Authorization: Bearer $(cat tmp.token)" \ + -d "{ \"serial\": \"$2\" }" \ + "$ADDR/settings/deviceSettings" | jq elif [[ $1 == "set-device-params" ]]; then if [[ $2 == "" ]]; then echo "No params file presenter"