Fetch internal files using the GitHub tree API

The changes made in #650 caused an issue, which stopped linking relative files in private repos. All files were resolved through the OctoLinker API which obviously doesn't work for private repos.
OctoLinker · Oct 21, 2019 · 5440450 · 5440450
1 parent fe292cc
commit 5440450
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 20 deletions.
diff --git a/packages/core/app.js b/packages/core/app.js
@@ -38,14 +38,17 @@ async function run(rootElement) {
     }
   }
 
+  const [, user, repo] = window.location.pathname.split('/');
+  const currentRepoSlug = `${user}/${repo}`;
+
   matches = matches
     .filter(result => result !== undefined)
     .map(({ link, urls }) => {
       const urlsSorted = helperSortUrls(urls, link.innerText);
 
       return {
         link,
-        urls: normaliseResolverResults(urlsSorted),
+        urls: normaliseResolverResults(urlsSorted, currentRepoSlug),
       };
     });
 

diff --git a/packages/helper-normalise-resolver-results/__snapshots__/test.js.snap b/packages/helper-normalise-resolver-results/__snapshots__/test.js.snap
@@ -13,12 +13,8 @@ Array [
 exports[`normaliseResolverResults converts {BASE_URL}/file.js 1`] = `
 Array [
   Object {
-    "branch": undefined,
-    "path": undefined,
-    "repo": undefined,
-    "type": "internal-link",
-    "url": "https://github.com/file.js",
-    "user": "file.js",
+    "target": "https://github.com/file.js",
+    "type": "ping",
   },
 ]
 `;
@@ -65,25 +61,29 @@ Array [
 exports[`normaliseResolverResults converts {BASE_URL}/foo/bar/blob/master/file.js,{BASE_URL}/foo/bar/blob/master/file.js 1`] = `
 Array [
   Object {
-    "target": "https://github.com/foo/bar/blob/master/file.js",
-    "type": "ping",
+    "branch": "master",
+    "path": "file.js",
+    "repo": "bar",
+    "type": "internal-link",
+    "url": "https://github.com/foo/bar/blob/master/file.js",
+    "user": "foo",
   },
   Object {
-    "target": "https://github.com/foo/bar/blob/master/file.js",
-    "type": "ping",
+    "branch": "master",
+    "path": "file.js",
+    "repo": "bar",
+    "type": "internal-link",
+    "url": "https://github.com/foo/bar/blob/master/file.js",
+    "user": "foo",
   },
 ]
 `;
 
 exports[`normaliseResolverResults converts {BASE_URL}file.js 1`] = `
 Array [
   Object {
-    "branch": undefined,
-    "path": undefined,
-    "repo": undefined,
-    "type": "internal-link",
-    "url": "https://github.comfile.js",
-    "user": undefined,
+    "target": "https://github.comfile.js",
+    "type": "ping",
   },
 ]
 `;

diff --git a/packages/helper-normalise-resolver-results/index.js b/packages/helper-normalise-resolver-results/index.js
@@ -52,10 +52,10 @@ const registry = ({ registry: type, target }) => ({
   target,
 });
 
-export default function(urls) {
+export default function(urls, slug) {
   return [].concat(urls).map(url => {
     if (typeof url === 'string') {
-      if (url.startsWith('{BASE_URL}') && urls.length === 1) {
+      if (url.startsWith(`{BASE_URL}/${slug}/`)) {
         return internal(url);
       }
 

diff --git a/packages/helper-normalise-resolver-results/test.js b/packages/helper-normalise-resolver-results/test.js
@@ -16,6 +16,8 @@ describe('normaliseResolverResults', () => {
     { registry: 'npm', target: 'foo' },
     () => {},
   ])('converts %s', url => {
-    expect(normaliseResolverResults([].concat(url))).toMatchSnapshot();
+    expect(
+      normaliseResolverResults([].concat(url), 'foo/bar'),
+    ).toMatchSnapshot();
   });
 });