typescript-angular: Fix Cannot read property 'apiKey' of undefined (#…

…9260) * fix #9259 * avoid optional chaining operator
OpenAPITools · Apr 16, 2021 · 0329119 · 0329119
1 parent b5dac42
commit 0329119
Show file tree

Hide file tree

Showing 19 changed files with 95 additions and 19 deletions.
diff --git a/modules/openapi-generator/src/main/resources/typescript-angular/configuration.mustache b/modules/openapi-generator/src/main/resources/typescript-angular/configuration.mustache
@@ -64,7 +64,11 @@ export class {{configurationClassName}} {
 {{#isApiKey}}
             this.credentials['{{name}}'] = () => {
                 {{! Fallback behaviour may be removed for 5.0 release. See #5062 }}
-                return this.apiKeys['{{name}}'] || this.apiKeys['{{keyParamName}}'];
+                if (this.apiKeys === null || this.apiKeys === undefined) {
+                    return undefined;
+                } else {
+                    return this.apiKeys['{{name}}'] || this.apiKeys['{{keyParamName}}'];
+                }
             };
 {{/isApiKey}}
 {{#isBasic}}

diff --git a/...s/client/petstore/typescript-angular-v10-provided-in-root/builds/default/configuration.ts b/...s/client/petstore/typescript-angular-v10-provided-in-root/builds/default/configuration.ts
@@ -61,7 +61,11 @@ export class Configuration {
         // init default api_key credential
         if (!this.credentials['api_key']) {
             this.credentials['api_key'] = () => {
-                return this.apiKeys['api_key'] || this.apiKeys['api_key'];
+                if (this.apiKeys === null || this.apiKeys === undefined) {
+                    return undefined;
+                } else {
+                    return this.apiKeys['api_key'] || this.apiKeys['api_key'];
+                }
             };
         }
 

diff --git a/.../client/petstore/typescript-angular-v10-provided-in-root/builds/with-npm/configuration.ts b/.../client/petstore/typescript-angular-v10-provided-in-root/builds/with-npm/configuration.ts
@@ -61,7 +61,11 @@ export class Configuration {
         // init default api_key credential
         if (!this.credentials['api_key']) {
             this.credentials['api_key'] = () => {
-                return this.apiKeys['api_key'] || this.apiKeys['api_key'];
+                if (this.apiKeys === null || this.apiKeys === undefined) {
+                    return undefined;
+                } else {
+                    return this.apiKeys['api_key'] || this.apiKeys['api_key'];
+                }
             };
         }
 

diff --git a/...s/client/petstore/typescript-angular-v11-provided-in-root/builds/default/configuration.ts b/...s/client/petstore/typescript-angular-v11-provided-in-root/builds/default/configuration.ts
@@ -61,7 +61,11 @@ export class Configuration {
         // init default api_key credential
         if (!this.credentials['api_key']) {
             this.credentials['api_key'] = () => {
-                return this.apiKeys['api_key'] || this.apiKeys['api_key'];
+                if (this.apiKeys === null || this.apiKeys === undefined) {
+                    return undefined;
+                } else {
+                    return this.apiKeys['api_key'] || this.apiKeys['api_key'];
+                }
             };
         }
 

diff --git a/.../client/petstore/typescript-angular-v11-provided-in-root/builds/with-npm/configuration.ts b/.../client/petstore/typescript-angular-v11-provided-in-root/builds/with-npm/configuration.ts
@@ -61,7 +61,11 @@ export class Configuration {
         // init default api_key credential
         if (!this.credentials['api_key']) {
             this.credentials['api_key'] = () => {
-                return this.apiKeys['api_key'] || this.apiKeys['api_key'];
+                if (this.apiKeys === null || this.apiKeys === undefined) {
+                    return undefined;
+                } else {
+                    return this.apiKeys['api_key'] || this.apiKeys['api_key'];
+                }
             };
         }
 

diff --git a/...lient/petstore/typescript-angular-v6-not-provided-in-root/builds/default/configuration.ts b/...lient/petstore/typescript-angular-v6-not-provided-in-root/builds/default/configuration.ts
@@ -61,7 +61,11 @@ export class Configuration {
         // init default api_key credential
         if (!this.credentials['api_key']) {
             this.credentials['api_key'] = () => {
-                return this.apiKeys['api_key'] || this.apiKeys['api_key'];
+                if (this.apiKeys === null || this.apiKeys === undefined) {
+                    return undefined;
+                } else {
+                    return this.apiKeys['api_key'] || this.apiKeys['api_key'];
+                }
             };
         }
 

diff --git a/...ient/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/configuration.ts b/...ient/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/configuration.ts
@@ -61,7 +61,11 @@ export class Configuration {
         // init default api_key credential
         if (!this.credentials['api_key']) {
             this.credentials['api_key'] = () => {
-                return this.apiKeys['api_key'] || this.apiKeys['api_key'];
+                if (this.apiKeys === null || this.apiKeys === undefined) {
+                    return undefined;
+                } else {
+                    return this.apiKeys['api_key'] || this.apiKeys['api_key'];
+                }
             };
         }
 

diff --git a/...es/client/petstore/typescript-angular-v6-provided-in-root/builds/default/configuration.ts b/...es/client/petstore/typescript-angular-v6-provided-in-root/builds/default/configuration.ts
@@ -61,7 +61,11 @@ export class Configuration {
         // init default api_key credential
         if (!this.credentials['api_key']) {
             this.credentials['api_key'] = () => {
-                return this.apiKeys['api_key'] || this.apiKeys['api_key'];
+                if (this.apiKeys === null || this.apiKeys === undefined) {
+                    return undefined;
+                } else {
+                    return this.apiKeys['api_key'] || this.apiKeys['api_key'];
+                }
             };
         }
 

diff --git a/...s/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/configuration.ts b/...s/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/configuration.ts
@@ -61,7 +61,11 @@ export class Configuration {
         // init default api_key credential
         if (!this.credentials['api_key']) {
             this.credentials['api_key'] = () => {
-                return this.apiKeys['api_key'] || this.apiKeys['api_key'];
+                if (this.apiKeys === null || this.apiKeys === undefined) {
+                    return undefined;
+                } else {
+                    return this.apiKeys['api_key'] || this.apiKeys['api_key'];
+                }
             };
         }
 

diff --git a/...lient/petstore/typescript-angular-v7-not-provided-in-root/builds/default/configuration.ts b/...lient/petstore/typescript-angular-v7-not-provided-in-root/builds/default/configuration.ts
@@ -61,7 +61,11 @@ export class Configuration {
         // init default api_key credential
         if (!this.credentials['api_key']) {
             this.credentials['api_key'] = () => {
-                return this.apiKeys['api_key'] || this.apiKeys['api_key'];
+                if (this.apiKeys === null || this.apiKeys === undefined) {
+                    return undefined;
+                } else {
+                    return this.apiKeys['api_key'] || this.apiKeys['api_key'];
+                }
             };
         }
 

diff --git a/...ient/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/configuration.ts b/...ient/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/configuration.ts
@@ -61,7 +61,11 @@ export class Configuration {
         // init default api_key credential
         if (!this.credentials['api_key']) {
             this.credentials['api_key'] = () => {
-                return this.apiKeys['api_key'] || this.apiKeys['api_key'];
+                if (this.apiKeys === null || this.apiKeys === undefined) {
+                    return undefined;
+                } else {
+                    return this.apiKeys['api_key'] || this.apiKeys['api_key'];
+                }
             };
         }
 

diff --git a/...es/client/petstore/typescript-angular-v7-provided-in-root/builds/default/configuration.ts b/...es/client/petstore/typescript-angular-v7-provided-in-root/builds/default/configuration.ts
@@ -61,7 +61,11 @@ export class Configuration {
         // init default api_key credential
         if (!this.credentials['api_key']) {
             this.credentials['api_key'] = () => {
-                return this.apiKeys['api_key'] || this.apiKeys['api_key'];
+                if (this.apiKeys === null || this.apiKeys === undefined) {
+                    return undefined;
+                } else {
+                    return this.apiKeys['api_key'] || this.apiKeys['api_key'];
+                }
             };
         }
 

diff --git a/...s/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/configuration.ts b/...s/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/configuration.ts
@@ -61,7 +61,11 @@ export class Configuration {
         // init default api_key credential
         if (!this.credentials['api_key']) {
             this.credentials['api_key'] = () => {
-                return this.apiKeys['api_key'] || this.apiKeys['api_key'];
+                if (this.apiKeys === null || this.apiKeys === undefined) {
+                    return undefined;
+                } else {
+                    return this.apiKeys['api_key'] || this.apiKeys['api_key'];
+                }
             };
         }
 

diff --git a/...e/typescript-angular-v8-provided-in-root/builds/single-request-parameter/configuration.ts b/...e/typescript-angular-v8-provided-in-root/builds/single-request-parameter/configuration.ts
@@ -61,7 +61,11 @@ export class Configuration {
         // init default api_key credential
         if (!this.credentials['api_key']) {
             this.credentials['api_key'] = () => {
-                return this.apiKeys['api_key'] || this.apiKeys['api_key'];
+                if (this.apiKeys === null || this.apiKeys === undefined) {
+                    return undefined;
+                } else {
+                    return this.apiKeys['api_key'] || this.apiKeys['api_key'];
+                }
             };
         }
 

diff --git a/...s/client/petstore/typescript-angular-v8-provided-in-root/builds/with-npm/configuration.ts b/...s/client/petstore/typescript-angular-v8-provided-in-root/builds/with-npm/configuration.ts
@@ -61,7 +61,11 @@ export class Configuration {
         // init default api_key credential
         if (!this.credentials['api_key']) {
             this.credentials['api_key'] = () => {
-                return this.apiKeys['api_key'] || this.apiKeys['api_key'];
+                if (this.apiKeys === null || this.apiKeys === undefined) {
+                    return undefined;
+                } else {
+                    return this.apiKeys['api_key'] || this.apiKeys['api_key'];
+                }
             };
         }
 

diff --git a/.../typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name/configuration.ts b/.../typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name/configuration.ts
@@ -61,7 +61,11 @@ export class PetStoreConfiguration {
         // init default api_key credential
         if (!this.credentials['api_key']) {
             this.credentials['api_key'] = () => {
-                return this.apiKeys['api_key'] || this.apiKeys['api_key'];
+                if (this.apiKeys === null || this.apiKeys === undefined) {
+                    return undefined;
+                } else {
+                    return this.apiKeys['api_key'] || this.apiKeys['api_key'];
+                }
             };
         }
 

diff --git a/...les/client/petstore/typescript-angular-v9-provided-in-any/builds/default/configuration.ts b/...les/client/petstore/typescript-angular-v9-provided-in-any/builds/default/configuration.ts
@@ -61,7 +61,11 @@ export class Configuration {
         // init default api_key credential
         if (!this.credentials['api_key']) {
             this.credentials['api_key'] = () => {
-                return this.apiKeys['api_key'] || this.apiKeys['api_key'];
+                if (this.apiKeys === null || this.apiKeys === undefined) {
+                    return undefined;
+                } else {
+                    return this.apiKeys['api_key'] || this.apiKeys['api_key'];
+                }
             };
         }
 

diff --git a/...es/client/petstore/typescript-angular-v9-provided-in-root/builds/default/configuration.ts b/...es/client/petstore/typescript-angular-v9-provided-in-root/builds/default/configuration.ts
@@ -61,7 +61,11 @@ export class Configuration {
         // init default api_key credential
         if (!this.credentials['api_key']) {
             this.credentials['api_key'] = () => {
-                return this.apiKeys['api_key'] || this.apiKeys['api_key'];
+                if (this.apiKeys === null || this.apiKeys === undefined) {
+                    return undefined;
+                } else {
+                    return this.apiKeys['api_key'] || this.apiKeys['api_key'];
+                }
             };
         }
 

diff --git a/...s/client/petstore/typescript-angular-v9-provided-in-root/builds/with-npm/configuration.ts b/...s/client/petstore/typescript-angular-v9-provided-in-root/builds/with-npm/configuration.ts
@@ -61,7 +61,11 @@ export class Configuration {
         // init default api_key credential
         if (!this.credentials['api_key']) {
             this.credentials['api_key'] = () => {
-                return this.apiKeys['api_key'] || this.apiKeys['api_key'];
+                if (this.apiKeys === null || this.apiKeys === undefined) {
+                    return undefined;
+                } else {
+                    return this.apiKeys['api_key'] || this.apiKeys['api_key'];
+                }
             };
         }