refs swagger-api/swagger-codegen#10090 - fix typescript-angular apiKey in template

frantuma · frantuma · commit 6b27308d351e · 2020-03-11T10:39:06.000+01:00
diff --git a/src/main/resources/handlebars/typescript-angular/api.service.mustache b/src/main/resources/handlebars/typescript-angular/api.service.mustache
@@ -200,13 +200,13 @@ export class {{classname}} {
         // authentication ({{name}}) required
 {{#isApiKey}}
 {{#isKeyInHeader}}
-        if (this.configuration.apiKeys["{{keyParamName}}"]) {
+        if (this.configuration.apiKeys && this.configuration.apiKeys["{{keyParamName}}"]) {
             {{#useHttpClient}}headers = {{/useHttpClient}}headers.set('{{keyParamName}}', this.configuration.apiKeys["{{keyParamName}}"]);
         }
 
 {{/isKeyInHeader}}
 {{#isKeyInQuery}}
-        if (this.configuration.apiKeys["{{keyParamName}}"]) {
+        if (this.configuration.apiKeys && this.configuration.apiKeys["{{keyParamName}}"]) {
             {{#useHttpClient}}queryParameters = {{/useHttpClient}}queryParameters.set('{{keyParamName}}', this.configuration.apiKeys["{{keyParamName}}"]);
         }
 
diff --git a/src/main/resources/mustache/typescript-angular/api.service.mustache b/src/main/resources/mustache/typescript-angular/api.service.mustache
@@ -200,13 +200,13 @@ export class {{classname}} {
         // authentication ({{name}}) required
 {{#isApiKey}}
 {{#isKeyInHeader}}
-        if (this.configuration.apiKeys["{{keyParamName}}"]) {
+        if (this.configuration.apiKeys && this.configuration.apiKeys["{{keyParamName}}"]) {
             {{#useHttpClient}}headers = {{/useHttpClient}}headers.set('{{keyParamName}}', this.configuration.apiKeys["{{keyParamName}}"]);
         }
 
 {{/isKeyInHeader}}
 {{#isKeyInQuery}}
-        if (this.configuration.apiKeys["{{keyParamName}}"]) {
+        if (this.configuration.apiKeys && this.configuration.apiKeys["{{keyParamName}}"]) {
             {{#useHttpClient}}queryParameters = {{/useHttpClient}}queryParameters.set('{{keyParamName}}', this.configuration.apiKeys["{{keyParamName}}"]);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -200,13 +200,13 @@ export class {{classname}} {`
`200`	`200`	`// authentication ({{name}}) required`
`201`	`201`	`{{#isApiKey}}`
`202`	`202`	`{{#isKeyInHeader}}`
`203`		`- if (this.configuration.apiKeys["{{keyParamName}}"]) {`
	`203`	`+ if (this.configuration.apiKeys && this.configuration.apiKeys["{{keyParamName}}"]) {`
`204`	`204`	`{{#useHttpClient}}headers = {{/useHttpClient}}headers.set('{{keyParamName}}', this.configuration.apiKeys["{{keyParamName}}"]);`
`205`	`205`	`}`
`206`	`206`
`207`	`207`	`{{/isKeyInHeader}}`
`208`	`208`	`{{#isKeyInQuery}}`
`209`		`- if (this.configuration.apiKeys["{{keyParamName}}"]) {`
	`209`	`+ if (this.configuration.apiKeys && this.configuration.apiKeys["{{keyParamName}}"]) {`
`210`	`210`	`{{#useHttpClient}}queryParameters = {{/useHttpClient}}queryParameters.set('{{keyParamName}}', this.configuration.apiKeys["{{keyParamName}}"]);`
`211`	`211`	`}`
`212`	`212`