From 0b8e0ff7cff22202587e78e165b80bdb005ea9af Mon Sep 17 00:00:00 2001 From: fourtf Date: Tue, 20 Aug 2019 18:53:26 +0200 Subject: [PATCH] deprecated old NetworkRequest api --- src/common/NetworkRequest.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/common/NetworkRequest.cpp b/src/common/NetworkRequest.cpp index 346ad7d4..30e251aa 100644 --- a/src/common/NetworkRequest.cpp +++ b/src/common/NetworkRequest.cpp @@ -183,17 +183,18 @@ NetworkRequest NetworkRequest::concurrent() && return std::move(*this); } -// TODO: rename to "authorizeTwitchV5"? NetworkRequest NetworkRequest::authorizeTwitchV5(const QString &clientID, const QString &oauthToken) && { - this->setRawHeader("Client-ID", clientID); - this->setRawHeader("Accept", "application/vnd.twitchtv.v5+json"); + // TODO: make two overloads, with and without oauth token + auto tmp = std::move(*this) + .header("Client-ID", clientID) + .header("Accept", "application/vnd.twitchtv.v5+json"); + if (!oauthToken.isEmpty()) - { - this->setRawHeader("Authorization", "OAuth " + oauthToken); - } - return std::move(*this); + return std::move(tmp).header("Authorization", "OAuth " + oauthToken); + else + return tmp; } NetworkRequest NetworkRequest::payload(const QByteArray &payload) &&