decap-cms-lib-util 3.0.4 → 3.1.0

package/dist/esm/API.js

@@ -172,7 +172,7 @@ async function constructRequestHeaders(headerConfig) {
     'Content-Type': 'application/json; charset=utf-8'
   }, headers);
   if (token) {
-    baseHeaders['Authorization'] = `token ${token}`;
+    baseHeaders['Authorization'] = `Bearer ${token}`;
   }
   return Promise.resolve(baseHeaders);
 }
@@ -180,6 +180,7 @@ function handleRequestError(error, responseStatus, backend) {
   throw new _APIError.default(error.message, responseStatus, backend);
 }
 async function apiRequest(path, config, parser = response => parseResponse(response)) {
+  var _config$apiRoot;
   const {
       token,
       backend
@@ -192,7 +193,7 @@ async function apiRequest(path, config, parser = response => parseResponse(respo
     headers: options.headers || {},
     token
   });
-  const baseUrl = apiRoots[backend];
+  const baseUrl = (_config$apiRoot = config.apiRoot) !== null && _config$apiRoot !== void 0 ? _config$apiRoot : apiRoots[backend];
   const url = constructUrlWithParams(`${baseUrl}${path}`, options.params);
   let responseStatus = 500;
   try {
@@ -212,7 +213,8 @@ async function getDefaultBranchName(configs) {
   const {
     token,
     backend,
-    repo
+    repo,
+    apiRoot
   } = configs;
   switch (backend) {
     case 'gitlab':
@@ -232,7 +234,8 @@ async function getDefaultBranchName(configs) {
   }
   const repoInfo = await apiRequest(apiPath, {
     token,
-    backend
+    backend,
+    apiRoot
   });
   let defaultBranchName;
   if (backend === 'bitbucket') {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "decap-cms-lib-util",
   "description": "Shared utilities for Decap CMS.",
-  "version": "3.0.4",
+  "version": "3.1.0",
   "repository": "https://github.com/decaporg/decap-cms/tree/main/packages/decap-cms-lib-util",
   "bugs": "https://github.com/decaporg/decap-cms/issues",
   "module": "dist/esm/index.js",
@@ -25,5 +25,5 @@
     "immutable": "^3.7.6",
     "lodash": "^4.17.11"
   },
-  "gitHead": "d3678b0ad1b9f93b841c85e4ee2de48167aa8906"
+  "gitHead": "86c93a4fae0fd954d043acc176b0618ab715623b"
 }

package/src/API.ts

@@ -142,6 +142,7 @@ type Backend = 'github' | 'gitlab' | 'bitbucket';
 type RequestConfig = Omit<RequestInit, 'headers'> &
   HeaderConfig & {
     backend: Backend;
+    apiRoot?: string;
     params?: ParamObject;
   };
 
@@ -182,7 +183,7 @@ async function constructRequestHeaders(headerConfig: HeaderConfig) {
   const { token, headers } = headerConfig;
   const baseHeaders: HeaderObj = { 'Content-Type': 'application/json; charset=utf-8', ...headers };
   if (token) {
-    baseHeaders['Authorization'] = `token ${token}`;
+    baseHeaders['Authorization'] = `Bearer ${token}`;
   }
   return Promise.resolve(baseHeaders);
 }
@@ -199,7 +200,7 @@ export async function apiRequest(
   const { token, backend, ...props } = config;
   const options = { cache: 'no-cache', ...props };
   const headers = await constructRequestHeaders({ headers: options.headers || {}, token });
-  const baseUrl = apiRoots[backend];
+  const baseUrl = config.apiRoot ?? apiRoots[backend];
   const url = constructUrlWithParams(`${baseUrl}${path}`, options.params);
   let responseStatus = 500;
   try {
@@ -220,9 +221,10 @@ export async function getDefaultBranchName(configs: {
   backend: Backend;
   repo: string;
   token?: string;
+  apiRoot?: string;
 }) {
   let apiPath;
-  const { token, backend, repo } = configs;
+  const { token, backend, repo, apiRoot } = configs;
   switch (backend) {
     case 'gitlab': {
       apiPath = `/projects/${encodeURIComponent(repo)}`;
@@ -236,7 +238,7 @@ export async function getDefaultBranchName(configs: {
       apiPath = `/repos/${repo}`;
     }
   }
-  const repoInfo = await apiRequest(apiPath, { token, backend });
+  const repoInfo = await apiRequest(apiPath, { token, backend, apiRoot });
   let defaultBranchName;
   if (backend === 'bitbucket') {
     const {