ETM-Schurig/powersync-app
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge PR #88: update AWS endpoints after symantec cert update

Browse Source
This commit is contained in:
Jenkins 2018-12-13 16:07:53 +01:00
commit dc7222b320
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libnymea-app-core/connection/awsclient.cpp
View File

@ -66,7 +66,7 @@ AWSClient::AWSClient(QObject *parent) : QObject(parent),
config.certificateEndpoint = "https://communityservice-cloud.nymea.io/certificatews/certificate"; config.certificateEndpoint = "https://communityservice-cloud.nymea.io/certificatews/certificate";
config.certificateApiKey = "aIRQv4yDdF6ASq12X1CPp7b6MpkdODfI3AOjOnkE"; config.certificateApiKey = "aIRQv4yDdF6ASq12X1CPp7b6MpkdODfI3AOjOnkE";
config.certificateVendorId = "d399290a-0599-4895-b4c3-34d2bdb579f4"; config.certificateVendorId = "d399290a-0599-4895-b4c3-34d2bdb579f4";
config.mqttEndpoint = "a2d0ba9572wepp.iot.eu-west-1.amazonaws.com"; config.mqttEndpoint = "a2d0ba9572wepp-ats.iot.eu-west-1.amazonaws.com";
config.region = "eu-west-1"; config.region = "eu-west-1";
config.apiEndpoint = "api-cloud.guh.io"; config.apiEndpoint = "api-cloud.guh.io";
config.pushNotificationSystem = pushSystem; config.pushNotificationSystem = pushSystem;
@ -79,7 +79,7 @@ AWSClient::AWSClient(QObject *parent) : QObject(parent),
config.certificateEndpoint = "https://testcommunityservice-cloud.nymea.io/certificatews/certificate"; config.certificateEndpoint = "https://testcommunityservice-cloud.nymea.io/certificatews/certificate";
config.certificateApiKey = "VhmAUy75eZ9jXaUEjgWZh9PpSIykPGBK7AZFPimh"; config.certificateApiKey = "VhmAUy75eZ9jXaUEjgWZh9PpSIykPGBK7AZFPimh";
config.certificateVendorId = "testVendor001"; config.certificateVendorId = "testVendor001";
config.mqttEndpoint = "a2addxakg5juii.iot.eu-west-1.amazonaws.com"; config.mqttEndpoint = "a2addxakg5juii-ats.iot.eu-west-1.amazonaws.com";
config.region = "eu-west-1"; config.region = "eu-west-1";
config.apiEndpoint = "testapi-cloud.guh.io"; config.apiEndpoint = "testapi-cloud.guh.io";
config.pushNotificationSystem = pushSystem == "APNS" ? pushSystem + "_SANDBOX" : pushSystem; config.pushNotificationSystem = pushSystem == "APNS" ? pushSystem + "_SANDBOX" : pushSystem;
@ -93,7 +93,7 @@ AWSClient::AWSClient(QObject *parent) : QObject(parent),
config.certificateEndpoint = ""; config.certificateEndpoint = "";
config.certificateApiKey = ""; config.certificateApiKey = "";
config.certificateVendorId = ""; config.certificateVendorId = "";
config.mqttEndpoint = "a27q7a2x15m8h3.iot.eu-west-1.amazonaws.com"; config.mqttEndpoint = "a27q7a2x15m8h3-ats.iot.eu-west-1.amazonaws.com";
config.region = "eu-west-1"; config.region = "eu-west-1";
config.apiEndpoint = "api-cloud.guh.io"; config.apiEndpoint = "api-cloud.guh.io";
config.pushNotificationSystem = pushSystem; config.pushNotificationSystem = pushSystem;
@ -876,6 +876,11 @@ bool AWSClient::postToMQTT(const QString &boxId, const QString &timestamp, std::
reply->deleteLater(); reply->deleteLater();
QByteArray data = reply->readAll(); QByteArray data = reply->readAll();
qDebug() << "post reply" << data; qDebug() << "post reply" << data;
if (reply->error() != QNetworkReply::NoError) {
qWarning() << "Network reply error" << reply->error() << reply->errorString();
callback(false);
return;
}
QJsonParseError error; QJsonParseError error;
QJsonDocument jsonDoc = QJsonDocument::fromJson(data, &error); QJsonDocument jsonDoc = QJsonDocument::fromJson(data, &error);
if (error.error != QJsonParseError::NoError) { if (error.error != QJsonParseError::NoError) {

5
libnymea-app-core/connection/cloudtransport.cpp
View File

@ -53,9 +53,10 @@ bool CloudTransport::connect(const QUrl &url)
m_timestamp = QDateTime::currentDateTime(); m_timestamp = QDateTime::currentDateTime();
bool postResult = m_awsClient->postToMQTT(url.host(), QString::number(m_timestamp.toMSecsSinceEpoch()), [this](bool success) { bool postResult = m_awsClient->postToMQTT(url.host(), QString::number(m_timestamp.toMSecsSinceEpoch()), [this](bool success) {
if (success) { if (success) {
m_remoteproxyConnection->connectServer(QUrl("wss://remoteproxy.nymea.io")); m_remoteproxyConnection->connectServer(QUrl("wss://remoteproxy.nymea.io"));
// m_remoteproxyConnection->connectServer(QUrl("wss://127.0.0.1:1212")); } else {
qDebug() << "Posting to MQTT failed";
emit error(QAbstractSocket::HostNotFoundError);
} }
}); });