Skip to content

[cpp-qt-client]Fix variable redeclarations in the api-body.mustache #22982

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
martonmiklos wants to merge 3 commits into
base: master
Choose a base branch
from
+283 −206
Open

[cpp-qt-client]Fix variable redeclarations in the api-body.mustache #22982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
edc984a
[cpp-qt-client]Fix variable redeclarations in the api-body.mustache
martonmiklos Feb 15, 2026
dd4166d
[cpp-qt-client]Utilize enum for OauthMethod flow
martonmiklos Feb 24, 2026
fef1373
[cpp-qt-clien]Suffix token variables in OAuth with meaningful state n…
martonmiklos Mar 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 33 additions & 33 deletions modules/openapi-generator/src/main/resources/cpp-qt-client/api-body.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,18 +697,18 @@ void {{classname}}::{{nickname}}({{#allParams}}{{#required}}const {{{dataType}}}
Q_EMIT allPendingRequestsCompleted();
}
});{{#authMethods}}{{#isOAuth}}{{#isCode}}
_OauthMethod = 2;
_OauthMethod = OauthMethod::AuthorizationFlow;
_implicitFlow.unlink();
_credentialFlow.unlink();
_passwordFlow.unlink();
_authFlow.link();
QStringList scope;
QStringList scopeAuthorizationFlow;
{{#scopes}}
scope.append("{{scope}}");
scopeAuthorizationFlow.append("{{scope}}");
{{/scopes}}
auto token = _authFlow.getToken(scope.join(" "));
if(token.isValid())
input.headers.insert("Authorization", "Bearer " + token.getToken());
auto tokenAuthorizationFlow = _authFlow.getToken(scopeAuthorizationFlow.join(" "));
if(tokenAuthorizationFlow.isValid())
input.headers.insert("Authorization", "Bearer " + tokenAuthorizationFlow.getToken());

_latestWorker = new {{prefix}}HttpRequestWorker(this, _manager);
_latestWorker->setTimeOut(_timeOut);
Expand All @@ -725,20 +725,20 @@ void {{classname}}::{{nickname}}({{#allParams}}{{#required}}const {{{dataType}}}
});

_latestInput = input;
_latestScope = scope;{{/isCode}}
_latestScope = scopeAuthorizationFlow;{{/isCode}}
{{#isImplicit}}
_OauthMethod = 1;
_OauthMethod = OauthMethod::ImplicitFlow;
_implicitFlow.link();
_passwordFlow.unlink();
_authFlow.unlink();
_credentialFlow.unlink();
QStringList scope;
QStringList scopeImplicitFlow;
{{#scopes}}
scope.append("{{scope}}");
scopeImplicitFlow.append("{{scope}}");
{{/scopes}}
auto token = _implicitFlow.getToken(scope.join(" "));
if(token.isValid())
input.headers.insert("Authorization", "Bearer " + token.getToken());
auto tokenImplicitFlow = _implicitFlow.getToken(scopeImplicitFlow.join(" "));
if(tokenImplicitFlow.isValid())
input.headers.insert("Authorization", "Bearer " + tokenImplicitFlow.getToken());

_latestWorker = new {{prefix}}HttpRequestWorker(this, _manager);
_latestWorker->setTimeOut(_timeOut);
Expand All @@ -755,20 +755,20 @@ void {{classname}}::{{nickname}}({{#allParams}}{{#required}}const {{{dataType}}}
});

_latestInput = input;
_latestScope = scope;{{/isImplicit}}
_latestScope = scopeImplicitFlow;{{/isImplicit}}
{{#isApplication}}
_OauthMethod = 3;
_OauthMethod = OauthMethod::ClientCredentialsFlow;
_authFlow.unlink();
_implicitFlow.unlink();
_passwordFlow.unlink();
_credentialFlow.link();
QStringList scope;
QStringList scopeClientCredentialsFlow;
{{#scopes}}
scope.append("{{scope}}");
scopeClientCredentialsFlow.append("{{scope}}");
{{/scopes}}
auto token = _credentialFlow.getToken(scope.join(" "));
if(token.isValid())
input.headers.insert("Authorization", "Bearer " + token.getToken());
auto tokenClientCredentialsFlow = _credentialFlow.getToken(scopeClientCredentialsFlow.join(" "));
if(tokenClientCredentialsFlow.isValid())
input.headers.insert("Authorization", "Bearer " + tokenClientCredentialsFlow.getToken());

_latestWorker = new {{prefix}}HttpRequestWorker(this, _manager);
_latestWorker->setTimeOut(_timeOut);
Expand All @@ -785,20 +785,20 @@ void {{classname}}::{{nickname}}({{#allParams}}{{#required}}const {{{dataType}}}
});

_latestInput = input;
_latestScope = scope;{{/isApplication}}
_latestScope = scopeClientCredentialsFlow;{{/isApplication}}
{{#isPassword}}
_OauthMethod = 4;
_OauthMethod = OauthMethod::ResourceOwnerPasswordFlow;
_passwordFlow.link();
_authFlow.unlink();
_implicitFlow.unlink();
_credentialFlow.unlink();
QStringList scope;
QStringList scopeResourceOwnerPasswordFlow;
{{#scopes}}
scope.append("{{scope}}");
scopeResourceOwnerPasswordFlow.append("{{scope}}");
{{/scopes}}
auto token = _passwordFlow.getToken(scope.join(" "));
if(token.isValid())
input.headers.insert("Authorization", "Bearer " + token.getToken());
auto tokenResourceOwnerPasswordFlow = _passwordFlow.getToken(scopeResourceOwnerPasswordFlow.join(" "));
if(tokenResourceOwnerPasswordFlow.isValid())
input.headers.insert("Authorization", "Bearer " + tokenResourceOwnerPasswordFlow.getToken());

_latestWorker = new {{prefix}}HttpRequestWorker(this, _manager);
_latestWorker->setTimeOut(_timeOut);
Expand All @@ -815,7 +815,7 @@ void {{classname}}::{{nickname}}({{#allParams}}{{#required}}const {{{dataType}}}
});

_latestInput = input;
_latestScope = scope;
_latestScope = scopeResourceOwnerPasswordFlow;
{{/isPassword}}{{/isOAuth}}{{/authMethods}}

worker->execute(&input);
Expand Down Expand Up @@ -960,11 +960,11 @@ void {{classname}}::{{nickname}}Callback({{prefix}}HttpRequestWorker *worker) {

{{/operation}}
{{/operations}}
void {{classname}}::tokenAvailable(){
void {{classname}}::tokenAvailable() {

oauthToken token;
switch (_OauthMethod) {
case 1: //implicit flow
case OauthMethod::ImplicitFlow:
token = _implicitFlow.getToken(_latestScope.join(" "));
if(token.isValid()){
_latestInput.headers.insert("Authorization", "Bearer " + token.getToken());
Expand All @@ -974,7 +974,7 @@ void {{classname}}::tokenAvailable(){
qDebug() << "Could not retrieve a valid token";
}
break;
case 2: //authorization flow
case OauthMethod::AuthorizationFlow:
token = _authFlow.getToken(_latestScope.join(" "));
if(token.isValid()){
_latestInput.headers.insert("Authorization", "Bearer " + token.getToken());
Expand All @@ -984,7 +984,7 @@ void {{classname}}::tokenAvailable(){
qDebug() << "Could not retrieve a valid token";
}
break;
case 3: //client credentials flow
case OauthMethod::ClientCredentialsFlow:
token = _credentialFlow.getToken(_latestScope.join(" "));
if(token.isValid()){
_latestInput.headers.insert("Authorization", "Bearer " + token.getToken());
Expand All @@ -994,7 +994,7 @@ void {{classname}}::tokenAvailable(){
qDebug() << "Could not retrieve a valid token";
}
break;
case 4: //resource owner password flow
case OauthMethod::ResourceOwnerPasswordFlow:
token = _passwordFlow.getToken(_latestScope.join(" "));
if(token.isValid()){
_latestInput.headers.insert("Authorization", "Bearer " + token.getToken());
Expand Down
9 changes: 8 additions & 1 deletion modules/openapi-generator/src/main/resources/cpp-qt-client/api-header.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,13 @@ public:
{{/operation}}{{/operations}}

private:
enum class OauthMethod : int {
INVALID_VALUE_OPENAPI_GENERATED = 0,
ImplicitFlow = 1,
AuthorizationFlow = 2,
ClientCredentialsFlow = 3,
ResourceOwnerPasswordFlow = 4
};
QMap<QString,int> _serverIndices;
QMap<QString,QList<{{prefix}}ServerConfiguration>> _serverConfigs;
QMap<QString, QString> _apiKeys;
Expand All @@ -82,7 +89,7 @@ private:
OauthImplicit _implicitFlow;
OauthCredentials _credentialFlow;
OauthPassword _passwordFlow;
int _OauthMethod = 0;
OauthMethod _OauthMethod = OauthMethod::INVALID_VALUE_OPENAPI_GENERATED;
{{#operations}}{{#operation}}
void {{nickname}}Callback({{prefix}}HttpRequestWorker *worker);{{/operation}}{{/operations}}

Expand Down
10 changes: 5 additions & 5 deletions samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXFakeApi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,11 +326,11 @@ void PFXFakeApi::getEnumInlineOrRefCallback(PFXHttpRequestWorker *worker) {
}
}

void PFXFakeApi::tokenAvailable(){
void PFXFakeApi::tokenAvailable() {

oauthToken token;
switch (_OauthMethod) {
case 1: //implicit flow
case OauthMethod::ImplicitFlow:
token = _implicitFlow.getToken(_latestScope.join(" "));
if(token.isValid()){
_latestInput.headers.insert("Authorization", "Bearer " + token.getToken());
Expand All @@ -340,7 +340,7 @@ void PFXFakeApi::tokenAvailable(){
qDebug() << "Could not retrieve a valid token";
}
break;
case 2: //authorization flow
case OauthMethod::AuthorizationFlow:
token = _authFlow.getToken(_latestScope.join(" "));
if(token.isValid()){
_latestInput.headers.insert("Authorization", "Bearer " + token.getToken());
Expand All @@ -350,7 +350,7 @@ void PFXFakeApi::tokenAvailable(){
qDebug() << "Could not retrieve a valid token";
}
break;
case 3: //client credentials flow
case OauthMethod::ClientCredentialsFlow:
token = _credentialFlow.getToken(_latestScope.join(" "));
if(token.isValid()){
_latestInput.headers.insert("Authorization", "Bearer " + token.getToken());
Expand All @@ -360,7 +360,7 @@ void PFXFakeApi::tokenAvailable(){
qDebug() << "Could not retrieve a valid token";
}
break;
case 4: //resource owner password flow
case OauthMethod::ResourceOwnerPasswordFlow:
token = _passwordFlow.getToken(_latestScope.join(" "));
if(token.isValid()){
_latestInput.headers.insert("Authorization", "Bearer " + token.getToken());
Expand Down
9 changes: 8 additions & 1 deletion samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXFakeApi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,13 @@ class PFXFakeApi : public QObject {


private:
enum class OauthMethod : int {
INVALID_VALUE_OPENAPI_GENERATED = 0,
ImplicitFlow = 1,
AuthorizationFlow = 2,
ClientCredentialsFlow = 3,
ResourceOwnerPasswordFlow = 4
};
QMap<QString,int> _serverIndices;
QMap<QString,QList<PFXServerConfiguration>> _serverConfigs;
QMap<QString, QString> _apiKeys;
Expand All @@ -84,7 +91,7 @@ class PFXFakeApi : public QObject {
OauthImplicit _implicitFlow;
OauthCredentials _credentialFlow;
OauthPassword _passwordFlow;
int _OauthMethod = 0;
OauthMethod _OauthMethod = OauthMethod::INVALID_VALUE_OPENAPI_GENERATED;

void getEnumInlineOrRefCallback(PFXHttpRequestWorker *worker);

Expand Down
Loading
Loading