Updated PR with XHR support, added E2E tests and added documentation

Author: ferdikoomen

README.md

@@ -339,6 +339,20 @@ import { OpenAPI } from './generated';
 OpenAPI.TOKEN = 'some-bearer-token';
 ```
 
+Alternatively, we also support an async method that provides the token for each request.
+You can simply assign this method to the same `TOKEN `property in the global OpenAPI object.
+
+```typescript
+import { OpenAPI } from './generated';
+
+const getToken = async () => {
+    // Some code that requests a token...
+    return 'SOME_TOKEN';
+}
+
+OpenAPI.TOKEN = getToken;
+```
+
 
 ### Compare to other generators
 Depending on which swagger generator you use, you will see different output.

package.json

@@ -1,6 +1,6 @@
 {
-    "name": "@beatgig/openapi-typescript-codegen",
-    "version": "0.5.0-async-token.2",
+    "name": "openapi-typescript-codegen",
+    "version": "0.5.1",
     "description": "NodeJS library that generates Typescript or Javascript clients based on the OpenAPI specification.",
     "author": "Ferdi Koomen",
     "homepage": "https://github.com/ferdikoomen/openapi-typescript-codegen",

src/templates/core/fetch/getHeaders.hbs

@@ -3,9 +3,8 @@ async function getHeaders(options: ApiRequestOptions): Promise<Headers> {
         Accept: 'application/json',
         ...options.headers,
     });
-        
-    const token = typeof OpenAPI.TOKEN === 'function' ? await OpenAPI.TOKEN() : OpenAPI.TOKEN;
 
+    const token = await getToken();
     if (isDefined(token) && token !== '') {
         headers.append('Authorization', `Bearer ${token}`);
     }

src/templates/core/fetch/request.hbs

@@ -23,6 +23,9 @@ import { OpenAPI } from './OpenAPI';
 {{>functions/getFormData}}
 
 
+{{>functions/getToken}}
+
+
 {{>fetch/getHeaders}}
 
 

src/templates/core/functions/getToken.hbs

@@ -0,0 +1,6 @@
+async function getToken(): Promise<string> {
+    if (typeof OpenAPI.TOKEN === 'function') {
+        return OpenAPI.TOKEN();
+    }
+    return OpenAPI.TOKEN;
+}

src/templates/core/node/getHeaders.hbs

@@ -1,11 +1,12 @@
-function getHeaders(options: ApiRequestOptions): Headers {
+async function getHeaders(options: ApiRequestOptions): Promise<Headers> {
     const headers = new Headers({
         Accept: 'application/json',
         ...options.headers,
     });
 
-    if (isDefined(OpenAPI.TOKEN) && OpenAPI.TOKEN !== '') {
-        headers.append('Authorization', `Bearer ${OpenAPI.TOKEN}`);
+    const token = await getToken();
+    if (isDefined(token) && token !== '') {
+        headers.append('Authorization', `Bearer ${token}`);
     }
 
     if (options.body) {

src/templates/core/node/request.hbs

@@ -27,6 +27,9 @@ import { OpenAPI } from './OpenAPI';
 {{>functions/getFormData}}
 
 
+{{>functions/getToken}}
+
+
 {{>node/getHeaders}}
 
 

src/templates/core/node/sendRequest.hbs

@@ -1,7 +1,7 @@
 async function sendRequest(options: ApiRequestOptions, url: string): Promise<Response> {
     const request: RequestInit = {
         method: options.method,
-        headers: getHeaders(options),
+        headers: await getHeaders(options),
         body: getRequestBody(options),
     };
     return await fetch(url, request);

src/templates/core/xhr/getHeaders.hbs

@@ -1,11 +1,12 @@
-function getHeaders(options: ApiRequestOptions): Headers {
+async function getHeaders(options: ApiRequestOptions): Promise<Headers> {
     const headers = new Headers({
         Accept: 'application/json',
         ...options.headers,
     });
 
-    if (isDefined(OpenAPI.TOKEN) && OpenAPI.TOKEN !== '') {
-        headers.append('Authorization', `Bearer ${OpenAPI.TOKEN}`);
+    const token = await getToken();
+    if (isDefined(token) && token !== '') {
+        headers.append('Authorization', `Bearer ${token}`);
     }
 
     if (options.body) {

src/templates/core/xhr/request.hbs

@@ -26,6 +26,9 @@ import { OpenAPI } from './OpenAPI';
 {{>functions/getFormData}}
 
 
+{{>functions/getToken}}
+
+
 {{>fetch/getHeaders}}