@budibase/backend-core 3.18.3 → 3.18.4
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 +10 -10
- package/dist/index.js.map +3 -3
- package/dist/package.json +2 -2
- package/dist/src/utils/utils.d.ts +0 -1
- package/dist/src/utils/utils.js +13 -21
- package/dist/src/utils/utils.js.map +1 -1
- package/package.json +2 -2
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@budibase/backend-core",
|
|
3
|
-
"version": "3.18.
|
|
3
|
+
"version": "3.18.4",
|
|
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",
|
|
@@ -112,5 +112,5 @@
|
|
|
112
112
|
}
|
|
113
113
|
}
|
|
114
114
|
},
|
|
115
|
-
"gitHead": "
|
|
115
|
+
"gitHead": "b82c05d3d0949d198b49415d20980e72cc61ca5b"
|
|
116
116
|
}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { Ctx, Event } from "@budibase/types";
|
|
2
|
-
export declare function resolveAppUrl(ctx: Ctx): Promise<string | undefined>;
|
|
3
2
|
export declare function isServingApp(ctx: Ctx): boolean;
|
|
4
3
|
export declare function isServingBuilder(ctx: Ctx): boolean;
|
|
5
4
|
export declare function isServingBuilderPreview(ctx: Ctx): boolean;
|
package/dist/src/utils/utils.js
CHANGED
|
@@ -45,7 +45,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
45
45
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
46
46
|
};
|
|
47
47
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
48
|
-
exports.resolveAppUrl = resolveAppUrl;
|
|
49
48
|
exports.isServingApp = isServingApp;
|
|
50
49
|
exports.isServingBuilder = isServingBuilder;
|
|
51
50
|
exports.isServingBuilderPreview = isServingBuilderPreview;
|
|
@@ -70,7 +69,6 @@ const environment_1 = __importDefault(require("../environment"));
|
|
|
70
69
|
const tenancy = __importStar(require("../tenancy"));
|
|
71
70
|
const APP_PREFIX = constants_1.DocumentType.APP + constants_1.SEPARATOR;
|
|
72
71
|
const PROD_APP_PREFIX = "/app/";
|
|
73
|
-
const BUILDER_PREVIEW_PATH = "/app/preview";
|
|
74
72
|
const BUILDER_PREFIX = "/builder";
|
|
75
73
|
const BUILDER_APP_PREFIX = `${BUILDER_PREFIX}/workspace/`;
|
|
76
74
|
const PUBLIC_API_PREFIX = "/api/public/v";
|
|
@@ -105,7 +103,10 @@ function isServingBuilder(ctx) {
|
|
|
105
103
|
return ctx.path.startsWith(BUILDER_APP_PREFIX);
|
|
106
104
|
}
|
|
107
105
|
function isServingBuilderPreview(ctx) {
|
|
108
|
-
return ctx.path
|
|
106
|
+
return isBuilderPreviewUrl(ctx.path);
|
|
107
|
+
}
|
|
108
|
+
function isBuilderPreviewUrl(path) {
|
|
109
|
+
return new RegExp(/^\/app\/app_\w+\/preview$/).test(path);
|
|
109
110
|
}
|
|
110
111
|
function isPublicApiRequest(ctx) {
|
|
111
112
|
return ctx.path.startsWith(PUBLIC_API_PREFIX);
|
|
@@ -118,8 +119,6 @@ function isPublicApiRequest(ctx) {
|
|
|
118
119
|
function getAppIdFromCtx(ctx) {
|
|
119
120
|
return __awaiter(this, void 0, void 0, function* () {
|
|
120
121
|
var _a, _b;
|
|
121
|
-
// look in headers
|
|
122
|
-
const options = [ctx.request.headers[constants_1.Header.APP_ID]];
|
|
123
122
|
let appId;
|
|
124
123
|
function confirmAppId(possibleAppId) {
|
|
125
124
|
if (!possibleAppId) {
|
|
@@ -128,17 +127,18 @@ function getAppIdFromCtx(ctx) {
|
|
|
128
127
|
if (!possibleAppId.startsWith(APP_PREFIX)) {
|
|
129
128
|
return appId;
|
|
130
129
|
}
|
|
131
|
-
if (appId &&
|
|
132
|
-
// TODO: check dev/prod conflicts
|
|
130
|
+
if (appId && appId !== possibleAppId) {
|
|
133
131
|
ctx.throw("App id conflict", 403);
|
|
134
132
|
}
|
|
135
133
|
return appId !== null && appId !== void 0 ? appId : possibleAppId;
|
|
136
134
|
}
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
135
|
+
// look in headers
|
|
136
|
+
let headers = ctx.request.headers[constants_1.Header.APP_ID] || [];
|
|
137
|
+
if (typeof headers === "string") {
|
|
138
|
+
headers = [headers];
|
|
139
|
+
}
|
|
140
|
+
for (let header of headers) {
|
|
141
|
+
appId = confirmAppId(header);
|
|
142
142
|
}
|
|
143
143
|
// look in body
|
|
144
144
|
if (ctx.request.body && ctx.request.body.appId) {
|
|
@@ -156,19 +156,11 @@ function getAppIdFromCtx(ctx) {
|
|
|
156
156
|
// lookup using custom url - prod apps only
|
|
157
157
|
// filter out the builder preview path which collides with the prod app path
|
|
158
158
|
// to ensure we don't load all apps excessively
|
|
159
|
-
const isBuilderPreview = ctx.path
|
|
159
|
+
const isBuilderPreview = isBuilderPreviewUrl(ctx.path);
|
|
160
160
|
const isViewingProdApp = ctx.path.startsWith(PROD_APP_PREFIX) && !isBuilderPreview;
|
|
161
161
|
if (isViewingProdApp) {
|
|
162
162
|
appId = confirmAppId(yield resolveAppUrl(ctx));
|
|
163
163
|
}
|
|
164
|
-
// look in the referer - builder only
|
|
165
|
-
// make sure this is performed after prod app url resolution, in case the
|
|
166
|
-
// referer header is present from a builder redirect
|
|
167
|
-
const referer = ctx.request.headers.referer;
|
|
168
|
-
if (referer === null || referer === void 0 ? void 0 : referer.includes(BUILDER_APP_PREFIX)) {
|
|
169
|
-
const refererId = parseAppIdFromUrlPath(ctx.request.headers.referer);
|
|
170
|
-
appId = confirmAppId(refererId);
|
|
171
|
-
}
|
|
172
164
|
return appId;
|
|
173
165
|
});
|
|
174
166
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/utils/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
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": "3.18.
|
|
3
|
+
"version": "3.18.4",
|
|
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",
|
|
@@ -112,5 +112,5 @@
|
|
|
112
112
|
}
|
|
113
113
|
}
|
|
114
114
|
},
|
|
115
|
-
"gitHead": "
|
|
115
|
+
"gitHead": "b82c05d3d0949d198b49415d20980e72cc61ca5b"
|
|
116
116
|
}
|