payload 1.7.2 → 1.7.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/admin/components/elements/ListDrawer/DrawerContent.js +3 -3
- package/dist/admin/components/elements/ListDrawer/DrawerContent.js.map +1 -1
- package/dist/admin/components/elements/TableColumns/index.js +9 -9
- package/dist/admin/components/elements/TableColumns/index.js.map +1 -1
- package/dist/admin/components/forms/field-types/RichText/elements/getCommonBlock.js +3 -2
- package/dist/admin/components/forms/field-types/RichText/elements/getCommonBlock.js.map +1 -1
- package/dist/admin/components/forms/field-types/RichText/elements/indent/index.js +2 -1
- package/dist/admin/components/forms/field-types/RichText/elements/indent/index.js.map +1 -1
- package/dist/admin/components/forms/field-types/RichText/elements/injectVoid.js +1 -1
- package/dist/admin/components/forms/field-types/RichText/elements/injectVoid.js.map +1 -1
- package/dist/admin/components/forms/field-types/RichText/elements/isBlockElement.d.ts +8 -0
- package/dist/admin/components/forms/field-types/RichText/elements/isBlockElement.js +28 -0
- package/dist/admin/components/forms/field-types/RichText/elements/isBlockElement.js.map +1 -0
- package/dist/admin/components/forms/field-types/RichText/elements/link/Button/index.js +4 -5
- package/dist/admin/components/forms/field-types/RichText/elements/link/Button/index.js.map +1 -1
- package/dist/admin/components/forms/field-types/RichText/elements/link/Element/index.js +3 -4
- package/dist/admin/components/forms/field-types/RichText/elements/link/Element/index.js.map +1 -1
- package/dist/admin/components/views/collections/List/formatFields.d.ts +1 -2
- package/dist/admin/components/views/collections/List/formatFields.js +1 -18
- package/dist/admin/components/views/collections/List/formatFields.js.map +1 -1
- package/dist/admin/components/views/collections/List/index.js +1 -1
- package/dist/admin/components/views/collections/List/index.js.map +1 -1
- package/dist/collections/buildSchema.js +5 -0
- package/dist/collections/buildSchema.js.map +1 -1
- package/dist/collections/config/sanitize.d.ts +1 -1
- package/dist/collections/config/sanitize.js +42 -0
- package/dist/collections/config/sanitize.js.map +1 -1
- package/dist/collections/config/schema.js +4 -0
- package/dist/collections/config/schema.js.map +1 -1
- package/dist/collections/config/types.d.ts +12 -4
- package/dist/collections/graphql/init.js +12 -30
- package/dist/collections/graphql/init.js.map +1 -1
- package/dist/collections/initLocal.js +10 -0
- package/dist/collections/initLocal.js.map +1 -1
- package/dist/collections/operations/delete.js +3 -21
- package/dist/collections/operations/delete.js.map +1 -1
- package/dist/collections/operations/deleteByID.js +6 -13
- package/dist/collections/operations/deleteByID.js.map +1 -1
- package/dist/collections/operations/find.js +3 -19
- package/dist/collections/operations/find.js.map +1 -1
- package/dist/collections/operations/findByID.js +6 -14
- package/dist/collections/operations/findByID.js.map +1 -1
- package/dist/collections/operations/findVersionByID.js +6 -14
- package/dist/collections/operations/findVersionByID.js.map +1 -1
- package/dist/collections/operations/findVersions.js +5 -28
- package/dist/collections/operations/findVersions.js.map +1 -1
- package/dist/collections/operations/restoreVersion.js +7 -14
- package/dist/collections/operations/restoreVersion.js.map +1 -1
- package/dist/collections/operations/update.js +2 -20
- package/dist/collections/operations/update.js.map +1 -1
- package/dist/collections/operations/updateByID.js +6 -13
- package/dist/collections/operations/updateByID.js.map +1 -1
- package/dist/errors/APIError.d.ts +0 -3
- package/dist/errors/APIError.js +1 -6
- package/dist/errors/APIError.js.map +1 -1
- package/dist/fields/config/schema.js +1 -1
- package/dist/fields/config/schema.js.map +1 -1
- package/dist/fields/config/types.d.ts +7 -2
- package/dist/fields/config/types.js.map +1 -1
- package/dist/fields/validations.d.ts +1 -1
- package/dist/globals/operations/findOne.js +7 -15
- package/dist/globals/operations/findOne.js.map +1 -1
- package/dist/globals/operations/findVersionByID.js +6 -14
- package/dist/globals/operations/findVersionByID.js.map +1 -1
- package/dist/globals/operations/findVersions.js +4 -30
- package/dist/globals/operations/findVersions.js.map +1 -1
- package/dist/globals/operations/update.js +6 -14
- package/dist/globals/operations/update.js.map +1 -1
- package/dist/graphql/schema/withNullableType.js +2 -1
- package/dist/graphql/schema/withNullableType.js.map +1 -1
- package/dist/mongoose/buildQuery.d.ts +10 -5
- package/dist/mongoose/buildQuery.js +64 -52
- package/dist/mongoose/buildQuery.js.map +1 -1
- package/dist/mongoose/sanitizeQueryValue.d.ts +1 -3
- package/dist/mongoose/sanitizeQueryValue.js +7 -4
- package/dist/mongoose/sanitizeQueryValue.js.map +1 -1
- package/dist/translations/fa.json +346 -0
- package/dist/translations/index.d.ts +731 -39
- package/dist/translations/index.js +4 -0
- package/dist/translations/index.js.map +1 -1
- package/dist/translations/ro.json +346 -0
- package/dist/utilities/entityToJSONSchema.js +9 -8
- package/dist/utilities/entityToJSONSchema.js.map +1 -1
- package/dist/versions/drafts/queryDrafts.js +4 -9
- package/dist/versions/drafts/queryDrafts.js.map +1 -1
- package/dist/versions/drafts/replaceWithDraftIfAvailable.js +3 -2
- package/dist/versions/drafts/replaceWithDraftIfAvailable.js.map +1 -1
- package/dist/webpack/getProdConfig.js +2 -3
- package/dist/webpack/getProdConfig.js.map +1 -1
- package/docs/access-control/collections.mdx +1 -3
- package/docs/access-control/fields.mdx +3 -1
- package/docs/admin/webpack.mdx +1 -3
- package/docs/authentication/config.mdx +2 -2
- package/docs/authentication/overview.mdx +2 -2
- package/docs/configuration/collections.mdx +4 -3
- package/docs/configuration/globals.mdx +1 -1
- package/docs/configuration/i18n.mdx +3 -1
- package/docs/fields/array.mdx +1 -1
- package/docs/fields/blocks.mdx +1 -1
- package/docs/fields/checkbox.mdx +1 -1
- package/docs/fields/code.mdx +1 -1
- package/docs/fields/collapsible.mdx +1 -1
- package/docs/fields/date.mdx +1 -1
- package/docs/fields/email.mdx +1 -1
- package/docs/fields/group.mdx +1 -1
- package/docs/fields/json.mdx +1 -1
- package/docs/fields/number.mdx +1 -1
- package/docs/fields/overview.mdx +2 -2
- package/docs/fields/point.mdx +1 -1
- package/docs/fields/radio.mdx +1 -2
- package/docs/fields/relationship.mdx +26 -19
- package/docs/fields/rich-text.mdx +3 -2
- package/docs/fields/row.mdx +1 -1
- package/docs/fields/select.mdx +1 -1
- package/docs/fields/tabs.mdx +1 -1
- package/docs/fields/text.mdx +1 -1
- package/docs/fields/textarea.mdx +1 -1
- package/docs/fields/ui.mdx +1 -1
- package/docs/fields/upload.mdx +1 -1
- package/docs/graphql/overview.mdx +1 -1
- package/docs/hooks/collections.mdx +1 -1
- package/docs/queries/overview.mdx +1 -1
- package/docs/rest-api/overview.mdx +1 -1
- package/docs/upload/overview.mdx +3 -3
- package/docs/versions/autosave.mdx +1 -1
- package/docs/versions/drafts.mdx +2 -2
- package/package.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"findVersions.js","sourceRoot":"","sources":["../../../src/globals/operations/findVersions.ts"],"names":[],"mappings":";;;;;AAEA,6EAAqD;AACrD,oGAA4E;AAE5E,
|
|
1
|
+
{"version":3,"file":"findVersions.js","sourceRoot":"","sources":["../../../src/globals/operations/findVersions.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const executeAccess_1 = __importDefault(require("../../auth/executeAccess"));
|
|
7
|
-
const auth_1 = require("../../auth");
|
|
8
7
|
const beforeChange_1 = require("../../fields/hooks/beforeChange");
|
|
9
8
|
const beforeValidate_1 = require("../../fields/hooks/beforeValidate");
|
|
10
9
|
const afterChange_1 = require("../../fields/hooks/afterChange");
|
|
@@ -24,20 +23,13 @@ async function update(args) {
|
|
|
24
23
|
// /////////////////////////////////////
|
|
25
24
|
// Retrieve document
|
|
26
25
|
// /////////////////////////////////////
|
|
27
|
-
const queryToBuild = {
|
|
28
|
-
and: [
|
|
29
|
-
{
|
|
30
|
-
globalType: {
|
|
31
|
-
equals: slug,
|
|
32
|
-
},
|
|
33
|
-
},
|
|
34
|
-
],
|
|
35
|
-
};
|
|
36
|
-
if ((0, auth_1.hasWhereAccessResult)(accessResults)) {
|
|
37
|
-
queryToBuild.and.push(accessResults);
|
|
38
|
-
}
|
|
39
26
|
const query = await Model.buildQuery({
|
|
40
|
-
where:
|
|
27
|
+
where: {
|
|
28
|
+
globalType: {
|
|
29
|
+
equals: slug,
|
|
30
|
+
},
|
|
31
|
+
},
|
|
32
|
+
access: accessResults,
|
|
41
33
|
req,
|
|
42
34
|
overrideAccess,
|
|
43
35
|
globalSlug: slug,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/globals/operations/update.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/globals/operations/update.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,8 @@ const graphql_1 = require("graphql");
|
|
|
4
4
|
const withNullableType = (field, type, forceNullable = false) => {
|
|
5
5
|
const hasReadAccessControl = field.access && field.access.read;
|
|
6
6
|
const condition = field.admin && field.admin.condition;
|
|
7
|
-
|
|
7
|
+
const isTimestamp = field.name === 'createdAt' || field.name === 'updatedAt';
|
|
8
|
+
if (!forceNullable && 'required' in field && field.required && !field.localized && !condition && !hasReadAccessControl && !isTimestamp) {
|
|
8
9
|
return new graphql_1.GraphQLNonNull(type);
|
|
9
10
|
}
|
|
10
11
|
return type;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"withNullableType.js","sourceRoot":"","sources":["../../../src/graphql/schema/withNullableType.ts"],"names":[],"mappings":";;AAAA,qCAAsD;AAGtD,MAAM,gBAAgB,GAAG,CAAC,KAAyB,EAAE,IAAiB,EAAE,aAAa,GAAG,KAAK,EAAe,EAAE;IAC5G,MAAM,oBAAoB,GAAG,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC;IAC/D,MAAM,SAAS,GAAG,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"withNullableType.js","sourceRoot":"","sources":["../../../src/graphql/schema/withNullableType.ts"],"names":[],"mappings":";;AAAA,qCAAsD;AAGtD,MAAM,gBAAgB,GAAG,CAAC,KAAyB,EAAE,IAAiB,EAAE,aAAa,GAAG,KAAK,EAAe,EAAE;IAC5G,MAAM,oBAAoB,GAAG,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC;IAC/D,MAAM,SAAS,GAAG,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC;IACvD,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,KAAK,WAAW,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW,CAAC;IAE7E,IAAI,CAAC,aAAa,IAAI,UAAU,IAAI,KAAK,IAAI,KAAK,CAAC,QAAQ,IAAI,CAAC,KAAK,CAAC,SAAS,IAAI,CAAC,SAAS,IAAI,CAAC,oBAAoB,IAAI,CAAC,WAAW,EAAE;QACtI,OAAO,IAAI,wBAAc,CAAC,IAAI,CAAC,CAAC;KACjC;IAED,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,kBAAe,gBAAgB,CAAC"}
|
|
@@ -23,6 +23,7 @@ type ParamParserArgs = {
|
|
|
23
23
|
versionsFields?: Field[];
|
|
24
24
|
model: any;
|
|
25
25
|
where: Where;
|
|
26
|
+
access?: Where | boolean;
|
|
26
27
|
overrideAccess?: boolean;
|
|
27
28
|
};
|
|
28
29
|
export declare class ParamParser {
|
|
@@ -30,6 +31,7 @@ export declare class ParamParser {
|
|
|
30
31
|
globalSlug?: string;
|
|
31
32
|
overrideAccess: boolean;
|
|
32
33
|
req: PayloadRequest;
|
|
34
|
+
access?: Where | boolean;
|
|
33
35
|
where: Where;
|
|
34
36
|
model: any;
|
|
35
37
|
fields: Field[];
|
|
@@ -45,21 +47,23 @@ export declare class ParamParser {
|
|
|
45
47
|
errors: {
|
|
46
48
|
path: string;
|
|
47
49
|
}[];
|
|
48
|
-
constructor({ req, collectionSlug, globalSlug, versionsFields, model, where, overrideAccess, }: ParamParserArgs);
|
|
50
|
+
constructor({ req, collectionSlug, globalSlug, versionsFields, model, where, access, overrideAccess, }: ParamParserArgs);
|
|
49
51
|
parse(): Promise<Record<string, unknown>>;
|
|
50
|
-
parsePathOrRelation(object: Where): Promise<Record<string, unknown>>;
|
|
51
|
-
buildAndOrConditions(conditions:
|
|
52
|
-
buildSearchParam({ fields, incomingPath, val, operator, }: {
|
|
52
|
+
parsePathOrRelation(object: Where, overrideAccess: boolean): Promise<Record<string, unknown>>;
|
|
53
|
+
buildAndOrConditions(conditions: Where[], overrideAccess: boolean): Promise<Record<string, unknown>[]>;
|
|
54
|
+
buildSearchParam({ fields, incomingPath, val, operator, overrideAccess, }: {
|
|
53
55
|
fields: Field[];
|
|
54
56
|
incomingPath: string;
|
|
55
57
|
val: unknown;
|
|
56
58
|
operator: string;
|
|
59
|
+
overrideAccess: boolean;
|
|
57
60
|
}): Promise<SearchParam>;
|
|
58
|
-
getLocalizedPaths({ collectionSlug, globalSlug, fields, incomingPath, }: {
|
|
61
|
+
getLocalizedPaths({ collectionSlug, globalSlug, fields, incomingPath, overrideAccess, }: {
|
|
59
62
|
collectionSlug?: string;
|
|
60
63
|
globalSlug?: string;
|
|
61
64
|
fields: Field[];
|
|
62
65
|
incomingPath: string;
|
|
66
|
+
overrideAccess: boolean;
|
|
63
67
|
}): Promise<PathToQuery[]>;
|
|
64
68
|
}
|
|
65
69
|
type GetBuildQueryPluginArgs = {
|
|
@@ -70,6 +74,7 @@ export type BuildQueryArgs = {
|
|
|
70
74
|
req: PayloadRequest;
|
|
71
75
|
where: Where;
|
|
72
76
|
overrideAccess: boolean;
|
|
77
|
+
access?: Where | boolean;
|
|
73
78
|
globalSlug?: string;
|
|
74
79
|
};
|
|
75
80
|
declare const getBuildQueryPlugin: ({ collectionSlug, versionsFields, }?: GetBuildQueryPluginArgs) => (schema: any) => void;
|
|
@@ -21,13 +21,14 @@ const subQueryOptions = {
|
|
|
21
21
|
lean: true,
|
|
22
22
|
};
|
|
23
23
|
class ParamParser {
|
|
24
|
-
constructor({ req, collectionSlug, globalSlug, versionsFields, model, where, overrideAccess, }) {
|
|
24
|
+
constructor({ req, collectionSlug, globalSlug, versionsFields, model, where, access, overrideAccess, }) {
|
|
25
25
|
this.req = req;
|
|
26
26
|
this.collectionSlug = collectionSlug;
|
|
27
27
|
this.globalSlug = globalSlug;
|
|
28
28
|
this.parse = this.parse.bind(this);
|
|
29
29
|
this.model = model;
|
|
30
30
|
this.where = where;
|
|
31
|
+
this.access = access;
|
|
31
32
|
this.overrideAccess = overrideAccess;
|
|
32
33
|
this.localizationConfig = req.payload.config.localization;
|
|
33
34
|
this.policies = {
|
|
@@ -47,50 +48,59 @@ class ParamParser {
|
|
|
47
48
|
}
|
|
48
49
|
// Entry point to the ParamParser class
|
|
49
50
|
async parse() {
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
51
|
+
const query = await this.parsePathOrRelation(this.where, this.overrideAccess);
|
|
52
|
+
const result = {
|
|
53
|
+
$and: [],
|
|
54
|
+
};
|
|
55
|
+
if (query)
|
|
56
|
+
result.$and.push(query);
|
|
57
|
+
if (typeof this.access === 'object') {
|
|
58
|
+
const accessQuery = await this.parsePathOrRelation(this.access, true);
|
|
59
|
+
if (accessQuery)
|
|
60
|
+
result.$and.push(accessQuery);
|
|
53
61
|
}
|
|
54
|
-
return
|
|
62
|
+
return result;
|
|
55
63
|
}
|
|
56
|
-
async parsePathOrRelation(object) {
|
|
64
|
+
async parsePathOrRelation(object, overrideAccess) {
|
|
57
65
|
let result = {};
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
const
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
66
|
+
if (typeof object === 'object') {
|
|
67
|
+
// We need to determine if the whereKey is an AND, OR, or a schema path
|
|
68
|
+
for (const relationOrPath of Object.keys(object)) {
|
|
69
|
+
const condition = object[relationOrPath];
|
|
70
|
+
if (relationOrPath.toLowerCase() === 'and' && Array.isArray(condition)) {
|
|
71
|
+
const builtAndConditions = await this.buildAndOrConditions(condition, overrideAccess);
|
|
72
|
+
if (builtAndConditions.length > 0)
|
|
73
|
+
result.$and = builtAndConditions;
|
|
74
|
+
}
|
|
75
|
+
else if (relationOrPath.toLowerCase() === 'or' && Array.isArray(condition)) {
|
|
76
|
+
const builtOrConditions = await this.buildAndOrConditions(condition, overrideAccess);
|
|
77
|
+
if (builtOrConditions.length > 0)
|
|
78
|
+
result.$or = builtOrConditions;
|
|
79
|
+
}
|
|
80
|
+
else {
|
|
81
|
+
// It's a path - and there can be multiple comparisons on a single path.
|
|
82
|
+
// For example - title like 'test' and title not equal to 'tester'
|
|
83
|
+
// So we need to loop on keys again here to handle each operator independently
|
|
84
|
+
const pathOperators = object[relationOrPath];
|
|
85
|
+
if (typeof pathOperators === 'object') {
|
|
86
|
+
for (const operator of Object.keys(pathOperators)) {
|
|
87
|
+
if (validOperators.includes(operator)) {
|
|
88
|
+
const searchParam = await this.buildSearchParam({
|
|
89
|
+
fields: this.fields,
|
|
90
|
+
incomingPath: relationOrPath,
|
|
91
|
+
val: pathOperators[operator],
|
|
92
|
+
operator,
|
|
93
|
+
overrideAccess,
|
|
94
|
+
});
|
|
95
|
+
if ((searchParam === null || searchParam === void 0 ? void 0 : searchParam.value) && (searchParam === null || searchParam === void 0 ? void 0 : searchParam.path)) {
|
|
96
|
+
result = {
|
|
97
|
+
...result,
|
|
98
|
+
[searchParam.path]: searchParam.value,
|
|
99
|
+
};
|
|
100
|
+
}
|
|
101
|
+
else if (typeof (searchParam === null || searchParam === void 0 ? void 0 : searchParam.value) === 'object') {
|
|
102
|
+
result = (0, deepmerge_1.default)(result, searchParam.value, { arrayMerge: combineMerge_1.combineMerge });
|
|
103
|
+
}
|
|
94
104
|
}
|
|
95
105
|
}
|
|
96
106
|
}
|
|
@@ -99,14 +109,14 @@ class ParamParser {
|
|
|
99
109
|
}
|
|
100
110
|
return result;
|
|
101
111
|
}
|
|
102
|
-
async buildAndOrConditions(conditions) {
|
|
112
|
+
async buildAndOrConditions(conditions, overrideAccess) {
|
|
103
113
|
const completedConditions = [];
|
|
104
114
|
// Loop over all AND / OR operations and add them to the AND / OR query param
|
|
105
115
|
// Operations should come through as an array
|
|
106
116
|
for (const condition of conditions) {
|
|
107
117
|
// If the operation is properly formatted as an object
|
|
108
118
|
if (typeof condition === 'object') {
|
|
109
|
-
const result = await this.parsePathOrRelation(condition);
|
|
119
|
+
const result = await this.parsePathOrRelation(condition, overrideAccess);
|
|
110
120
|
if (Object.keys(result).length > 0) {
|
|
111
121
|
completedConditions.push(result);
|
|
112
122
|
}
|
|
@@ -115,7 +125,7 @@ class ParamParser {
|
|
|
115
125
|
return completedConditions;
|
|
116
126
|
}
|
|
117
127
|
// Convert the Payload key / value / operator into a MongoDB query
|
|
118
|
-
async buildSearchParam({ fields, incomingPath, val, operator, }) {
|
|
128
|
+
async buildSearchParam({ fields, incomingPath, val, operator, overrideAccess, }) {
|
|
119
129
|
var _a;
|
|
120
130
|
// Replace GraphQL nested field double underscore formatting
|
|
121
131
|
let sanitizedPath = incomingPath.replace(/__/gi, '.');
|
|
@@ -148,12 +158,12 @@ class ParamParser {
|
|
|
148
158
|
globalSlug: this.globalSlug,
|
|
149
159
|
fields,
|
|
150
160
|
incomingPath: sanitizedPath,
|
|
161
|
+
overrideAccess,
|
|
151
162
|
});
|
|
152
163
|
}
|
|
153
164
|
const [{ path, field }] = paths;
|
|
154
165
|
if (path) {
|
|
155
166
|
const formattedValue = (0, sanitizeQueryValue_1.sanitizeQueryValue)({
|
|
156
|
-
ctx: this,
|
|
157
167
|
field,
|
|
158
168
|
path,
|
|
159
169
|
operator,
|
|
@@ -182,7 +192,7 @@ class ParamParser {
|
|
|
182
192
|
},
|
|
183
193
|
},
|
|
184
194
|
req: this.req,
|
|
185
|
-
overrideAccess
|
|
195
|
+
overrideAccess,
|
|
186
196
|
});
|
|
187
197
|
const result = await SubModel.find(subQuery, subQueryOptions);
|
|
188
198
|
const $in = result.map((doc) => doc._id.toString());
|
|
@@ -229,7 +239,7 @@ class ParamParser {
|
|
|
229
239
|
}
|
|
230
240
|
// Build up an array of auto-localized paths to search on
|
|
231
241
|
// Multiple paths may be possible if searching on properties of relationship fields
|
|
232
|
-
async getLocalizedPaths({ collectionSlug, globalSlug, fields, incomingPath, }) {
|
|
242
|
+
async getLocalizedPaths({ collectionSlug, globalSlug, fields, incomingPath, overrideAccess, }) {
|
|
233
243
|
var _a;
|
|
234
244
|
const pathSegments = incomingPath.split('.');
|
|
235
245
|
let paths = [
|
|
@@ -242,7 +252,7 @@ class ParamParser {
|
|
|
242
252
|
collectionSlug,
|
|
243
253
|
},
|
|
244
254
|
];
|
|
245
|
-
if (!
|
|
255
|
+
if (!overrideAccess) {
|
|
246
256
|
if (collectionSlug) {
|
|
247
257
|
const collection = { ...this.req.payload.collections[collectionSlug].config };
|
|
248
258
|
collection.fields = fields;
|
|
@@ -303,7 +313,7 @@ class ParamParser {
|
|
|
303
313
|
continue;
|
|
304
314
|
}
|
|
305
315
|
if (matchedField) {
|
|
306
|
-
if (!
|
|
316
|
+
if (!overrideAccess) {
|
|
307
317
|
const fieldAccess = lastIncompletePath.fieldPolicies[matchedField.name].read.permission;
|
|
308
318
|
if (!fieldAccess || ('hidden' in matchedField && matchedField.hidden)) {
|
|
309
319
|
this.errors.push({ path: currentPath });
|
|
@@ -358,6 +368,7 @@ class ParamParser {
|
|
|
358
368
|
collectionSlug: relatedCollection.slug,
|
|
359
369
|
fields: relatedCollection.fields,
|
|
360
370
|
incomingPath: nestedPathToQuery,
|
|
371
|
+
overrideAccess,
|
|
361
372
|
});
|
|
362
373
|
paths = [
|
|
363
374
|
...paths,
|
|
@@ -373,7 +384,7 @@ class ParamParser {
|
|
|
373
384
|
if ('fields' in lastIncompletePath.field) {
|
|
374
385
|
lastIncompletePath.fields = (0, flattenTopLevelFields_1.default)(lastIncompletePath.field.fields, false);
|
|
375
386
|
}
|
|
376
|
-
if (!
|
|
387
|
+
if (!overrideAccess && 'fields' in lastIncompletePath.fieldPolicies[lastIncompletePath.field.name]) {
|
|
377
388
|
lastIncompletePath.fieldPolicies = lastIncompletePath.fieldPolicies[lastIncompletePath.field.name].fields;
|
|
378
389
|
}
|
|
379
390
|
if (i + 1 === pathSegments.length)
|
|
@@ -399,7 +410,7 @@ exports.ParamParser = ParamParser;
|
|
|
399
410
|
const getBuildQueryPlugin = ({ collectionSlug, versionsFields, } = {}) => {
|
|
400
411
|
return function buildQueryPlugin(schema) {
|
|
401
412
|
const modifiedSchema = schema;
|
|
402
|
-
async function buildQuery({ req, where, overrideAccess = false, globalSlug }) {
|
|
413
|
+
async function buildQuery({ req, where, overrideAccess = false, access, globalSlug }) {
|
|
403
414
|
const paramParser = new ParamParser({
|
|
404
415
|
req,
|
|
405
416
|
collectionSlug,
|
|
@@ -407,6 +418,7 @@ const getBuildQueryPlugin = ({ collectionSlug, versionsFields, } = {}) => {
|
|
|
407
418
|
versionsFields,
|
|
408
419
|
model: this,
|
|
409
420
|
where,
|
|
421
|
+
access,
|
|
410
422
|
overrideAccess,
|
|
411
423
|
});
|
|
412
424
|
const result = await paramParser.parse();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildQuery.js","sourceRoot":"","sources":["../../src/mongoose/buildQuery.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"buildQuery.js","sourceRoot":"","sources":["../../src/mongoose/buildQuery.ts"],"names":[],"mappings":";;;;;;AAAA,gCAAgC;AAChC,qCAAqC;AACrC,yCAAyC;AACzC,0DAAkC;AAElC,4DAAyD;AACzD,+CAA4C;AAC5C,6DAA0D;AAE1D,kDAA0G;AAE1G,+FAA+D;AAC/D,sEAAmE;AAEnE,sEAA8C;AAE9C,MAAM,cAAc,GAAG,CAAC,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,oBAAoB,EAAE,cAAc,EAAE,iBAAiB,EAAE,WAAW,EAAE,YAAY,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;AAEnL,MAAM,eAAe,GAAG;IACtB,KAAK,EAAE,EAAE;IACT,IAAI,EAAE,IAAI;CACX,CAAC;AA6BF,MAAa,WAAW;IA8BtB,YAAY,EACV,GAAG,EACH,cAAc,EACd,UAAU,EACV,cAAc,EACd,KAAK,EACL,KAAK,EACL,MAAM,EACN,cAAc,GACE;QAChB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,kBAAkB,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC;QAC1D,IAAI,CAAC,QAAQ,GAAG;YACd,WAAW,EAAE,EAAE;YACf,OAAO,EAAE,EAAE;SACZ,CAAC;QACF,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QAEjB,oBAAoB;QACpB,IAAI,UAAU,EAAE;YACd,MAAM,YAAY,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC;YACxF,IAAI,CAAC,MAAM,GAAG,cAAc,IAAI,YAAY,CAAC,MAAM,CAAC;SACrD;QAED,IAAI,cAAc,EAAE;YAClB,MAAM,gBAAgB,GAAG,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC;YACxE,IAAI,CAAC,MAAM,GAAG,cAAc,IAAI,gBAAgB,CAAC,MAAM,CAAC;SACzD;IACH,CAAC;IAED,uCAAuC;IAEvC,KAAK,CAAC,KAAK;QACT,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QAE9E,MAAM,MAAM,GAAG;YACb,IAAI,EAAE,EAAE;SACT,CAAC;QAEF,IAAI,KAAK;YAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAEnC,IAAI,OAAO,IAAI,CAAC,MAAM,KAAK,QAAQ,EAAE;YACnC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;YACtE,IAAI,WAAW;gBAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SAChD;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,MAAa,EAAE,cAAuB;QAC9D,IAAI,MAAM,GAAG,EAAsB,CAAC;QAEpC,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;YAC9B,uEAAuE;YACvE,KAAK,MAAM,cAAc,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;gBAChD,MAAM,SAAS,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC;gBACzC,IAAI,cAAc,CAAC,WAAW,EAAE,KAAK,KAAK,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;oBACtE,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;oBACtF,IAAI,kBAAkB,CAAC,MAAM,GAAG,CAAC;wBAAE,MAAM,CAAC,IAAI,GAAG,kBAAkB,CAAC;iBACrE;qBAAM,IAAI,cAAc,CAAC,WAAW,EAAE,KAAK,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;oBAC5E,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;oBACrF,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC;wBAAE,MAAM,CAAC,GAAG,GAAG,iBAAiB,CAAC;iBAClE;qBAAM;oBACL,wEAAwE;oBACxE,kEAAkE;oBAClE,8EAA8E;oBAC9E,MAAM,aAAa,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC;oBAC7C,IAAI,OAAO,aAAa,KAAK,QAAQ,EAAE;wBACrC,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE;4BACjD,IAAI,cAAc,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;gCACrC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC;oCAC9C,MAAM,EAAE,IAAI,CAAC,MAAM;oCACnB,YAAY,EAAE,cAAc;oCAC5B,GAAG,EAAE,aAAa,CAAC,QAAQ,CAAC;oCAC5B,QAAQ;oCACR,cAAc;iCACf,CAAC,CAAC;gCAEH,IAAI,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,KAAK,MAAI,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,IAAI,CAAA,EAAE;oCAC3C,MAAM,GAAG;wCACP,GAAG,MAAM;wCACT,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,WAAW,CAAC,KAAK;qCACtC,CAAC;iCACH;qCAAM,IAAI,OAAO,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,KAAK,CAAA,KAAK,QAAQ,EAAE;oCACjD,MAAM,GAAG,IAAA,mBAAS,EAAC,MAAM,EAAE,WAAW,CAAC,KAAK,EAAE,EAAE,UAAU,EAAE,2BAAY,EAAE,CAAC,CAAC;iCAC7E;6BACF;yBACF;qBACF;iBACF;aACF;SACF;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,UAAmB,EAAE,cAAuB;QACrE,MAAM,mBAAmB,GAAG,EAAE,CAAC;QAC/B,6EAA6E;QAC7E,6CAA6C;QAC7C,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;YAClC,sDAAsD;YACtD,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE;gBACjC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;gBACzE,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;oBAClC,mBAAmB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;iBAClC;aACF;SACF;QACD,OAAO,mBAAmB,CAAC;IAC7B,CAAC;IAED,kEAAkE;IAClE,KAAK,CAAC,gBAAgB,CAAC,EACrB,MAAM,EACN,YAAY,EACZ,GAAG,EACH,QAAQ,EACR,cAAc,GAOf;;QACC,4DAA4D;QAC5D,IAAI,aAAa,GAAG,YAAY,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QACtD,IAAI,aAAa,KAAK,IAAI;YAAE,aAAa,GAAG,KAAK,CAAC;QAElD,IAAI,KAAK,GAAkB,EAAE,CAAC;QAE9B,IAAI,WAAW,GAAG,KAAK,CAAC;QAExB,IAAI,aAAa,KAAK,KAAK,EAAE;YAC3B,MAAM,aAAa,GAAG,MAAA,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,cAAc,CAAC,0CAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,wBAAgB,EAAC,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;YAEvJ,IAAI,WAAW,GAAsB,MAAM,CAAC;YAE5C,IAAI,aAAa,EAAE;gBACjB,IAAI,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,IAAI,MAAK,MAAM,IAAI,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,IAAI,MAAK,QAAQ,EAAE;oBACtE,WAAW,GAAG,aAAa,CAAC,IAAI,CAAC;iBAClC;gBAED,WAAW,GAAG,IAAI,CAAC;aACpB;YAED,KAAK,CAAC,IAAI,CAAC;gBACT,IAAI,EAAE,KAAK;gBACX,KAAK,EAAE;oBACL,IAAI,EAAE,IAAI;oBACV,IAAI,EAAE,WAAW;iBAClB;gBACD,QAAQ,EAAE,IAAI;gBACd,cAAc,EAAE,IAAI,CAAC,cAAc;aACpC,CAAC,CAAC;SACJ;aAAM;YACL,KAAK,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC;gBACnC,cAAc,EAAE,IAAI,CAAC,cAAc;gBACnC,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,MAAM;gBACN,YAAY,EAAE,aAAa;gBAC3B,cAAc;aACf,CAAC,CAAC;SACJ;QAED,MAAM,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,GAAG,KAAK,CAAC;QAEhC,IAAI,IAAI,EAAE;YACR,MAAM,cAAc,GAAG,IAAA,uCAAkB,EAAC;gBACxC,KAAK;gBACL,IAAI;gBACJ,QAAQ;gBACR,GAAG;gBACH,WAAW;aACZ,CAAC,CAAC;YAEH,uDAAuD;YACvD,mDAAmD;YACnD,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;gBACpB,0CAA0C;gBAC1C,6BAA6B;gBAC7B,MAAM,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;gBAE9C,MAAM,wBAAwB,GAAG;oBAC/B,KAAK,EAAE,EAAE;iBACK,CAAC;gBAEjB,MAAM,iBAAiB,GAAG,MAAM,YAAY,CAAC,MAAM,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,cAAc,EAAE,EAAE,CAAC,EAAE,EAAE;oBAC7G,MAAM,gBAAgB,GAAG,MAAM,UAAU,CAAC;oBAE1C,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC;oBAEpE,+BAA+B;oBAC/B,+CAA+C;oBAC/C,IAAI,CAAC,KAAK,CAAC,EAAE;wBACX,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,UAAU,CAAC;4BACzC,KAAK,EAAE;gCACL,CAAC,OAAO,CAAC,EAAE;oCACT,CAAC,QAAQ,CAAC,EAAE,GAAG;iCAChB;6BACF;4BACD,GAAG,EAAE,IAAI,CAAC,GAAG;4BACb,cAAc;yBACf,CAAC,CAAC;wBAEH,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;wBAE9D,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;wBAEpD,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC;4BAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,EAAE,CAAC;wBAE/D,MAAM,WAAW,GAAG,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;wBAE7C,OAAO;4BACL,KAAK,EAAE,EAAE,CAAC,WAAW,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE;yBAClC,CAAC;qBACH;oBAED,MAAM,QAAQ,GAAG,gBAAgB,CAAC,KAAK,CAAC;oBACxC,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;oBAE9D,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;oBAEpD,8BAA8B;oBAC9B,qCAAqC;oBACrC,IAAI,CAAC,GAAG,CAAC,KAAK,YAAY,CAAC,MAAM,EAAE;wBACjC,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,EAAE,CAAC;qBACjC;oBAED,OAAO;wBACL,KAAK,EAAE;4BACL,GAAG,EAAE,EAAE,GAAG,EAAE;yBACb;qBACF,CAAC;gBACJ,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,wBAAwB,CAAC,CAAC,CAAC;gBAE9C,OAAO,iBAAiB,CAAC;aAC1B;YAED,IAAI,QAAQ,IAAI,cAAc,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;gBACjD,MAAM,WAAW,GAAG,yBAAW,CAAC,QAAQ,CAAC,CAAC;gBAE1C,yDAAyD;gBACzD,wDAAwD;gBACxD,IAAI,CAAC,WAAW,EAAE;oBAChB,OAAO;wBACL,IAAI;wBACJ,KAAK,EAAE,cAAc;qBACtB,CAAC;iBACH;gBAED,OAAO;oBACL,IAAI;oBACJ,KAAK,EAAE,EAAE,CAAC,WAAW,CAAC,EAAE,cAAc,EAAE;iBACzC,CAAC;aACH;SACF;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,yDAAyD;IACzD,mFAAmF;IAEnF,KAAK,CAAC,iBAAiB,CAAC,EACtB,cAAc,EACd,UAAU,EACV,MAAM,EACN,YAAY,EACZ,cAAc,GAOf;;QACC,MAAM,YAAY,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAE7C,IAAI,KAAK,GAAkB;YACzB;gBACE,IAAI,EAAE,EAAE;gBACR,QAAQ,EAAE,KAAK;gBACf,KAAK,EAAE,SAAS;gBAChB,MAAM,EAAE,IAAA,+BAAa,EAAC,MAAM,EAAE,KAAK,CAAC;gBACpC,aAAa,EAAE,SAAS;gBACxB,cAAc;aACf;SACF,CAAC;QAEF,IAAI,CAAC,cAAc,EAAE;YACnB,IAAI,cAAc,EAAE;gBAClB,MAAM,UAAU,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC,MAAM,EAAE,CAAC;gBAC9E,UAAU,CAAC,MAAM,GAAG,MAAM,CAAC;gBAE3B,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,cAAc,CAAC,EAAE;oBAC9C,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,IAAA,qCAAiB,EAAC;wBAC3C,GAAG,EAAE,IAAI,CAAC,GAAG;wBACb,MAAM,EAAE,UAAU;wBAClB,UAAU,EAAE,CAAC,MAAM,CAAC;wBACpB,IAAI,EAAE,YAAY;qBACnB,CAAC,CAAC;oBAEH,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;oBAC5B,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,cAAc,CAAC,GAAG,MAAM,CAAC;iBACpD;gBAED,KAAK,CAAC,CAAC,CAAC,CAAC,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC;gBAE1E,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,UAAU,CAAC,IAAI,IAAI,CAAC,CAAA,MAAA,UAAU,CAAC,IAAI,0CAAE,oBAAoB,CAAA,EAAE;oBACxG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC,CAAC;oBACzC,OAAO,EAAE,CAAC;iBACX;aACF;YAED,IAAI,UAAU,EAAE;gBACd,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;oBACtC,MAAM,MAAM,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,KAAK,UAAU,CAAC,EAAE,CAAC;oBAC9F,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;oBAEvB,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,IAAA,qCAAiB,EAAC;wBAC3C,GAAG,EAAE,IAAI,CAAC,GAAG;wBACb,MAAM,EAAE,MAAM;wBACd,UAAU,EAAE,CAAC,MAAM,CAAC;wBACpB,IAAI,EAAE,QAAQ;qBACf,CAAC,CAAC;oBAEH,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;oBAC5B,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,MAAM,CAAC;iBAC5C;gBAED,KAAK,CAAC,CAAC,CAAC,CAAC,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC;aACnE;SACF;QAED,uCAAuC;QACvC,mCAAmC;QACnC,yBAAyB;QAEzB,IAAI,IAAI,GAAG,KAAK,CAAC;QAEjB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE;YAC/C,IAAI,IAAI;gBAAE,SAAS;YAEnB,MAAM,OAAO,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;YAEhC,MAAM,kBAAkB,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC;YAEnE,IAAI,kBAAkB,EAAE;gBACtB,MAAM,EAAE,IAAI,EAAE,GAAG,kBAAkB,CAAC;gBACpC,IAAI,WAAW,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,IAAI,OAAO,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;gBAExD,MAAM,YAAY,GAAG,kBAAkB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,wBAAgB,EAAC,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC;gBAClH,kBAAkB,CAAC,KAAK,GAAG,YAAY,CAAC;gBAExC,IAAI,WAAW,KAAK,YAAY,IAAI,IAAI,CAAC,UAAU,EAAE;oBACnD,kBAAkB,CAAC,IAAI,GAAG,WAAW,CAAC;oBACtC,kBAAkB,CAAC,QAAQ,GAAG,IAAI,CAAC;oBACnC,kBAAkB,CAAC,KAAK,GAAG;wBACzB,IAAI,EAAE,YAAY;wBAClB,IAAI,EAAE,MAAM;qBACb,CAAC;oBAEF,IAAI,GAAG,IAAI,CAAC;oBACZ,SAAS;iBACV;gBAED,IAAI,YAAY,EAAE;oBAChB,IAAI,CAAC,cAAc,EAAE;wBACnB,MAAM,WAAW,GAAG,kBAAkB,CAAC,aAAa,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC;wBAExF,IAAI,CAAC,WAAW,IAAI,CAAC,QAAQ,IAAI,YAAY,IAAI,YAAY,CAAC,MAAM,CAAC,EAAE;4BACrE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;4BACxC,IAAI,GAAG,IAAI,CAAC;4BACZ,SAAS;yBACV;qBACF;oBAED,MAAM,WAAW,GAAG,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;oBACxC,MAAM,mBAAmB,GAAG,IAAI,CAAC,kBAAkB,IAAI,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;oBAE7G,IAAI,mBAAmB,EAAE;wBACvB,iDAAiD;wBACjD,CAAC,IAAI,CAAC,CAAC;wBACP,WAAW,GAAG,GAAG,WAAW,IAAI,WAAW,EAAE,CAAC;qBAC/C;yBAAM,IAAI,IAAI,CAAC,kBAAkB,IAAI,WAAW,IAAI,YAAY,IAAI,YAAY,CAAC,SAAS,EAAE;wBAC3F,WAAW,GAAG,GAAG,WAAW,IAAI,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;qBACnD;oBAED,QAAQ,YAAY,CAAC,IAAI,EAAE;wBACzB,KAAK,QAAQ,CAAC;wBACd,KAAK,UAAU,CAAC;wBAChB,KAAK,MAAM,CAAC,CAAC;4BACX,MAAM,gBAAgB,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;4BAC7D,kBAAkB,CAAC,QAAQ,GAAG,IAAI,CAAC;4BACnC,kBAAkB,CAAC,IAAI,GAAG,gBAAgB,CAAC,CAAC,CAAC,GAAG,WAAW,IAAI,gBAAgB,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC;4BAChG,IAAI,GAAG,IAAI,CAAC;4BACZ,SAAS;yBACV;wBAED,KAAK,cAAc,CAAC;wBACpB,KAAK,QAAQ,CAAC,CAAC;4BACb,qCAAqC;4BACrC,yDAAyD;4BACzD,IAAI,OAAO,YAAY,CAAC,UAAU,KAAK,QAAQ,EAAE;gCAC/C,MAAM,kBAAkB,GAAG,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;gCAEnG,IAAI,kBAAkB,EAAE;oCACtB,kBAAkB,CAAC,QAAQ,GAAG,IAAI,CAAC;oCACnC,kBAAkB,CAAC,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;iCAClD;qCAAM;oCACL,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;oCACxC,IAAI,GAAG,IAAI,CAAC;oCACZ,SAAS;iCACV;6BACF;iCAAM;gCACL,kBAAkB,CAAC,QAAQ,GAAG,IAAI,CAAC;gCACnC,kBAAkB,CAAC,cAAc,GAAG,YAAY,CAAC,UAAU,CAAC;gCAC5D,kBAAkB,CAAC,IAAI,GAAG,WAAW,CAAC;gCAEtC,MAAM,iBAAiB,GAAG,YAAY,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gCAE5F,IAAI,iBAAiB,EAAE;oCACrB,MAAM,iBAAiB,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,YAAY,CAAC,UAAoB,CAAC,CAAC,MAAM,CAAC;oCAEjG,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC;wCAClD,cAAc,EAAE,iBAAiB,CAAC,IAAI;wCACtC,MAAM,EAAE,iBAAiB,CAAC,MAAM;wCAChC,YAAY,EAAE,iBAAiB;wCAC/B,cAAc;qCACf,CAAC,CAAC;oCAEH,KAAK,GAAG;wCACN,GAAG,KAAK;wCACR,GAAG,cAAc;qCAClB,CAAC;iCACH;gCAED,IAAI,GAAG,IAAI,CAAC;gCACZ,SAAS;6BACV;4BAED,MAAM;yBACP;wBAED,OAAO,CAAC,CAAC;4BACP,IAAI,QAAQ,IAAI,kBAAkB,CAAC,KAAK,EAAE;gCACxC,kBAAkB,CAAC,MAAM,GAAG,IAAA,+BAAa,EAAC,kBAAkB,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;6BACnF;4BAED,IAAI,CAAC,cAAc,IAAI,QAAQ,IAAI,kBAAkB,CAAC,aAAa,CAAC,kBAAkB,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;gCAClG,kBAAkB,CAAC,aAAa,GAAG,kBAAkB,CAAC,aAAa,CAAC,kBAAkB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC;6BAC3G;4BAED,IAAI,CAAC,GAAG,CAAC,KAAK,YAAY,CAAC,MAAM;gCAAE,kBAAkB,CAAC,QAAQ,GAAG,IAAI,CAAC;4BACtE,kBAAkB,CAAC,IAAI,GAAG,WAAW,CAAC;4BACtC,SAAS;yBACV;qBACF;iBACF;qBAAM;oBACL,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;oBACxC,IAAI,GAAG,IAAI,CAAC;oBACZ,SAAS;iBACV;aACF;SACF;QAED,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AA1fD,kCA0fC;AAeD,yEAAyE;AACzE,yDAAyD;AACzD,MAAM,mBAAmB,GAAG,CAAC,EAC3B,cAAc,EACd,cAAc,MACa,EAAE,EAAE,EAAE;IACjC,OAAO,SAAS,gBAAgB,CAAC,MAAM;QACrC,MAAM,cAAc,GAAG,MAAM,CAAC;QAC9B,KAAK,UAAU,UAAU,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,cAAc,GAAG,KAAK,EAAE,MAAM,EAAE,UAAU,EAAkB;YAClG,MAAM,WAAW,GAAG,IAAI,WAAW,CAAC;gBAClC,GAAG;gBACH,cAAc;gBACd,UAAU;gBACV,cAAc;gBACd,KAAK,EAAE,IAAI;gBACX,KAAK;gBACL,MAAM;gBACN,cAAc;aACf,CAAC,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,KAAK,EAAE,CAAC;YAEzC,IAAI,WAAW,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;gBACjC,MAAM,IAAI,oBAAU,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;aAC1C;YAED,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,cAAc,CAAC,OAAO,CAAC,UAAU,GAAG,UAAU,CAAC;IACjD,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,mBAAmB,CAAC"}
|
|
@@ -1,12 +1,10 @@
|
|
|
1
1
|
import { Field, TabAsField } from '../fields/config/types';
|
|
2
|
-
import { ParamParser } from './buildQuery';
|
|
3
2
|
type SanitizeQueryValueArgs = {
|
|
4
|
-
ctx: ParamParser;
|
|
5
3
|
field: Field | TabAsField;
|
|
6
4
|
path: string;
|
|
7
5
|
operator: string;
|
|
8
6
|
val: any;
|
|
9
7
|
hasCustomID: boolean;
|
|
10
8
|
};
|
|
11
|
-
export declare const sanitizeQueryValue: ({
|
|
9
|
+
export declare const sanitizeQueryValue: ({ field, path, operator, val, hasCustomID }: SanitizeQueryValueArgs) => unknown;
|
|
12
10
|
export {};
|
|
@@ -7,22 +7,19 @@ exports.sanitizeQueryValue = void 0;
|
|
|
7
7
|
const mongoose_1 = __importDefault(require("mongoose"));
|
|
8
8
|
const createArrayFromCommaDelineated_1 = require("./createArrayFromCommaDelineated");
|
|
9
9
|
const wordBoundariesRegex_1 = __importDefault(require("../utilities/wordBoundariesRegex"));
|
|
10
|
-
const sanitizeQueryValue = ({
|
|
10
|
+
const sanitizeQueryValue = ({ field, path, operator, val, hasCustomID }) => {
|
|
11
11
|
let formattedValue = val;
|
|
12
12
|
// Disregard invalid _ids
|
|
13
13
|
if (path === '_id' && typeof val === 'string' && val.split(',').length === 1) {
|
|
14
14
|
if (!hasCustomID) {
|
|
15
15
|
const isValid = mongoose_1.default.Types.ObjectId.isValid(val);
|
|
16
|
-
formattedValue = new mongoose_1.default.Types.ObjectId(val);
|
|
17
16
|
if (!isValid) {
|
|
18
|
-
ctx.errors.push({ path });
|
|
19
17
|
return undefined;
|
|
20
18
|
}
|
|
21
19
|
}
|
|
22
20
|
if (field.type === 'number') {
|
|
23
21
|
const parsedNumber = parseFloat(val);
|
|
24
22
|
if (Number.isNaN(parsedNumber)) {
|
|
25
|
-
ctx.errors.push({ path });
|
|
26
23
|
return undefined;
|
|
27
24
|
}
|
|
28
25
|
}
|
|
@@ -37,6 +34,12 @@ const sanitizeQueryValue = ({ ctx, field, path, operator, val, hasCustomID }) =>
|
|
|
37
34
|
if (field.type === 'number' && typeof val === 'string') {
|
|
38
35
|
formattedValue = Number(val);
|
|
39
36
|
}
|
|
37
|
+
if (field.type === 'date' && typeof val === 'string') {
|
|
38
|
+
formattedValue = new Date(val);
|
|
39
|
+
if (Number.isNaN(Date.parse(formattedValue))) {
|
|
40
|
+
return undefined;
|
|
41
|
+
}
|
|
42
|
+
}
|
|
40
43
|
if (['relationship', 'upload'].includes(field.type)) {
|
|
41
44
|
if (val === 'null') {
|
|
42
45
|
formattedValue = null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sanitizeQueryValue.js","sourceRoot":"","sources":["../../src/mongoose/sanitizeQueryValue.ts"],"names":[],"mappings":";;;;;;AAAA,wDAAgC;AAChC,qFAAkF;AAClF,2FAAmE;
|
|
1
|
+
{"version":3,"file":"sanitizeQueryValue.js","sourceRoot":"","sources":["../../src/mongoose/sanitizeQueryValue.ts"],"names":[],"mappings":"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"}
|