@budibase/backend-core 2.13.39 → 2.13.41
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/index.js +2255 -2155
- package/dist/index.js.map +4 -4
- package/dist/index.js.meta.json +1 -1
- package/dist/package.json +4 -4
- package/dist/src/constants/misc.d.ts +1 -18
- package/dist/src/constants/misc.js +2 -19
- package/dist/src/constants/misc.js.map +1 -1
- package/dist/src/utils/utils.js +7 -4
- package/dist/src/utils/utils.js.map +1 -1
- package/package.json +4 -4
- package/src/constants/misc.ts +1 -18
- package/src/utils/utils.ts +7 -4
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@budibase/backend-core",
|
|
3
|
-
"version": "2.13.
|
|
3
|
+
"version": "2.13.41",
|
|
4
4
|
"description": "Budibase backend core libraries used in server and worker",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/src/index.d.ts",
|
|
@@ -23,8 +23,8 @@
|
|
|
23
23
|
"dependencies": {
|
|
24
24
|
"@budibase/nano": "10.1.4",
|
|
25
25
|
"@budibase/pouchdb-replication-stream": "1.2.10",
|
|
26
|
-
"@budibase/shared-core": "2.13.
|
|
27
|
-
"@budibase/types": "2.13.
|
|
26
|
+
"@budibase/shared-core": "2.13.41",
|
|
27
|
+
"@budibase/types": "2.13.41",
|
|
28
28
|
"@techpass/passport-openidconnect": "0.3.2",
|
|
29
29
|
"aws-cloudfront-sign": "3.0.2",
|
|
30
30
|
"aws-sdk": "2.1030.0",
|
|
@@ -96,5 +96,5 @@
|
|
|
96
96
|
}
|
|
97
97
|
}
|
|
98
98
|
},
|
|
99
|
-
"gitHead": "
|
|
99
|
+
"gitHead": "43d4394cc5663899aa8e4e12009c8e13f707bf67"
|
|
100
100
|
}
|
|
@@ -9,24 +9,7 @@ export declare enum Cookie {
|
|
|
9
9
|
DatasourceAuth = "budibase:datasourceauth",
|
|
10
10
|
OIDC_CONFIG = "budibase:oidc:config"
|
|
11
11
|
}
|
|
12
|
-
export
|
|
13
|
-
API_KEY = "x-budibase-api-key",
|
|
14
|
-
LICENSE_KEY = "x-budibase-license-key",
|
|
15
|
-
API_VER = "x-budibase-api-version",
|
|
16
|
-
APP_ID = "x-budibase-app-id",
|
|
17
|
-
SESSION_ID = "x-budibase-session-id",
|
|
18
|
-
TYPE = "x-budibase-type",
|
|
19
|
-
PREVIEW_ROLE = "x-budibase-role",
|
|
20
|
-
TENANT_ID = "x-budibase-tenant-id",
|
|
21
|
-
VERIFICATION_CODE = "x-budibase-verification-code",
|
|
22
|
-
RETURN_VERIFICATION_CODE = "x-budibase-return-verification-code",
|
|
23
|
-
RESET_PASSWORD_CODE = "x-budibase-reset-password-code",
|
|
24
|
-
RETURN_RESET_PASSWORD_CODE = "x-budibase-return-reset-password-code",
|
|
25
|
-
TOKEN = "x-budibase-token",
|
|
26
|
-
CSRF_TOKEN = "x-csrf-token",
|
|
27
|
-
CORRELATION_ID = "x-budibase-correlation-id",
|
|
28
|
-
AUTHORIZATION = "authorization"
|
|
29
|
-
}
|
|
12
|
+
export { Header } from "@budibase/shared-core";
|
|
30
13
|
export declare enum GlobalRole {
|
|
31
14
|
OWNER = "owner",
|
|
32
15
|
ADMIN = "admin",
|
|
@@ -14,25 +14,8 @@ var Cookie;
|
|
|
14
14
|
Cookie["DatasourceAuth"] = "budibase:datasourceauth";
|
|
15
15
|
Cookie["OIDC_CONFIG"] = "budibase:oidc:config";
|
|
16
16
|
})(Cookie || (exports.Cookie = Cookie = {}));
|
|
17
|
-
var
|
|
18
|
-
(function (
|
|
19
|
-
Header["API_KEY"] = "x-budibase-api-key";
|
|
20
|
-
Header["LICENSE_KEY"] = "x-budibase-license-key";
|
|
21
|
-
Header["API_VER"] = "x-budibase-api-version";
|
|
22
|
-
Header["APP_ID"] = "x-budibase-app-id";
|
|
23
|
-
Header["SESSION_ID"] = "x-budibase-session-id";
|
|
24
|
-
Header["TYPE"] = "x-budibase-type";
|
|
25
|
-
Header["PREVIEW_ROLE"] = "x-budibase-role";
|
|
26
|
-
Header["TENANT_ID"] = "x-budibase-tenant-id";
|
|
27
|
-
Header["VERIFICATION_CODE"] = "x-budibase-verification-code";
|
|
28
|
-
Header["RETURN_VERIFICATION_CODE"] = "x-budibase-return-verification-code";
|
|
29
|
-
Header["RESET_PASSWORD_CODE"] = "x-budibase-reset-password-code";
|
|
30
|
-
Header["RETURN_RESET_PASSWORD_CODE"] = "x-budibase-return-reset-password-code";
|
|
31
|
-
Header["TOKEN"] = "x-budibase-token";
|
|
32
|
-
Header["CSRF_TOKEN"] = "x-csrf-token";
|
|
33
|
-
Header["CORRELATION_ID"] = "x-budibase-correlation-id";
|
|
34
|
-
Header["AUTHORIZATION"] = "authorization";
|
|
35
|
-
})(Header || (exports.Header = Header = {}));
|
|
17
|
+
var shared_core_1 = require("@budibase/shared-core");
|
|
18
|
+
Object.defineProperty(exports, "Header", { enumerable: true, get: function () { return shared_core_1.Header; } });
|
|
36
19
|
var GlobalRole;
|
|
37
20
|
(function (GlobalRole) {
|
|
38
21
|
GlobalRole["OWNER"] = "owner";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"misc.js","sourceRoot":"","sources":["../../../src/constants/misc.ts"],"names":[],"mappings":";;;AAAA,IAAY,UAGX;AAHD,WAAY,UAAU;IACpB,+BAAiB,CAAA;IACjB,mCAAqB,CAAA;AACvB,CAAC,EAHW,UAAU,0BAAV,UAAU,QAGrB;AAED,IAAY,MAMX;AAND,WAAY,MAAM;IAChB,gCAAsB,CAAA;IACtB,gCAAsB,CAAA;IACtB,2DAAiD,CAAA;IACjD,oDAA0C,CAAA;IAC1C,8CAAoC,CAAA;AACtC,CAAC,EANW,MAAM,sBAAN,MAAM,QAMjB;AAED,
|
|
1
|
+
{"version":3,"file":"misc.js","sourceRoot":"","sources":["../../../src/constants/misc.ts"],"names":[],"mappings":";;;AAAA,IAAY,UAGX;AAHD,WAAY,UAAU;IACpB,+BAAiB,CAAA;IACjB,mCAAqB,CAAA;AACvB,CAAC,EAHW,UAAU,0BAAV,UAAU,QAGrB;AAED,IAAY,MAMX;AAND,WAAY,MAAM;IAChB,gCAAsB,CAAA;IACtB,gCAAsB,CAAA;IACtB,2DAAiD,CAAA;IACjD,oDAA0C,CAAA;IAC1C,8CAAoC,CAAA;AACtC,CAAC,EANW,MAAM,sBAAN,MAAM,QAMjB;AAED,qDAA8C;AAArC,qGAAA,MAAM,OAAA;AAEf,IAAY,UAKX;AALD,WAAY,UAAU;IACpB,6BAAe,CAAA;IACf,6BAAe,CAAA;IACf,iCAAmB,CAAA;IACnB,qDAAuC,CAAA;AACzC,CAAC,EALW,UAAU,0BAAV,UAAU,QAKrB;AAED,IAAY,MAQX;AARD,WAAY,MAAM;IAChB,+BAAqB,CAAA;IACrB,6BAAmB,CAAA;IACnB,uBAAa,CAAA;IACb,2BAAiB,CAAA;IACjB,uBAAa,CAAA;IACb,mCAAyB,CAAA;IACzB,uBAAa,CAAA;AACf,CAAC,EARW,MAAM,sBAAN,MAAM,QAQjB;AAEY,QAAA,cAAc,GAAG,IAAI,IAAI,CAAC,CAAC,aAAa,CAAC,CAAA;AACzC,QAAA,cAAc,GAAG,IAAI,IAAI,CAAC,aAAa,CAAC,CAAA;AACxC,QAAA,iBAAiB,GAAG,SAAS,CAAA"}
|
package/dist/src/utils/utils.js
CHANGED
|
@@ -116,7 +116,7 @@ function getAppIdFromCtx(ctx) {
|
|
|
116
116
|
appId = confirmAppId(ctx.request.body.appId);
|
|
117
117
|
}
|
|
118
118
|
// look in the path
|
|
119
|
-
const pathId =
|
|
119
|
+
const pathId = parseAppIdFromUrlPath(ctx.path);
|
|
120
120
|
if (!appId && pathId) {
|
|
121
121
|
appId = confirmAppId(pathId);
|
|
122
122
|
}
|
|
@@ -133,18 +133,21 @@ function getAppIdFromCtx(ctx) {
|
|
|
133
133
|
// referer header is present from a builder redirect
|
|
134
134
|
const referer = ctx.request.headers.referer;
|
|
135
135
|
if (!appId && (referer === null || referer === void 0 ? void 0 : referer.includes(BUILDER_APP_PREFIX))) {
|
|
136
|
-
const refererId =
|
|
136
|
+
const refererId = parseAppIdFromUrlPath(ctx.request.headers.referer);
|
|
137
137
|
appId = confirmAppId(refererId);
|
|
138
138
|
}
|
|
139
139
|
return appId;
|
|
140
140
|
});
|
|
141
141
|
}
|
|
142
142
|
exports.getAppIdFromCtx = getAppIdFromCtx;
|
|
143
|
-
function
|
|
143
|
+
function parseAppIdFromUrlPath(url) {
|
|
144
144
|
if (!url) {
|
|
145
145
|
return;
|
|
146
146
|
}
|
|
147
|
-
return url
|
|
147
|
+
return url
|
|
148
|
+
.split("?")[0] // Remove any possible query string
|
|
149
|
+
.split("/")
|
|
150
|
+
.find(subPath => subPath.startsWith(APP_PREFIX));
|
|
148
151
|
}
|
|
149
152
|
/**
|
|
150
153
|
* opens the contents of the specified encrypted JWT.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/utils/utils.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/utils/utils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@budibase/backend-core",
|
|
3
|
-
"version": "2.13.
|
|
3
|
+
"version": "2.13.41",
|
|
4
4
|
"description": "Budibase backend core libraries used in server and worker",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/src/index.d.ts",
|
|
@@ -23,8 +23,8 @@
|
|
|
23
23
|
"dependencies": {
|
|
24
24
|
"@budibase/nano": "10.1.4",
|
|
25
25
|
"@budibase/pouchdb-replication-stream": "1.2.10",
|
|
26
|
-
"@budibase/shared-core": "2.13.
|
|
27
|
-
"@budibase/types": "2.13.
|
|
26
|
+
"@budibase/shared-core": "2.13.41",
|
|
27
|
+
"@budibase/types": "2.13.41",
|
|
28
28
|
"@techpass/passport-openidconnect": "0.3.2",
|
|
29
29
|
"aws-cloudfront-sign": "3.0.2",
|
|
30
30
|
"aws-sdk": "2.1030.0",
|
|
@@ -96,5 +96,5 @@
|
|
|
96
96
|
}
|
|
97
97
|
}
|
|
98
98
|
},
|
|
99
|
-
"gitHead": "
|
|
99
|
+
"gitHead": "43d4394cc5663899aa8e4e12009c8e13f707bf67"
|
|
100
100
|
}
|
package/src/constants/misc.ts
CHANGED
|
@@ -11,24 +11,7 @@ export enum Cookie {
|
|
|
11
11
|
OIDC_CONFIG = "budibase:oidc:config",
|
|
12
12
|
}
|
|
13
13
|
|
|
14
|
-
export
|
|
15
|
-
API_KEY = "x-budibase-api-key",
|
|
16
|
-
LICENSE_KEY = "x-budibase-license-key",
|
|
17
|
-
API_VER = "x-budibase-api-version",
|
|
18
|
-
APP_ID = "x-budibase-app-id",
|
|
19
|
-
SESSION_ID = "x-budibase-session-id",
|
|
20
|
-
TYPE = "x-budibase-type",
|
|
21
|
-
PREVIEW_ROLE = "x-budibase-role",
|
|
22
|
-
TENANT_ID = "x-budibase-tenant-id",
|
|
23
|
-
VERIFICATION_CODE = "x-budibase-verification-code",
|
|
24
|
-
RETURN_VERIFICATION_CODE = "x-budibase-return-verification-code",
|
|
25
|
-
RESET_PASSWORD_CODE = "x-budibase-reset-password-code",
|
|
26
|
-
RETURN_RESET_PASSWORD_CODE = "x-budibase-return-reset-password-code",
|
|
27
|
-
TOKEN = "x-budibase-token",
|
|
28
|
-
CSRF_TOKEN = "x-csrf-token",
|
|
29
|
-
CORRELATION_ID = "x-budibase-correlation-id",
|
|
30
|
-
AUTHORIZATION = "authorization",
|
|
31
|
-
}
|
|
14
|
+
export { Header } from "@budibase/shared-core"
|
|
32
15
|
|
|
33
16
|
export enum GlobalRole {
|
|
34
17
|
OWNER = "owner",
|
package/src/utils/utils.ts
CHANGED
|
@@ -96,7 +96,7 @@ export async function getAppIdFromCtx(ctx: Ctx) {
|
|
|
96
96
|
}
|
|
97
97
|
|
|
98
98
|
// look in the path
|
|
99
|
-
const pathId =
|
|
99
|
+
const pathId = parseAppIdFromUrlPath(ctx.path)
|
|
100
100
|
if (!appId && pathId) {
|
|
101
101
|
appId = confirmAppId(pathId)
|
|
102
102
|
}
|
|
@@ -116,18 +116,21 @@ export async function getAppIdFromCtx(ctx: Ctx) {
|
|
|
116
116
|
// referer header is present from a builder redirect
|
|
117
117
|
const referer = ctx.request.headers.referer
|
|
118
118
|
if (!appId && referer?.includes(BUILDER_APP_PREFIX)) {
|
|
119
|
-
const refererId =
|
|
119
|
+
const refererId = parseAppIdFromUrlPath(ctx.request.headers.referer)
|
|
120
120
|
appId = confirmAppId(refererId)
|
|
121
121
|
}
|
|
122
122
|
|
|
123
123
|
return appId
|
|
124
124
|
}
|
|
125
125
|
|
|
126
|
-
function
|
|
126
|
+
function parseAppIdFromUrlPath(url?: string) {
|
|
127
127
|
if (!url) {
|
|
128
128
|
return
|
|
129
129
|
}
|
|
130
|
-
return url
|
|
130
|
+
return url
|
|
131
|
+
.split("?")[0] // Remove any possible query string
|
|
132
|
+
.split("/")
|
|
133
|
+
.find(subPath => subPath.startsWith(APP_PREFIX))
|
|
131
134
|
}
|
|
132
135
|
|
|
133
136
|
/**
|