From 2d30714d5e762f311c8e4a111c687546f380373d Mon Sep 17 00:00:00 2001
From: Jakub Surdej <kubasurdej@gmail.com>
Date: Tue, 29 Sep 2020 10:56:38 +0200
Subject: [PATCH] Allow auth.accessToken to be either function or string
 (#7484)

---
 .../src/main/resources/Javascript/ApiClient.mustache         | 5 ++++-
 .../src/main/resources/Javascript/es6/ApiClient.mustache     | 5 ++++-
 samples/client/petstore/javascript-es6/src/ApiClient.js      | 5 ++++-
 .../client/petstore/javascript-promise-es6/src/ApiClient.js  | 5 ++++-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/Javascript/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Javascript/ApiClient.mustache
index b402e62d1a5..d06606a38be 100644
--- a/modules/openapi-generator/src/main/resources/Javascript/ApiClient.mustache
+++ b/modules/openapi-generator/src/main/resources/Javascript/ApiClient.mustache
@@ -338,7 +338,10 @@
           break;
         case 'bearer':
           if (auth.accessToken) {
-            request.set({'Authorization': 'Bearer ' + auth.accessToken});
+            var localVarBearerToken = typeof auth.accessToken === 'function'
+              ? auth.accessToken()
+              : auth.accessToken
+            request.set({'Authorization': 'Bearer ' + localVarBearerToken});
           }
           break;
         case 'apiKey':
diff --git a/modules/openapi-generator/src/main/resources/Javascript/es6/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Javascript/es6/ApiClient.mustache
index fcb92377e19..ff9799a1554 100644
--- a/modules/openapi-generator/src/main/resources/Javascript/es6/ApiClient.mustache
+++ b/modules/openapi-generator/src/main/resources/Javascript/es6/ApiClient.mustache
@@ -304,7 +304,10 @@ class ApiClient {
                     break;
                 case 'bearer':
                     if (auth.accessToken) {
-                        request.set({'Authorization': 'Bearer ' + auth.accessToken});
+                        var localVarBearerToken = typeof auth.accessToken === 'function'
+                          ? auth.accessToken()
+                          : auth.accessToken
+                        request.set({'Authorization': 'Bearer ' + localVarBearerToken});
                     }
 
                     break;
diff --git a/samples/client/petstore/javascript-es6/src/ApiClient.js b/samples/client/petstore/javascript-es6/src/ApiClient.js
index a750c17c975..a6b7b871820 100644
--- a/samples/client/petstore/javascript-es6/src/ApiClient.js
+++ b/samples/client/petstore/javascript-es6/src/ApiClient.js
@@ -302,7 +302,10 @@ class ApiClient {
                     break;
                 case 'bearer':
                     if (auth.accessToken) {
-                        request.set({'Authorization': 'Bearer ' + auth.accessToken});
+                        var localVarBearerToken = typeof auth.accessToken === 'function'
+                          ? auth.accessToken()
+                          : auth.accessToken
+                        request.set({'Authorization': 'Bearer ' + localVarBearerToken});
                     }
 
                     break;
diff --git a/samples/client/petstore/javascript-promise-es6/src/ApiClient.js b/samples/client/petstore/javascript-promise-es6/src/ApiClient.js
index 390d96b3e33..ead1a81b942 100644
--- a/samples/client/petstore/javascript-promise-es6/src/ApiClient.js
+++ b/samples/client/petstore/javascript-promise-es6/src/ApiClient.js
@@ -302,7 +302,10 @@ class ApiClient {
                     break;
                 case 'bearer':
                     if (auth.accessToken) {
-                        request.set({'Authorization': 'Bearer ' + auth.accessToken});
+                        var localVarBearerToken = typeof auth.accessToken === 'function'
+                          ? auth.accessToken()
+                          : auth.accessToken
+                        request.set({'Authorization': 'Bearer ' + localVarBearerToken});
                     }
 
                     break;