@budibase/backend-core 2.8.31 → 2.8.32-alpha.1

package/dist/src/environment.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = require("fs");
+const types_1 = require("@budibase/types");
 function isTest() {
     return isCypress() || isJest();
 }
@@ -38,7 +39,7 @@ function httpLogging() {
     }
     return process.env.HTTP_LOGGING;
 }
-function findVersion() {
+function getPackageJsonFields() {
     function findFileInAncestors(fileName, currentDir) {
         const filePath = `${currentDir}/${fileName}`;
         if ((0, fs_1.existsSync)(filePath)) {
@@ -54,77 +55,32 @@ function findVersion() {
     try {
         const packageJsonFile = findFileInAncestors("package.json", process.cwd());
         const content = (0, fs_1.readFileSync)(packageJsonFile, "utf-8");
-        return JSON.parse(content).version;
+        const parsedContent = JSON.parse(content);
+        return {
+            VERSION: parsedContent.version,
+            SERVICE_NAME: parsedContent.name,
+        };
     }
     catch (_a) {
         // throwing an error here is confusing/causes backend-core to be hard to import
-        return undefined;
+        return { VERSION: "", SERVICE_NAME: "" };
     }
 }
-const environment = {
-    isTest,
+function isWorker() {
+    return environment.SERVICE_TYPE === types_1.ServiceType.WORKER;
+}
+function isApps() {
+    return environment.SERVICE_TYPE === types_1.ServiceType.APPS;
+}
+const environment = Object.assign(Object.assign({ isTest,
     isJest,
     isDev,
-    isProd: () => {
+    isWorker,
+    isApps, isProd: () => {
         return !isDev();
-    },
-    JS_BCRYPT: process.env.JS_BCRYPT,
-    JWT_SECRET: process.env.JWT_SECRET,
-    JWT_SECRET_FALLBACK: process.env.JWT_SECRET_FALLBACK,
-    ENCRYPTION_KEY: process.env.ENCRYPTION_KEY,
-    API_ENCRYPTION_KEY: getAPIEncryptionKey(),
-    COUCH_DB_URL: process.env.COUCH_DB_URL || "http://localhost:4005",
-    COUCH_DB_USERNAME: process.env.COUCH_DB_USER,
-    COUCH_DB_PASSWORD: process.env.COUCH_DB_PASSWORD,
-    GOOGLE_CLIENT_ID: process.env.GOOGLE_CLIENT_ID,
-    GOOGLE_CLIENT_SECRET: process.env.GOOGLE_CLIENT_SECRET,
-    SALT_ROUNDS: process.env.SALT_ROUNDS,
-    REDIS_URL: process.env.REDIS_URL || "localhost:6379",
-    REDIS_PASSWORD: process.env.REDIS_PASSWORD,
-    REDIS_CLUSTERED: process.env.REDIS_CLUSTERED,
-    MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY,
-    MINIO_SECRET_KEY: process.env.MINIO_SECRET_KEY,
-    AWS_REGION: process.env.AWS_REGION,
-    MINIO_URL: process.env.MINIO_URL,
-    MINIO_ENABLED: process.env.MINIO_ENABLED || 1,
-    INTERNAL_API_KEY: process.env.INTERNAL_API_KEY,
-    INTERNAL_API_KEY_FALLBACK: process.env.INTERNAL_API_KEY_FALLBACK,
-    MULTI_TENANCY: process.env.MULTI_TENANCY,
-    ACCOUNT_PORTAL_URL: process.env.ACCOUNT_PORTAL_URL || "https://account.budibase.app",
-    ACCOUNT_PORTAL_API_KEY: process.env.ACCOUNT_PORTAL_API_KEY || "",
-    DISABLE_ACCOUNT_PORTAL: process.env.DISABLE_ACCOUNT_PORTAL,
-    SELF_HOSTED: selfHosted,
-    COOKIE_DOMAIN: process.env.COOKIE_DOMAIN,
-    PLATFORM_URL: process.env.PLATFORM_URL || "",
-    POSTHOG_TOKEN: process.env.POSTHOG_TOKEN,
-    ENABLE_ANALYTICS: process.env.ENABLE_ANALYTICS,
-    TENANT_FEATURE_FLAGS: process.env.TENANT_FEATURE_FLAGS,
-    CLOUDFRONT_CDN: process.env.CLOUDFRONT_CDN,
-    CLOUDFRONT_PRIVATE_KEY_64: process.env.CLOUDFRONT_PRIVATE_KEY_64,
-    CLOUDFRONT_PUBLIC_KEY_ID: process.env.CLOUDFRONT_PUBLIC_KEY_ID,
-    BACKUPS_BUCKET_NAME: process.env.BACKUPS_BUCKET_NAME || DefaultBucketName.BACKUPS,
-    APPS_BUCKET_NAME: process.env.APPS_BUCKET_NAME || DefaultBucketName.APPS,
-    TEMPLATES_BUCKET_NAME: process.env.TEMPLATES_BUCKET_NAME || DefaultBucketName.TEMPLATES,
-    GLOBAL_BUCKET_NAME: process.env.GLOBAL_BUCKET_NAME || DefaultBucketName.GLOBAL,
-    PLUGIN_BUCKET_NAME: process.env.PLUGIN_BUCKET_NAME || DefaultBucketName.PLUGINS,
-    USE_COUCH: process.env.USE_COUCH || true,
-    MOCK_REDIS: process.env.MOCK_REDIS,
-    DEFAULT_LICENSE: process.env.DEFAULT_LICENSE,
-    SERVICE: process.env.SERVICE || "budibase",
-    LOG_LEVEL: process.env.LOG_LEVEL || "info",
-    SESSION_UPDATE_PERIOD: process.env.SESSION_UPDATE_PERIOD,
-    DEPLOYMENT_ENVIRONMENT: process.env.DEPLOYMENT_ENVIRONMENT || "docker-compose",
-    HTTP_LOGGING: httpLogging(),
-    ENABLE_AUDIT_LOG_IP_ADDR: process.env.ENABLE_AUDIT_LOG_IP_ADDR,
+    }, JS_BCRYPT: process.env.JS_BCRYPT, JWT_SECRET: process.env.JWT_SECRET, JWT_SECRET_FALLBACK: process.env.JWT_SECRET_FALLBACK, ENCRYPTION_KEY: process.env.ENCRYPTION_KEY, API_ENCRYPTION_KEY: getAPIEncryptionKey(), COUCH_DB_URL: process.env.COUCH_DB_URL || "http://localhost:4005", COUCH_DB_USERNAME: process.env.COUCH_DB_USER, COUCH_DB_PASSWORD: process.env.COUCH_DB_PASSWORD, GOOGLE_CLIENT_ID: process.env.GOOGLE_CLIENT_ID, GOOGLE_CLIENT_SECRET: process.env.GOOGLE_CLIENT_SECRET, SALT_ROUNDS: process.env.SALT_ROUNDS, REDIS_URL: process.env.REDIS_URL || "localhost:6379", REDIS_PASSWORD: process.env.REDIS_PASSWORD, REDIS_CLUSTERED: process.env.REDIS_CLUSTERED, MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY, MINIO_SECRET_KEY: process.env.MINIO_SECRET_KEY, AWS_REGION: process.env.AWS_REGION, MINIO_URL: process.env.MINIO_URL, MINIO_ENABLED: process.env.MINIO_ENABLED || 1, INTERNAL_API_KEY: process.env.INTERNAL_API_KEY, INTERNAL_API_KEY_FALLBACK: process.env.INTERNAL_API_KEY_FALLBACK, MULTI_TENANCY: process.env.MULTI_TENANCY, ACCOUNT_PORTAL_URL: process.env.ACCOUNT_PORTAL_URL || "https://account.budibase.app", ACCOUNT_PORTAL_API_KEY: process.env.ACCOUNT_PORTAL_API_KEY || "", DISABLE_ACCOUNT_PORTAL: process.env.DISABLE_ACCOUNT_PORTAL, SELF_HOSTED: selfHosted, COOKIE_DOMAIN: process.env.COOKIE_DOMAIN, PLATFORM_URL: process.env.PLATFORM_URL || "", POSTHOG_TOKEN: process.env.POSTHOG_TOKEN, ENABLE_ANALYTICS: process.env.ENABLE_ANALYTICS, TENANT_FEATURE_FLAGS: process.env.TENANT_FEATURE_FLAGS, CLOUDFRONT_CDN: process.env.CLOUDFRONT_CDN, CLOUDFRONT_PRIVATE_KEY_64: process.env.CLOUDFRONT_PRIVATE_KEY_64, CLOUDFRONT_PUBLIC_KEY_ID: process.env.CLOUDFRONT_PUBLIC_KEY_ID, BACKUPS_BUCKET_NAME: process.env.BACKUPS_BUCKET_NAME || DefaultBucketName.BACKUPS, APPS_BUCKET_NAME: process.env.APPS_BUCKET_NAME || DefaultBucketName.APPS, TEMPLATES_BUCKET_NAME: process.env.TEMPLATES_BUCKET_NAME || DefaultBucketName.TEMPLATES, GLOBAL_BUCKET_NAME: process.env.GLOBAL_BUCKET_NAME || DefaultBucketName.GLOBAL, PLUGIN_BUCKET_NAME: process.env.PLUGIN_BUCKET_NAME || DefaultBucketName.PLUGINS, USE_COUCH: process.env.USE_COUCH || true, MOCK_REDIS: process.env.MOCK_REDIS, DEFAULT_LICENSE: process.env.DEFAULT_LICENSE, SERVICE: process.env.SERVICE || "budibase", LOG_LEVEL: process.env.LOG_LEVEL || "info", SESSION_UPDATE_PERIOD: process.env.SESSION_UPDATE_PERIOD, DEPLOYMENT_ENVIRONMENT: process.env.DEPLOYMENT_ENVIRONMENT || "docker-compose", HTTP_LOGGING: httpLogging(), ENABLE_AUDIT_LOG_IP_ADDR: process.env.ENABLE_AUDIT_LOG_IP_ADDR, 
     // smtp
-    SMTP_FALLBACK_ENABLED: process.env.SMTP_FALLBACK_ENABLED,
-    SMTP_USER: process.env.SMTP_USER,
-    SMTP_PASSWORD: process.env.SMTP_PASSWORD,
-    SMTP_HOST: process.env.SMTP_HOST,
-    SMTP_PORT: parseInt(process.env.SMTP_PORT || ""),
-    SMTP_FROM_ADDRESS: process.env.SMTP_FROM_ADDRESS,
-    DISABLE_JWT_WARNING: process.env.DISABLE_JWT_WARNING,
-    BLACKLIST_IPS: process.env.BLACKLIST_IPS,
+    SMTP_FALLBACK_ENABLED: process.env.SMTP_FALLBACK_ENABLED, SMTP_USER: process.env.SMTP_USER, SMTP_PASSWORD: process.env.SMTP_PASSWORD, SMTP_HOST: process.env.SMTP_HOST, SMTP_PORT: parseInt(process.env.SMTP_PORT || ""), SMTP_FROM_ADDRESS: process.env.SMTP_FROM_ADDRESS, DISABLE_JWT_WARNING: process.env.DISABLE_JWT_WARNING, BLACKLIST_IPS: process.env.BLACKLIST_IPS, SERVICE_TYPE: "unknown", 
     /**
      * Enable to allow an admin user to login using a password.
      * This can be useful to prevent lockout when configuring SSO.
@@ -132,16 +88,11 @@ const environment = {
      */
     ENABLE_SSO_MAINTENANCE_MODE: selfHosted
         ? process.env.ENABLE_SSO_MAINTENANCE_MODE
-        : false,
-    VERSION: findVersion(),
-    DISABLE_PINO_LOGGER: process.env.DISABLE_PINO_LOGGER,
-    OFFLINE_MODE: process.env.OFFLINE_MODE,
-    _set(key, value) {
+        : false }, getPackageJsonFields()), { DISABLE_PINO_LOGGER: process.env.DISABLE_PINO_LOGGER, OFFLINE_MODE: process.env.OFFLINE_MODE, _set(key, value) {
         process.env[key] = value;
         // @ts-ignore
         environment[key] = value;
-    },
-};
+    }, ROLLING_LOG_MAX_SIZE: process.env.ROLLING_LOG_MAX_SIZE || "10M" });
 // clean up any environment variable edge cases
 for (let [key, value] of Object.entries(environment)) {
     // handle the edge case of "0" to disable an environment variable

package/dist/src/environment.js.map

@@ -1 +1 @@
-{"version":3,"file":"environment.js","sourceRoot":"","sources":["../../src/environment.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"environment.js","sourceRoot":"","sources":["../../src/environment.ts"],"names":[],"mappings":"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"}

package/dist/src/events/identification.js

@@ -44,6 +44,7 @@ const processors_1 = require("./processors");
 const utils_1 = require("../utils");
 const installation = __importStar(require("../installation"));
 const configs = __importStar(require("../configs"));
+const users = __importStar(require("../users"));
 const generic_1 = require("../cache/generic");
 /**
  * An identity can be:
@@ -163,12 +164,11 @@ const identifyTenantGroup = (tenantId, account, timestamp) => __awaiter(void 0,
     yield identify(Object.assign(Object.assign({}, group), { id: `$${type}_${id}` }), timestamp);
 });
 const identifyUser = (user, account, timestamp) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b;
     const id = user._id;
     const tenantId = yield getEventTenantId(user.tenantId);
     const type = types_1.IdentityType.USER;
-    let builder = ((_a = user.builder) === null || _a === void 0 ? void 0 : _a.global) || false;
-    let admin = ((_b = user.admin) === null || _b === void 0 ? void 0 : _b.global) || false;
+    let builder = users.hasBuilderPermissions(user);
+    let admin = users.hasAdminPermissions(user);
     let providerType;
     if ((0, types_1.isSSOUser)(user)) {
         providerType = user.providerType;

package/dist/src/events/identification.js.map

@@ -1 +1 @@
-{"version":3,"file":"identification.js","sourceRoot":"","sources":["../../../src/events/identification.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"identification.js","sourceRoot":"","sources":["../../../src/events/identification.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAAqC;AACrC,iEAAkD;AAClD,iEAAgC;AAChC,2CAewB;AACxB,6CAAyC;AACzC,oCAAgC;AAChC,8DAA+C;AAC/C,oDAAqC;AACrC,gDAAiC;AACjC,8CAA2D;AAE3D;;;;;;GAMG;AACH,MAAM,kBAAkB,GAAG,GAA4B,EAAE;IACvD,IAAI,eAAe,GAAG,WAAW,CAAC,WAAW,EAAE,CAAA;IAC/C,MAAM,WAAW,GAAG,wBAAwB,EAAE,CAAA;IAE9C,IAAI,YAAY,CAAA;IAEhB,IAAI,CAAC,eAAe,EAAE;QACpB,YAAY,GAAG,oBAAY,CAAC,MAAM,CAAA;KACnC;SAAM;QACL,YAAY,GAAG,eAAe,CAAC,IAAI,CAAA;KACpC;IAED,IAAI,YAAY,KAAK,oBAAY,CAAC,YAAY,EAAE;QAC9C,MAAM,cAAc,GAAG,MAAM,iBAAiB,EAAE,CAAA;QAChD,MAAM,OAAO,GAAG,iBAAiB,EAAE,CAAA;QACnC,OAAO;YACL,EAAE,EAAE,gBAAgB,CAAC,cAAc,EAAE,YAAY,CAAC;YAClD,OAAO;YACP,IAAI,EAAE,YAAY;YAClB,cAAc;YACd,WAAW;SACZ,CAAA;KACF;SAAM,IAAI,YAAY,KAAK,oBAAY,CAAC,MAAM,EAAE;QAC/C,MAAM,cAAc,GAAG,MAAM,iBAAiB,EAAE,CAAA;QAChD,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAA;QAC9D,MAAM,OAAO,GAAG,iBAAiB,EAAE,CAAA;QAEnC,OAAO;YACL,EAAE,EAAE,gBAAgB,CAAC,QAAQ,EAAE,YAAY,CAAC;YAC5C,IAAI,EAAE,YAAY;YAClB,OAAO;YACP,cAAc;YACd,QAAQ;YACR,YAAY,EAAE,OAAO,CAAC,WAAW,EAAE;YACnC,WAAW;SACZ,CAAA;KACF;SAAM,IAAI,YAAY,KAAK,oBAAY,CAAC,IAAI,EAAE;QAC7C,MAAM,WAAW,GAAG,eAA8B,CAAA;QAClD,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAA;QAC9D,MAAM,cAAc,GAAG,MAAM,iBAAiB,EAAE,CAAA;QAEhD,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,CAAA;QACnC,IAAI,OAAO,CAAA;QACX,IAAI,OAAO,EAAE;YACX,OAAO,GAAG,OAAO,CAAC,OAAO,CAAA;SAC1B;aAAM;YACL,OAAO,GAAG,iBAAiB,EAAE,CAAA;SAC9B;QAED,OAAO;YACL,EAAE,EAAE,WAAW,CAAC,GAAG;YACnB,IAAI,EAAE,YAAY;YAClB,OAAO;YACP,cAAc;YACd,QAAQ;YACR,WAAW;YACX,YAAY,EAAE,OAAO,CAAC,WAAW,EAAE;YACnC,QAAQ,EAAE,WAAW,CAAC,QAAQ;SAC/B,CAAA;KACF;SAAM;QACL,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAA;KACzC;AACH,CAAC,CAAA,CAAA;AAED,MAAM,yBAAyB,GAAG,CAChC,SAAiB,EACjB,SAA2B,EACZ,EAAE;IACjB,MAAM,EAAE,GAAG,SAAS,CAAA;IACpB,MAAM,IAAI,GAAG,oBAAY,CAAC,YAAY,CAAA;IACtC,MAAM,OAAO,GAAG,iBAAiB,EAAE,CAAA;IACnC,MAAM,OAAO,GAAG,qBAAG,CAAC,OAAO,CAAA;IAC3B,MAAM,WAAW,GAAG,wBAAwB,EAAE,CAAA;IAE9C,MAAM,KAAK,GAAsB;QAC/B,EAAE;QACF,IAAI;QACJ,OAAO;QACP,OAAO;QACP,WAAW;KACZ,CAAA;IAED,MAAM,aAAa,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA;IACrC,iFAAiF;IACjF,iFAAiF;IACjF,MAAM,QAAQ,iCAAM,KAAK,KAAE,EAAE,EAAE,IAAI,IAAI,IAAI,EAAE,EAAE,KAAI,SAAS,CAAC,CAAA;AAC/D,CAAC,CAAA,CAAA;AAED,MAAM,mBAAmB,GAAG,CAC1B,QAAgB,EAChB,OAA4B,EAC5B,SAA2B,EACZ,EAAE;IACjB,MAAM,EAAE,GAAG,MAAM,gBAAgB,CAAC,QAAQ,CAAC,CAAA;IAC3C,MAAM,IAAI,GAAG,oBAAY,CAAC,MAAM,CAAA;IAChC,MAAM,cAAc,GAAG,MAAM,iBAAiB,EAAE,CAAA;IAChD,MAAM,WAAW,GAAG,wBAAwB,EAAE,CAAA;IAE9C,IAAI,OAAgB,CAAA;IACpB,IAAI,UAA8B,CAAA;IAClC,IAAI,WAA+B,CAAA;IAEnC,IAAI,OAAO,EAAE;QACX,UAAU,GAAG,OAAO,CAAC,UAAU,CAAA;QAC/B,WAAW,GAAG,OAAO,CAAC,IAAI,CAAA;QAC1B,OAAO,GAAG,OAAO,CAAC,OAAO,CAAA;KAC1B;SAAM;QACL,OAAO,GAAG,iBAAiB,EAAE,CAAA;KAC9B;IAED,MAAM,KAAK,GAAgB;QACzB,EAAE;QACF,IAAI;QACJ,OAAO;QACP,WAAW;QACX,cAAc;QACd,UAAU;QACV,WAAW;KACZ,CAAA;IAED,MAAM,aAAa,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA;IACrC,iFAAiF;IACjF,2EAA2E;IAC3E,MAAM,QAAQ,iCAAM,KAAK,KAAE,EAAE,EAAE,IAAI,IAAI,IAAI,EAAE,EAAE,KAAI,SAAS,CAAC,CAAA;AAC/D,CAAC,CAAA,CAAA;AAED,MAAM,YAAY,GAAG,CACnB,IAAU,EACV,OAAiC,EACjC,SAA2B,EAC3B,EAAE;IACF,MAAM,EAAE,GAAG,IAAI,CAAC,GAAa,CAAA;IAC7B,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IACtD,MAAM,IAAI,GAAG,oBAAY,CAAC,IAAI,CAAA;IAC9B,IAAI,OAAO,GAAG,KAAK,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAA;IAC/C,IAAI,KAAK,GAAG,KAAK,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAA;IAC3C,IAAI,YAAY,CAAA;IAChB,IAAI,IAAA,iBAAS,EAAC,IAAI,CAAC,EAAE;QACnB,YAAY,GAAG,IAAI,CAAC,YAAY,CAAA;KACjC;IACD,MAAM,aAAa,GAAG,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,cAAc,MAAK,IAAI,CAAC,GAAG,IAAI,KAAK,CAAA;IACnE,MAAM,QAAQ,GACZ,OAAO,IAAI,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,cAAc,MAAK,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAA;IAC5E,MAAM,cAAc,GAAG,MAAM,iBAAiB,EAAE,CAAA;IAChD,MAAM,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,iBAAiB,EAAE,CAAA;IAC/D,MAAM,WAAW,GAAG,wBAAwB,EAAE,CAAA;IAE9C,MAAM,QAAQ,GAAiB;QAC7B,EAAE;QACF,IAAI;QACJ,OAAO;QACP,cAAc;QACd,QAAQ;QACR,QAAQ;QACR,aAAa;QACb,YAAY;QACZ,OAAO;QACP,KAAK;QACL,WAAW;KACZ,CAAA;IAED,MAAM,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAA;AACrC,CAAC,CAAA,CAAA;AAED,MAAM,eAAe,GAAG,CAAO,OAAgB,EAAE,EAAE;IACjD,IAAI,EAAE,GAAG,OAAO,CAAC,SAAS,CAAA;IAC1B,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAA;IACjC,IAAI,IAAI,GAAG,oBAAY,CAAC,IAAI,CAAA;IAC5B,IAAI,YAAY,GAAG,IAAA,oBAAY,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CAAA;IAC3E,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAA;IACjC,MAAM,aAAa,GAAG,IAAI,CAAA;IAC1B,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAA;IAC/B,MAAM,cAAc,GAAG,MAAM,iBAAiB,EAAE,CAAA;IAChD,MAAM,WAAW,GAAG,wBAAwB,EAAE,CAAA;IAE9C,IAAI,IAAA,sBAAc,EAAC,OAAO,CAAC,EAAE;QAC3B,IAAI,OAAO,CAAC,cAAc,EAAE;YAC1B,yCAAyC;YACzC,EAAE,GAAG,OAAO,CAAC,cAAc,CAAA;SAC5B;KACF;IAED,MAAM,QAAQ,GAAiB;QAC7B,EAAE;QACF,IAAI;QACJ,OAAO;QACP,cAAc;QACd,QAAQ;QACR,YAAY;QACZ,QAAQ;QACR,aAAa;QACb,WAAW;KACZ,CAAA;IAED,MAAM,QAAQ,CAAC,QAAQ,CAAC,CAAA;AAC1B,CAAC,CAAA,CAAA;AAED,MAAM,QAAQ,GAAG,CAAO,QAAkB,EAAE,SAA2B,EAAE,EAAE;IACzE,MAAM,uBAAU,CAAC,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAA;AAChD,CAAC,CAAA,CAAA;AAED,MAAM,aAAa,GAAG,CAAO,KAAY,EAAE,SAA2B,EAAE,EAAE;IACxE,MAAM,uBAAU,CAAC,aAAa,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA;AAClD,CAAC,CAAA,CAAA;AAED,MAAM,wBAAwB,GAAG,GAAG,EAAE;IACpC,IAAI,qBAAG,CAAC,KAAK,EAAE,EAAE;QACf,OAAO,aAAa,CAAA;KACrB;SAAM;QACL,OAAO,qBAAG,CAAC,sBAAsB,CAAA;KAClC;AACH,CAAC,CAAA;AAED,MAAM,iBAAiB,GAAG,GAAG,EAAE;IAC7B,OAAO,qBAAG,CAAC,WAAW,CAAC,CAAC,CAAC,eAAO,CAAC,IAAI,CAAC,CAAC,CAAC,eAAO,CAAC,KAAK,CAAA;AACvD,CAAC,CAAA;AAED,MAAM,iBAAiB,GAAG,GAAS,EAAE;IACnC,IAAI,eAAe,EAAE,EAAE;QACrB,OAAO,gBAAgB,CAAA;KACxB;IACD,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,UAAU,EAAE,CAAA;IAC/C,OAAO,OAAO,CAAC,SAAS,CAAA;AAC1B,CAAC,CAAA,CAAA;AAED,MAAM,gBAAgB,GAAG,CAAO,QAAgB,EAAmB,EAAE;IACnE,IAAI,qBAAG,CAAC,WAAW,EAAE;QACnB,OAAO,IAAA,yBAAiB,EAAC,QAAQ,CAAC,CAAA;KACnC;SAAM;QACL,8CAA8C;QAC9C,OAAO,QAAQ,CAAA;KAChB;AACH,CAAC,CAAA,CAAA;AAEM,MAAM,iBAAiB,GAAG,CAAO,QAAgB,EAAmB,EAAE;IAC3E,iEAAiE;IACjE,OAAO,OAAO,CAAC,UAAU,CAAC,QAAQ,EAAE,GAAG,EAAE;QACvC,OAAO,IAAA,mBAAS,EAAC,kBAAQ,CAAC,gBAAgB,EAAE,aAAG,CAAC,OAAO,EAAE,GAAS,EAAE;YAClE,MAAM,EAAE,GAAG,OAAO,CAAC,WAAW,EAAE,CAAA;YAChC,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,oBAAoB,EAAE,CAAA;YAEnD,IAAI,cAAsB,CAAA;YAC1B,IAAI,MAAM,CAAC,MAAM,CAAC,cAAc,EAAE;gBAChC,OAAO,MAAM,CAAC,MAAM,CAAC,cAAc,CAAA;aACpC;iBAAM;gBACL,cAAc,GAAG,GAAG,IAAA,aAAK,GAAE,IAAI,QAAQ,EAAE,CAAA;gBACzC,MAAM,CAAC,MAAM,CAAC,cAAc,GAAG,cAAc,CAAA;gBAC7C,MAAM,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;gBACpB,OAAO,cAAc,CAAA;aACtB;QACH,CAAC,CAAA,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA,CAAA;AAlBY,QAAA,iBAAiB,qBAkB7B;AAED,MAAM,eAAe,GAAG,GAAG,EAAE;IAC3B,OAAO,qBAAG,CAAC,OAAO,KAAK,gBAAgB,CAAA;AACzC,CAAC,CAAA;AAED,MAAM,gBAAgB,GAAG,CAAC,EAAU,EAAE,IAAkB,EAAE,EAAE;IAC1D,IAAI,IAAI,KAAK,oBAAY,CAAC,YAAY,IAAI,IAAI,KAAK,oBAAY,CAAC,MAAM,EAAE;QACtE,OAAO,IAAI,IAAI,IAAI,EAAE,EAAE,CAAA;KACxB;SAAM;QACL,OAAO,EAAE,CAAA;KACV;AACH,CAAC,CAAA;AAED,kBAAe;IACb,kBAAkB;IAClB,yBAAyB;IACzB,mBAAmB;IACnB,YAAY;IACZ,eAAe;IACf,QAAQ;IACR,aAAa;IACb,iBAAiB;IACjB,iBAAiB,EAAjB,yBAAiB;CAClB,CAAA"}

package/dist/src/logging/index.d.ts

@@ -1,4 +1,4 @@
 export * as correlation from "./correlation/correlation";
 export { logger } from "./pino/logger";
 export * from "./alerts";
-export declare let LOG_CONTEXT: boolean;
+export * as system from "./system";

package/dist/src/logging/index.js

@@ -26,11 +26,10 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LOG_CONTEXT = exports.logger = exports.correlation = void 0;
+exports.system = exports.logger = exports.correlation = void 0;
 exports.correlation = __importStar(require("./correlation/correlation"));
 var logger_1 = require("./pino/logger");
 Object.defineProperty(exports, "logger", { enumerable: true, get: function () { return logger_1.logger; } });
 __exportStar(require("./alerts"), exports);
-// turn off or on context logging i.e. tenantId, appId etc
-exports.LOG_CONTEXT = true;
+exports.system = __importStar(require("./system"));
 //# sourceMappingURL=index.js.map

package/dist/src/logging/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/logging/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yEAAwD;AACxD,wCAAsC;AAA7B,gGAAA,MAAM,OAAA;AACf,2CAAwB;AAExB,0DAA0D;AAC/C,QAAA,WAAW,GAAG,IAAI,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/logging/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yEAAwD;AACxD,wCAAsC;AAA7B,gGAAA,MAAM,OAAA;AACf,2CAAwB;AACxB,mDAAkC"}

package/dist/src/logging/pino/logger.js

@@ -27,35 +27,53 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.logger = void 0;
-const environment_1 = __importDefault(require("../../environment"));
 const pino_1 = __importDefault(require("pino"));
+const pino_pretty_1 = __importDefault(require("pino-pretty"));
+const environment_1 = __importDefault(require("../../environment"));
 const context = __importStar(require("../../context"));
 const correlation = __importStar(require("../correlation"));
-const index_1 = require("../index");
+const system_1 = require("../system");
 // LOGGER
 let pinoInstance;
 if (!environment_1.default.DISABLE_PINO_LOGGER) {
+    const level = environment_1.default.LOG_LEVEL;
     const pinoOptions = {
-        level: environment_1.default.LOG_LEVEL,
+        level,
         formatters: {
-            level: label => {
-                return { level: label.toUpperCase() };
+            level: level => {
+                return { level: level.toUpperCase() };
             },
             bindings: () => {
-                return {};
+                if (environment_1.default.SELF_HOSTED) {
+                    // "service" is being injected in datadog using the pod names,
+                    // so we should leave it blank to allow the default behaviour if it's not running self-hosted
+                    return {
+                        service: environment_1.default.SERVICE_NAME,
+                    };
+                }
+                else {
+                    return {};
+                }
             },
         },
         timestamp: () => `,"timestamp":"${new Date(Date.now()).toISOString()}"`,
     };
-    if (environment_1.default.isDev()) {
-        pinoOptions.transport = {
-            target: "pino-pretty",
-            options: {
-                singleLine: true,
-            },
-        };
+    const destinations = [];
+    destinations.push(environment_1.default.isDev()
+        ? {
+            stream: (0, pino_pretty_1.default)({ singleLine: true }),
+            level: level,
+        }
+        : { stream: process.stdout, level: level });
+    if (environment_1.default.SELF_HOSTED) {
+        destinations.push({
+            stream: (0, system_1.localFileDestination)(),
+            level: level,
+        });
     }
-    pinoInstance = (0, pino_1.default)(pinoOptions);
+    pinoInstance = destinations.length
+        ? (0, pino_1.default)(pinoOptions, pino_1.default.multistream(destinations))
+        : (0, pino_1.default)(pinoOptions);
     function isPlainObject(obj) {
         return typeof obj === "object" && obj !== null && !(obj instanceof Error);
     }
@@ -86,16 +104,14 @@ if (!environment_1.default.DISABLE_PINO_LOGGER) {
         });
         const identity = getIdentity();
         let contextObject = {};
-        if (index_1.LOG_CONTEXT) {
-            contextObject = {
-                tenantId: getTenantId(),
-                appId: getAppId(),
-                automationId: getAutomationId(),
-                identityId: identity === null || identity === void 0 ? void 0 : identity._id,
-                identityType: identity === null || identity === void 0 ? void 0 : identity.type,
-                correlationId: correlation.getId(),
-            };
-        }
+        contextObject = {
+            tenantId: getTenantId(),
+            appId: getAppId(),
+            automationId: getAutomationId(),
+            identityId: identity === null || identity === void 0 ? void 0 : identity._id,
+            identityType: identity === null || identity === void 0 ? void 0 : identity.type,
+            correlationId: correlation.getId(),
+        };
         const mergingObject = Object.assign({ err: error, pid: process.pid }, contextObject);
         if (objects.length) {
             // init generic data object for params supplied that don't have a

package/dist/src/logging/pino/logger.js.map

@@ -1 +1 @@
-{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../../src/logging/pino/logger.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../../src/logging/pino/logger.ts"],"names":[],"mappings":"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"}

package/dist/src/logging/system.d.ts

@@ -0,0 +1,9 @@
+/// <reference types="node" />
+/// <reference types="pouchdb-core" />
+import * as rfs from "rotating-file-stream";
+export declare function getSingleFileMaxSizeInfo(totalMaxSize: string): {
+    size: string;
+    totalHistoryFiles: number;
+} | undefined;
+export declare function localFileDestination(): rfs.RotatingFileStream;
+export declare function getLogReadStream(): Buffer;

package/dist/src/logging/system.js

@@ -0,0 +1,101 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getLogReadStream = exports.localFileDestination = exports.getSingleFileMaxSizeInfo = void 0;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const rfs = __importStar(require("rotating-file-stream"));
+const environment_1 = __importDefault(require("../environment"));
+const objectStore_1 = require("../objectStore");
+const logsFileName = `budibase.log`;
+const budibaseLogsHistoryFileName = "budibase-logs-history.txt";
+const logsPath = path_1.default.join((0, objectStore_1.budibaseTempDir)(), "systemlogs");
+function getFullPath(fileName) {
+    return path_1.default.join(logsPath, fileName);
+}
+function getSingleFileMaxSizeInfo(totalMaxSize) {
+    const regex = /(\d+)([A-Za-z])/;
+    const match = totalMaxSize === null || totalMaxSize === void 0 ? void 0 : totalMaxSize.match(regex);
+    if (!match) {
+        console.warn(`totalMaxSize does not have a valid value`, {
+            totalMaxSize,
+        });
+        return undefined;
+    }
+    const size = +match[1];
+    const unit = match[2];
+    if (size === 1) {
+        switch (unit) {
+            case "B":
+                return { size: `${size}B`, totalHistoryFiles: 1 };
+            case "K":
+                return { size: `${(size * 1000) / 2}B`, totalHistoryFiles: 1 };
+            case "M":
+                return { size: `${(size * 1000) / 2}K`, totalHistoryFiles: 1 };
+            case "G":
+                return { size: `${(size * 1000) / 2}M`, totalHistoryFiles: 1 };
+            default:
+                return undefined;
+        }
+    }
+    if (size % 2 === 0) {
+        return { size: `${size / 2}${unit}`, totalHistoryFiles: 1 };
+    }
+    return { size: `1${unit}`, totalHistoryFiles: size - 1 };
+}
+exports.getSingleFileMaxSizeInfo = getSingleFileMaxSizeInfo;
+function localFileDestination() {
+    const fileInfo = getSingleFileMaxSizeInfo(environment_1.default.ROLLING_LOG_MAX_SIZE);
+    const outFile = rfs.createStream(logsFileName, {
+        // As we have a rolling size, we want to half the max size
+        size: fileInfo === null || fileInfo === void 0 ? void 0 : fileInfo.size,
+        path: logsPath,
+        maxFiles: (fileInfo === null || fileInfo === void 0 ? void 0 : fileInfo.totalHistoryFiles) || 1,
+        immutable: true,
+        history: budibaseLogsHistoryFileName,
+        initialRotation: false,
+    });
+    return outFile;
+}
+exports.localFileDestination = localFileDestination;
+function getLogReadStream() {
+    const streams = [];
+    const historyFile = getFullPath(budibaseLogsHistoryFileName);
+    if (fs_1.default.existsSync(historyFile)) {
+        const fileContent = fs_1.default.readFileSync(historyFile, "utf-8");
+        const historyFiles = fileContent.split("\n");
+        for (const historyFile of historyFiles.filter(x => x)) {
+            streams.push(fs_1.default.readFileSync(historyFile));
+        }
+    }
+    streams.push(fs_1.default.readFileSync(getFullPath(logsFileName)));
+    const combinedContent = Buffer.concat(streams);
+    return combinedContent;
+}
+exports.getLogReadStream = getLogReadStream;
+//# sourceMappingURL=system.js.map

package/dist/src/logging/system.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"system.js","sourceRoot":"","sources":["../../../src/logging/system.ts"],"names":[],"mappings":"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"}

package/dist/src/middleware/adminOnly.d.ts

@@ -1,3 +1,3 @@
-import { BBContext } from "@budibase/types";
-declare const _default: (ctx: BBContext, next: any) => Promise<any>;
+import { UserCtx } from "@budibase/types";
+declare const _default: (ctx: UserCtx, next: any) => Promise<any>;
 export default _default;

package/dist/src/middleware/adminOnly.js

@@ -9,9 +9,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const users_1 = require("../users");
 exports.default = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
-    if (!ctx.internal &&
-        (!ctx.user || !ctx.user.admin || !ctx.user.admin.global)) {
+    if (!ctx.internal && !(0, users_1.isAdmin)(ctx.user)) {
         ctx.throw(403, "Admin user only endpoint.");
     }
     return next();

package/dist/src/middleware/adminOnly.js.map

@@ -1 +1 @@
-{"version":3,"file":"adminOnly.js","sourceRoot":"","sources":["../../../src/middleware/adminOnly.ts"],"names":[],"mappings":";;;;;;;;;;;AAEA,kBAAe,CAAO,GAAc,EAAE,IAAS,EAAE,EAAE;IACjD,IACE,CAAC,GAAG,CAAC,QAAQ;QACb,CAAC,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EACxD;QACA,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,2BAA2B,CAAC,CAAA;KAC5C;IACD,OAAO,IAAI,EAAE,CAAA;AACf,CAAC,CAAA,CAAA"}
+{"version":3,"file":"adminOnly.js","sourceRoot":"","sources":["../../../src/middleware/adminOnly.ts"],"names":[],"mappings":";;;;;;;;;;;AACA,oCAAkC;AAElC,kBAAe,CAAO,GAAY,EAAE,IAAS,EAAE,EAAE;IAC/C,IAAI,CAAC,GAAG,CAAC,QAAQ,IAAI,CAAC,IAAA,eAAO,EAAC,GAAG,CAAC,IAAI,CAAC,EAAE;QACvC,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,2BAA2B,CAAC,CAAA;KAC5C;IACD,OAAO,IAAI,EAAE,CAAA;AACf,CAAC,CAAA,CAAA"}

package/dist/src/middleware/builderOnly.d.ts

@@ -1,3 +1,3 @@
-import { BBContext } from "@budibase/types";
-declare const _default: (ctx: BBContext, next: any) => Promise<any>;
+import { UserCtx } from "@budibase/types";
+declare const _default: (ctx: UserCtx, next: any) => Promise<any>;
 export default _default;

package/dist/src/middleware/builderOnly.js

@@ -8,10 +8,24 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+const users_1 = require("../users");
+const context_1 = require("../context");
+const environment_1 = __importDefault(require("../environment"));
 exports.default = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
-    if (!ctx.internal &&
-        (!ctx.user || !ctx.user.builder || !ctx.user.builder.global)) {
+    const appId = (0, context_1.getAppId)();
+    const builderFn = environment_1.default.isWorker()
+        ? users_1.hasBuilderPermissions
+        : environment_1.default.isApps()
+            ? users_1.isBuilder
+            : undefined;
+    if (!builderFn) {
+        throw new Error("Service name unknown - middleware inactive.");
+    }
+    if (!ctx.internal && !builderFn(ctx.user, appId)) {
         ctx.throw(403, "Builder user only endpoint.");
     }
     return next();

package/dist/src/middleware/builderOnly.js.map

@@ -1 +1 @@
-{"version":3,"file":"builderOnly.js","sourceRoot":"","sources":["../../../src/middleware/builderOnly.ts"],"names":[],"mappings":";;;;;;;;;;;AAEA,kBAAe,CAAO,GAAc,EAAE,IAAS,EAAE,EAAE;IACjD,IACE,CAAC,GAAG,CAAC,QAAQ;QACb,CAAC,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAC5D;QACA,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,6BAA6B,CAAC,CAAA;KAC9C;IACD,OAAO,IAAI,EAAE,CAAA;AACf,CAAC,CAAA,CAAA"}
+{"version":3,"file":"builderOnly.js","sourceRoot":"","sources":["../../../src/middleware/builderOnly.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,oCAA2D;AAC3D,wCAAqC;AACrC,iEAAgC;AAEhC,kBAAe,CAAO,GAAY,EAAE,IAAS,EAAE,EAAE;IAC/C,MAAM,KAAK,GAAG,IAAA,kBAAQ,GAAE,CAAA;IACxB,MAAM,SAAS,GAAG,qBAAG,CAAC,QAAQ,EAAE;QAC9B,CAAC,CAAC,6BAAqB;QACvB,CAAC,CAAC,qBAAG,CAAC,MAAM,EAAE;YACd,CAAC,CAAC,iBAAS;YACX,CAAC,CAAC,SAAS,CAAA;IACb,IAAI,CAAC,SAAS,EAAE;QACd,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAA;KAC/D;IACD,IAAI,CAAC,GAAG,CAAC,QAAQ,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE;QAChD,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,6BAA6B,CAAC,CAAA;KAC9C;IACD,OAAO,IAAI,EAAE,CAAA;AACf,CAAC,CAAA,CAAA"}

package/dist/src/middleware/builderOrAdmin.d.ts

@@ -1,3 +1,3 @@
-import { BBContext } from "@budibase/types";
-declare const _default: (ctx: BBContext, next: any) => Promise<any>;
+import { UserCtx } from "@budibase/types";
+declare const _default: (ctx: UserCtx, next: any) => Promise<any>;
 export default _default;

package/dist/src/middleware/builderOrAdmin.js

@@ -8,12 +8,25 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+const users_1 = require("../users");
+const context_1 = require("../context");
+const environment_1 = __importDefault(require("../environment"));
 exports.default = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
-    if (!ctx.internal &&
-        (!ctx.user || !ctx.user.builder || !ctx.user.builder.global) &&
-        (!ctx.user || !ctx.user.admin || !ctx.user.admin.global)) {
-        ctx.throw(403, "Builder user only endpoint.");
+    const appId = (0, context_1.getAppId)();
+    const builderFn = environment_1.default.isWorker()
+        ? users_1.hasBuilderPermissions
+        : environment_1.default.isApps()
+            ? users_1.isBuilder
+            : undefined;
+    if (!builderFn) {
+        throw new Error("Service name unknown - middleware inactive.");
+    }
+    if (!ctx.internal && !builderFn(ctx.user, appId) && !(0, users_1.isAdmin)(ctx.user)) {
+        ctx.throw(403, "Admin/Builder user only endpoint.");
     }
     return next();
 });

package/dist/src/middleware/builderOrAdmin.js.map

@@ -1 +1 @@
-{"version":3,"file":"builderOrAdmin.js","sourceRoot":"","sources":["../../../src/middleware/builderOrAdmin.ts"],"names":[],"mappings":";;;;;;;;;;;AAEA,kBAAe,CAAO,GAAc,EAAE,IAAS,EAAE,EAAE;IACjD,IACE,CAAC,GAAG,CAAC,QAAQ;QACb,CAAC,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;QAC5D,CAAC,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EACxD;QACA,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,6BAA6B,CAAC,CAAA;KAC9C;IACD,OAAO,IAAI,EAAE,CAAA;AACf,CAAC,CAAA,CAAA"}
+{"version":3,"file":"builderOrAdmin.js","sourceRoot":"","sources":["../../../src/middleware/builderOrAdmin.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,oCAAoE;AACpE,wCAAqC;AACrC,iEAAgC;AAEhC,kBAAe,CAAO,GAAY,EAAE,IAAS,EAAE,EAAE;IAC/C,MAAM,KAAK,GAAG,IAAA,kBAAQ,GAAE,CAAA;IACxB,MAAM,SAAS,GAAG,qBAAG,CAAC,QAAQ,EAAE;QAC9B,CAAC,CAAC,6BAAqB;QACvB,CAAC,CAAC,qBAAG,CAAC,MAAM,EAAE;YACd,CAAC,CAAC,iBAAS;YACX,CAAC,CAAC,SAAS,CAAA;IACb,IAAI,CAAC,SAAS,EAAE;QACd,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAA;KAC/D;IACD,IAAI,CAAC,GAAG,CAAC,QAAQ,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,IAAA,eAAO,EAAC,GAAG,CAAC,IAAI,CAAC,EAAE;QACtE,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,mCAAmC,CAAC,CAAA;KACpD;IACD,OAAO,IAAI,EAAE,CAAA;AACf,CAAC,CAAA,CAAA"}