- Fixed ferdikoomen#411

Author: ferdikoomen

src/templates/core/OpenAPI.hbs

@@ -1,15 +1,24 @@
 {{>header}}
 
+type Resolver<T> = () => Promise<T>;
+type Headers = Record<string, string>;
+
 interface Config {
     BASE: string;
     VERSION: string;
     WITH_CREDENTIALS: boolean;
-    TOKEN: string | (() => Promise<string>);
+    TOKEN?: string | Resolver<string>;
+    USERNAME?: string | Resolver<string>;
+    PASSWORD?: string | Resolver<string>;
+    HEADERS?: Headers | Resolver<Headers>;
 }
 
 export const OpenAPI: Config = {
     BASE: '{{{server}}}',
     VERSION: '{{{version}}}',
     WITH_CREDENTIALS: false,
-    TOKEN: '',
+    TOKEN: undefined,
+    USERNAME: undefined,
+    PASSWORD: undefined,
+    HEADERS: undefined,
 };

src/templates/core/fetch/getHeaders.hbs

@@ -1,14 +1,23 @@
 async function getHeaders(options: ApiRequestOptions): Promise<Headers> {
     const headers = new Headers({
         Accept: 'application/json',
+        ...OpenAPI.HEADERS,
         ...options.headers,
     });
 
-    const token = await getToken();
-    if (isDefined(token) && token !== '') {
+    const token = await resolve(OpenAPI.TOKEN);
+    const username = await resolve(OpenAPI.USERNAME);
+    const password = await resolve(OpenAPI.PASSWORD);
+
+    if (isStringWithValue(token)) {
         headers.append('Authorization', `Bearer ${token}`);
     }
 
+    if (isStringWithValue(username) && isStringWithValue(password)) {
+        const credentials = btoa(`${username}:${password}`);
+        headers.append('Authorization', `Basic ${credentials}`);
+    }
+
     if (options.body) {
         if (isBlob(options.body)) {
             headers.append('Content-Type', options.body.type || 'application/octet-stream');

src/templates/core/fetch/request.hbs

@@ -11,6 +11,9 @@ import { OpenAPI } from './OpenAPI';
 {{>functions/isString}}
 
 
+{{>functions/isStringWithValue}}
+
+
 {{>functions/isBlob}}
 
 
@@ -23,7 +26,7 @@ import { OpenAPI } from './OpenAPI';
 {{>functions/getFormData}}
 
 
-{{>functions/getToken}}
+{{>functions/resolve}}
 
 
 {{>fetch/getHeaders}}

src/templates/core/functions/getToken.hbs

@@ -0,0 +1,3 @@
+function isStringWithValue(value: any): value is string {
+    return isString(value) && value !== '';
+}

src/templates/core/functions/isStringWithValue.hbs

@@ -0,0 +1,8 @@
+type Resolver<T> = () => Promise<T>;
+
+async function resolve<T>(resolver?: T | Resolver<T>): Promise<T | undefined> {
+    if (typeof resolver === 'function') {
+        return (resolver as Resolver<T>)();
+    }
+    return resolver;
+}

src/templates/core/functions/resolve.hbs

@@ -1,14 +1,23 @@
 async function getHeaders(options: ApiRequestOptions): Promise<Headers> {
     const headers = new Headers({
         Accept: 'application/json',
+        ...OpenAPI.HEADERS,
         ...options.headers,
     });
 
-    const token = await getToken();
-    if (isDefined(token) && token !== '') {
+    const token = await resolve(OpenAPI.TOKEN);
+    const username = await resolve(OpenAPI.USERNAME);
+    const password = await resolve(OpenAPI.PASSWORD);
+
+    if (isStringWithValue(token)) {
         headers.append('Authorization', `Bearer ${token}`);
     }
 
+    if (isStringWithValue(username) && isStringWithValue(password)) {
+        const credentials = Buffer.from(`${username}:${password}`).toString('base64');
+        headers.append('Authorization', `Basic ${credentials}`);
+    }
+
     if (options.body) {
         if (isBinary(options.body)) {
             headers.append('Content-Type', 'application/octet-stream');

src/templates/core/node/getHeaders.hbs

@@ -15,6 +15,9 @@ import { OpenAPI } from './OpenAPI';
 {{>functions/isString}}
 
 
+{{>functions/isStringWithValue}}
+
+
 {{>functions/isBinary}}
 
 
@@ -27,7 +30,7 @@ import { OpenAPI } from './OpenAPI';
 {{>functions/getFormData}}
 
 
-{{>functions/getToken}}
+{{>functions/resolve}}
 
 
 {{>node/getHeaders}}

src/templates/core/node/request.hbs

@@ -1,14 +1,23 @@
 async function getHeaders(options: ApiRequestOptions): Promise<Headers> {
     const headers = new Headers({
         Accept: 'application/json',
+        ...OpenAPI.HEADERS,
         ...options.headers,
     });
 
-    const token = await getToken();
-    if (isDefined(token) && token !== '') {
+    const token = await resolve(OpenAPI.TOKEN);
+    const username = await resolve(OpenAPI.USERNAME);
+    const password = await resolve(OpenAPI.PASSWORD);
+
+    if (isStringWithValue(token)) {
         headers.append('Authorization', `Bearer ${token}`);
     }
 
+    if (isStringWithValue(username) && isStringWithValue(password)) {
+        const credentials = btoa(`${username}:${password}`);
+        headers.append('Authorization', `Basic ${credentials}`);
+    }
+
     if (options.body) {
         if (isBlob(options.body)) {
             headers.append('Content-Type', options.body.type || 'application/octet-stream');

src/templates/core/xhr/getHeaders.hbs

@@ -11,6 +11,9 @@ import { OpenAPI } from './OpenAPI';
 {{>functions/isString}}
 
 
+{{>functions/isStringWithValue}}
+
+
 {{>functions/isBlob}}
 
 
@@ -26,7 +29,7 @@ import { OpenAPI } from './OpenAPI';
 {{>functions/getFormData}}
 
 
-{{>functions/getToken}}
+{{>functions/resolve}}
 
 
 {{>fetch/getHeaders}}