Skip to content

[HttpBasicAuth] Use positive isBasicBasic tag instead of negative isBasicBearer #5095

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

Merged
wing328 merged 2 commits into from
Jan 24, 2020
Merged

[HttpBasicAuth] Use positive isBasicBasic tag instead of negative isBasicBearer #5095

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7797fe4
use positive isBasicBasic tag instead of negative isBasicBearer
sebastien-rosset Jan 23, 2020
b3bb69a
use positive isBasicBasic tag instead of negative isBasicBearer
sebastien-rosset Jan 23, 2020
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
Next Next commit
use positive isBasicBasic tag instead of negative isBasicBearer
  • Loading branch information
@sebastien-rosset
sebastien-rosset committed Jan 23, 2020
commit 7797fe4146e4ff94500b35bb74d797756b733fef
4 changes: 2 additions & 2 deletions modules/openapi-generator/src/main/resources/Javascript/ApiClient.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@
{{/emitJSDoc}}{{=< >=}} this.authentications = {
<#authMethods>
<#isBasic>
<^isBasicBearer>
<#isBasicBasic>
'<name>': {type: 'basic'}<^-last>,</-last>
</isBasicBearer>
</isBasicBasic>
<#isBasicBearer>
'<name>': {type: 'bearer'}<^-last>,</-last><#bearerFormat> // <&.></bearerFormat>
</isBasicBearer>
Expand Down
8 changes: 4 additions & 4 deletions modules/openapi-generator/src/main/resources/Javascript/README.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,12 @@ var {{{moduleName}}} = require('{{{projectName}}}');
var defaultClient = {{{moduleName}}}.ApiClient.instance;
{{#authMethods}}
{{#isBasic}}
{{^isBasicBearer}}
{{#isBasicBasic}}
// Configure HTTP basic authorization: {{{name}}}
var {{{name}}} = defaultClient.authentications['{{{name}}}'];
{{{name}}}.username = 'YOUR USERNAME'
{{{name}}}.password = 'YOUR PASSWORD'
{{/isBasicBearer}}
{{/isBasicBasic}}
{{#isBasicBearer}}
// Configure Bearer{{#bearerFormat}} ({{{.}}}){{/bearerFormat}} access token for authorization: {{{name}}}
var {{{name}}} = defaultClient.authentications['{{{name}}}'];
Expand Down Expand Up @@ -192,10 +192,10 @@ All endpoints do not require authorization.
- **Location**: {{#isKeyInQuery}}URL query string{{/isKeyInQuery}}{{#isKeyInHeader}}HTTP header{{/isKeyInHeader}}
{{/isApiKey}}
{{#isBasic}}
{{^isBasicBearer}}
{{#isBasicBasic}}

- **Type**: HTTP basic authentication
{{/isBasicBearer}}
{{/isBasicBasic}}
{{#isBasicBearer}}

- **Type**: Bearer authentication{{#bearerFormat}} ({{{.}}}){{/bearerFormat}}
Expand Down
4 changes: 2 additions & 2 deletions modules/openapi-generator/src/main/resources/Javascript/api_doc.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ var {{{moduleName}}} = require('{{{projectName}}}');
var defaultClient = {{{moduleName}}}.ApiClient.instance;
{{#authMethods}}
{{#isBasic}}
{{^isBasicBearer}}
{{#isBasicBasic}}
// Configure HTTP basic authorization: {{{name}}}
var {{{name}}} = defaultClient.authentications['{{{name}}}'];
{{{name}}}.username = 'YOUR USERNAME';
{{{name}}}.password = 'YOUR PASSWORD';
{{/isBasicBearer}}
{{/isBasicBasic}}
{{#isBasicBearer}}
// Configure Bearer{{#bearerFormat}} ({{{.}}}){{/bearerFormat}} access token for authorization: {{{name}}}
var {{{name}}} = defaultClient.authentications['{{{name}}}'];
Expand Down
4 changes: 2 additions & 2 deletions modules/openapi-generator/src/main/resources/Javascript/es6/ApiClient.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ class ApiClient {
this.authentications = {
<#authMethods>
<#isBasic>
<^isBasicBearer>
<#isBasicBasic>
'<name>': {type: 'basic'}<^-last>,</-last>
</isBasicBearer>
</isBasicBasic>
<#isBasicBearer>
'<name>': {type: 'bearer'}<^-last>,</-last><#bearerFormat> // <&.></bearerFormat>
</isBasicBearer>
Expand Down
8 changes: 4 additions & 4 deletions modules/openapi-generator/src/main/resources/Javascript/es6/README.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,12 +112,12 @@ var {{{moduleName}}} = require('{{{projectName}}}');
var defaultClient = {{{moduleName}}}.ApiClient.instance;
{{#authMethods}}
{{#isBasic}}
{{^isBasicBearer}}
{{#isBasicBasic}}
// Configure HTTP basic authorization: {{{name}}}
var {{{name}}} = defaultClient.authentications['{{{name}}}'];
{{{name}}}.username = 'YOUR USERNAME'
{{{name}}}.password = 'YOUR PASSWORD'
{{/isBasicBearer}}
{{/isBasicBasic}}
{{#isBasicBearer}}
// Configure Bearer{{#bearerFormat}} ({{{.}}}){{/bearerFormat}} access token for authorization: {{{name}}}
var {{{name}}} = defaultClient.authentications['{{{name}}}'];
Expand Down Expand Up @@ -206,9 +206,9 @@ All endpoints do not require authorization.
- **Location**: {{#isKeyInQuery}}URL query string{{/isKeyInQuery}}{{#isKeyInHeader}}HTTP header{{/isKeyInHeader}}
{{/isApiKey}}
{{#isBasic}}
{{^isBasicBearer}}
{{#isBasicBasic}}
- **Type**: HTTP basic authentication
{{/isBasicBearer}}
{{/isBasicBasic}}
{{#isBasicBearer}}
- **Type**: Bearer authentication{{#bearerFormat}} ({{{.}}}){{/bearerFormat}}
{{/isBasicBearer}}
Expand Down
4 changes: 2 additions & 2 deletions modules/openapi-generator/src/main/resources/Javascript/es6/api_doc.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ import {{{moduleName}}} from '{{{projectName}}}';
let defaultClient = {{{moduleName}}}.ApiClient.instance;
{{#authMethods}}
{{#isBasic}}
{{^isBasicBearer}}
{{#isBasicBasic}}
// Configure HTTP basic authorization: {{{name}}}
let {{{name}}} = defaultClient.authentications['{{{name}}}'];
{{{name}}}.username = 'YOUR USERNAME';
{{{name}}}.password = 'YOUR PASSWORD';
{{/isBasicBearer}}
{{/isBasicBasic}}
{{#isBasicBearer}}
// Configure Bearer{{#bearerFormat}} ({{{.}}}){{/bearerFormat}} access token for authorization: {{{name}}}
let {{{name}}} = defaultClient.authentications['{{{name}}}'];
Expand Down