@budibase/backend-core 2.7.35 → 2.7.36-alpha.2

package/dist/jest.config.js

@@ -14,5 +14,6 @@ const config = {
     collectCoverageFrom: ["src/**/*.{js,ts}"],
     coverageReporters: ["lcov", "json", "clover"],
 };
+process.env.DISABLE_PINO_LOGGER = "1";
 exports.default = config;
 //# sourceMappingURL=jest.config.js.map

package/dist/jest.config.js.map

@@ -1 +1 @@
-{"version":3,"file":"jest.config.js","sourceRoot":"","sources":["../jest.config.ts"],"names":[],"mappings":";;AACA,MAAM,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAA;AAE7C,MAAM,UAAU,mCACX,MAAM,KACT,MAAM,EAAE,+BAA+B,EACvC,UAAU,EAAE,CAAC,oBAAoB,CAAC,EAClC,kBAAkB,EAAE,CAAC,sBAAsB,CAAC,EAC5C,SAAS,EAAE;QACT,YAAY,EAAE,WAAW;KAC1B,EACD,gBAAgB,EAAE;QAChB,iBAAiB,EAAE,wBAAwB;KAC5C,GACF,CAAA;AAED,MAAM,MAAM,GAA0B;IACpC,QAAQ,EAAE;wCAEH,UAAU,KACb,WAAW,EAAE,iBAAiB,EAC9B,SAAS,EAAE,CAAC,+BAA+B,CAAC,EAC5C,MAAM,EAAE,oBAAoB;wCAGzB,UAAU,KACb,SAAS,EAAE,CAAC,kCAAkC,CAAC;KAElD;IACD,mBAAmB,EAAE,CAAC,kBAAkB,CAAC;IACzC,iBAAiB,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC;CAC9C,CAAA;AAED,kBAAe,MAAM,CAAA"}
+{"version":3,"file":"jest.config.js","sourceRoot":"","sources":["../jest.config.ts"],"names":[],"mappings":";;AACA,MAAM,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAA;AAE7C,MAAM,UAAU,mCACX,MAAM,KACT,MAAM,EAAE,+BAA+B,EACvC,UAAU,EAAE,CAAC,oBAAoB,CAAC,EAClC,kBAAkB,EAAE,CAAC,sBAAsB,CAAC,EAC5C,SAAS,EAAE;QACT,YAAY,EAAE,WAAW;KAC1B,EACD,gBAAgB,EAAE;QAChB,iBAAiB,EAAE,wBAAwB;KAC5C,GACF,CAAA;AAED,MAAM,MAAM,GAA0B;IACpC,QAAQ,EAAE;wCAEH,UAAU,KACb,WAAW,EAAE,iBAAiB,EAC9B,SAAS,EAAE,CAAC,+BAA+B,CAAC,EAC5C,MAAM,EAAE,oBAAoB;wCAGzB,UAAU,KACb,SAAS,EAAE,CAAC,kCAAkC,CAAC;KAElD;IACD,mBAAmB,EAAE,CAAC,kBAAkB,CAAC;IACzC,iBAAiB,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC;CAC9C,CAAA;AAED,OAAO,CAAC,GAAG,CAAC,mBAAmB,GAAG,GAAG,CAAA;AAErC,kBAAe,MAAM,CAAA"}

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.7.35",
+  "version": "2.7.36-alpha.2",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -22,12 +22,12 @@
   "dependencies": {
     "@budibase/nano": "10.1.2",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "2.7.35",
+    "@budibase/types": "2.7.36-alpha.2",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
     "aws-sdk": "2.1030.0",
-    "bcrypt": "5.0.1",
+    "bcrypt": "5.1.0",
     "bcryptjs": "2.4.3",
     "bull": "4.10.1",
     "correlation-id": "4.0.0",
@@ -101,5 +101,5 @@
       }
     }
   },
-  "gitHead": "6db1d089ee2d2df8caf513cf2cb4b22f167b91f1"
+  "gitHead": "9e73358c0b5d945e052a08f6a9277a4d263eec01"
 }

package/dist/src/db/Replication.js

@@ -58,6 +58,9 @@ class Replication {
     appReplicateOpts() {
         return {
             filter: (doc) => {
+                if (doc._id && doc._id.startsWith(constants_1.DocumentType.AUTOMATION_LOG)) {
+                    return false;
+                }
                 return doc._id !== constants_1.DocumentType.APP_METADATA;
             },
         };

package/dist/src/db/Replication.js.map

@@ -1 +1 @@
-{"version":3,"file":"Replication.js","sourceRoot":"","sources":["../../../src/db/Replication.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,mCAAkD;AAClD,4CAA2C;AAE3C,MAAM,WAAW;IAKf;;;;OAIG;IACH,YAAY,EAAE,MAAM,EAAE,MAAM,EAAO;QACjC,IAAI,CAAC,MAAM,GAAG,IAAA,kBAAU,EAAC,MAAM,CAAC,CAAA;QAChC,IAAI,CAAC,MAAM,GAAG,IAAA,kBAAU,EAAC,MAAM,CAAC,CAAA;IAClC,CAAC;IAED,KAAK;QACH,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,IAAA,oBAAY,EAAC,IAAI,CAAC,MAAM,CAAC,EAAE,IAAA,oBAAY,EAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;IAC5E,CAAC;IAED,SAAS,CAAC,SAAc,EAAE,IAAI,GAAG,EAAE;QACjC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;YAC3B,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC;iBACzB,EAAE,CAAC,QAAQ,EAAE,UAAU,GAAQ;gBAC9B,2DAA2D;gBAC3D,MAAM,IAAI,KAAK,CAAC,wCAAwC,GAAG,EAAE,CAAC,CAAA;YAChE,CAAC,CAAC;iBACD,EAAE,CAAC,UAAU,EAAE,UAAU,IAAS;gBACjC,OAAO,OAAO,CAAC,IAAI,CAAC,CAAA;YACtB,CAAC,CAAC;iBACD,EAAE,CAAC,OAAO,EAAE,UAAU,GAAQ;gBAC7B,MAAM,IAAI,KAAK,CAAC,sBAAsB,GAAG,EAAE,CAAC,CAAA;YAC9C,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;IACJ,CAAC;IAED;;;OAGG;IACH,IAAI,CAAC,IAAI,GAAG,EAAE;QACZ,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;QACzD,OAAO,IAAI,CAAC,WAAW,CAAA;IACzB,CAAC;IAED;;;OAGG;IACH,SAAS,CAAC,IAAI,GAAG,EAAE;QACjB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,CAAC,CAAA;QACjE,OAAO,IAAI,CAAC,WAAW,CAAA;IACzB,CAAC;IAED,gBAAgB;QACd,OAAO;YACL,MAAM,EAAE,CAAC,GAAQ,EAAE,EAAE;gBACnB,OAAO,GAAG,CAAC,GAAG,KAAK,wBAAY,CAAC,YAAY,CAAA;YAC9C,CAAC;SACF,CAAA;IACH,CAAC;IAED;;OAEG;IACG,QAAQ;;YACZ,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAA;YAC3B,wBAAwB;YACxB,IAAI,CAAC,MAAM,GAAG,IAAA,kBAAU,EAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;YAC1C,oDAAoD;YACpD,MAAM,IAAI,CAAC,SAAS,EAAE,CAAA;QACxB,CAAC;KAAA;IAED,MAAM;QACJ,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAA;IAC3B,CAAC;CACF;AAED,kBAAe,WAAW,CAAA"}
+{"version":3,"file":"Replication.js","sourceRoot":"","sources":["../../../src/db/Replication.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,mCAAkD;AAClD,4CAA2C;AAE3C,MAAM,WAAW;IAKf;;;;OAIG;IACH,YAAY,EAAE,MAAM,EAAE,MAAM,EAAO;QACjC,IAAI,CAAC,MAAM,GAAG,IAAA,kBAAU,EAAC,MAAM,CAAC,CAAA;QAChC,IAAI,CAAC,MAAM,GAAG,IAAA,kBAAU,EAAC,MAAM,CAAC,CAAA;IAClC,CAAC;IAED,KAAK;QACH,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,IAAA,oBAAY,EAAC,IAAI,CAAC,MAAM,CAAC,EAAE,IAAA,oBAAY,EAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;IAC5E,CAAC;IAED,SAAS,CAAC,SAAc,EAAE,IAAI,GAAG,EAAE;QACjC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;YAC3B,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC;iBACzB,EAAE,CAAC,QAAQ,EAAE,UAAU,GAAQ;gBAC9B,2DAA2D;gBAC3D,MAAM,IAAI,KAAK,CAAC,wCAAwC,GAAG,EAAE,CAAC,CAAA;YAChE,CAAC,CAAC;iBACD,EAAE,CAAC,UAAU,EAAE,UAAU,IAAS;gBACjC,OAAO,OAAO,CAAC,IAAI,CAAC,CAAA;YACtB,CAAC,CAAC;iBACD,EAAE,CAAC,OAAO,EAAE,UAAU,GAAQ;gBAC7B,MAAM,IAAI,KAAK,CAAC,sBAAsB,GAAG,EAAE,CAAC,CAAA;YAC9C,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;IACJ,CAAC;IAED;;;OAGG;IACH,IAAI,CAAC,IAAI,GAAG,EAAE;QACZ,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;QACzD,OAAO,IAAI,CAAC,WAAW,CAAA;IACzB,CAAC;IAED;;;OAGG;IACH,SAAS,CAAC,IAAI,GAAG,EAAE;QACjB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,CAAC,CAAA;QACjE,OAAO,IAAI,CAAC,WAAW,CAAA;IACzB,CAAC;IAED,gBAAgB;QACd,OAAO;YACL,MAAM,EAAE,CAAC,GAAQ,EAAE,EAAE;gBACnB,IAAI,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,wBAAY,CAAC,cAAc,CAAC,EAAE;oBAC9D,OAAO,KAAK,CAAA;iBACb;gBACD,OAAO,GAAG,CAAC,GAAG,KAAK,wBAAY,CAAC,YAAY,CAAA;YAC9C,CAAC;SACF,CAAA;IACH,CAAC;IAED;;OAEG;IACG,QAAQ;;YACZ,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAA;YAC3B,wBAAwB;YACxB,IAAI,CAAC,MAAM,GAAG,IAAA,kBAAU,EAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;YAC1C,oDAAoD;YACpD,MAAM,IAAI,CAAC,SAAS,EAAE,CAAA;QACxB,CAAC;KAAA;IAED,MAAM;QACJ,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAA;IAC3B,CAAC;CACF;AAED,kBAAe,WAAW,CAAA"}

package/dist/src/docIds/ids.d.ts

@@ -40,7 +40,11 @@ export declare function generateAppUserID(prodAppId: string, userId: string): st
  * Generates a new role ID.
  * @returns {string} The new role ID which the role doc can be stored under.
  */
-export declare function generateRoleID(id?: any): string;
+export declare function generateRoleID(name: string): string;
+/**
+ * Utility function to be more verbose.
+ */
+export declare function prefixRoleID(name: string): string;
 /**
  * Generates a new dev info document ID - this is scoped to a user.
  * @returns {string} The new dev info ID which info for dev (like api key) can be stored under.

package/dist/src/docIds/ids.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generatePluginID = exports.generateDevInfoID = exports.generateRoleID = exports.generateAppUserID = exports.generateTemplateID = exports.getGlobalIDFromUserMetadataID = exports.generateUserMetadataID = exports.generateGlobalUserID = exports.generateWorkspaceID = exports.generateRowID = exports.generateAppID = void 0;
+exports.generatePluginID = exports.generateDevInfoID = exports.prefixRoleID = exports.generateRoleID = exports.generateAppUserID = exports.generateTemplateID = exports.getGlobalIDFromUserMetadataID = exports.generateUserMetadataID = exports.generateGlobalUserID = exports.generateWorkspaceID = exports.generateRowID = exports.generateAppID = void 0;
 const constants_1 = require("../constants");
 const newid_1 = require("./newid");
 /**
@@ -78,10 +78,21 @@ exports.generateAppUserID = generateAppUserID;
  * Generates a new role ID.
  * @returns {string} The new role ID which the role doc can be stored under.
  */
-function generateRoleID(id) {
-    return `${constants_1.DocumentType.ROLE}${constants_1.SEPARATOR}${id || (0, newid_1.newid)()}`;
+function generateRoleID(name) {
+    const prefix = `${constants_1.DocumentType.ROLE}${constants_1.SEPARATOR}`;
+    if (name.startsWith(prefix)) {
+        return name;
+    }
+    return `${prefix}${name}`;
 }
 exports.generateRoleID = generateRoleID;
+/**
+ * Utility function to be more verbose.
+ */
+function prefixRoleID(name) {
+    return generateRoleID(name);
+}
+exports.prefixRoleID = prefixRoleID;
 /**
  * Generates a new dev info document ID - this is scoped to a user.
  * @returns {string} The new dev info ID which info for dev (like api key) can be stored under.

package/dist/src/docIds/ids.js.map

@@ -1 +1 @@
-{"version":3,"file":"ids.js","sourceRoot":"","sources":["../../../src/docIds/ids.ts"],"names":[],"mappings":";;;AAAA,4CAKqB;AACrB,mCAA+B;AAE/B;;;GAGG;AACI,MAAM,aAAa,GAAG,CAAC,QAAwB,EAAE,EAAE;IACxD,IAAI,EAAE,GAAG,sBAAU,CAAA;IACnB,IAAI,QAAQ,EAAE;QACZ,EAAE,IAAI,GAAG,QAAQ,GAAG,qBAAS,EAAE,CAAA;KAChC;IACD,OAAO,GAAG,EAAE,GAAG,IAAA,aAAK,GAAE,EAAE,CAAA;AAC1B,CAAC,CAAA;AANY,QAAA,aAAa,iBAMzB;AAED;;;;;GAKG;AACH,SAAgB,aAAa,CAAC,OAAe,EAAE,EAAW;IACxD,EAAE,GAAG,EAAE,IAAI,IAAA,aAAK,GAAE,CAAA;IAClB,OAAO,GAAG,wBAAY,CAAC,GAAG,GAAG,qBAAS,GAAG,OAAO,GAAG,qBAAS,GAAG,EAAE,EAAE,CAAA;AACrE,CAAC;AAHD,sCAGC;AAED;;;GAGG;AACH,SAAgB,mBAAmB;IACjC,OAAO,GAAG,wBAAY,CAAC,SAAS,GAAG,qBAAS,GAAG,IAAA,aAAK,GAAE,EAAE,CAAA;AAC1D,CAAC;AAFD,kDAEC;AAED;;;GAGG;AACH,SAAgB,oBAAoB,CAAC,EAAQ;IAC3C,OAAO,GAAG,wBAAY,CAAC,IAAI,GAAG,qBAAS,GAAG,EAAE,IAAI,IAAA,aAAK,GAAE,EAAE,CAAA;AAC3D,CAAC;AAFD,oDAEC;AAED;;;;GAIG;AACH,SAAgB,sBAAsB,CAAC,QAAgB;IACrD,OAAO,aAAa,CAAC,yBAAa,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAA;AAC7D,CAAC;AAFD,wDAEC;AAED;;GAEG;AACH,SAAgB,6BAA6B,CAAC,EAAU;IACtD,MAAM,MAAM,GAAG,GAAG,wBAAY,CAAC,GAAG,GAAG,qBAAS,GAAG,yBAAa,CAAC,aAAa,GAAG,qBAAS,EAAE,CAAA;IAC1F,IAAI,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;QAC/B,OAAO,EAAE,CAAA;KACV;IACD,OAAO,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;AAC5B,CAAC;AAND,sEAMC;AAED;;;GAGG;AACH,SAAgB,kBAAkB,CAAC,OAAY;IAC7C,OAAO,GAAG,wBAAY,CAAC,QAAQ,GAAG,qBAAS,GAAG,OAAO,GAAG,qBAAS,GAAG,IAAA,aAAK,GAAE,EAAE,CAAA;AAC/E,CAAC;AAFD,gDAEC;AAED,SAAgB,iBAAiB,CAAC,SAAiB,EAAE,MAAc;IACjE,OAAO,GAAG,SAAS,GAAG,qBAAS,GAAG,MAAM,EAAE,CAAA;AAC5C,CAAC;AAFD,8CAEC;AAED;;;GAGG;AACH,SAAgB,cAAc,CAAC,EAAQ;IACrC,OAAO,GAAG,wBAAY,CAAC,IAAI,GAAG,qBAAS,GAAG,EAAE,IAAI,IAAA,aAAK,GAAE,EAAE,CAAA;AAC3D,CAAC;AAFD,wCAEC;AAED;;;GAGG;AACI,MAAM,iBAAiB,GAAG,CAAC,MAAW,EAAE,EAAE;IAC/C,OAAO,GAAG,wBAAY,CAAC,QAAQ,GAAG,qBAAS,GAAG,MAAM,EAAE,CAAA;AACxD,CAAC,CAAA;AAFY,QAAA,iBAAiB,qBAE7B;AAED;;;GAGG;AACI,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAAE,EAAE;IAC/C,OAAO,GAAG,wBAAY,CAAC,MAAM,GAAG,qBAAS,GAAG,IAAI,EAAE,CAAA;AACpD,CAAC,CAAA;AAFY,QAAA,gBAAgB,oBAE5B"}
+{"version":3,"file":"ids.js","sourceRoot":"","sources":["../../../src/docIds/ids.ts"],"names":[],"mappings":"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"}

package/dist/src/events/publishers/serve.d.ts

@@ -1,6 +1,6 @@
 import { App } from "@budibase/types";
 declare function servedBuilder(timezone: string): Promise<void>;
-declare function servedApp(app: App, timezone: string): Promise<void>;
+declare function servedApp(app: App, timezone: string, embed?: boolean | undefined): Promise<void>;
 declare function servedAppPreview(app: App, timezone: string): Promise<void>;
 declare const _default: {
     servedBuilder: typeof servedBuilder;

package/dist/src/events/publishers/serve.js

@@ -19,11 +19,12 @@ function servedBuilder(timezone) {
         yield (0, events_1.publishEvent)(types_1.Event.SERVED_BUILDER, properties);
     });
 }
-function servedApp(app, timezone) {
+function servedApp(app, timezone, embed) {
     return __awaiter(this, void 0, void 0, function* () {
         const properties = {
             appVersion: app.version,
             timezone,
+            embed: embed === true,
         };
         yield (0, events_1.publishEvent)(types_1.Event.SERVED_APP, properties);
     });

package/dist/src/events/publishers/serve.js.map

@@ -1 +1 @@
-{"version":3,"file":"serve.js","sourceRoot":"","sources":["../../../../src/events/publishers/serve.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,sCAAwC;AACxC,2CAMwB;AAExB,SAAe,aAAa,CAAC,QAAgB;;QAC3C,MAAM,UAAU,GAAuB;YACrC,QAAQ;SACT,CAAA;QACD,MAAM,IAAA,qBAAY,EAAC,aAAK,CAAC,cAAc,EAAE,UAAU,CAAC,CAAA;IACtD,CAAC;CAAA;AAED,SAAe,SAAS,CAAC,GAAQ,EAAE,QAAgB;;QACjD,MAAM,UAAU,GAAmB;YACjC,UAAU,EAAE,GAAG,CAAC,OAAO;YACvB,QAAQ;SACT,CAAA;QACD,MAAM,IAAA,qBAAY,EAAC,aAAK,CAAC,UAAU,EAAE,UAAU,CAAC,CAAA;IAClD,CAAC;CAAA;AAED,SAAe,gBAAgB,CAAC,GAAQ,EAAE,QAAgB;;QACxD,MAAM,UAAU,GAA0B;YACxC,KAAK,EAAE,GAAG,CAAC,KAAK;YAChB,UAAU,EAAE,GAAG,CAAC,OAAO;YACvB,QAAQ;SACT,CAAA;QACD,MAAM,IAAA,qBAAY,EAAC,aAAK,CAAC,kBAAkB,EAAE,UAAU,CAAC,CAAA;IAC1D,CAAC;CAAA;AAED,kBAAe;IACb,aAAa;IACb,SAAS;IACT,gBAAgB;CACjB,CAAA"}
+{"version":3,"file":"serve.js","sourceRoot":"","sources":["../../../../src/events/publishers/serve.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,sCAAwC;AACxC,2CAMwB;AAExB,SAAe,aAAa,CAAC,QAAgB;;QAC3C,MAAM,UAAU,GAAuB;YACrC,QAAQ;SACT,CAAA;QACD,MAAM,IAAA,qBAAY,EAAC,aAAK,CAAC,cAAc,EAAE,UAAU,CAAC,CAAA;IACtD,CAAC;CAAA;AAED,SAAe,SAAS,CACtB,GAAQ,EACR,QAAgB,EAChB,KAA2B;;QAE3B,MAAM,UAAU,GAAmB;YACjC,UAAU,EAAE,GAAG,CAAC,OAAO;YACvB,QAAQ;YACR,KAAK,EAAE,KAAK,KAAK,IAAI;SACtB,CAAA;QACD,MAAM,IAAA,qBAAY,EAAC,aAAK,CAAC,UAAU,EAAE,UAAU,CAAC,CAAA;IAClD,CAAC;CAAA;AAED,SAAe,gBAAgB,CAAC,GAAQ,EAAE,QAAgB;;QACxD,MAAM,UAAU,GAA0B;YACxC,KAAK,EAAE,GAAG,CAAC,KAAK;YAChB,UAAU,EAAE,GAAG,CAAC,OAAO;YACvB,QAAQ;SACT,CAAA;QACD,MAAM,IAAA,qBAAY,EAAC,aAAK,CAAC,kBAAkB,EAAE,UAAU,CAAC,CAAA;IAC1D,CAAC;CAAA;AAED,kBAAe;IACb,aAAa;IACb,SAAS;IACT,gBAAgB;CACjB,CAAA"}

package/dist/src/middleware/passport/datasource/google.d.ts

@@ -1,7 +1,7 @@
-import { BBContext } from "@budibase/types";
+import { UserCtx } from "@budibase/types";
 declare type Passport = {
     authenticate: any;
 };
-export declare function preAuth(passport: Passport, ctx: BBContext, next: Function): Promise<any>;
-export declare function postAuth(passport: Passport, ctx: BBContext, next: Function): Promise<any>;
+export declare function preAuth(passport: Passport, ctx: UserCtx, next: Function): Promise<any>;
+export declare function postAuth(passport: Passport, ctx: UserCtx, next: Function): Promise<any>;
 export {};

package/dist/src/middleware/passport/datasource/google.js

@@ -35,9 +35,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.postAuth = exports.preAuth = void 0;
 const google = __importStar(require("../sso/google"));
 const constants_1 = require("../../../constants");
-const utils_1 = require("../../../utils");
-const db_1 = require("../../../db");
 const configs = __importStar(require("../../../configs"));
+const cache = __importStar(require("../../../cache"));
+const utils = __importStar(require("../../../utils"));
 const sso_1 = require("../sso/sso");
 const GoogleStrategy = require("passport-google-oauth").OAuth2Strategy;
 function fetchGoogleCreds() {
@@ -56,8 +56,8 @@ function preAuth(passport, ctx, next) {
         const platformUrl = yield configs.getPlatformUrl({ tenantAware: false });
         let callbackUrl = `${platformUrl}/api/global/auth/datasource/google/callback`;
         const strategy = yield google.strategyFactory(googleConfig, callbackUrl, sso_1.ssoSaveUserNoOp);
-        if (!ctx.query.appId || !ctx.query.datasourceId) {
-            ctx.throw(400, "appId and datasourceId query params not present.");
+        if (!ctx.query.appId) {
+            ctx.throw(400, "appId query param not present.");
         }
         return passport.authenticate(strategy, {
             scope: ["profile", "email", "https://www.googleapis.com/auth/spreadsheets"],
@@ -73,34 +73,21 @@ function postAuth(passport, ctx, next) {
         const config = yield fetchGoogleCreds();
         const platformUrl = yield configs.getPlatformUrl({ tenantAware: false });
         let callbackUrl = `${platformUrl}/api/global/auth/datasource/google/callback`;
-        const authStateCookie = (0, utils_1.getCookie)(ctx, constants_1.Cookie.DatasourceAuth);
+        const authStateCookie = utils.getCookie(ctx, constants_1.Cookie.DatasourceAuth);
         return passport.authenticate(new GoogleStrategy({
             clientID: config.clientID,
             clientSecret: config.clientSecret,
             callbackURL: callbackUrl,
-        }, (accessToken, refreshToken, profile, done) => {
-            (0, utils_1.clearCookie)(ctx, constants_1.Cookie.DatasourceAuth);
+        }, (accessToken, refreshToken, _profile, done) => {
+            utils.clearCookie(ctx, constants_1.Cookie.DatasourceAuth);
             done(null, { accessToken, refreshToken });
         }), { successRedirect: "/", failureRedirect: "/error" }, (err, tokens) => __awaiter(this, void 0, void 0, function* () {
             const baseUrl = `/builder/app/${authStateCookie.appId}/data`;
-            // update the DB for the datasource with all the user info
-            yield (0, db_1.doWithDB)(authStateCookie.appId, (db) => __awaiter(this, void 0, void 0, function* () {
-                let datasource;
-                try {
-                    datasource = yield db.get(authStateCookie.datasourceId);
-                }
-                catch (err) {
-                    if (err.status === 404) {
-                        ctx.redirect(baseUrl);
-                    }
-                }
-                if (!datasource.config) {
-                    datasource.config = {};
-                }
-                datasource.config.auth = Object.assign({ type: "google" }, tokens);
-                yield db.put(datasource);
-                ctx.redirect(`${baseUrl}/datasource/${authStateCookie.datasourceId}`);
-            }));
+            const id = utils.newid();
+            yield cache.store(`datasource:creation:${authStateCookie.appId}:google:${id}`, {
+                tokens,
+            });
+            ctx.redirect(`${baseUrl}/new?continue_google_setup=${id}`);
         }))(ctx, next);
     });
 }

package/dist/src/middleware/passport/datasource/google.js.map

@@ -1 +1 @@
-{"version":3,"file":"google.js","sourceRoot":"","sources":["../../../../../src/middleware/passport/datasource/google.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"google.js","sourceRoot":"","sources":["../../../../../src/middleware/passport/datasource/google.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAAuC;AACvC,kDAA2C;AAC3C,0DAA2C;AAC3C,sDAAuC;AACvC,sDAAuC;AAEvC,oCAA4C;AAE5C,MAAM,cAAc,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC,cAAc,CAAA;AAMtE,SAAe,gBAAgB;;QAC7B,IAAI,MAAM,GAAG,MAAM,OAAO,CAAC,yBAAyB,EAAE,CAAA;QAEtD,IAAI,CAAC,MAAM,EAAE;YACX,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAA;SACjD;QACD,OAAO,MAAM,CAAA;IACf,CAAC;CAAA;AAED,SAAsB,OAAO,CAC3B,QAAkB,EAClB,GAAY,EACZ,IAAc;;QAEd,0BAA0B;QAC1B,MAAM,YAAY,GAAG,MAAM,gBAAgB,EAAE,CAAA;QAC7C,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,cAAc,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAA;QAExE,IAAI,WAAW,GAAG,GAAG,WAAW,6CAA6C,CAAA;QAC7E,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,eAAe,CAC3C,YAAY,EACZ,WAAW,EACX,qBAAe,CAChB,CAAA;QAED,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE;YACpB,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,gCAAgC,CAAC,CAAA;SACjD;QAED,OAAO,QAAQ,CAAC,YAAY,CAAC,QAAQ,EAAE;YACrC,KAAK,EAAE,CAAC,SAAS,EAAE,OAAO,EAAE,8CAA8C,CAAC;YAC3E,UAAU,EAAE,SAAS;YACrB,MAAM,EAAE,SAAS;SAClB,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;IACf,CAAC;CAAA;AAzBD,0BAyBC;AAED,SAAsB,QAAQ,CAC5B,QAAkB,EAClB,GAAY,EACZ,IAAc;;QAEd,0BAA0B;QAC1B,MAAM,MAAM,GAAG,MAAM,gBAAgB,EAAE,CAAA;QACvC,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,cAAc,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAA;QAExE,IAAI,WAAW,GAAG,GAAG,WAAW,6CAA6C,CAAA;QAC7E,MAAM,eAAe,GAAG,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE,kBAAM,CAAC,cAAc,CAAC,CAAA;QAEnE,OAAO,QAAQ,CAAC,YAAY,CAC1B,IAAI,cAAc,CAChB;YACE,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,WAAW,EAAE,WAAW;SACzB,EACD,CACE,WAAmB,EACnB,YAAoB,EACpB,QAAoB,EACpB,IAAc,EACd,EAAE;YACF,KAAK,CAAC,WAAW,CAAC,GAAG,EAAE,kBAAM,CAAC,cAAc,CAAC,CAAA;YAC7C,IAAI,CAAC,IAAI,EAAE,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC,CAAA;QAC3C,CAAC,CACF,EACD,EAAE,eAAe,EAAE,GAAG,EAAE,eAAe,EAAE,QAAQ,EAAE,EACnD,CAAO,GAAQ,EAAE,MAAgB,EAAE,EAAE;YACnC,MAAM,OAAO,GAAG,gBAAgB,eAAe,CAAC,KAAK,OAAO,CAAA;YAE5D,MAAM,EAAE,GAAG,KAAK,CAAC,KAAK,EAAE,CAAA;YACxB,MAAM,KAAK,CAAC,KAAK,CACf,uBAAuB,eAAe,CAAC,KAAK,WAAW,EAAE,EAAE,EAC3D;gBACE,MAAM;aACP,CACF,CAAA;YAED,GAAG,CAAC,QAAQ,CAAC,GAAG,OAAO,8BAA8B,EAAE,EAAE,CAAC,CAAA;QAC5D,CAAC,CAAA,CACF,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;IACd,CAAC;CAAA;AA5CD,4BA4CC"}

package/dist/src/security/encryption.d.ts

@@ -5,3 +5,11 @@ export declare enum SecretOption {
 export declare function getSecret(secretOption: SecretOption): string;
 export declare function encrypt(input: string, secretOption?: SecretOption): string;
 export declare function decrypt(input: string, secretOption?: SecretOption): string;
+export declare function encryptFile({ dir, filename }: {
+    dir: string;
+    filename: string;
+}, secret: string): Promise<{
+    filename: string;
+    dir: string;
+}>;
+export declare function decryptFile(inputPath: string, outputPath: string, secret: string): Promise<void>;

package/dist/src/security/encryption.js

@@ -1,16 +1,29 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        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 });
-exports.decrypt = exports.encrypt = exports.getSecret = exports.SecretOption = void 0;
+exports.decryptFile = exports.encryptFile = exports.decrypt = exports.encrypt = exports.getSecret = exports.SecretOption = void 0;
 const crypto_1 = __importDefault(require("crypto"));
+const fs_1 = __importDefault(require("fs"));
+const zlib_1 = __importDefault(require("zlib"));
 const environment_1 = __importDefault(require("../environment"));
+const path_1 = require("path");
 const ALGO = "aes-256-ctr";
 const SEPARATOR = "-";
 const ITERATIONS = 10000;
-const RANDOM_BYTES = 16;
 const STRETCH_LENGTH = 32;
+const SALT_LENGTH = 16;
+const IV_LENGTH = 16;
 var SecretOption;
 (function (SecretOption) {
     SecretOption["API"] = "api";
@@ -35,11 +48,11 @@ function getSecret(secretOption) {
     return secret;
 }
 exports.getSecret = getSecret;
-function stretchString(string, salt) {
-    return crypto_1.default.pbkdf2Sync(string, salt, ITERATIONS, STRETCH_LENGTH, "sha512");
+function stretchString(secret, salt) {
+    return crypto_1.default.pbkdf2Sync(secret, salt, ITERATIONS, STRETCH_LENGTH, "sha512");
 }
 function encrypt(input, secretOption = SecretOption.API) {
-    const salt = crypto_1.default.randomBytes(RANDOM_BYTES);
+    const salt = crypto_1.default.randomBytes(SALT_LENGTH);
     const stretched = stretchString(getSecret(secretOption), salt);
     const cipher = crypto_1.default.createCipheriv(ALGO, stretched, salt);
     const base = cipher.update(input);
@@ -58,4 +71,93 @@ function decrypt(input, secretOption = SecretOption.API) {
     return Buffer.concat([base, final]).toString();
 }
 exports.decrypt = decrypt;
+function encryptFile({ dir, filename }, secret) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const outputFileName = `${filename}.enc`;
+        const filePath = (0, path_1.join)(dir, filename);
+        const inputFile = fs_1.default.createReadStream(filePath);
+        const outputFile = fs_1.default.createWriteStream((0, path_1.join)(dir, outputFileName));
+        const salt = crypto_1.default.randomBytes(SALT_LENGTH);
+        const iv = crypto_1.default.randomBytes(IV_LENGTH);
+        const stretched = stretchString(secret, salt);
+        const cipher = crypto_1.default.createCipheriv(ALGO, stretched, iv);
+        outputFile.write(salt);
+        outputFile.write(iv);
+        inputFile.pipe(zlib_1.default.createGzip()).pipe(cipher).pipe(outputFile);
+        return new Promise(r => {
+            outputFile.on("finish", () => {
+                r({
+                    filename: outputFileName,
+                    dir,
+                });
+            });
+        });
+    });
+}
+exports.encryptFile = encryptFile;
+function getSaltAndIV(path) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const fileStream = fs_1.default.createReadStream(path);
+        const salt = yield readBytes(fileStream, SALT_LENGTH);
+        const iv = yield readBytes(fileStream, IV_LENGTH);
+        fileStream.close();
+        return { salt, iv };
+    });
+}
+function decryptFile(inputPath, outputPath, secret) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { salt, iv } = yield getSaltAndIV(inputPath);
+        const inputFile = fs_1.default.createReadStream(inputPath, {
+            start: SALT_LENGTH + IV_LENGTH,
+        });
+        const outputFile = fs_1.default.createWriteStream(outputPath);
+        const stretched = stretchString(secret, salt);
+        const decipher = crypto_1.default.createDecipheriv(ALGO, stretched, iv);
+        const unzip = zlib_1.default.createGunzip();
+        inputFile.pipe(decipher).pipe(unzip).pipe(outputFile);
+        return new Promise((res, rej) => {
+            outputFile.on("finish", () => {
+                outputFile.close();
+                res();
+            });
+            inputFile.on("error", e => {
+                outputFile.close();
+                rej(e);
+            });
+            decipher.on("error", e => {
+                outputFile.close();
+                rej(e);
+            });
+            unzip.on("error", e => {
+                outputFile.close();
+                rej(e);
+            });
+            outputFile.on("error", e => {
+                outputFile.close();
+                rej(e);
+            });
+        });
+    });
+}
+exports.decryptFile = decryptFile;
+function readBytes(stream, length) {
+    return new Promise((resolve, reject) => {
+        let bytesRead = 0;
+        const data = [];
+        stream.on("readable", () => {
+            let chunk;
+            while ((chunk = stream.read(length - bytesRead)) !== null) {
+                data.push(chunk);
+                bytesRead += chunk.length;
+            }
+            resolve(Buffer.concat(data));
+        });
+        stream.on("end", () => {
+            reject(new Error("Insufficient data in the stream."));
+        });
+        stream.on("error", error => {
+            reject(error);
+        });
+    });
+}
 //# sourceMappingURL=encryption.js.map

package/dist/src/security/encryption.js.map

@@ -1 +1 @@
-{"version":3,"file":"encryption.js","sourceRoot":"","sources":["../../../src/security/encryption.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA2B;AAC3B,iEAAgC;AAEhC,MAAM,IAAI,GAAG,aAAa,CAAA;AAC1B,MAAM,SAAS,GAAG,GAAG,CAAA;AACrB,MAAM,UAAU,GAAG,KAAK,CAAA;AACxB,MAAM,YAAY,GAAG,EAAE,CAAA;AACvB,MAAM,cAAc,GAAG,EAAE,CAAA;AAEzB,IAAY,YAGX;AAHD,WAAY,YAAY;IACtB,2BAAW,CAAA;IACX,yCAAyB,CAAA;AAC3B,CAAC,EAHW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAGvB;AAED,SAAgB,SAAS,CAAC,YAA0B;IAClD,IAAI,MAAM,EAAE,UAAU,CAAA;IACtB,QAAQ,YAAY,EAAE;QACpB,KAAK,YAAY,CAAC,UAAU;YAC1B,MAAM,GAAG,qBAAG,CAAC,cAAc,CAAA;YAC3B,UAAU,GAAG,gBAAgB,CAAA;YAC7B,MAAK;QACP,KAAK,YAAY,CAAC,GAAG,CAAC;QACtB;YACE,MAAM,GAAG,qBAAG,CAAC,kBAAkB,CAAA;YAC/B,UAAU,GAAG,oBAAoB,CAAA;YACjC,MAAK;KACR;IACD,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,IAAI,KAAK,CAAC,WAAW,UAAU,oCAAoC,CAAC,CAAA;KAC3E;IACD,OAAO,MAAM,CAAA;AACf,CAAC;AAjBD,8BAiBC;AAED,SAAS,aAAa,CAAC,MAAc,EAAE,IAAY;IACjD,OAAO,gBAAM,CAAC,UAAU,CAAC,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,cAAc,EAAE,QAAQ,CAAC,CAAA;AAC9E,CAAC;AAED,SAAgB,OAAO,CACrB,KAAa,EACb,eAA6B,YAAY,CAAC,GAAG;IAE7C,MAAM,IAAI,GAAG,gBAAM,CAAC,WAAW,CAAC,YAAY,CAAC,CAAA;IAC7C,MAAM,SAAS,GAAG,aAAa,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,IAAI,CAAC,CAAA;IAC9D,MAAM,MAAM,GAAG,gBAAM,CAAC,cAAc,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,CAAA;IAC3D,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IACjC,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,EAAE,CAAA;IAC5B,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;IAC9D,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,SAAS,GAAG,SAAS,EAAE,CAAA;AAC1D,CAAC;AAXD,0BAWC;AAED,SAAgB,OAAO,CACrB,KAAa,EACb,eAA6B,YAAY,CAAC,GAAG;IAE7C,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;IAChD,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;IAC3C,MAAM,SAAS,GAAG,aAAa,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,UAAU,CAAC,CAAA;IACpE,MAAM,QAAQ,GAAG,gBAAM,CAAC,gBAAgB,CAAC,IAAI,EAAE,SAAS,EAAE,UAAU,CAAC,CAAA;IACrE,MAAM,IAAI,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,CAAA;IAC3D,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,EAAE,CAAA;IAC9B,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAA;AAChD,CAAC;AAXD,0BAWC"}
+{"version":3,"file":"encryption.js","sourceRoot":"","sources":["../../../src/security/encryption.ts"],"names":[],"mappings":"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"}

package/dist/src/security/roles.d.ts

@@ -5,12 +5,17 @@ export declare const BUILTIN_ROLE_IDS: {
     BASIC: string;
     PUBLIC: string;
 };
+export declare const RoleIDVersion: {
+    UUID: undefined;
+    NAME: string;
+};
 export declare class Role implements RoleDoc {
     _id: string;
     _rev?: string;
     name: string;
     permissionId: string;
     inherits?: string;
+    version?: string;
     permissions: {};
     constructor(id: string, name: string, permissionId: string);
     addInheritance(inherits: string): this;
@@ -37,9 +42,12 @@ export declare function lowerBuiltinRoleID(roleId1?: string, roleId2?: string):
  * Gets the role object, this is mainly useful for two purposes, to check if the level exists and
  * to check if the role inherits any others.
  * @param {string|null} roleId The level ID to lookup.
+ * @param {object|null} opts options for the function, like whether to halt errors, instead return public.
  * @returns {Promise<Role|object|null>} The role object, which may contain an "inherits" property.
  */
-export declare function getRole(roleId?: string): Promise<RoleDoc | undefined>;
+export declare function getRole(roleId?: string, opts?: {
+    defaultPublic?: boolean;
+}): Promise<RoleDoc | undefined>;
 /**
  * Returns an ordered array of the user's inherited role IDs, this can be used
  * to determine if a user can access something that requires a specific role.
@@ -84,8 +92,8 @@ export declare class AccessController {
 /**
  * Adds the "role_" for builtin role IDs which are to be written to the DB (for permissions).
  */
-export declare function getDBRoleID(roleId?: string): string;
+export declare function getDBRoleID(roleName: string): string;
 /**
  * Remove the "role_" from builtin role IDs that have been written to the DB (for permissions).
  */
-export declare function getExternalRoleID(roleId?: string): string | undefined;
+export declare function getExternalRoleID(roleId: string, version?: string): string;

package/dist/src/security/roles.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getExternalRoleID = exports.getDBRoleID = exports.AccessController = exports.getRequiredResourceRole = exports.getAllRoles = exports.checkForRoleResourceArray = exports.getUserRoleHierarchy = exports.getRole = exports.lowerBuiltinRoleID = exports.roleToNumber = exports.builtinRoleToNumber = exports.isBuiltin = exports.BUILTIN_ROLE_NAME_ARRAY = exports.BUILTIN_ROLE_ID_ARRAY = exports.getBuiltinRoles = exports.Role = exports.BUILTIN_ROLE_IDS = void 0;
+exports.getExternalRoleID = exports.getDBRoleID = exports.AccessController = exports.getRequiredResourceRole = exports.getAllRoles = exports.checkForRoleResourceArray = exports.getUserRoleHierarchy = exports.getRole = exports.lowerBuiltinRoleID = exports.roleToNumber = exports.builtinRoleToNumber = exports.isBuiltin = exports.BUILTIN_ROLE_NAME_ARRAY = exports.BUILTIN_ROLE_ID_ARRAY = exports.getBuiltinRoles = exports.Role = exports.RoleIDVersion = exports.BUILTIN_ROLE_IDS = void 0;
 const permissions_1 = require("./permissions");
 const db_1 = require("../db");
 const context_1 = require("../context");
@@ -29,12 +29,20 @@ const EXTERNAL_BUILTIN_ROLE_IDS = [
     BUILTIN_IDS.BASIC,
     BUILTIN_IDS.PUBLIC,
 ];
+exports.RoleIDVersion = {
+    // original version, with a UUID based ID
+    UUID: undefined,
+    // new version - with name based ID
+    NAME: "name",
+};
 class Role {
     constructor(id, name, permissionId) {
         this.permissions = {};
         this._id = id;
         this.name = name;
         this.permissionId = permissionId;
+        // version for managing the ID - removing the role_ when responding
+        this.version = exports.RoleIDVersion.NAME;
     }
     addInheritance(inherits) {
         this.inherits = inherits;
@@ -119,9 +127,10 @@ exports.lowerBuiltinRoleID = lowerBuiltinRoleID;
  * Gets the role object, this is mainly useful for two purposes, to check if the level exists and
  * to check if the role inherits any others.
  * @param {string|null} roleId The level ID to lookup.
+ * @param {object|null} opts options for the function, like whether to halt errors, instead return public.
  * @returns {Promise<Role|object|null>} The role object, which may contain an "inherits" property.
  */
-function getRole(roleId) {
+function getRole(roleId, opts) {
     return __awaiter(this, void 0, void 0, function* () {
         if (!roleId) {
             return undefined;
@@ -132,14 +141,21 @@ function getRole(roleId) {
         if (isBuiltin(roleId)) {
             role = cloneDeep(Object.values(BUILTIN_ROLES).find(role => role._id === roleId));
         }
+        else {
+            // make sure has the prefix (if it has it then it won't be added)
+            roleId = (0, db_1.prefixRoleID)(roleId);
+        }
         try {
             const db = (0, context_1.getAppDB)();
             const dbRole = yield db.get(getDBRoleID(roleId));
             role = Object.assign(role, dbRole);
             // finalise the ID
-            role._id = getExternalRoleID(role._id);
+            role._id = getExternalRoleID(role._id, role.version);
         }
         catch (err) {
+            if (!isBuiltin(roleId) && (opts === null || opts === void 0 ? void 0 : opts.defaultPublic)) {
+                return cloneDeep(BUILTIN_ROLES.PUBLIC);
+            }
             // only throw an error if there is no role at all
             if (Object.keys(role).length === 0) {
                 throw err;
@@ -231,19 +247,20 @@ function getAllRoles(appId) {
                         include_docs: true,
                     }));
                     roles = body.rows.map((row) => row.doc);
+                    roles.forEach(role => (role._id = getExternalRoleID(role._id, role.version)));
                 }
                 const builtinRoles = getBuiltinRoles();
                 // need to combine builtin with any DB record of them (for sake of permissions)
                 for (let builtinRoleId of EXTERNAL_BUILTIN_ROLE_IDS) {
                     const builtinRole = builtinRoles[builtinRoleId];
-                    const dbBuiltin = roles.filter(dbRole => getExternalRoleID(dbRole._id) === builtinRoleId)[0];
+                    const dbBuiltin = roles.filter(dbRole => getExternalRoleID(dbRole._id, dbRole.version) === builtinRoleId)[0];
                     if (dbBuiltin == null) {
                         roles.push(builtinRole || builtinRoles.BASIC);
                     }
                     else {
                         // remove role and all back after combining with the builtin
                         roles = roles.filter(role => role._id !== dbBuiltin._id);
-                        dbBuiltin._id = getExternalRoleID(dbBuiltin._id);
+                        dbBuiltin._id = getExternalRoleID(dbBuiltin._id, dbBuiltin.version);
                         roles.push(Object.assign(builtinRole, dbBuiltin));
                     }
                 }
@@ -346,19 +363,20 @@ exports.AccessController = AccessController;
 /**
  * Adds the "role_" for builtin role IDs which are to be written to the DB (for permissions).
  */
-function getDBRoleID(roleId) {
-    if (roleId === null || roleId === void 0 ? void 0 : roleId.startsWith(db_1.DocumentType.ROLE)) {
-        return roleId;
+function getDBRoleID(roleName) {
+    if (roleName === null || roleName === void 0 ? void 0 : roleName.startsWith(db_1.DocumentType.ROLE)) {
+        return roleName;
     }
-    return (0, db_1.generateRoleID)(roleId);
+    return (0, db_1.prefixRoleID)(roleName);
 }
 exports.getDBRoleID = getDBRoleID;
 /**
  * Remove the "role_" from builtin role IDs that have been written to the DB (for permissions).
  */
-function getExternalRoleID(roleId) {
+function getExternalRoleID(roleId, version) {
     // for built-in roles we want to remove the DB role ID element (role_)
-    if ((roleId === null || roleId === void 0 ? void 0 : roleId.startsWith(db_1.DocumentType.ROLE)) && isBuiltin(roleId)) {
+    if ((roleId.startsWith(db_1.DocumentType.ROLE) && isBuiltin(roleId)) ||
+        version === exports.RoleIDVersion.NAME) {
         return roleId.split(`${db_1.DocumentType.ROLE}${db_1.SEPARATOR}`)[1];
     }
     return roleId;