@budibase/server 1.0.105-alpha.41 → 1.0.105-alpha.44

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.105-alpha.41",
+  "version": "1.0.105-alpha.44",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -68,10 +68,10 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.105-alpha.41",
-    "@budibase/client": "^1.0.105-alpha.41",
-    "@budibase/pro": "1.0.105-alpha.40",
-    "@budibase/string-templates": "^1.0.105-alpha.41",
+    "@budibase/backend-core": "^1.0.105-alpha.44",
+    "@budibase/client": "^1.0.105-alpha.44",
+    "@budibase/pro": "1.0.105-alpha.43",
+    "@budibase/string-templates": "^1.0.105-alpha.44",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",
@@ -180,5 +180,5 @@
   "optionalDependencies": {
     "oracledb": "^5.3.0"
   },
-  "gitHead": "b5a5efbf595ab6052259366291a51fd33f02094d"
+  "gitHead": "ca260b68cc32135d03a3cc994d456bf5df95e414"
 }

package/src/api/controllers/application.ts

@@ -386,24 +386,32 @@ export const revertClient = async (ctx: any) => {
 }
 
 const destroyApp = async (ctx: any) => {
-  const db = getAppDB()
+  let appId = ctx.params.appId
+  let isUnpublish = ctx.query && ctx.query.unpublish
+
+  if (isUnpublish) {
+    appId = getProdAppID(appId)
+  }
 
+  const db = isUnpublish ? getProdAppDB() : getAppDB()
   const result = await db.destroy()
-  if (ctx.query?.unpublish) {
+
+  if (isUnpublish) {
     await quotas.removePublishedApp()
   } else {
     await quotas.removeApp()
   }
+
   /* istanbul ignore next */
-  if (!env.isTest() && !ctx.query.unpublish) {
-    await deleteApp(ctx.params.appId)
+  if (!env.isTest() && !isUnpublish) {
+    await deleteApp(appId)
   }
-  if (ctx.query && ctx.query.unpublish) {
-    await cleanupAutomations(ctx.params.appId)
+  if (isUnpublish) {
+    await cleanupAutomations(appId)
   }
   // make sure the app/role doesn't stick around after the app has been deleted
-  await removeAppFromUserRoles(ctx, ctx.params.appId)
-  await appCache.invalidateAppMetadata(ctx.params.appId)
+  await removeAppFromUserRoles(ctx, appId)
+  await appCache.invalidateAppMetadata(appId)
   return result
 }
 

package/src/api/controllers/deploy/index.ts

@@ -110,6 +110,9 @@ async function deployApp(deployment: any) {
     console.log("replication complete.. replacing app meta doc")
     const db = getProdAppDB()
     const appDoc = await db.get(DocumentTypes.APP_METADATA)
+
+    deployment.appUrl = appDoc.url
+
     appDoc.appId = productionAppId
     appDoc.instance._id = productionAppId
     await db.put(appDoc)