decap-cms-backend-github 3.4.0 → 3.5.0

package/dist/esm/API.js

@@ -91,14 +91,17 @@ export default class API {
         token: this.token
       });
     }
-    return this._userPromise;
+    return this._userPromise.then(user => ({
+      name: user.name || 'Unknown',
+      login: user.login
+    }));
   }
   async hasWriteAccess() {
     try {
       const result = await this.request(this.repoURL);
       // update config repoOwner to avoid case sensitivity issues with GitHub
       this.repoOwner = result.owner.login;
-      return result.permissions.push;
+      return result.permissions?.push ?? false;
     } catch (error) {
       console.error('Problem fetching repo data from GitHub');
       throw error;
@@ -402,7 +405,7 @@ export default class API {
     const [{
       files
     }, pullRequestAuthor] = await Promise.all([this.getDifferences(this.branch, pullRequest.head.sha), this.getPullRequestAuthor(pullRequest)]);
-    const diffs = await Promise.all(files.map(file => this.diffFromFile(file)));
+    const diffs = await Promise.all((files || []).map(file => this.diffFromFile(file)));
     const label = pullRequest.labels.find(l => isCMSLabel(l.name, this.cmsLabelPrefix));
     const status = labelToStatus(label.name, this.cmsLabelPrefix);
     const updatedAt = pullRequest.updated_at;
@@ -450,8 +453,8 @@ export default class API {
           commit
         } = result[0];
         return {
-          author: commit.author.name || commit.author.email,
-          updatedOn: commit.author.date
+          author: commit.author?.name || commit.author?.email || '',
+          updatedOn: commit.author?.date || ''
         };
       } catch (e) {
         return {
@@ -502,12 +505,12 @@ export default class API {
       });
       return result.tree
       // filter only files and up to the required depth
-      .filter(file => file.type === 'blob' && file.path.split('/').length <= depth).map(file => ({
+      .filter(file => file.type === 'blob' && file.path && file.path.split('/').length <= depth).map(file => ({
         type: file.type,
         id: file.sha,
         name: basename(file.path),
         path: `${folder}/${file.path}`,
-        size: file.size
+        size: file.size || 0
       }));
     } catch (err) {
       if (err && err.status === 404) {
@@ -668,7 +671,7 @@ export default class API {
     const resp = await this.request(`${this.originRepoURL}/commits/${sha}/status`);
     return resp.statuses.map(s => ({
       context: s.context,
-      target_url: s.target_url,
+      target_url: s.target_url || '',
       state: s.state === GitHubCommitStatusState.Success ? PreviewState.Success : PreviewState.Other
     }));
   }
@@ -744,7 +747,7 @@ export default class API {
     return {
       path: diff.filename,
       newFile: diff.status === 'added',
-      sha: diff.sha,
+      sha: diff.sha || '',
       // media files diffs don't have a patch attribute, except svg files
       // renamed files don't have a patch attribute too
       binary: diff.status !== 'renamed' && !diff.patch || diff.filename.endsWith('.svg')
@@ -769,7 +772,7 @@ export default class API {
       const {
         files: diffFiles
       } = await this.getDifferences(this.branch, await this.getHeadReference(branch));
-      const diffs = await Promise.all(diffFiles.map(file => this.diffFromFile(file)));
+      const diffs = await Promise.all((diffFiles || []).map(file => this.diffFromFile(file)));
       // mark media files to remove
       const mediaFilesToRemove = [];
       for (const diff of diffs.filter(d => d.binary)) {
@@ -824,7 +827,15 @@ export default class API {
       } = commit.commit;
 
       // create a new commit from the updated tree
-      const newCommit = await this.createCommit(message, tree.sha, [baseCommit.sha], author, committer);
+      const newCommit = await this.createCommit(message, tree.sha, [baseCommit.sha], author ? {
+        name: author.name || '',
+        email: author.email || '',
+        date: author.date
+      } : undefined, committer ? {
+        name: committer.name || '',
+        email: committer.email || '',
+        date: committer.date
+      } : undefined);
       return newCommit;
     } else {
       return commit;

package/dist/esm/implementation.js

@@ -124,11 +124,18 @@ export default class GitHub {
     token
   }) {
     if (!this._currentUserPromise) {
-      this._currentUserPromise = fetch(`${this.apiRoot}/user`, {
-        headers: {
-          Authorization: `${this.tokenKeyword} ${token}`
-        }
-      }).then(res => res.json());
+      this._currentUserPromise = (async () => {
+        const res = await fetch(`${this.apiRoot}/user`, {
+          headers: {
+            Authorization: `${this.tokenKeyword} ${token}`
+          }
+        });
+        const user = await res.json();
+        return {
+          ...user,
+          name: user.name || 'Unknown'
+        };
+      })();
     }
     return this._currentUserPromise;
   }
@@ -255,7 +262,7 @@ export default class GitHub {
       useOpenAuthoring: this.useOpenAuthoring,
       initialWorkflowStatus: this.options.initialWorkflowStatus,
       baseUrl: this.baseUrl,
-      getUser: this.currentUser
+      getUser: args => this.currentUser(args)
     });
     const user = await this.api.user();
     const isCollab = await this.api.hasWriteAccess().catch(error => {

package/dist/esm/rateLimitLink.js

@@ -0,0 +1,24 @@
+/**
+ * Rate limit info type and callback
+ */
+
+/**
+ * Extracts rate limit information from response headers
+ */
+export function extractRateLimitInfo(headers) {
+  const used = headers.get('x-ratelimit-used');
+  const limit = headers.get('x-ratelimit-limit');
+  const remaining = headers.get('x-ratelimit-remaining');
+  const reset = headers.get('x-ratelimit-reset');
+  const resource = headers.get('x-ratelimit-resource');
+  if (!used || !limit || !remaining || !reset || !resource) {
+    return null;
+  }
+  return {
+    used: parseInt(used, 10),
+    limit: parseInt(limit, 10),
+    remaining: parseInt(remaining, 10),
+    reset: parseInt(reset, 10),
+    resource
+  };
+}

package/dist/esm/types/githubPullRequests.js

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "decap-cms-backend-github",
   "description": "GitHub backend for Decap CMS",
-  "version": "3.4.0",
+  "version": "3.5.0",
   "license": "MIT",
   "repository": "https://github.com/decaporg/decap-cms/tree/main/packages/decap-cms-backend-github",
   "bugs": "https://github.com/decaporg/decap-cms/issues",
@@ -44,5 +44,5 @@
   "browser": {
     "path": "path-browserify"
   },
-  "gitHead": "d3465f53b7f056ad5d872948a07eaa8e4ae63315"
+  "gitHead": "0c1b7c7d63ba6ddb3de3692fbb6b16ac6ebb44d5"
 }