@budibase/server 2.1.31 → 2.1.32-alpha.0

package/dist/utilities/global.js

@@ -8,49 +8,54 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const { getMultiIDParams, getGlobalIDFromUserMetadataID, } = require("../db/utils");
-const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles");
-const { getProdAppID } = require("@budibase/backend-core/db");
-const { getGlobalUserParams } = require("@budibase/backend-core/db");
-const { user: userCache } = require("@budibase/backend-core/cache");
-const { getGlobalDB, isUserInAppTenant, } = require("@budibase/backend-core/tenancy");
-const env = require("../environment");
-const { getAppId } = require("@budibase/backend-core/context");
-const { groups } = require("@budibase/pro");
-exports.updateAppRole = (user, { appId } = {}) => {
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getGlobalUsersFromMetadata = exports.getGlobalUsers = exports.getGlobalUser = exports.getRawGlobalUser = exports.getCachedSelf = exports.updateAppRole = void 0;
+const utils_1 = require("../db/utils");
+const backend_core_1 = require("@budibase/backend-core");
+const environment_1 = __importDefault(require("../environment"));
+const pro_1 = require("@budibase/pro");
+function updateAppRole(user, { appId } = {}) {
     var _a, _b;
-    appId = appId || getAppId();
+    appId = appId || backend_core_1.context.getAppId();
     if (!user || !user.roles) {
         return user;
     }
     // if in an multi-tenancy environment make sure roles are never updated
-    if (env.MULTI_TENANCY && !isUserInAppTenant(appId, user)) {
+    if (environment_1.default.MULTI_TENANCY && appId && !backend_core_1.tenancy.isUserInAppTenant(appId, user)) {
         delete user.builder;
         delete user.admin;
-        user.roleId = BUILTIN_ROLE_IDS.PUBLIC;
+        user.roleId = backend_core_1.roles.BUILTIN_ROLE_IDS.PUBLIC;
         return user;
     }
     // always use the deployed app
-    user.roleId = user.roles[getProdAppID(appId)];
+    if (appId) {
+        user.roleId = user.roles[backend_core_1.db.getProdAppID(appId)];
+    }
     // if a role wasn't found then either set as admin (builder) or public (everyone else)
     if (!user.roleId && user.builder && user.builder.global) {
-        user.roleId = BUILTIN_ROLE_IDS.ADMIN;
+        user.roleId = backend_core_1.roles.BUILTIN_ROLE_IDS.ADMIN;
     }
     else if (!user.roleId && !((_a = user === null || user === void 0 ? void 0 : user.userGroups) === null || _a === void 0 ? void 0 : _a.length)) {
-        user.roleId = BUILTIN_ROLE_IDS.PUBLIC;
+        user.roleId = backend_core_1.roles.BUILTIN_ROLE_IDS.PUBLIC;
     }
     else if ((_b = user === null || user === void 0 ? void 0 : user.userGroups) === null || _b === void 0 ? void 0 : _b.length) {
-        user.roleId = null;
+        user.roleId = undefined;
     }
     delete user.roles;
     return user;
-};
+}
+exports.updateAppRole = updateAppRole;
 function checkGroupRoles(user, { appId } = {}) {
     return __awaiter(this, void 0, void 0, function* () {
-        if (user.roleId && user.roleId !== BUILTIN_ROLE_IDS.PUBLIC) {
+        if (user.roleId && user.roleId !== backend_core_1.roles.BUILTIN_ROLE_IDS.PUBLIC) {
             return user;
         }
-        user.roleId = yield groups.getGroupRoleId(user, appId);
+        if (appId) {
+            user.roleId = yield pro_1.groups.getGroupRoleId(user, appId);
+        }
         return user;
     });
 }
@@ -60,57 +65,73 @@ function processUser(user, { appId } = {}) {
         if (user) {
             delete user.password;
         }
-        user = yield exports.updateAppRole(user, { appId });
+        user = yield updateAppRole(user, { appId });
         if (!user.roleId && ((_a = user === null || user === void 0 ? void 0 : user.userGroups) === null || _a === void 0 ? void 0 : _a.length)) {
             user = yield checkGroupRoles(user, { appId });
         }
         return user;
     });
 }
-exports.getCachedSelf = (ctx, appId) => __awaiter(void 0, void 0, void 0, function* () {
-    // this has to be tenant aware, can't depend on the context to find it out
-    // running some middlewares before the tenancy causes context to break
-    const user = yield userCache.getUser(ctx.user._id);
-    return processUser(user, { appId });
-});
-exports.getRawGlobalUser = (userId) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = getGlobalDB();
-    return db.get(getGlobalIDFromUserMetadataID(userId));
-});
-exports.getGlobalUser = (userId) => __awaiter(void 0, void 0, void 0, function* () {
-    const appId = getAppId();
-    let user = yield exports.getRawGlobalUser(userId);
-    return processUser(user, { appId });
-});
-exports.getGlobalUsers = (users = null) => __awaiter(void 0, void 0, void 0, function* () {
-    const appId = getAppId();
-    const db = getGlobalDB();
-    let globalUsers;
-    if (users) {
-        const globalIds = users.map(user => getGlobalIDFromUserMetadataID(user._id));
-        globalUsers = (yield db.allDocs(getMultiIDParams(globalIds))).rows.map(row => row.doc);
-    }
-    else {
-        globalUsers = (yield db.allDocs(getGlobalUserParams(null, {
-            include_docs: true,
-        }))).rows.map(row => row.doc);
-    }
-    globalUsers = globalUsers
-        .filter(user => user != null)
-        .map(user => {
-        delete user.password;
-        delete user.forceResetPassword;
-        return user;
+function getCachedSelf(ctx, appId) {
+    var _a;
+    return __awaiter(this, void 0, void 0, function* () {
+        // this has to be tenant aware, can't depend on the context to find it out
+        // running some middlewares before the tenancy causes context to break
+        const user = yield backend_core_1.cache.user.getUser((_a = ctx.user) === null || _a === void 0 ? void 0 : _a._id);
+        return processUser(user, { appId });
     });
-    if (!appId) {
-        return globalUsers;
-    }
-    return globalUsers.map(user => exports.updateAppRole(user));
-});
-exports.getGlobalUsersFromMetadata = (users) => __awaiter(void 0, void 0, void 0, function* () {
-    const globalUsers = yield exports.getGlobalUsers(users);
-    return users.map(user => {
-        const globalUser = globalUsers.find(globalUser => globalUser && user._id.includes(globalUser._id));
-        return Object.assign(Object.assign({}, globalUser), user);
+}
+exports.getCachedSelf = getCachedSelf;
+function getRawGlobalUser(userId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const db = backend_core_1.tenancy.getGlobalDB();
+        return db.get((0, utils_1.getGlobalIDFromUserMetadataID)(userId));
+    });
+}
+exports.getRawGlobalUser = getRawGlobalUser;
+function getGlobalUser(userId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const appId = backend_core_1.context.getAppId();
+        let user = yield getRawGlobalUser(userId);
+        return processUser(user, { appId });
+    });
+}
+exports.getGlobalUser = getGlobalUser;
+function getGlobalUsers(users) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const appId = backend_core_1.context.getAppId();
+        const db = backend_core_1.tenancy.getGlobalDB();
+        let globalUsers;
+        if (users) {
+            const globalIds = users.map(user => (0, utils_1.getGlobalIDFromUserMetadataID)(user._id));
+            globalUsers = (yield db.allDocs((0, utils_1.getMultiIDParams)(globalIds))).rows.map(row => row.doc);
+        }
+        else {
+            globalUsers = (yield db.allDocs(backend_core_1.db.getGlobalUserParams(null, {
+                include_docs: true,
+            }))).rows.map(row => row.doc);
+        }
+        globalUsers = globalUsers
+            .filter(user => user != null)
+            .map(user => {
+            delete user.password;
+            delete user.forceResetPassword;
+            return user;
+        });
+        if (!appId) {
+            return globalUsers;
+        }
+        return globalUsers.map(user => updateAppRole(user));
     });
-});
+}
+exports.getGlobalUsers = getGlobalUsers;
+function getGlobalUsersFromMetadata(users) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const globalUsers = yield getGlobalUsers(users);
+        return users.map(user => {
+            const globalUser = globalUsers.find(globalUser => { var _a; return globalUser && ((_a = user._id) === null || _a === void 0 ? void 0 : _a.includes(globalUser._id)); });
+            return Object.assign(Object.assign({}, globalUser), user);
+        });
+    });
+}
+exports.getGlobalUsersFromMetadata = getGlobalUsersFromMetadata;

package/dist/utilities/security.js

@@ -1,28 +1,28 @@
 "use strict";
-const { PermissionLevels, PermissionTypes, getBuiltinPermissionByID, isPermissionLevelHigherThanRead, } = require("@budibase/backend-core/permissions");
+const { PermissionLevel, PermissionType, getBuiltinPermissionByID, isPermissionLevelHigherThanRead, } = require("@budibase/backend-core/permissions");
 const { lowerBuiltinRoleID, getBuiltinRoles, } = require("@budibase/backend-core/roles");
 const { DocumentType } = require("../db/utils");
 const CURRENTLY_SUPPORTED_LEVELS = [
-    PermissionLevels.WRITE,
-    PermissionLevels.READ,
-    PermissionLevels.EXECUTE,
+    PermissionLevel.WRITE,
+    PermissionLevel.READ,
+    PermissionLevel.EXECUTE,
 ];
 exports.getPermissionType = resourceId => {
     const docType = Object.values(DocumentType).filter(docType => resourceId.startsWith(docType))[0];
     switch (docType) {
         case DocumentType.TABLE:
         case DocumentType.ROW:
-            return PermissionTypes.TABLE;
+            return PermissionType.TABLE;
         case DocumentType.AUTOMATION:
-            return PermissionTypes.AUTOMATION;
+            return PermissionType.AUTOMATION;
         case DocumentType.WEBHOOK:
-            return PermissionTypes.WEBHOOK;
+            return PermissionType.WEBHOOK;
         case DocumentType.QUERY:
         case DocumentType.DATASOURCE:
-            return PermissionTypes.QUERY;
+            return PermissionType.QUERY;
         default:
             // views don't have an ID, will end up here
-            return PermissionTypes.VIEW;
+            return PermissionType.VIEW;
     }
 };
 /**
@@ -44,7 +44,7 @@ exports.getBasePermissions = resourceId => {
             const level = typedPermission.level;
             permissions[level] = lowerBuiltinRoleID(permissions[level], roleId);
             if (isPermissionLevelHigherThanRead(level)) {
-                permissions[PermissionLevels.READ] = lowerBuiltinRoleID(permissions[PermissionLevels.READ], roleId);
+                permissions[PermissionLevel.READ] = lowerBuiltinRoleID(permissions[PermissionLevel.READ], roleId);
             }
         }
     }

package/dist/utilities/workerRequests.js

@@ -13,16 +13,16 @@ const env = require("../environment");
 const { checkSlashesInUrl } = require("./index");
 const { getProdAppID } = require("@budibase/backend-core/db");
 const { updateAppRole } = require("./global");
-const { Headers } = require("@budibase/backend-core/constants");
+const { Header } = require("@budibase/backend-core/constants");
 const { getTenantId, isTenantIdSet } = require("@budibase/backend-core/tenancy");
 function request(ctx, request) {
     if (!request.headers) {
         request.headers = {};
     }
     if (!ctx) {
-        request.headers[Headers.API_KEY] = env.INTERNAL_API_KEY;
+        request.headers[Header.API_KEY] = env.INTERNAL_API_KEY;
         if (isTenantIdSet()) {
-            request.headers[Headers.TENANT_ID] = getTenantId();
+            request.headers[Header.TENANT_ID] = getTenantId();
         }
     }
     if (request.body && Object.keys(request.body).length > 0) {

package/jest.config.ts

@@ -0,0 +1,33 @@
+import { Config } from "@jest/types"
+import * as fs from "fs"
+
+const config: Config.InitialOptions = {
+  preset: "ts-jest",
+  testEnvironment: "node",
+  setupFiles: ["./src/tests/jestSetup.ts"],
+  collectCoverageFrom: [
+    "src/**/*.{js,ts}",
+    // The use of coverage with couchdb view functions breaks tests
+    "!src/db/views/staticViews.*",
+  ],
+  coverageReporters: ["lcov", "json", "clover"],
+}
+
+if (!process.env.CI) {
+  // use sources when not in CI
+  config.moduleNameMapper = {
+    "@budibase/backend-core/(.*)": "<rootDir>/../backend-core/$1",
+    "@budibase/backend-core": "<rootDir>/../backend-core/src",
+    "@budibase/types": "<rootDir>/../types/src",
+    "^axios.*$": "<rootDir>/node_modules/axios/lib/axios.js",
+  }
+  // add pro sources if they exist
+  if (fs.existsSync("../../../budibase-pro")) {
+    config.moduleNameMapper["@budibase/pro"] =
+      "<rootDir>/../../../budibase-pro/packages/pro/src"
+  }
+} else {
+  console.log("Running tests with compiled dependency sources")
+}
+
+export default config

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.1.31",
+  "version": "2.1.32-alpha.0",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -36,40 +36,6 @@
     "env:account:enable": "node scripts/account.js enable",
     "env:account:disable": "node scripts/account.js disable"
   },
-  "jest": {
-    "preset": "ts-jest",
-    "testEnvironment": "node",
-    "moduleNameMapper": {
-      "@budibase/backend-core/(.*)": "<rootDir>/../backend-core/$1",
-      "@budibase/backend-core": "<rootDir>/../backend-core/src",
-      "@budibase/types": "<rootDir>/../types/src"
-    },
-    "setupFiles": [
-      "./scripts/jestSetup.js"
-    ],
-    "collectCoverageFrom": [
-      "src/**/*.js",
-      "!**/node_modules/**",
-      "!src/db/views/*.js",
-      "!src/api/controllers/deploy/**/*.js",
-      "!src/*.js",
-      "!src/api/controllers/static/**/*",
-      "!src/db/dynamoClient.js",
-      "!src/utilities/usageQuota.js",
-      "!src/api/routes/tests/**/*",
-      "!src/db/tests/**/*",
-      "!src/tests/**/*",
-      "!src/automations/tests/**/*",
-      "!src/utilities/fileProcessor.js",
-      "!src/utilities/fileSystem/**/*",
-      "!src/utilities/redis.js"
-    ],
-    "coverageReporters": [
-      "lcov",
-      "json",
-      "clover"
-    ]
-  },
   "keywords": [
     "budibase"
   ],
@@ -77,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^2.1.31",
-    "@budibase/client": "^2.1.31",
-    "@budibase/pro": "2.1.30",
-    "@budibase/string-templates": "^2.1.31",
-    "@budibase/types": "^2.1.31",
+    "@budibase/backend-core": "2.1.32-alpha.0",
+    "@budibase/client": "2.1.32-alpha.0",
+    "@budibase/pro": "2.1.31",
+    "@budibase/string-templates": "2.1.32-alpha.0",
+    "@budibase/types": "2.1.32-alpha.0",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -179,7 +145,7 @@
     "eslint": "6.8.0",
     "ioredis-mock": "7.2.0",
     "is-wsl": "2.2.0",
-    "jest": "27.5.1",
+    "jest": "28.1.1",
     "jest-openapi": "0.14.2",
     "nodemon": "2.0.15",
     "openapi-types": "9.3.1",
@@ -190,14 +156,14 @@
     "supertest": "4.0.2",
     "swagger-jsdoc": "6.1.0",
     "timekeeper": "2.2.0",
-    "ts-jest": "27.1.3",
-    "ts-node": "10.5.0",
+    "ts-jest": "28.0.4",
+    "ts-node": "10.8.1",
     "tsconfig-paths": "4.0.0",
-    "typescript": "4.6.2",
+    "typescript": "4.7.3",
     "update-dotenv": "1.1.1"
   },
   "optionalDependencies": {
     "oracledb": "5.3.0"
   },
-  "gitHead": "26c060039a7ced587f3c7005ab9ef3ac9224937a"
+  "gitHead": "f192fc72b3035780f5d1b7595f24227841f50cf6"
 }

package/scripts/localdomain.js

@@ -2,6 +2,36 @@
 const updateDotEnv = require("update-dotenv")
 
 const arg = process.argv.slice(2)[0]
+const isEnable = arg === "enable"
+
+let domain = process.argv.slice(2)[1]
+if (!domain) {
+  domain = "local.com"
+}
+
+const getAccountPortalUrl = () => {
+  if (isEnable) {
+    return `http://account.${domain}:10001`
+  } else {
+    return `http://localhost:10001`
+  }
+}
+
+const getBudibaseUrl = () => {
+  if (isEnable) {
+    return `http://${domain}:10000`
+  } else {
+    return `http://localhost:10000`
+  }
+}
+
+const getCookieDomain = () => {
+  if (isEnable) {
+    return `.${domain}`
+  } else {
+    return ""
+  }
+}
 
 /**
  * For testing multi tenancy sub domains locally.
@@ -16,9 +46,7 @@ const arg = process.argv.slice(2)[0]
  * 127.0.0.1   t2.local.com
  */
 updateDotEnv({
-  ACCOUNT_PORTAL_URL:
-    arg === "enable"
-      ? "http://account.local.com:10001"
-      : "http://localhost:10001",
-  COOKIE_DOMAIN: arg === "enable" ? ".local.com" : "",
-}).then(() => console.log("Updated worker!"))
+  ACCOUNT_PORTAL_URL: getAccountPortalUrl(),
+  COOKIE_DOMAIN: getCookieDomain(),
+  PLATFORM_URL: getBudibaseUrl(),
+}).then(() => console.log("Updated server!"))

package/src/api/controllers/application.ts

@@ -14,17 +14,16 @@ import {
   DocumentType,
   AppStatus,
 } from "../../db/utils"
-const {
-  BUILTIN_ROLE_IDS,
-  AccessController,
-} = require("@budibase/backend-core/roles")
-const { CacheKeys, bustCache } = require("@budibase/backend-core/cache")
-const {
-  getAllApps,
-  isDevAppID,
-  getProdAppID,
-  Replication,
-} = require("@budibase/backend-core/db")
+import {
+  db as dbCore,
+  roles,
+  cache,
+  tenancy,
+  context,
+  errors,
+  events,
+  migrations,
+} from "@budibase/backend-core"
 import { USERS_TABLE_SCHEMA } from "../../constants"
 import { removeAppFromUserRoles } from "../../utilities/workerRequests"
 import { clientLibraryPath, stringToReadStream } from "../../utilities"
@@ -34,15 +33,11 @@ import {
   backupClientLibrary,
   revertClientLibrary,
 } from "../../utilities/fileSystem/clientLibrary"
-const { getTenantId, isMultiTenant } = require("@budibase/backend-core/tenancy")
 import { syncGlobalUsers } from "./user"
-const { app: appCache } = require("@budibase/backend-core/cache")
 import { cleanupAutomations } from "../../automations/utils"
-import { context } from "@budibase/backend-core"
 import { checkAppMetadata } from "../../automations/logging"
 import { getUniqueRows } from "../../utilities/usageQuota/rows"
 import { quotas, groups } from "@budibase/pro"
-import { errors, events, migrations } from "@budibase/backend-core"
 import { App, Layout, Screen, MigrationType } from "@budibase/types"
 import { BASE_LAYOUT_PROP_IDS } from "../../constants/layouts"
 import { enrichPluginURLs } from "../../utilities/plugins"
@@ -75,7 +70,7 @@ async function getScreens() {
 
 function getUserRoleId(ctx: any) {
   return !ctx.user.role || !ctx.user.role._id
-    ? BUILTIN_ROLE_IDS.PUBLIC
+    ? roles.BUILTIN_ROLE_IDS.PUBLIC
     : ctx.user.role._id
 }
 
@@ -123,7 +118,7 @@ const checkAppName = (
 }
 
 async function createInstance(template: any) {
-  const tenantId = isMultiTenant() ? getTenantId() : null
+  const tenantId = tenancy.isMultiTenant() ? tenancy.getTenantId() : null
   const baseAppId = generateAppID(tenantId)
   const appId = generateDevAppID(baseAppId)
   await context.updateAppId(appId)
@@ -162,7 +157,7 @@ async function createInstance(template: any) {
 export const fetch = async (ctx: any) => {
   const dev = ctx.query && ctx.query.status === AppStatus.DEV
   const all = ctx.query && ctx.query.status === AppStatus.ALL
-  const apps = await getAllApps({ dev, all })
+  const apps = (await dbCore.getAllApps({ dev, all })) as App[]
 
   const appIds = apps
     .filter((app: any) => app.status === "development")
@@ -187,7 +182,7 @@ export const fetch = async (ctx: any) => {
 export const fetchAppDefinition = async (ctx: any) => {
   const layouts = await getLayouts()
   const userRoleId = getUserRoleId(ctx)
-  const accessController = new AccessController()
+  const accessController = new roles.AccessController()
   const screens = await accessController.checkScreensAccess(
     await getScreens(),
     userRoleId
@@ -211,7 +206,7 @@ export const fetchAppPackage = async (ctx: any) => {
   // Only filter screens if the user is not a builder
   if (!(ctx.user.builder && ctx.user.builder.global)) {
     const userRoleId = getUserRoleId(ctx)
-    const accessController = new AccessController()
+    const accessController = new roles.AccessController()
     screens = await accessController.checkScreensAccess(screens, userRoleId)
   }
 
@@ -224,7 +219,7 @@ export const fetchAppPackage = async (ctx: any) => {
 }
 
 const performAppCreate = async (ctx: any) => {
-  const apps = await getAllApps({ dev: true })
+  const apps = await dbCore.getAllApps({ dev: true })
   const name = ctx.request.body.name
   checkAppName(ctx, apps, name)
   const url = getAppUrl(ctx)
@@ -254,7 +249,7 @@ const performAppCreate = async (ctx: any) => {
     url: url,
     template: templateKey,
     instance,
-    tenantId: getTenantId(),
+    tenantId: tenancy.getTenantId(),
     updatedAt: new Date().toISOString(),
     createdAt: new Date().toISOString(),
     status: AppStatus.DEV,
@@ -313,7 +308,7 @@ const performAppCreate = async (ctx: any) => {
     await createApp(appId)
   }
 
-  await appCache.invalidateAppMetadata(appId, newApplication)
+  await cache.app.invalidateAppMetadata(appId, newApplication)
   return newApplication
 }
 
@@ -343,7 +338,7 @@ const creationEvents = async (request: any, app: App) => {
 }
 
 const appPostCreate = async (ctx: any, app: App) => {
-  const tenantId = getTenantId()
+  const tenantId = tenancy.getTenantId()
   await migrations.backPopulateMigrations({
     type: MigrationType.APP,
     tenantId,
@@ -356,7 +351,9 @@ const appPostCreate = async (ctx: any, app: App) => {
     const rowCount = rows ? rows.length : 0
     if (rowCount) {
       try {
-        await quotas.addRows(rowCount)
+        await context.doInAppContext(app.appId, () => {
+          return quotas.addRows(rowCount)
+        })
       } catch (err: any) {
         if (err.code && err.code === errors.codes.USAGE_LIMIT_EXCEEDED) {
           // this import resulted in row usage exceeding the quota
@@ -374,7 +371,7 @@ const appPostCreate = async (ctx: any, app: App) => {
 export const create = async (ctx: any) => {
   const newApplication = await quotas.addApp(() => performAppCreate(ctx))
   await appPostCreate(ctx, newApplication)
-  await bustCache(CacheKeys.CHECKLIST)
+  await cache.bustCache(cache.CacheKeys.CHECKLIST)
   ctx.body = newApplication
   ctx.status = 200
 }
@@ -382,7 +379,7 @@ export const create = async (ctx: any) => {
 // This endpoint currently operates as a PATCH rather than a PUT
 // Thus name and url fields are handled only if present
 export const update = async (ctx: any) => {
-  const apps = await getAllApps({ dev: true })
+  const apps = await dbCore.getAllApps({ dev: true })
   // validation
   const name = ctx.request.body.name
   if (name) {
@@ -455,7 +452,7 @@ const destroyApp = async (ctx: any) => {
   let isUnpublish = ctx.query && ctx.query.unpublish
 
   if (isUnpublish) {
-    appId = getProdAppID(appId)
+    appId = dbCore.getProdAppID(appId)
   }
 
   const db = isUnpublish ? context.getProdAppDB() : context.getAppDB()
@@ -481,7 +478,7 @@ const destroyApp = async (ctx: any) => {
   else {
     await removeAppFromUserRoles(ctx, appId)
   }
-  await appCache.invalidateAppMetadata(appId)
+  await cache.app.invalidateAppMetadata(appId)
   return result
 }
 
@@ -517,19 +514,17 @@ export const sync = async (ctx: any, next: any) => {
   }
 
   const appId = ctx.params.appId
-  if (!isDevAppID(appId)) {
+  if (!dbCore.isDevAppID(appId)) {
     ctx.throw(400, "This action cannot be performed for production apps")
   }
 
   // replicate prod to dev
-  const prodAppId = getProdAppID(appId)
+  const prodAppId = dbCore.getProdAppID(appId)
 
-  try {
-    // specific case, want to make sure setup is skipped
-    const prodDb = context.getProdAppDB({ skip_setup: true })
-    const info = await prodDb.info()
-    if (info.error) throw info.error
-  } catch (err) {
+  // specific case, want to make sure setup is skipped
+  const prodDb = context.getProdAppDB({ skip_setup: true })
+  const exists = await prodDb.exists()
+  if (!exists) {
     // the database doesn't exist. Don't replicate
     ctx.status = 200
     ctx.body = {
@@ -538,7 +533,7 @@ export const sync = async (ctx: any, next: any) => {
     return next()
   }
 
-  const replication = new Replication({
+  const replication = new dbCore.Replication({
     source: prodAppId,
     target: appId,
   })
@@ -579,7 +574,7 @@ export const updateAppPackage = async (appPackage: any, appId: any) => {
 
     await db.put(newAppPackage)
     // remove any cached metadata, so that it will be updated
-    await appCache.invalidateAppMetadata(appId)
+    await cache.app.invalidateAppMetadata(appId)
     return newAppPackage
   })
 }