@budibase/backend-core 2.6.19-alpha.0 → 2.6.19
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/package.json +5 -3
- package/dist/src/constants/db.d.ts +1 -1
- package/dist/src/constants/db.js +1 -1
- package/dist/src/db/couch/DatabaseImpl.d.ts +0 -1
- package/dist/src/db/couch/DatabaseImpl.js +3 -8
- package/dist/src/db/couch/DatabaseImpl.js.map +1 -1
- package/dist/src/db/couch/connections.js +10 -11
- package/dist/src/db/couch/connections.js.map +1 -1
- package/dist/src/db/couch/utils.d.ts +0 -6
- package/dist/src/db/couch/utils.js +3 -9
- package/dist/src/db/couch/utils.js.map +1 -1
- package/dist/src/utils/utils.d.ts +0 -3
- package/dist/src/utils/utils.js +3 -17
- package/dist/src/utils/utils.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +5 -3
- package/src/constants/db.ts +1 -1
- package/src/db/couch/DatabaseImpl.ts +4 -10
- package/src/db/couch/connections.ts +8 -8
- package/src/db/couch/utils.ts +1 -15
- package/src/utils/tests/utils.spec.ts +0 -82
- package/src/utils/utils.ts +10 -18
- package/tsconfig.json +8 -3
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@budibase/backend-core",
|
|
3
|
-
"version": "2.6.19
|
|
3
|
+
"version": "2.6.19",
|
|
4
4
|
"description": "Budibase backend core libraries used in server and worker",
|
|
5
5
|
"main": "dist/src/index.js",
|
|
6
6
|
"types": "dist/src/index.d.ts",
|
|
@@ -15,6 +15,8 @@
|
|
|
15
15
|
"prebuild": "rimraf dist/",
|
|
16
16
|
"prepack": "cp package.json dist",
|
|
17
17
|
"build": "tsc -p tsconfig.build.json",
|
|
18
|
+
"build:pro": "../../scripts/pro/build.sh",
|
|
19
|
+
"postbuild": "yarn run build:pro",
|
|
18
20
|
"build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput",
|
|
19
21
|
"test": "bash scripts/test.sh",
|
|
20
22
|
"test:watch": "jest --watchAll"
|
|
@@ -22,7 +24,7 @@
|
|
|
22
24
|
"dependencies": {
|
|
23
25
|
"@budibase/nano": "10.1.2",
|
|
24
26
|
"@budibase/pouchdb-replication-stream": "1.2.10",
|
|
25
|
-
"@budibase/types": "2.6.19
|
|
27
|
+
"@budibase/types": "^2.6.19",
|
|
26
28
|
"@shopify/jest-koa-mocks": "5.0.1",
|
|
27
29
|
"@techpass/passport-openidconnect": "0.3.2",
|
|
28
30
|
"aws-cloudfront-sign": "2.2.0",
|
|
@@ -88,5 +90,5 @@
|
|
|
88
90
|
"tsconfig-paths": "4.0.0",
|
|
89
91
|
"typescript": "4.7.3"
|
|
90
92
|
},
|
|
91
|
-
"gitHead": "
|
|
93
|
+
"gitHead": "ef8ac7e2e16f83f8d7475d310302cd22aa57fdd2"
|
|
92
94
|
}
|
|
@@ -19,7 +19,7 @@ export declare enum ViewName {
|
|
|
19
19
|
AUTOMATION_LOGS = "automation_logs",
|
|
20
20
|
ACCOUNT_BY_EMAIL = "account_by_email",
|
|
21
21
|
PLATFORM_USERS_LOWERCASE = "platform_users_lowercase",
|
|
22
|
-
USER_BY_GROUP = "
|
|
22
|
+
USER_BY_GROUP = "by_group_user",
|
|
23
23
|
APP_BACKUP_BY_TRIGGER = "by_trigger"
|
|
24
24
|
}
|
|
25
25
|
export declare const DeprecatedViews: {
|
package/dist/src/constants/db.js
CHANGED
|
@@ -24,7 +24,7 @@ var ViewName;
|
|
|
24
24
|
ViewName["AUTOMATION_LOGS"] = "automation_logs";
|
|
25
25
|
ViewName["ACCOUNT_BY_EMAIL"] = "account_by_email";
|
|
26
26
|
ViewName["PLATFORM_USERS_LOWERCASE"] = "platform_users_lowercase";
|
|
27
|
-
ViewName["USER_BY_GROUP"] = "
|
|
27
|
+
ViewName["USER_BY_GROUP"] = "by_group_user";
|
|
28
28
|
ViewName["APP_BACKUP_BY_TRIGGER"] = "by_trigger";
|
|
29
29
|
})(ViewName = exports.ViewName || (exports.ViewName = {}));
|
|
30
30
|
exports.DeprecatedViews = {
|
|
@@ -9,7 +9,6 @@ export declare class DatabaseImpl implements Database {
|
|
|
9
9
|
private static nano;
|
|
10
10
|
private readonly instanceNano?;
|
|
11
11
|
private readonly pouchOpts;
|
|
12
|
-
private readonly couchInfo;
|
|
13
12
|
constructor(dbName?: string, opts?: DatabaseOpts, connection?: string);
|
|
14
13
|
static init(): void;
|
|
15
14
|
exists(): Promise<boolean>;
|
|
@@ -39,15 +39,14 @@ function DatabaseWithConnection(dbName, connection, opts) {
|
|
|
39
39
|
exports.DatabaseWithConnection = DatabaseWithConnection;
|
|
40
40
|
class DatabaseImpl {
|
|
41
41
|
constructor(dbName, opts, connection) {
|
|
42
|
-
this.couchInfo = (0, connections_1.getCouchInfo)();
|
|
43
42
|
if (dbName == null) {
|
|
44
43
|
throw new Error("Database name cannot be undefined.");
|
|
45
44
|
}
|
|
46
45
|
this.name = dbName;
|
|
47
46
|
this.pouchOpts = opts || {};
|
|
48
47
|
if (connection) {
|
|
49
|
-
|
|
50
|
-
this.instanceNano = buildNano(
|
|
48
|
+
const couchInfo = (0, connections_1.getCouchInfo)(connection);
|
|
49
|
+
this.instanceNano = buildNano(couchInfo);
|
|
51
50
|
}
|
|
52
51
|
if (!DatabaseImpl.nano) {
|
|
53
52
|
DatabaseImpl.init();
|
|
@@ -59,11 +58,7 @@ class DatabaseImpl {
|
|
|
59
58
|
}
|
|
60
59
|
exists() {
|
|
61
60
|
return __awaiter(this, void 0, void 0, function* () {
|
|
62
|
-
|
|
63
|
-
url: `${this.couchInfo.url}/${this.name}`,
|
|
64
|
-
method: "HEAD",
|
|
65
|
-
cookie: this.couchInfo.cookie,
|
|
66
|
-
});
|
|
61
|
+
let response = yield (0, utils_1.directCouchCall)(`/${this.name}`, "HEAD");
|
|
67
62
|
return response.status === 200;
|
|
68
63
|
});
|
|
69
64
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DatabaseImpl.js","sourceRoot":"","sources":["../../../../src/db/couch/DatabaseImpl.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,0DAAiC;AACjC,2CAWwB;AACxB,+CAA4C;AAC5C,
|
|
1
|
+
{"version":3,"file":"DatabaseImpl.js","sourceRoot":"","sources":["../../../../src/db/couch/DatabaseImpl.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,29 +6,28 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.getUrlInfo = exports.getCouchInfo = void 0;
|
|
7
7
|
const environment_1 = __importDefault(require("../../environment"));
|
|
8
8
|
const getCouchInfo = (connection) => {
|
|
9
|
-
var _a, _b;
|
|
10
9
|
const urlInfo = (0, exports.getUrlInfo)(connection);
|
|
11
10
|
let username;
|
|
12
11
|
let password;
|
|
13
|
-
if (
|
|
14
|
-
// set from url
|
|
15
|
-
username = urlInfo.auth.username;
|
|
16
|
-
}
|
|
17
|
-
else if (environment_1.default.COUCH_DB_USERNAME) {
|
|
12
|
+
if (environment_1.default.COUCH_DB_USERNAME) {
|
|
18
13
|
// set from env
|
|
19
14
|
username = environment_1.default.COUCH_DB_USERNAME;
|
|
20
15
|
}
|
|
16
|
+
else if (urlInfo.auth.username) {
|
|
17
|
+
// set from url
|
|
18
|
+
username = urlInfo.auth.username;
|
|
19
|
+
}
|
|
21
20
|
else if (!environment_1.default.isTest()) {
|
|
22
21
|
throw new Error("CouchDB username not set");
|
|
23
22
|
}
|
|
24
|
-
if (
|
|
25
|
-
// set from url
|
|
26
|
-
password = urlInfo.auth.password;
|
|
27
|
-
}
|
|
28
|
-
else if (environment_1.default.COUCH_DB_PASSWORD) {
|
|
23
|
+
if (environment_1.default.COUCH_DB_PASSWORD) {
|
|
29
24
|
// set from env
|
|
30
25
|
password = environment_1.default.COUCH_DB_PASSWORD;
|
|
31
26
|
}
|
|
27
|
+
else if (urlInfo.auth.password) {
|
|
28
|
+
// set from url
|
|
29
|
+
password = urlInfo.auth.password;
|
|
30
|
+
}
|
|
32
31
|
else if (!environment_1.default.isTest()) {
|
|
33
32
|
throw new Error("CouchDB password not set");
|
|
34
33
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connections.js","sourceRoot":"","sources":["../../../../src/db/couch/connections.ts"],"names":[],"mappings":";;;;;;AAAA,oEAAmC;AAE5B,MAAM,YAAY,GAAG,CAAC,UAAmB,EAAE,EAAE
|
|
1
|
+
{"version":3,"file":"connections.js","sourceRoot":"","sources":["../../../../src/db/couch/connections.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,2 @@
|
|
|
1
1
|
export declare function directCouchCall(path: string, method?: string, body?: any): Promise<import("node-fetch").Response>;
|
|
2
|
-
export declare function directCouchUrlCall({ url, cookie, method, body, }: {
|
|
3
|
-
url: string;
|
|
4
|
-
cookie: string;
|
|
5
|
-
method: string;
|
|
6
|
-
body?: any;
|
|
7
|
-
}): Promise<import("node-fetch").Response>;
|
|
8
2
|
export declare function directCouchQuery(path: string, method?: string, body?: any): Promise<any>;
|
|
@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
12
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
exports.directCouchQuery = exports.
|
|
15
|
+
exports.directCouchQuery = exports.directCouchCall = void 0;
|
|
16
16
|
const connections_1 = require("./connections");
|
|
17
17
|
const node_fetch_1 = __importDefault(require("node-fetch"));
|
|
18
18
|
const helpers_1 = require("../../helpers");
|
|
@@ -20,12 +20,6 @@ function directCouchCall(path, method = "GET", body) {
|
|
|
20
20
|
return __awaiter(this, void 0, void 0, function* () {
|
|
21
21
|
let { url, cookie } = (0, connections_1.getCouchInfo)();
|
|
22
22
|
const couchUrl = `${url}/${path}`;
|
|
23
|
-
return yield directCouchUrlCall({ url: couchUrl, cookie, method, body });
|
|
24
|
-
});
|
|
25
|
-
}
|
|
26
|
-
exports.directCouchCall = directCouchCall;
|
|
27
|
-
function directCouchUrlCall({ url, cookie, method, body, }) {
|
|
28
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
29
23
|
const params = {
|
|
30
24
|
method: method,
|
|
31
25
|
headers: {
|
|
@@ -36,10 +30,10 @@ function directCouchUrlCall({ url, cookie, method, body, }) {
|
|
|
36
30
|
params.body = JSON.stringify(body);
|
|
37
31
|
params.headers["Content-Type"] = "application/json";
|
|
38
32
|
}
|
|
39
|
-
return yield (0, node_fetch_1.default)((0, helpers_1.checkSlashesInUrl)(encodeURI(
|
|
33
|
+
return yield (0, node_fetch_1.default)((0, helpers_1.checkSlashesInUrl)(encodeURI(couchUrl)), params);
|
|
40
34
|
});
|
|
41
35
|
}
|
|
42
|
-
exports.
|
|
36
|
+
exports.directCouchCall = directCouchCall;
|
|
43
37
|
function directCouchQuery(path, method = "GET", body) {
|
|
44
38
|
return __awaiter(this, void 0, void 0, function* () {
|
|
45
39
|
const response = yield directCouchCall(path, method, body);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/db/couch/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+CAA4C;AAC5C,4DAA8B;AAC9B,2CAAiD;AAEjD,SAAsB,eAAe,CACnC,IAAY,EACZ,SAAiB,KAAK,EACtB,IAAU;;QAEV,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,IAAA,0BAAY,GAAE,CAAA;QACpC,MAAM,QAAQ,GAAG,GAAG,GAAG,IAAI,IAAI,EAAE,CAAA;QACjC,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/db/couch/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+CAA4C;AAC5C,4DAA8B;AAC9B,2CAAiD;AAEjD,SAAsB,eAAe,CACnC,IAAY,EACZ,SAAiB,KAAK,EACtB,IAAU;;QAEV,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,IAAA,0BAAY,GAAE,CAAA;QACpC,MAAM,QAAQ,GAAG,GAAG,GAAG,IAAI,IAAI,EAAE,CAAA;QACjC,MAAM,MAAM,GAAQ;YAClB,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,aAAa,EAAE,MAAM;aACtB;SACF,CAAA;QACD,IAAI,IAAI,IAAI,MAAM,KAAK,KAAK,EAAE;YAC5B,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;YAClC,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,kBAAkB,CAAA;SACpD;QACD,OAAO,MAAM,IAAA,oBAAK,EAAC,IAAA,2BAAiB,EAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,EAAE,MAAM,CAAC,CAAA;IACpE,CAAC;CAAA;AAlBD,0CAkBC;AAED,SAAsB,gBAAgB,CACpC,IAAY,EACZ,SAAiB,KAAK,EACtB,IAAU;;QAEV,MAAM,QAAQ,GAAG,MAAM,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;QAC1D,IAAI,QAAQ,CAAC,MAAM,GAAG,GAAG,EAAE;YACzB,OAAO,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;SAC7B;aAAM;YACL,MAAM,oCAAoC,CAAA;SAC3C;IACH,CAAC;CAAA;AAXD,4CAWC"}
|
|
@@ -1,9 +1,6 @@
|
|
|
1
1
|
import { Ctx, Event } from "@budibase/types";
|
|
2
2
|
export declare function resolveAppUrl(ctx: Ctx): Promise<string | undefined>;
|
|
3
3
|
export declare function isServingApp(ctx: Ctx): boolean;
|
|
4
|
-
export declare function isServingBuilder(ctx: Ctx): boolean;
|
|
5
|
-
export declare function isServingBuilderPreview(ctx: Ctx): boolean;
|
|
6
|
-
export declare function isPublicApiRequest(ctx: Ctx): boolean;
|
|
7
4
|
/**
|
|
8
5
|
* Given a request tries to find the appId, which can be located in various places
|
|
9
6
|
* @param {object} ctx The main request body to look through.
|
package/dist/src/utils/utils.js
CHANGED
|
@@ -35,7 +35,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
35
35
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
36
36
|
};
|
|
37
37
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
38
|
-
exports.isAudited = exports.timeout = exports.isClient = exports.clearCookie = exports.setCookie = exports.getCookie = exports.isValidInternalAPIKey = exports.openJwt = exports.getAppIdFromCtx = exports.
|
|
38
|
+
exports.isAudited = exports.timeout = exports.isClient = exports.clearCookie = exports.setCookie = exports.getCookie = exports.isValidInternalAPIKey = exports.openJwt = exports.getAppIdFromCtx = exports.isServingApp = exports.resolveAppUrl = void 0;
|
|
39
39
|
const db_1 = require("../db");
|
|
40
40
|
const constants_1 = require("../constants");
|
|
41
41
|
const environment_1 = __importDefault(require("../environment"));
|
|
@@ -46,9 +46,7 @@ const jwt = require("jsonwebtoken");
|
|
|
46
46
|
const APP_PREFIX = constants_1.DocumentType.APP + constants_1.SEPARATOR;
|
|
47
47
|
const PROD_APP_PREFIX = "/app/";
|
|
48
48
|
const BUILDER_PREVIEW_PATH = "/app/preview";
|
|
49
|
-
const
|
|
50
|
-
const BUILDER_APP_PREFIX = `${BUILDER_PREFIX}/app/`;
|
|
51
|
-
const PUBLIC_API_PREFIX = "/api/public/v";
|
|
49
|
+
const BUILDER_REFERER_PREFIX = "/builder/app/";
|
|
52
50
|
function confirmAppId(possibleAppId) {
|
|
53
51
|
return possibleAppId && possibleAppId.startsWith(APP_PREFIX)
|
|
54
52
|
? possibleAppId
|
|
@@ -86,18 +84,6 @@ function isServingApp(ctx) {
|
|
|
86
84
|
return false;
|
|
87
85
|
}
|
|
88
86
|
exports.isServingApp = isServingApp;
|
|
89
|
-
function isServingBuilder(ctx) {
|
|
90
|
-
return ctx.path.startsWith(BUILDER_APP_PREFIX);
|
|
91
|
-
}
|
|
92
|
-
exports.isServingBuilder = isServingBuilder;
|
|
93
|
-
function isServingBuilderPreview(ctx) {
|
|
94
|
-
return ctx.path.startsWith(BUILDER_PREVIEW_PATH);
|
|
95
|
-
}
|
|
96
|
-
exports.isServingBuilderPreview = isServingBuilderPreview;
|
|
97
|
-
function isPublicApiRequest(ctx) {
|
|
98
|
-
return ctx.path.startsWith(PUBLIC_API_PREFIX);
|
|
99
|
-
}
|
|
100
|
-
exports.isPublicApiRequest = isPublicApiRequest;
|
|
101
87
|
/**
|
|
102
88
|
* Given a request tries to find the appId, which can be located in various places
|
|
103
89
|
* @param {object} ctx The main request body to look through.
|
|
@@ -135,7 +121,7 @@ function getAppIdFromCtx(ctx) {
|
|
|
135
121
|
// make sure this is performed after prod app url resolution, in case the
|
|
136
122
|
// referer header is present from a builder redirect
|
|
137
123
|
const referer = ctx.request.headers.referer;
|
|
138
|
-
if (!appId && (referer === null || referer === void 0 ? void 0 : referer.includes(
|
|
124
|
+
if (!appId && (referer === null || referer === void 0 ? void 0 : referer.includes(BUILDER_REFERER_PREFIX))) {
|
|
139
125
|
const refererId = parseAppIdFromUrl(ctx.request.headers.referer);
|
|
140
126
|
appId = confirmAppId(refererId);
|
|
141
127
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/utils/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/utils/utils.ts"],"names":[],"mappings":"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"}
|