@budibase/server 1.0.147 → 1.0.149

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.147",
+  "version": "1.0.149",
   "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.147",
-    "@budibase/client": "^1.0.147",
-    "@budibase/pro": "^1.0.145",
-    "@budibase/string-templates": "^1.0.147",
+    "@budibase/backend-core": "^1.0.149",
+    "@budibase/client": "^1.0.149",
+    "@budibase/pro": "1.0.148",
+    "@budibase/string-templates": "^1.0.149",
     "@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": "6496cf37ea91b101c66dc214e657204a5c4fd6d0"
+  "gitHead": "178613c0ffbca82002472eb9278d660d1e8ac7f6"
 }

package/src/db/utils.js

@@ -9,6 +9,8 @@ const {
   StaticDatabases,
   isDevAppID,
   isProdAppID,
+  getDevelopmentAppID,
+  generateAppID,
 } = require("@budibase/backend-core/db")
 
 const UNICODE_MAX = "\ufff0"
@@ -80,6 +82,8 @@ exports.UNICODE_MAX = UNICODE_MAX
 exports.SearchIndexes = SearchIndexes
 exports.AppStatus = AppStatus
 exports.BudibaseInternalDB = BudibaseInternalDB
+exports.generateAppID = generateAppID
+exports.generateDevAppID = getDevelopmentAppID
 
 exports.generateRoleID = generateRoleID
 exports.getRoleParams = getRoleParams
@@ -243,28 +247,6 @@ exports.getLinkParams = (otherProps = {}) => {
   return getDocParams(DocumentTypes.LINK, null, otherProps)
 }
 
-/**
- * Generates a new app ID.
- * @returns {string} The new app ID which the app doc can be stored under.
- */
-exports.generateAppID = (tenantId = null) => {
-  let id = `${DocumentTypes.APP}${SEPARATOR}`
-  if (tenantId) {
-    id += `${tenantId}${SEPARATOR}`
-  }
-  return `${id}${newid()}`
-}
-
-/**
- * Generates a development app ID from a real app ID.
- * @returns {string} the dev app ID which can be used for dev database.
- */
-exports.generateDevAppID = appId => {
-  const prefix = `${DocumentTypes.APP}${SEPARATOR}`
-  const rest = appId.split(prefix)[1]
-  return `${DocumentTypes.APP_DEV}${SEPARATOR}${rest}`
-}
-
 /**
  * Generates a new layout ID.
  * @returns {string} The new layout ID which the layout doc can be stored under.