decap-cms-backend-github 3.1.0-beta.0 → 3.1.0-beta.1

package/dist/esm/implementation.js

@@ -252,23 +252,40 @@ class GitHub {
       this.useOpenAuthoring = false;
       return Promise.resolve();
     }
-    if (!(await this.forkExists({
+
+    // If a fork exists merge it with upstream
+    // otherwise create a new fork.
+    const currentUser = await this.currentUser({
       token
-    }))) {
-      await getPermissionToFork();
-    }
-    const fork = await fetch(`${this.apiRoot}/repos/${this.originRepo}/forks`, {
-      method: 'POST',
-      headers: {
-        Authorization: `token ${token}`
-      }
-    }).then(res => res.json());
+    });
+    const repoName = this.originRepo.split('/')[1];
+    this.repo = `${currentUser.login}/${repoName}`;
     this.useOpenAuthoring = true;
-    this.repo = fork.full_name;
-    return this.pollUntilForkExists({
-      repo: fork.full_name,
+    if (await this.forkExists({
       token
-    });
+    })) {
+      return fetch(`${this.apiRoot}/repos/${this.repo}/merge-upstream`, {
+        method: 'POST',
+        headers: {
+          Authorization: `token ${token}`
+        },
+        body: JSON.stringify({
+          branch: this.branch
+        })
+      });
+    } else {
+      await getPermissionToFork();
+      const fork = await fetch(`${this.apiRoot}/repos/${this.originRepo}/forks`, {
+        method: 'POST',
+        headers: {
+          Authorization: `token ${token}`
+        }
+      }).then(res => res.json());
+      return this.pollUntilForkExists({
+        repo: fork.full_name,
+        token
+      });
+    }
   }
   async authenticate(state) {
     this.token = state.token;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "decap-cms-backend-github",
   "description": "GitHub backend for Decap CMS",
-  "version": "3.1.0-beta.0",
+  "version": "3.1.0-beta.1",
   "license": "MIT",
   "repository": "https://github.com/decaporg/decap-cms/tree/master/packages/decap-cms-backend-github",
   "bugs": "https://github.com/decaporg/decap-cms/issues",
@@ -40,5 +40,5 @@
     "prop-types": "^15.7.2",
     "react": "^18.2.0"
   },
-  "gitHead": "26f650bbfd8b20611ad9bb8957ce2d889a1a9085"
+  "gitHead": "ab43e911c48666f7615761dac5ba9e4300bf3825"
 }

package/src/implementation.tsx

@@ -283,19 +283,34 @@ export default class GitHub implements Implementation {
       return Promise.resolve();
     }
 
-    if (!(await this.forkExists({ token }))) {
+    // If a fork exists merge it with upstream
+    // otherwise create a new fork.
+    const currentUser = await this.currentUser({ token });
+    const repoName = this.originRepo.split('/')[1];
+    this.repo = `${currentUser.login}/${repoName}`;
+    this.useOpenAuthoring = true;
+
+    if (await this.forkExists({ token })) {
+      return fetch(`${this.apiRoot}/repos/${this.repo}/merge-upstream`, {
+        method: 'POST',
+        headers: {
+          Authorization: `token ${token}`,
+        },
+        body: JSON.stringify({
+          branch: this.branch,
+        }),
+      });
+    } else {
       await getPermissionToFork();
-    }
 
-    const fork = await fetch(`${this.apiRoot}/repos/${this.originRepo}/forks`, {
-      method: 'POST',
-      headers: {
-        Authorization: `token ${token}`,
-      },
-    }).then(res => res.json());
-    this.useOpenAuthoring = true;
-    this.repo = fork.full_name;
-    return this.pollUntilForkExists({ repo: fork.full_name, token });
+      const fork = await fetch(`${this.apiRoot}/repos/${this.originRepo}/forks`, {
+        method: 'POST',
+        headers: {
+          Authorization: `token ${token}`,
+        },
+      }).then(res => res.json());
+      return this.pollUntilForkExists({ repo: fork.full_name, token });
+    }
   }
 
   async authenticate(state: Credentials) {