From 6961c52b142a7be4ea41b1bdacdf388ddc156eb6 Mon Sep 17 00:00:00 2001 From: Tiffany Marrel Date: Fri, 14 Apr 2023 10:59:48 +0200 Subject: [PATCH] [xojo] fix use of isBasic condition --- .../src/main/resources/xojo-client/README.mustache | 8 ++++++-- .../src/main/resources/xojo-client/api.mustache | 2 +- .../src/main/resources/xojo-client/api_mock.mustache | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/xojo-client/README.mustache b/modules/openapi-generator/src/main/resources/xojo-client/README.mustache index 9a27ce47c516..771cddb98fe6 100644 --- a/modules/openapi-generator/src/main/resources/xojo-client/README.mustache +++ b/modules/openapi-generator/src/main/resources/xojo-client/README.mustache @@ -99,8 +99,12 @@ Class | Method | HTTP request | Description - **API key parameter name**: {{{keyParamName}}} - **Location**: {{#isKeyInQuery}}URL query string{{/isKeyInQuery}}{{#isKeyInHeader}}HTTP header{{/isKeyInHeader}} {{/isApiKey}} -{{#isBasic}}- **Type**: HTTP basic authentication -{{/isBasic}} +{{#isBasicBasic}}- **Type**: HTTP basic authentication +{{/isBasicBasic}} +{{#isBasicBearer}}- **Type**: Bearer authentication{{#bearerFormat}} ({{{.}}}){{/bearerFormat}} +{{/isBasicBearer}} +{{#isHttpSignature}}- **Type**: HTTP signature authentication +{{/isHttpSignature}} {{#isOAuth}}- **Type**: OAuth - **Flow**: {{{flow}}} - **Authorization URL**: {{{authorizationUrl}}} diff --git a/modules/openapi-generator/src/main/resources/xojo-client/api.mustache b/modules/openapi-generator/src/main/resources/xojo-client/api.mustache index 2f6ca2f6d4e2..466059b32e73 100644 --- a/modules/openapi-generator/src/main/resources/xojo-client/api.mustache +++ b/modules/openapi-generator/src/main/resources/xojo-client/api.mustache @@ -15,7 +15,7 @@ Protected Class {{classname}} // - subresourceOperation: {{.}}{{/subresourceOperation}}{{#defaultResponse}} // - defaultResponse: {{.}}{{/defaultResponse}} //{{#authMethods}} - // - {{#isBasic}}BASIC{{/isBasic}}{{#isOAuth}}OAuth{{/isOAuth}}{{#isApiKey}}API Key{{/isApiKey}}: + // - {{#isBasicBasic}}BASIC{{/isBasicBasic}}{{#isBasicBearer}}Bearer Token{{/isBasicBearer}}{{#isOAuth}}OAuth{{/isOAuth}}{{#isApiKey}}API Key{{/isApiKey}}: // - type: {{type}}{{#keyParamName}} {{keyParamName}} {{#isKeyInQuery}}(QUERY){{/isKeyInQuery}}{{#isKeyInHeader}}(HEADER){{/isKeyInHeader}}{{/keyParamName}} // - name: {{name}}{{/authMethods}} //{{#hasResponseHeaders}} diff --git a/modules/openapi-generator/src/main/resources/xojo-client/api_mock.mustache b/modules/openapi-generator/src/main/resources/xojo-client/api_mock.mustache index f989d58fc942..d01bba42f55b 100644 --- a/modules/openapi-generator/src/main/resources/xojo-client/api_mock.mustache +++ b/modules/openapi-generator/src/main/resources/xojo-client/api_mock.mustache @@ -23,7 +23,7 @@ Public Class Mock // - subresourceOperation: {{.}}{{/subresourceOperation}}{{#defaultResponse}} // - defaultResponse: {{.}}{{/defaultResponse}} //{{#authMethods}} - // - {{#isBasic}}BASIC{{/isBasic}}{{#isOAuth}}OAuth{{/isOAuth}}{{#isApiKey}}API Key{{/isApiKey}}: + // - {{#isBasicBasic}}BASIC{{/isBasicBasic}}{{#isBasicBearer}}Bearer Token{{/isBasicBearer}}{{#isOAuth}}OAuth{{/isOAuth}}{{#isApiKey}}API Key{{/isApiKey}}: // - type: {{type}}{{#keyParamName}} {{keyParamName}} {{#isKeyInQuery}}(QUERY){{/isKeyInQuery}}{{#isKeyInHeader}}(HEADER){{/isKeyInHeader}}{{/keyParamName}} // - name: {{name}}{{/authMethods}} //{{#hasResponseHeaders}}