From 5c7581ae1dbd24c27475d2097e428b600de3496b Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Wed, 11 Jan 2017 00:33:56 +0100 Subject: [PATCH] Auto-generate client ID --- QtClient/JoplinQtClient/application.cpp | 12 +++++++----- QtClient/JoplinQtClient/application.h | 1 - 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/QtClient/JoplinQtClient/application.cpp b/QtClient/JoplinQtClient/application.cpp index 96868fc26..fbd7d3e0f 100755 --- a/QtClient/JoplinQtClient/application.cpp +++ b/QtClient/JoplinQtClient/application.cpp @@ -37,6 +37,11 @@ Application::Application(int &argc, char **argv) : Settings settings; + if (!settings.contains("clientId")) { + // Client ID should be unique per instance of a program + settings.setValue("clientId", uuid::createUuid()); + } + view_.setResizeMode(QQuickView::SizeRootObjectToView); QQmlContext *ctxt = view_.rootContext(); ctxt->setContextProperty("folderListModel", &folderModel_); @@ -88,17 +93,14 @@ Application::Application(int &argc, char **argv) : } void Application::login(const QString &email, const QString &password) { + Settings settings; QUrlQuery postData; postData.addQueryItem("email", email); postData.addQueryItem("password", password); - postData.addQueryItem("client_id", clientId()); + postData.addQueryItem("client_id", settings.value("clientId").toString()); api_.post("sessions", QUrlQuery(), postData, "getSession"); } -QString Application::clientId() const { - return "2222222222222222"; -} - void Application::api_requestDone(const QJsonObject& response, const QString& tag) { // TODO: handle errors // Handle expired sessions diff --git a/QtClient/JoplinQtClient/application.h b/QtClient/JoplinQtClient/application.h index 89bb18f41..cfc078618 100755 --- a/QtClient/JoplinQtClient/application.h +++ b/QtClient/JoplinQtClient/application.h @@ -22,7 +22,6 @@ public: Application(int &argc, char **argv); void login(const QString& email, const QString& password); - QString clientId() const; private: