From 6b7121bdcb65cfd5c2e9f87e374997032fe56135 Mon Sep 17 00:00:00 2001 From: Alejandro Martinez Date: Mon, 7 Mar 2022 12:36:53 -0300 Subject: [PATCH] Add encrypted keys for Nolio sync and generate test build GC_NOLIO_CLIENT_SECRET shortened to GC_NOLIO_SECRET to avoid travis-ci limit. [publish binaries] --- .travis.yml | 2 ++ appveyor.yml | 4 ++++ src/Cloud/Nolio.cpp | 2 +- src/Core/Secrets.h | 6 +++--- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index e8c04f5c9..e71f27404 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,6 +37,8 @@ env: - secure: em0xXIm69rMHsHXYQiizeJB7dEFBkX33PsWDHwBNrX6lFBued23eL96KJC4RVbk6A+AHFtXFATrreZ14D5JH/E/37CXhe3X2R93WqiPUSH0s7NI4fFA1BroKUNAlqO4bMqDBidtNmwMPaLTXjaOnOZyvbAG7z+QV3TKC8tOeZDU= - secure: VFaSERlgsjzjiDQhKw8XFvQrjdvFzHHL7V3NQg+RfELHoT6I1pAGFdl/+lRBIVOiVkbQ6XnpBA28nlf0QydPHElRZdqmh0azQV/bkUXD4ffPE8q0iSqeqhAZ+5L05K5K+Gby/y8TZE4FX6e/7trFL7oq+h9x0gq5RQO8rAcTV84= - secure: eTSJmS38EsTkI22yvDJLUrBxSyLDwd3pDRsyLQfZ3ThN0UJ9cQN2uB7aLy3OzNYadpi+Axlr46MgG0G5qGV1hHXkf+C4orGkURQWxHA7L5R/oE98TuYMO1bisZu9dJEVbmEM4cehCjbB7DExzxK4m6+oTJsWhVbIwlNh5Poq/v4= + - secure: gUDTEErUOhzkSVofEvdw1jqHHsE/K+/SOqRBKDToaFPhi6XK+Tvu1LqPMjfPdjYLaCSiwc/R79fJrAEuK+7KSwdiLEnDv3RMpRS5g1UWyJ/ZYd5xNR+WiBqUvnY/S/CJokuNw7gBbGq7JCO4pmIGV5YB9FA4Na6MG/eHzTSOIig= + - secure: Qk+gzBLwjrB8abUYzxap10dYSpIeKpB1gqhdoMbqS23G0r1lejnsjutIfReuJGK/efCmhisKN1xIX/InvJWD8z6GsLJFmf3F0oRj7aDJ/X5UIn9Upflje9xgHQafP1FJuzZBWtzandNfPE8EmEOgAQsJZ3c7xBE1SY/6xcJaQTc= jobs: include: diff --git a/appveyor.yml b/appveyor.yml index 25aed8b0e..e9c1b6cef 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -35,6 +35,10 @@ environment: secure: n6a8nJgqMyg+VsVeoIIR8TFzxyDFVi2w/ggetQk5agY= GC_RWGPS_API_KEY: secure: uUtCyF5ByZ1VYJOztUngIA== + GC_NOLIO_CLIENT_ID: + secure: /OFVjEBwU7o3SItIQVf/YlJ8XErxneXIT2N0JyPMSXR1tCbdZVWixMHpqKNWoNk4 + GC_NOLIO_SECRET: + secure: mmMksvVnfBiXufBDn2gAhQY53n0J9BokSCtDY51uU918QJ/LL4XOojtJp5tMFn8T7ugyDhNASpqZXiK55vxSD53vm+tjufpfzppKEeh93Babvc/VrndLB1X/RZCRUQTR6rka05fYl4e0eBzP1H091A== init: # Setup QT 5.14 - 64Bit diff --git a/src/Cloud/Nolio.cpp b/src/Cloud/Nolio.cpp index e978e45ed..a30c4696f 100644 --- a/src/Cloud/Nolio.cpp +++ b/src/Cloud/Nolio.cpp @@ -99,7 +99,7 @@ bool Nolio::open(QStringList &errors){ QNetworkRequest request(QUrl("https://www.nolio.io/api/token/")); request.setRawHeader("Content-Type", "application/x-www-form-urlencoded"); - QString authheader = QString("%1:%2").arg(GC_NOLIO_CLIENT_ID).arg(GC_NOLIO_CLIENT_SECRET); + QString authheader = QString("%1:%2").arg(GC_NOLIO_CLIENT_ID).arg(GC_NOLIO_SECRET); request.setRawHeader("Authorization", "Basic " + authheader.toLatin1().toBase64()); QString data = QString("grant_type=refresh_token&refresh_token=").append(refresh_token); diff --git a/src/Core/Secrets.h b/src/Core/Secrets.h index cfc5c9fba..b255cd35d 100644 --- a/src/Core/Secrets.h +++ b/src/Core/Secrets.h @@ -119,6 +119,6 @@ #define GC_NOLIO_CLIENT_ID "__GC_NOLIO_CLIENT_ID__" #endif -#ifndef GC_NOLIO_CLIENT_SECRET -#define GC_NOLIO_CLIENT_SECRET "__GC_NOLIO_CLIENT_SECRET__" -#endif \ No newline at end of file +#ifndef GC_NOLIO_SECRET +#define GC_NOLIO_SECRET "__GC_NOLIO_SECRET__" +#endif