From f759d86b97481cfed538ccb46f7fbe868509e13f Mon Sep 17 00:00:00 2001 From: Tiffany Marrel Date: Tue, 16 May 2023 09:24:48 +0200 Subject: [PATCH] [android] fix use of isBasic condition --- .../src/main/resources/android/README.mustache | 8 ++++++-- .../android/libraries/volley/apiInvoker.mustache | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/android/README.mustache b/modules/openapi-generator/src/main/resources/android/README.mustache index d61a46e981d9..734209cc4af1 100644 --- a/modules/openapi-generator/src/main/resources/android/README.mustache +++ b/modules/openapi-generator/src/main/resources/android/README.mustache @@ -104,8 +104,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**: HTTP Bearer Token authentication{{#bearerFormat}} ({{{.}}}){{/bearerFormat}} +{{/isBasicBearer}} +{{#isHttpSignature}}- **Type**: HTTP signature authentication +{{/isHttpSignature}} {{#isOAuth}} - **Type**: OAuth diff --git a/modules/openapi-generator/src/main/resources/android/libraries/volley/apiInvoker.mustache b/modules/openapi-generator/src/main/resources/android/libraries/volley/apiInvoker.mustache index db0fcd2e6295..1837047a6653 100644 --- a/modules/openapi-generator/src/main/resources/android/libraries/volley/apiInvoker.mustache +++ b/modules/openapi-generator/src/main/resources/android/libraries/volley/apiInvoker.mustache @@ -196,9 +196,9 @@ public class ApiInvoker { {{#isApiKey}} INSTANCE.authentications.put("{{name}}", new ApiKeyAuth({{#isKeyInHeader}}"header"{{/isKeyInHeader}}{{^isKeyInHeader}}"query"{{/isKeyInHeader}}, "{{keyParamName}}")); {{/isApiKey}} - {{#isBasic}} + {{#isBasicBasic}} INSTANCE.authentications.put("{{name}}", new HttpBasicAuth()); - {{/isBasic}} + {{/isBasicBasic}} {{#isOAuth}} // TODO: comment out below as OAuth does not exist //INSTANCE.authentications.put("{{name}}", new OAuth());