Skip to content

Commit fef1373

Browse files
martonmiklosmartonmiklos
committed
[cpp-qt-clien]Suffix token variables in OAuth with meaningful state names instead of numeric indexes
1 parent dd4166d commit fef1373

3 files changed

Lines changed: 54 additions & 54 deletions

File tree

‎modules/openapi-generator/src/main/resources/cpp-qt-client/api-body.mustache‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -706,9 +706,9 @@ void {{classname}}::{{nickname}}({{#allParams}}{{#required}}const {{{dataType}}}
706706
{{#scopes}}
707707
scopeAuthorizationFlow.append("{{scope}}");
708708
{{/scopes}}
709-
auto token2 = _authFlow.getToken(scopeAuthorizationFlow.join(" "));
710-
if(token2.isValid())
711-
input.headers.insert("Authorization", "Bearer " + token2.getToken());
709+
auto tokenAuthorizationFlow = _authFlow.getToken(scopeAuthorizationFlow.join(" "));
710+
if(tokenAuthorizationFlow.isValid())
711+
input.headers.insert("Authorization", "Bearer " + tokenAuthorizationFlow.getToken());
712712

713713
_latestWorker = new {{prefix}}HttpRequestWorker(this, _manager);
714714
_latestWorker->setTimeOut(_timeOut);
@@ -736,9 +736,9 @@ void {{classname}}::{{nickname}}({{#allParams}}{{#required}}const {{{dataType}}}
736736
{{#scopes}}
737737
scopeImplicitFlow.append("{{scope}}");
738738
{{/scopes}}
739-
auto token1 = _implicitFlow.getToken(scopeImplicitFlow.join(" "));
740-
if(token1.isValid())
741-
input.headers.insert("Authorization", "Bearer " + token1.getToken());
739+
auto tokenImplicitFlow = _implicitFlow.getToken(scopeImplicitFlow.join(" "));
740+
if(tokenImplicitFlow.isValid())
741+
input.headers.insert("Authorization", "Bearer " + tokenImplicitFlow.getToken());
742742

743743
_latestWorker = new {{prefix}}HttpRequestWorker(this, _manager);
744744
_latestWorker->setTimeOut(_timeOut);
@@ -766,9 +766,9 @@ void {{classname}}::{{nickname}}({{#allParams}}{{#required}}const {{{dataType}}}
766766
{{#scopes}}
767767
scopeClientCredentialsFlow.append("{{scope}}");
768768
{{/scopes}}
769-
auto token3 = _credentialFlow.getToken(scopeClientCredentialsFlow.join(" "));
770-
if(token3.isValid())
771-
input.headers.insert("Authorization", "Bearer " + token3.getToken());
769+
auto tokenClientCredentialsFlow = _credentialFlow.getToken(scopeClientCredentialsFlow.join(" "));
770+
if(tokenClientCredentialsFlow.isValid())
771+
input.headers.insert("Authorization", "Bearer " + tokenClientCredentialsFlow.getToken());
772772

773773
_latestWorker = new {{prefix}}HttpRequestWorker(this, _manager);
774774
_latestWorker->setTimeOut(_timeOut);
@@ -796,9 +796,9 @@ void {{classname}}::{{nickname}}({{#allParams}}{{#required}}const {{{dataType}}}
796796
{{#scopes}}
797797
scopeResourceOwnerPasswordFlow.append("{{scope}}");
798798
{{/scopes}}
799-
auto token4 = _passwordFlow.getToken(scopeResourceOwnerPasswordFlow.join(" "));
800-
if(token4.isValid())
801-
input.headers.insert("Authorization", "Bearer " + token4.getToken());
799+
auto tokenResourceOwnerPasswordFlow = _passwordFlow.getToken(scopeResourceOwnerPasswordFlow.join(" "));
800+
if(tokenResourceOwnerPasswordFlow.isValid())
801+
input.headers.insert("Authorization", "Bearer " + tokenResourceOwnerPasswordFlow.getToken());
802802

803803
_latestWorker = new {{prefix}}HttpRequestWorker(this, _manager);
804804
_latestWorker->setTimeOut(_timeOut);

‎samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXPetApi.cpp‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -272,9 +272,9 @@ void PFXPetApi::addPet(const PFXPet &pfx_pet) {
272272
QStringList scopeImplicitFlow;
273273
scopeImplicitFlow.append("write:pets");
274274
scopeImplicitFlow.append("read:pets");
275-
auto token1 = _implicitFlow.getToken(scopeImplicitFlow.join(" "));
276-
if(token1.isValid())
277-
input.headers.insert("Authorization", "Bearer " + token1.getToken());
275+
auto tokenImplicitFlow = _implicitFlow.getToken(scopeImplicitFlow.join(" "));
276+
if(tokenImplicitFlow.isValid())
277+
input.headers.insert("Authorization", "Bearer " + tokenImplicitFlow.getToken());
278278

279279
_latestWorker = new PFXHttpRequestWorker(this, _manager);
280280
_latestWorker->setTimeOut(_timeOut);
@@ -480,9 +480,9 @@ void PFXPetApi::deletePet(const qint64 &pet_id, const ::test_namespace::Optional
480480
QStringList scopeImplicitFlow;
481481
scopeImplicitFlow.append("write:pets");
482482
scopeImplicitFlow.append("read:pets");
483-
auto token1 = _implicitFlow.getToken(scopeImplicitFlow.join(" "));
484-
if(token1.isValid())
485-
input.headers.insert("Authorization", "Bearer " + token1.getToken());
483+
auto tokenImplicitFlow = _implicitFlow.getToken(scopeImplicitFlow.join(" "));
484+
if(tokenImplicitFlow.isValid())
485+
input.headers.insert("Authorization", "Bearer " + tokenImplicitFlow.getToken());
486486

487487
_latestWorker = new PFXHttpRequestWorker(this, _manager);
488488
_latestWorker->setTimeOut(_timeOut);
@@ -675,9 +675,9 @@ void PFXPetApi::findPetsByStatus(const QList<QString> &status) {
675675
QStringList scopeImplicitFlow;
676676
scopeImplicitFlow.append("write:pets");
677677
scopeImplicitFlow.append("read:pets");
678-
auto token1 = _implicitFlow.getToken(scopeImplicitFlow.join(" "));
679-
if(token1.isValid())
680-
input.headers.insert("Authorization", "Bearer " + token1.getToken());
678+
auto tokenImplicitFlow = _implicitFlow.getToken(scopeImplicitFlow.join(" "));
679+
if(tokenImplicitFlow.isValid())
680+
input.headers.insert("Authorization", "Bearer " + tokenImplicitFlow.getToken());
681681

682682
_latestWorker = new PFXHttpRequestWorker(this, _manager);
683683
_latestWorker->setTimeOut(_timeOut);
@@ -880,9 +880,9 @@ void PFXPetApi::findPetsByTags(const QList<QString> &tags) {
880880
QStringList scopeImplicitFlow;
881881
scopeImplicitFlow.append("write:pets");
882882
scopeImplicitFlow.append("read:pets");
883-
auto token1 = _implicitFlow.getToken(scopeImplicitFlow.join(" "));
884-
if(token1.isValid())
885-
input.headers.insert("Authorization", "Bearer " + token1.getToken());
883+
auto tokenImplicitFlow = _implicitFlow.getToken(scopeImplicitFlow.join(" "));
884+
if(tokenImplicitFlow.isValid())
885+
input.headers.insert("Authorization", "Bearer " + tokenImplicitFlow.getToken());
886886

887887
_latestWorker = new PFXHttpRequestWorker(this, _manager);
888888
_latestWorker->setTimeOut(_timeOut);
@@ -1092,9 +1092,9 @@ void PFXPetApi::updatePet(const PFXPet &pfx_pet) {
10921092
QStringList scopeImplicitFlow;
10931093
scopeImplicitFlow.append("write:pets");
10941094
scopeImplicitFlow.append("read:pets");
1095-
auto token1 = _implicitFlow.getToken(scopeImplicitFlow.join(" "));
1096-
if(token1.isValid())
1097-
input.headers.insert("Authorization", "Bearer " + token1.getToken());
1095+
auto tokenImplicitFlow = _implicitFlow.getToken(scopeImplicitFlow.join(" "));
1096+
if(tokenImplicitFlow.isValid())
1097+
input.headers.insert("Authorization", "Bearer " + tokenImplicitFlow.getToken());
10981098

10991099
_latestWorker = new PFXHttpRequestWorker(this, _manager);
11001100
_latestWorker->setTimeOut(_timeOut);
@@ -1223,9 +1223,9 @@ void PFXPetApi::updatePetWithForm(const qint64 &pet_id, const ::test_namespace::
12231223
QStringList scopeImplicitFlow;
12241224
scopeImplicitFlow.append("write:pets");
12251225
scopeImplicitFlow.append("read:pets");
1226-
auto token1 = _implicitFlow.getToken(scopeImplicitFlow.join(" "));
1227-
if(token1.isValid())
1228-
input.headers.insert("Authorization", "Bearer " + token1.getToken());
1226+
auto tokenImplicitFlow = _implicitFlow.getToken(scopeImplicitFlow.join(" "));
1227+
if(tokenImplicitFlow.isValid())
1228+
input.headers.insert("Authorization", "Bearer " + tokenImplicitFlow.getToken());
12291229

12301230
_latestWorker = new PFXHttpRequestWorker(this, _manager);
12311231
_latestWorker->setTimeOut(_timeOut);
@@ -1354,9 +1354,9 @@ void PFXPetApi::uploadFile(const qint64 &pet_id, const ::test_namespace::Optiona
13541354
QStringList scopeImplicitFlow;
13551355
scopeImplicitFlow.append("write:pets");
13561356
scopeImplicitFlow.append("read:pets");
1357-
auto token1 = _implicitFlow.getToken(scopeImplicitFlow.join(" "));
1358-
if(token1.isValid())
1359-
input.headers.insert("Authorization", "Bearer " + token1.getToken());
1357+
auto tokenImplicitFlow = _implicitFlow.getToken(scopeImplicitFlow.join(" "));
1358+
if(tokenImplicitFlow.isValid())
1359+
input.headers.insert("Authorization", "Bearer " + tokenImplicitFlow.getToken());
13601360

13611361
_latestWorker = new PFXHttpRequestWorker(this, _manager);
13621362
_latestWorker->setTimeOut(_timeOut);

‎samples/client/petstore/cpp-qt/client/PFXPetApi.cpp‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -272,9 +272,9 @@ void PFXPetApi::addPet(const PFXPet &pfx_pet) {
272272
QStringList scopeImplicitFlow;
273273
scopeImplicitFlow.append("write:pets");
274274
scopeImplicitFlow.append("read:pets");
275-
auto token1 = _implicitFlow.getToken(scopeImplicitFlow.join(" "));
276-
if(token1.isValid())
277-
input.headers.insert("Authorization", "Bearer " + token1.getToken());
275+
auto tokenImplicitFlow = _implicitFlow.getToken(scopeImplicitFlow.join(" "));
276+
if(tokenImplicitFlow.isValid())
277+
input.headers.insert("Authorization", "Bearer " + tokenImplicitFlow.getToken());
278278

279279
_latestWorker = new PFXHttpRequestWorker(this, _manager);
280280
_latestWorker->setTimeOut(_timeOut);
@@ -480,9 +480,9 @@ void PFXPetApi::deletePet(const qint64 &pet_id, const ::test_namespace::Optional
480480
QStringList scopeImplicitFlow;
481481
scopeImplicitFlow.append("write:pets");
482482
scopeImplicitFlow.append("read:pets");
483-
auto token1 = _implicitFlow.getToken(scopeImplicitFlow.join(" "));
484-
if(token1.isValid())
485-
input.headers.insert("Authorization", "Bearer " + token1.getToken());
483+
auto tokenImplicitFlow = _implicitFlow.getToken(scopeImplicitFlow.join(" "));
484+
if(tokenImplicitFlow.isValid())
485+
input.headers.insert("Authorization", "Bearer " + tokenImplicitFlow.getToken());
486486

487487
_latestWorker = new PFXHttpRequestWorker(this, _manager);
488488
_latestWorker->setTimeOut(_timeOut);
@@ -675,9 +675,9 @@ void PFXPetApi::findPetsByStatus(const QList<QString> &status) {
675675
QStringList scopeImplicitFlow;
676676
scopeImplicitFlow.append("write:pets");
677677
scopeImplicitFlow.append("read:pets");
678-
auto token1 = _implicitFlow.getToken(scopeImplicitFlow.join(" "));
679-
if(token1.isValid())
680-
input.headers.insert("Authorization", "Bearer " + token1.getToken());
678+
auto tokenImplicitFlow = _implicitFlow.getToken(scopeImplicitFlow.join(" "));
679+
if(tokenImplicitFlow.isValid())
680+
input.headers.insert("Authorization", "Bearer " + tokenImplicitFlow.getToken());
681681

682682
_latestWorker = new PFXHttpRequestWorker(this, _manager);
683683
_latestWorker->setTimeOut(_timeOut);
@@ -880,9 +880,9 @@ void PFXPetApi::findPetsByTags(const QList<QString> &tags) {
880880
QStringList scopeImplicitFlow;
881881
scopeImplicitFlow.append("write:pets");
882882
scopeImplicitFlow.append("read:pets");
883-
auto token1 = _implicitFlow.getToken(scopeImplicitFlow.join(" "));
884-
if(token1.isValid())
885-
input.headers.insert("Authorization", "Bearer " + token1.getToken());
883+
auto tokenImplicitFlow = _implicitFlow.getToken(scopeImplicitFlow.join(" "));
884+
if(tokenImplicitFlow.isValid())
885+
input.headers.insert("Authorization", "Bearer " + tokenImplicitFlow.getToken());
886886

887887
_latestWorker = new PFXHttpRequestWorker(this, _manager);
888888
_latestWorker->setTimeOut(_timeOut);
@@ -1092,9 +1092,9 @@ void PFXPetApi::updatePet(const PFXPet &pfx_pet) {
10921092
QStringList scopeImplicitFlow;
10931093
scopeImplicitFlow.append("write:pets");
10941094
scopeImplicitFlow.append("read:pets");
1095-
auto token1 = _implicitFlow.getToken(scopeImplicitFlow.join(" "));
1096-
if(token1.isValid())
1097-
input.headers.insert("Authorization", "Bearer " + token1.getToken());
1095+
auto tokenImplicitFlow = _implicitFlow.getToken(scopeImplicitFlow.join(" "));
1096+
if(tokenImplicitFlow.isValid())
1097+
input.headers.insert("Authorization", "Bearer " + tokenImplicitFlow.getToken());
10981098

10991099
_latestWorker = new PFXHttpRequestWorker(this, _manager);
11001100
_latestWorker->setTimeOut(_timeOut);
@@ -1223,9 +1223,9 @@ void PFXPetApi::updatePetWithForm(const qint64 &pet_id, const ::test_namespace::
12231223
QStringList scopeImplicitFlow;
12241224
scopeImplicitFlow.append("write:pets");
12251225
scopeImplicitFlow.append("read:pets");
1226-
auto token1 = _implicitFlow.getToken(scopeImplicitFlow.join(" "));
1227-
if(token1.isValid())
1228-
input.headers.insert("Authorization", "Bearer " + token1.getToken());
1226+
auto tokenImplicitFlow = _implicitFlow.getToken(scopeImplicitFlow.join(" "));
1227+
if(tokenImplicitFlow.isValid())
1228+
input.headers.insert("Authorization", "Bearer " + tokenImplicitFlow.getToken());
12291229

12301230
_latestWorker = new PFXHttpRequestWorker(this, _manager);
12311231
_latestWorker->setTimeOut(_timeOut);
@@ -1354,9 +1354,9 @@ void PFXPetApi::uploadFile(const qint64 &pet_id, const ::test_namespace::Optiona
13541354
QStringList scopeImplicitFlow;
13551355
scopeImplicitFlow.append("write:pets");
13561356
scopeImplicitFlow.append("read:pets");
1357-
auto token1 = _implicitFlow.getToken(scopeImplicitFlow.join(" "));
1358-
if(token1.isValid())
1359-
input.headers.insert("Authorization", "Bearer " + token1.getToken());
1357+
auto tokenImplicitFlow = _implicitFlow.getToken(scopeImplicitFlow.join(" "));
1358+
if(tokenImplicitFlow.isValid())
1359+
input.headers.insert("Authorization", "Bearer " + tokenImplicitFlow.getToken());
13601360

13611361
_latestWorker = new PFXHttpRequestWorker(this, _manager);
13621362
_latestWorker->setTimeOut(_timeOut);

0 commit comments

Comments
 (0)