Showing the changes to libraries/networking/src/UserActivityLogger.cpp (1 of 6 files). Show all
Unified · Split
| @@ -11,8 +11,6 @@ · 10 unmodified lines | |||
| 11 | 11 | ||
| 12 | #include "UserActivityLogger.h" | 12 | #include "UserActivityLogger.h" |
| 13 | 13 | ||
| 14 | #include "AccountManager.h" | ||
| 15 | |||
| 16 | #include <QHttpMultiPart> | 14 | #include <QHttpMultiPart> |
| 17 | #include <QJsonDocument> | 15 | #include <QJsonDocument> |
| 18 | 16 | ||
| @@ -26,32 +24,32 @@ UserActivityLogger& UserActivityLogger::getInstance() { · 7 unmodified lines | |||
| 26 | UserActivityLogger::UserActivityLogger() { | 24 | UserActivityLogger::UserActivityLogger() { |
| 27 | } | 25 | } |
| 28 | 26 | ||
| 29 | void UserActivityLogger::logAction(QString action, QJsonObject details) { | 27 | void UserActivityLogger::logAction(QString action, QJsonObject details, JSONCallbackParameters params) { |
| 30 | AccountManager& accountManager = AccountManager::getInstance(); | 28 | AccountManager& accountManager = AccountManager::getInstance(); |
| 31 | QHttpMultiPart* multipart = new QHttpMultiPart(QHttpMultiPart::FormDataType); | 29 | QHttpMultiPart* multipart = new QHttpMultiPart(QHttpMultiPart::FormDataType); |
| 32 | 30 | ||
| 33 | if (action != "login") { | 31 | QHttpPart actionPart; |
| 34 | QHttpPart actionPart; | 32 | actionPart.setHeader(QNetworkRequest::ContentDispositionHeader, "form-data; name=\"action_name\""); |
| 35 | actionPart.setHeader(QNetworkRequest::ContentDispositionHeader, "form-data; name=\"action_name\""); | 33 | actionPart.setBody(QByteArray().append(action)); |
| 36 | actionPart.setBody(QByteArray().append(action)); | 34 | multipart->append(actionPart); |
| 37 | multipart->append(actionPart); | 35 | |
| 38 | 36 | ||
| 39 | 37 | if (!details.isEmpty()) { | |
| 40 | if (!details.isEmpty()) { | 38 | QHttpPart detailsPart; |
| 41 | QHttpPart detailsPart; | 39 | detailsPart.setHeader(QNetworkRequest::ContentDispositionHeader, "form-data;" |
| 42 | detailsPart.setHeader(QNetworkRequest::ContentDispositionHeader, "form-data;" | 40 | " name=\"action_details\""); |
| 43 | " name=\"action_details\""); | 41 | detailsPart.setBody(QJsonDocument(details).toJson(QJsonDocument::Compact)); |
| 44 | detailsPart.setBody(QJsonDocument(details).toJson(QJsonDocument::Compact)); | 42 | multipart->append(detailsPart); |
| 45 | multipart->append(detailsPart); | ||
| 46 | } | ||
| 47 | } | 43 | } |
| 48 | qDebug() << "Loging activity " << action; | 44 | qDebug() << "Loging activity" << action; |
| 45 | qDebug() << AccountManager::getInstance().getAuthURL() << ": " << AccountManager::getInstance().isLoggedIn(); | ||
| 49 | 46 | ||
| 50 | JSONCallbackParameters params; | 47 | if (params.isEmpty()) { |
| 51 | params.jsonCallbackReceiver = this; | 48 | params.jsonCallbackReceiver = this; |
| 52 | params.jsonCallbackMethod = "requestFinished"; | 49 | params.jsonCallbackMethod = "requestFinished"; |
| 53 | params.errorCallbackReceiver = this; | 50 | params.errorCallbackReceiver = this; |
| 54 | params.errorCallbackMethod = "requestError"; | 51 | params.errorCallbackMethod = "requestError"; |
| 52 | } | ||
| 55 | 53 | ||
| 56 | accountManager.authenticatedRequest(USER_ACTIVITY_URL, | 54 | accountManager.authenticatedRequest(USER_ACTIVITY_URL, |
| 57 | QNetworkAccessManager::PostOperation, | 55 | QNetworkAccessManager::PostOperation, |
| @@ -68,8 +66,8 @@ void UserActivityLogger::requestError(QNetworkReply::NetworkError error,const QS · 10 unmodified lines | |||
| 68 | qDebug() << error << ": " << string; | 66 | qDebug() << error << ": " << string; |
| 69 | } | 67 | } |
| 70 | 68 | ||
| 71 | void UserActivityLogger::login() { | 69 | void UserActivityLogger::launch() { |
| 72 | const QString ACTION_NAME = "login"; | 70 | const QString ACTION_NAME = "launch"; |
| 73 | QJsonObject actionDetails; | 71 | QJsonObject actionDetails; |
| 74 | 72 | ||
| 75 | QString OS_KEY = "OS"; | 73 | QString OS_KEY = "OS"; |
| @@ -91,9 +89,9 @@ void UserActivityLogger::login() { · 15 unmodified lines | |||
| 91 | logAction(ACTION_NAME, actionDetails); | 89 | logAction(ACTION_NAME, actionDetails); |
| 92 | } | 90 | } |
| 93 | 91 | ||
| 94 | void UserActivityLogger::logout() { | 92 | void UserActivityLogger::close(JSONCallbackParameters params) { |
| 95 | const QString ACTION_NAME = ""; | 93 | const QString ACTION_NAME = "close"; |
| 96 | logAction(ACTION_NAME); | 94 | logAction(ACTION_NAME, QJsonObject(), params); |
| 97 | } | 95 | } |
| 98 | 96 | ||
| 99 | void UserActivityLogger::changedDisplayName(QString displayName) { | 97 | void UserActivityLogger::changedDisplayName(QString displayName) { |