Merge branch 'master' into repo-picker

3 files changed, 17 insertions, 4 deletions

diff --git a/api/services/github/files.js b/api/services/github/files.js
index 5f5837f..40bcb41 100644
--- a/api/services/github/files.js
+++ b/api/services/github/files.js
@@ -4,12 +4,22 @@ const zmk = require('../zmk')
 
 const MODE_FILE = '100644'
 
+class InvalidRepoError extends Error {}
+
 async function fetchKeyboardFiles (installationId, repository) {
   const { data: { token: installationToken } } = await auth.createInstallationToken(installationId)
-  const { data: info } = await fetchFile(installationToken, repository, 'config/info.json', true)
-  const { data: keymap } = await fetchFile(installationToken, repository, 'config/keymap.json', true)
+  try {
+    const { data: info } = await fetchFile(installationToken, repository, 'config/info.json', true)
+    const { data: keymap } = await fetchFile(installationToken, repository, 'config/keymap.json', true)
+
+    return { info, keymap }
+  } catch (err) {
+    if (err.response && err.response.status === 404) {
+      throw new InvalidRepoError()
+    }
 
-  return { info, keymap }
+    throw err
+  }
 }
 
 function fetchFile (installationToken, repository, path, raw = false) {
@@ -76,6 +86,7 @@ async function commitChanges (installationId, repository, layout, keymap) {
 }
 
 module.exports = {
+  InvalidRepoError,
   fetchKeyboardFiles,
   commitChanges
 }
diff --git a/api/services/github/index.js b/api/services/github/index.js
index 34a0654..8443dd7 100644
--- a/api/services/github/index.js
+++ b/api/services/github/index.js
@@ -13,6 +13,7 @@ const {
 } = require('./installations')
 
 const {
+  InvalidRepoError,
   fetchKeyboardFiles,
   commitChanges
 } = require('./files')
@@ -26,6 +27,7 @@ module.exports = {
   verifyUserToken,
   fetchInstallation,
   fetchInstallationRepos,
+  InvalidRepoError,
   fetchKeyboardFiles,
   commitChanges
 }
diff --git a/api/services/zmk/keymap.js b/api/services/zmk/keymap.js
index 011f486..a8837ea 100644
--- a/api/services/zmk/keymap.js
+++ b/api/services/zmk/keymap.js
@@ -108,7 +108,7 @@ function generateKeymapCode (layout, keymap, encoded) {
     })
 
     return `
-        ${name} {
+        ${name.replace(/[^a-zA-Z0-9_]/g, '_')} {
             bindings = <
 ${rendered}
             >;