From 6af448d1959a823fe411a9c973ebdee5dee5eac0 Mon Sep 17 00:00:00 2001
From: Nyall Dawson <nyall.dawson@gmail.com>
Date: Sat, 23 Nov 2024 08:57:37 +1000
Subject: [PATCH] Don't include empty redirect URI or scope in parameters
---
src/o2.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/o2.cpp b/src/o2.cpp
index 6dd07d5..49903b1 100644
--- a/src/o2.cpp
+++ b/src/o2.cpp
@@ -223,8 +223,10 @@ void O2::link() {
parameters.append(qMakePair(QString(O2_OAUTH2_RESPONSE_TYPE),
(grantFlow_ == GrantFlowAuthorizationCode)? QString(O2_OAUTH2_GRANT_TYPE_CODE): QString(O2_OAUTH2_GRANT_TYPE_TOKEN)));
parameters.append(qMakePair(QString(O2_OAUTH2_CLIENT_ID), clientId_));
- parameters.append(qMakePair(QString(O2_OAUTH2_REDIRECT_URI), redirectUri_));
- parameters.append(qMakePair(QString(O2_OAUTH2_SCOPE), scope_.replace( " ", "+" )));
+ if ( !redirectUri_.isEmpty() )
+ parameters.append(qMakePair(QString(O2_OAUTH2_REDIRECT_URI), redirectUri_));
+ if ( !scope_.isEmpty() )
+ parameters.append(qMakePair(QString(O2_OAUTH2_SCOPE), scope_.replace( " ", "+" )));
parameters.append(qMakePair(QString(O2_OAUTH2_STATE), uniqueState));
if ( !apiKey_.isEmpty() )
parameters.append(qMakePair(QString(O2_OAUTH2_API_KEY), apiKey_));