feat: more informative user-facing errors regarding metadata verifica…

…tion (#490)
dhis2 · May 25, 2021 · 47fb951 · 47fb951
1 parent c7c4475
commit 47fb951
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/server/src/routes/v1/apps/handlers/createApp.js b/server/src/routes/v1/apps/handlers/createApp.js
@@ -132,13 +132,17 @@ module.exports = {
             )
 
             const { file } = payload
-            verifyBundle({
-                buffer: file._data,
-                appId: app.id,
-                appName: name,
-                version,
-                organisationName: organisation.name,
-            })
+            try {
+                verifyBundle({
+                    buffer: file._data,
+                    appId: app.id,
+                    appName: name,
+                    version,
+                    organisationName: organisation.name,
+                })
+            } catch (error) {
+                throw Boom.badRequest(error)
+            }
             const appUpload = saveFile(
                 `${app.id}/${appVersion.id}`,
                 'app.zip',

diff --git a/server/src/routes/v1/apps/handlers/createAppVersion.js b/server/src/routes/v1/apps/handlers/createAppVersion.js
@@ -196,7 +196,12 @@ module.exports = {
                 version,
                 organisationName: organisation.name,
             })
+        } catch (err) {
+            await transaction.rollback()
+            throw Boom.badRequest(err)
+        }
 
+        try {
             await saveFile(`${appId}/${versionId}`, 'app.zip', file._data)
         } catch (err) {
             await transaction.rollback()