payload 1.0.8 → 1.0.11
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/README.md +5 -2
- package/dist/admin/components/forms/Form/index.js +1 -1
- package/dist/admin/components/forms/field-types/Array/Array.js +14 -10
- package/dist/admin/components/forms/field-types/Blocks/Blocks.js +14 -9
- package/dist/admin/components/forms/field-types/Collapsible/index.js +14 -4
- package/dist/admin/components/forms/field-types/Number/index.js +5 -1
- package/dist/admin/components/forms/field-types/RadioGroup/RadioInput/index.scss +4 -4
- package/dist/admin/components/forms/useField/index.js +2 -1
- package/dist/admin/components/utilities/DocumentInfo/index.js +1 -4
- package/dist/admin/components/utilities/DocumentInfo/types.d.ts +0 -2
- package/dist/admin/components/utilities/Preferences/index.d.ts +2 -2
- package/dist/admin/components/views/Account/index.js +8 -5
- package/dist/admin/components/views/Global/index.js +8 -5
- package/dist/admin/components/views/collections/Edit/index.js +7 -4
- package/dist/admin/components/views/collections/List/index.js +1 -1
- package/dist/admin/scss/app.scss +1 -1
- package/dist/auth/graphql/resolvers/refresh.js +2 -2
- package/dist/auth/operations/local/forgotPassword.js +10 -6
- package/dist/auth/operations/local/login.js +13 -9
- package/dist/auth/operations/local/resetPassword.js +11 -7
- package/dist/auth/operations/local/unlock.js +11 -7
- package/dist/auth/operations/login.js +2 -2
- package/dist/auth/strategies/jwt.js +5 -26
- package/dist/auth/types.d.ts +4 -3
- package/dist/auth/types.js +1 -1
- package/dist/bin/generateGraphQLSchema.js +2 -2
- package/dist/collections/config/schema.js +13 -5
- package/dist/collections/dataloader.d.ts +4 -0
- package/dist/collections/dataloader.js +90 -0
- package/dist/collections/graphql/init.js +2 -2
- package/dist/collections/init.js +4 -3
- package/dist/collections/operations/find.d.ts +2 -0
- package/dist/collections/operations/find.js +25 -9
- package/dist/collections/operations/local/create.js +17 -13
- package/dist/collections/operations/local/delete.js +12 -8
- package/dist/collections/operations/local/find.d.ts +4 -0
- package/dist/collections/operations/local/find.js +19 -10
- package/dist/collections/operations/local/findByID.js +11 -8
- package/dist/collections/operations/local/findVersionByID.js +13 -9
- package/dist/collections/operations/local/findVersions.js +12 -8
- package/dist/collections/operations/local/restoreVersion.js +12 -8
- package/dist/collections/operations/local/update.js +15 -11
- package/dist/express/middleware/authenticate.js +3 -3
- package/dist/express/types.d.ts +3 -0
- package/dist/fields/hooks/afterRead/relationshipPopulationPromise.js +13 -13
- package/dist/globals/operations/local/findOne.js +12 -8
- package/dist/globals/operations/local/findVersionByID.js +12 -8
- package/dist/globals/operations/local/findVersions.js +12 -8
- package/dist/globals/operations/local/restoreVersion.js +12 -8
- package/dist/globals/operations/local/update.js +12 -8
- package/dist/graphql/schema/buildObjectType.js +39 -84
- package/dist/init.js +6 -1
- package/dist/mongoose/buildSchema.js +4 -1
- package/dist/mongoose/sanitizeFormattedValue.js +2 -2
- package/docs/access-control/collections.mdx +3 -5
- package/docs/authentication/config.mdx +14 -0
- package/docs/graphql/graphql-schema.mdx +1 -1
- package/package.json +8 -3
|
@@ -28,7 +28,7 @@ async function login(incomingArgs) {
|
|
|
28
28
|
// Login
|
|
29
29
|
// /////////////////////////////////////
|
|
30
30
|
const { email: unsanitizedEmail, password } = data;
|
|
31
|
-
const email = unsanitizedEmail ? unsanitizedEmail.toLowerCase() : null;
|
|
31
|
+
const email = unsanitizedEmail ? unsanitizedEmail.toLowerCase().trim() : null;
|
|
32
32
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
33
33
|
// @ts-ignore Improper typing in library, additional args should be optional
|
|
34
34
|
const userDoc = await Model.findByUsername(email);
|
|
@@ -138,4 +138,4 @@ async function login(incomingArgs) {
|
|
|
138
138
|
};
|
|
139
139
|
}
|
|
140
140
|
exports.default = login;
|
|
141
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
141
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9naW4uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvYXV0aC9vcGVyYXRpb25zL2xvZ2luLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQUEsZ0VBQStCO0FBRS9CLHlDQUErRDtBQUUvRCw4RkFBc0U7QUFDdEUsMkRBQW1DO0FBQ25DLG9HQUE0RTtBQUM1RSxxREFBdUY7QUFHdkYsNERBQXlEO0FBQ3pELHNEQUE4QjtBQXFCOUIsS0FBSyxVQUFVLEtBQUssQ0FBSSxZQUF1QjtJQUM3QyxJQUFJLElBQUksR0FBRyxZQUFZLENBQUM7SUFFeEIsd0NBQXdDO0lBQ3hDLCtCQUErQjtJQUMvQix3Q0FBd0M7SUFFeEMsTUFBTSxJQUFJLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsZUFBZSxDQUFDLE1BQU0sQ0FBQyxLQUFLLEVBQUUsU0FBUyxFQUFFLElBQUksRUFBRSxFQUFFO1FBQ2xGLE1BQU0sU0FBUyxDQUFDO1FBRWhCLElBQUksR0FBRyxDQUFDLE1BQU0sSUFBSSxDQUFDO1lBQ2pCLElBQUk7WUFDSixTQUFTLEVBQUUsT0FBTztTQUNuQixDQUFDLENBQUMsSUFBSSxJQUFJLENBQUM7SUFDZCxDQUFDLEVBQUUsT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUM7SUFFdEIsTUFBTSxFQUNKLFVBQVUsRUFBRSxFQUNWLEtBQUssRUFDTCxNQUFNLEVBQUUsZ0JBQWdCLEdBQ3pCLEVBQ0QsSUFBSSxFQUNKLEdBQUcsRUFBRSxFQUNILE9BQU8sRUFBRSxFQUNQLE1BQU0sRUFDTixNQUFNLEdBQ1AsR0FDRixFQUNELEdBQUcsRUFDSCxLQUFLLEVBQ0wsY0FBYyxFQUNkLGdCQUFnQixHQUNqQixHQUFHLElBQUksQ0FBQztJQUVULHdDQUF3QztJQUN4QyxRQUFRO0lBQ1Isd0NBQXdDO0lBRXhDLE1BQU0sRUFBRSxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsUUFBUSxFQUFFLEdBQUcsSUFBSSxDQUFDO0lB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
|
|
@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const passport_jwt_1 = __importDefault(require("passport-jwt"));
|
|
7
|
-
const
|
|
7
|
+
const findByID_1 = __importDefault(require("../../collections/operations/findByID"));
|
|
8
8
|
const getExtractJWT_1 = __importDefault(require("../getExtractJWT"));
|
|
9
9
|
const JwtStrategy = passport_jwt_1.default.Strategy;
|
|
10
10
|
exports.default = ({ secret, config, collections }) => {
|
|
@@ -19,36 +19,15 @@ exports.default = ({ secret, config, collections }) => {
|
|
|
19
19
|
}
|
|
20
20
|
try {
|
|
21
21
|
const collection = collections[token.collection];
|
|
22
|
-
const where = {};
|
|
23
|
-
if (collection.config.auth.verify) {
|
|
24
|
-
where.and = [
|
|
25
|
-
{
|
|
26
|
-
email: {
|
|
27
|
-
equals: token.email,
|
|
28
|
-
},
|
|
29
|
-
},
|
|
30
|
-
{
|
|
31
|
-
_verified: {
|
|
32
|
-
not_equals: false,
|
|
33
|
-
},
|
|
34
|
-
},
|
|
35
|
-
];
|
|
36
|
-
}
|
|
37
|
-
else {
|
|
38
|
-
where.email = {
|
|
39
|
-
equals: token.email,
|
|
40
|
-
};
|
|
41
|
-
}
|
|
42
22
|
const isGraphQL = (req.url || '').replace(/\/$/, '') === config.routes.graphQL.replace(/\/$/, '');
|
|
43
|
-
const
|
|
44
|
-
|
|
23
|
+
const user = await (0, findByID_1.default)({
|
|
24
|
+
id: token.id,
|
|
45
25
|
collection,
|
|
46
26
|
req,
|
|
47
27
|
overrideAccess: true,
|
|
48
28
|
depth: isGraphQL ? 0 : collection.config.auth.depth,
|
|
49
29
|
});
|
|
50
|
-
if (
|
|
51
|
-
const user = userQuery.docs[0];
|
|
30
|
+
if (user && (!collection.config.auth.verify || user._verified)) {
|
|
52
31
|
user.collection = collection.config.slug;
|
|
53
32
|
user._strategy = 'local-jwt';
|
|
54
33
|
done(null, user);
|
|
@@ -62,4 +41,4 @@ exports.default = ({ secret, config, collections }) => {
|
|
|
62
41
|
}
|
|
63
42
|
});
|
|
64
43
|
};
|
|
65
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
44
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiand0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2F1dGgvc3RyYXRlZ2llcy9qd3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSxnRUFBNEQ7QUFHNUQscUZBQTZEO0FBQzdELHFFQUE2QztBQUU3QyxNQUFNLFdBQVcsR0FBRyxzQkFBVyxDQUFDLFFBQVEsQ0FBQztBQUV6QyxrQkFBZSxDQUFDLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxXQUFXLEVBQVcsRUFBb0IsRUFBRTtJQUM1RSxNQUFNLElBQUksR0FBb0I7UUFDNUIsaUJBQWlCLEVBQUUsSUFBSTtRQUN2QixjQUFjLEVBQUUsSUFBQSx1QkFBYSxFQUFDLE1BQU0sQ0FBQztRQUNyQyxXQUFXLEVBQUUsTUFBTTtLQUNwQixDQUFDO0lBRUYsT0FBTyxJQUFJLFdBQVcsQ0FBQyxJQUFJLEVBQUUsS0FBSyxFQUFFLEdBQUcsRUFBRSxLQUFLLEVBQUUsSUFBSSxFQUFFLEVBQUU7UUFDdEQsSUFBSSxHQUFHLENBQUMsSUFBSSxFQUFFO1lBQ1osSUFBSSxDQUFDLElBQUksRUFBRSxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUM7U0FDdEI7UUFFRCxJQUFJO1lBQ0YsTUFBTSxVQUFVLEdBQUcsV0FBVyxDQUFDLEtBQUssQ0FBQyxVQUFVLENBQUMsQ0FBQztZQUVqRCxNQUFNLFNBQVMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxHQUFHLElBQUksRUFBRSxDQUFDLENBQUMsT0FBTyxDQUFDLEtBQUssRUFBRSxFQUFFLENBQUMsS0FBSyxNQUFNLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1lBRWxHLE1BQU0sSUFBSSxHQUFHLE1BQU0sSUFBQSxrQkFBUSxFQUFDO2dCQUMxQixFQUFFLEVBQUUsS0FBSyxDQUFDLEVBQUU7Z0JBQ1osVUFBVTtnQkFDVixHQUFHO2dCQUNILGNBQWMsRUFBRSxJQUFJO2dCQUNwQixLQUFLLEVBQUUsU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLEtBQUs7YUFDcEQsQ0FBQyxDQUFDO1lBRUgsSUFBSSxJQUFJLElBQUksQ0FBQyxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sSUFBSSxJQUFJLENBQUMsU0FBUyxDQUFDLEVBQUU7Z0JBQzlELElBQUksQ0FBQyxVQUFVLEdBQUcsVUFBVSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUM7Z0JBQ3pDLElBQUksQ0FBQyxTQUFTLEdBQUcsV0FBVyxDQUFDO2dCQUM3QixJQUFJLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxDQUFDO2FBQ2xCO2lCQUFNO2dCQUNMLElBQUksQ0FBQyxJQUFJLEVBQUUsS0FBSyxDQUFDLENBQUM7YUFDbkI7U0FDRjtRQUFDLE9BQU8sR0FBRyxFQUFFO1lBQ1osSUFBSSxDQUFDLElBQUksRUFBRSxLQUFLLENBQUMsQ0FBQztTQUNuQjtJQUNILENBQUMsQ0FBQyxDQUFDO0FBQ0wsQ0FBQyxDQUFDIn0=
|
package/dist/auth/types.d.ts
CHANGED
|
@@ -2,6 +2,7 @@ import { Strategy } from 'passport';
|
|
|
2
2
|
import { DeepRequired } from 'ts-essentials';
|
|
3
3
|
import { PayloadRequest } from '../express/types';
|
|
4
4
|
import { Where, PayloadMongooseDocument } from '../types';
|
|
5
|
+
import { Payload } from '..';
|
|
5
6
|
export declare type Permission = {
|
|
6
7
|
permission: boolean;
|
|
7
8
|
where?: Record<string, unknown>;
|
|
@@ -73,6 +74,7 @@ declare type GenerateForgotPasswordEmailSubject = (args?: {
|
|
|
73
74
|
token?: string;
|
|
74
75
|
user?: any;
|
|
75
76
|
}) => Promise<string> | string;
|
|
77
|
+
declare type AuthStrategy = (ctx: Payload) => Strategy | Strategy;
|
|
76
78
|
export interface IncomingAuthType {
|
|
77
79
|
tokenExpiration?: number;
|
|
78
80
|
verify?: boolean | {
|
|
@@ -94,9 +96,8 @@ export interface IncomingAuthType {
|
|
|
94
96
|
};
|
|
95
97
|
disableLocalStrategy?: true;
|
|
96
98
|
strategies?: {
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
logout?: boolean;
|
|
99
|
+
name?: string;
|
|
100
|
+
strategy: AuthStrategy;
|
|
100
101
|
}[];
|
|
101
102
|
}
|
|
102
103
|
export declare type VerifyConfig = {
|
package/dist/auth/types.js
CHANGED
|
@@ -5,4 +5,4 @@ function hasWhereAccessResult(result) {
|
|
|
5
5
|
return result && typeof result === 'object';
|
|
6
6
|
}
|
|
7
7
|
exports.hasWhereAccessResult = hasWhereAccessResult;
|
|
8
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
8
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYXV0aC90eXBlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFpSEEsU0FBZ0Isb0JBQW9CLENBQUMsTUFBdUI7SUFDMUQsT0FBTyxNQUFNLElBQUksT0FBTyxNQUFNLEtBQUssUUFBUSxDQUFDO0FBQzlDLENBQUM7QUFGRCxvREFFQyJ9
|
|
@@ -20,11 +20,11 @@ function generateGraphQLSchema() {
|
|
|
20
20
|
});
|
|
21
21
|
logger.info('Compiling GraphQL schema...');
|
|
22
22
|
fs_1.default.writeFileSync(config.graphQL.schemaOutputFile, (0, graphql_1.printSchema)(__1.default.schema));
|
|
23
|
-
logger.info(`GraphQL written to ${config.
|
|
23
|
+
logger.info(`GraphQL written to ${config.graphQL.schemaOutputFile}`);
|
|
24
24
|
}
|
|
25
25
|
exports.generateGraphQLSchema = generateGraphQLSchema;
|
|
26
26
|
// when generateGraphQLSchema.js is launched directly
|
|
27
27
|
if (module.id === require.main.id) {
|
|
28
28
|
generateGraphQLSchema();
|
|
29
29
|
}
|
|
30
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
30
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2VuZXJhdGVHcmFwaFFMU2NoZW1hLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Jpbi9nZW5lcmF0ZUdyYXBoUUxTY2hlbWEudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsc0NBQXNDO0FBQ3RDLDRDQUFvQjtBQUNwQixxQ0FBc0M7QUFDdEMsaUVBQXlDO0FBQ3pDLDBEQUF3QztBQUN4QywyQ0FBeUI7QUFFekIsU0FBZ0IscUJBQXFCO0lBQ25DLE1BQU0sTUFBTSxHQUFHLElBQUEsZ0JBQU0sR0FBRSxDQUFDO0lBQ3hCLE1BQU0sTUFBTSxHQUFHLElBQUEsY0FBVSxHQUFFLENBQUM7SUFFNUIsV0FBTyxDQUFDLElBQUksQ0FBQztRQUNYLE1BQU0sRUFBRSxZQUFZO1FBQ3BCLFFBQVEsRUFBRSxLQUFLO1FBQ2YsS0FBSyxFQUFFLElBQUk7S0FDWixDQUFDLENBQUM7SUFFSCxNQUFNLENBQUMsSUFBSSxDQUFDLDZCQUE2QixDQUFDLENBQUM7SUFDM0MsWUFBRSxDQUFDLGFBQWEsQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLGdCQUFnQixFQUFFLElBQUEscUJBQVcsRUFBQyxXQUFPLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQztJQUMvRSxNQUFNLENBQUMsSUFBSSxDQUFDLHNCQUFzQixNQUFNLENBQUMsT0FBTyxDQUFDLGdCQUFnQixFQUFFLENBQUMsQ0FBQztBQUN2RSxDQUFDO0FBYkQsc0RBYUM7QUFFRCxxREFBcUQ7QUFDckQsSUFBSSxNQUFNLENBQUMsRUFBRSxLQUFLLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFBRSxFQUFFO0lBQ2pDLHFCQUFxQixFQUFFLENBQUM7Q0FDekIifQ==
|
|
@@ -5,6 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const joi_1 = __importDefault(require("joi"));
|
|
7
7
|
const componentSchema_1 = require("../../utilities/componentSchema");
|
|
8
|
+
const strategyBaseSchema = joi_1.default.object().keys({
|
|
9
|
+
refresh: joi_1.default.boolean(),
|
|
10
|
+
logout: joi_1.default.boolean(),
|
|
11
|
+
});
|
|
8
12
|
const collectionSchema = joi_1.default.object().keys({
|
|
9
13
|
slug: joi_1.default.string().required(),
|
|
10
14
|
labels: joi_1.default.object({
|
|
@@ -82,11 +86,15 @@ const collectionSchema = joi_1.default.object().keys({
|
|
|
82
86
|
}),
|
|
83
87
|
maxLoginAttempts: joi_1.default.number(),
|
|
84
88
|
disableLocalStrategy: joi_1.default.boolean().valid(true),
|
|
85
|
-
strategies: joi_1.default.array().items(joi_1.default.
|
|
89
|
+
strategies: joi_1.default.array().items(joi_1.default.alternatives().try(strategyBaseSchema.keys({
|
|
90
|
+
name: joi_1.default.string().required(),
|
|
91
|
+
strategy: joi_1.default.func()
|
|
92
|
+
.maxArity(1)
|
|
93
|
+
.required(),
|
|
94
|
+
}), strategyBaseSchema.keys({
|
|
95
|
+
name: joi_1.default.string(),
|
|
86
96
|
strategy: joi_1.default.object().required(),
|
|
87
|
-
|
|
88
|
-
logout: joi_1.default.boolean(),
|
|
89
|
-
})),
|
|
97
|
+
}))),
|
|
90
98
|
}), joi_1.default.boolean()),
|
|
91
99
|
versions: joi_1.default.alternatives().try(joi_1.default.object({
|
|
92
100
|
maxPerDoc: joi_1.default.number(),
|
|
@@ -113,4 +121,4 @@ const collectionSchema = joi_1.default.object().keys({
|
|
|
113
121
|
}), joi_1.default.boolean()),
|
|
114
122
|
});
|
|
115
123
|
exports.default = collectionSchema;
|
|
116
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
124
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2NoZW1hLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvbGxlY3Rpb25zL2NvbmZpZy9zY2hlbWEudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSw4Q0FBc0I7QUFDdEIscUVBQWtFO0FBRWxFLE1BQU0sa0JBQWtCLEdBQUcsYUFBRyxDQUFDLE1BQU0sRUFBRSxDQUFDLElBQUksQ0FBQztJQUMzQyxPQUFPLEVBQUUsYUFBRyxDQUFDLE9BQU8sRUFBRTtJQUN0QixNQUFNLEVBQUUsYUFBRyxDQUFDLE9BQU8sRUFBRTtDQUN0QixDQUFDLENBQUM7QUFFSCxNQUFNLGdCQUFnQixHQUFHLGFBQUcsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxJQUFJLENBQUM7SUFDekMsSUFBSSxFQUFFLGFBQUcsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxRQUFRLEVBQUU7SUFDN0IsTUFBTSxFQUFFLGFBQUcsQ0FBQyxNQUFNLENBQUM7UUFDakIsUUFBUSxFQUFFLGFBQUcsQ0FBQyxNQUFNLEVBQUU7UUFDdEIsTUFBTSxFQUFFLGFBQUcsQ0FBQyxNQUFNLEVBQUU7S0FDckIsQ0FBQztJQUNGLE1BQU0sRUFBRSxhQUFHLENBQUMsTUFBTSxDQUFDO1FBQ2pCLE1BQU0sRUFBRSxhQUFHLENBQUMsSUFBSSxFQUFFO1FBQ2xCLElBQUksRUFBRSxhQUFHLENBQUMsSUFBSSxFQUFFO1FBQ2hCLFlBQVksRUFBRSxhQUFHLENBQUMsSUFBSSxFQUFFO1FBQ3hCLE1BQU0sRUFBRSxhQUFHLENBQUMsSUFBSSxFQUFFO1FBQ2xCLE1BQU0sRUFBRSxhQUFHLENBQUMsSUFBSSxFQUFFO1FBQ2xCLE1BQU0sRUFBRSxhQUFHLENBQUMsSUFBSSxFQUFFO1FBQ2xCLEtBQUssRUFBRSxhQUFHLENBQUMsSUFBSSxFQUFFO0tBQ2xCLENBQUM7SUFDRixVQUFVLEVBQUUsYUFBRyxDQUFDLE9BQU8sRUFBRTtJQUN6QixLQUFLLEVBQUUsYUFBRyxDQUFDLE1BQU0sQ0FBQztR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
|
|
@@ -0,0 +1,90 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.getDataLoader = void 0;
|
|
7
|
+
const dataloader_1 = __importDefault(require("dataloader"));
|
|
8
|
+
// Payload uses `dataloader` to solve the classic GraphQL N+1 problem.
|
|
9
|
+
// We keep a list of all documents requested to be populated for any given request
|
|
10
|
+
// and then batch together documents within the same collection,
|
|
11
|
+
// making only 1 find per each collection, rather than `findByID` per each requested doc.
|
|
12
|
+
// This dramatically improves performance for REST and Local API `depth` populations,
|
|
13
|
+
// and also ensures complex GraphQL queries perform lightning-fast.
|
|
14
|
+
const batchAndLoadDocs = (req) => async (keys) => {
|
|
15
|
+
const { payload } = req;
|
|
16
|
+
// Create docs array of same length as keys, using null as value
|
|
17
|
+
// We will replace nulls with injected docs as they are retrieved
|
|
18
|
+
const docs = keys.map(() => null);
|
|
19
|
+
// Batch IDs by their `find` args
|
|
20
|
+
// so we can make one find query per combination of collection, depth, locale, and fallbackLocale.
|
|
21
|
+
// Resulting shape will be as follows:
|
|
22
|
+
// {
|
|
23
|
+
// // key is stringified set of find args
|
|
24
|
+
// '["pages",2,0,"es","en",false,false]': [
|
|
25
|
+
// // value is array of IDs to find with these args
|
|
26
|
+
// 'q34tl23462346234524',
|
|
27
|
+
// '435523540194324280',
|
|
28
|
+
// '2346245j35l3j5234532li',
|
|
29
|
+
// ],
|
|
30
|
+
// // etc
|
|
31
|
+
// };
|
|
32
|
+
const batchByFindArgs = keys.reduce((batches, key) => {
|
|
33
|
+
const [collection, id, depth, currentDepth, locale, fallbackLocale, overrideAccess, showHiddenFields] = JSON.parse(key);
|
|
34
|
+
const batchKeyArray = [
|
|
35
|
+
collection,
|
|
36
|
+
depth,
|
|
37
|
+
currentDepth,
|
|
38
|
+
locale,
|
|
39
|
+
fallbackLocale,
|
|
40
|
+
overrideAccess,
|
|
41
|
+
showHiddenFields,
|
|
42
|
+
];
|
|
43
|
+
const batchKey = JSON.stringify(batchKeyArray);
|
|
44
|
+
return {
|
|
45
|
+
...batches,
|
|
46
|
+
[batchKey]: [
|
|
47
|
+
...batches[batchKey] || [],
|
|
48
|
+
id,
|
|
49
|
+
],
|
|
50
|
+
};
|
|
51
|
+
}, {});
|
|
52
|
+
// Run find requests in parallel
|
|
53
|
+
const results = Object.entries(batchByFindArgs).map(async ([batchKey, ids]) => {
|
|
54
|
+
const [collection, depth, currentDepth, locale, fallbackLocale, overrideAccess, showHiddenFields] = JSON.parse(batchKey);
|
|
55
|
+
const result = await payload.find({
|
|
56
|
+
collection,
|
|
57
|
+
locale,
|
|
58
|
+
fallbackLocale,
|
|
59
|
+
depth,
|
|
60
|
+
currentDepth,
|
|
61
|
+
pagination: false,
|
|
62
|
+
where: {
|
|
63
|
+
id: {
|
|
64
|
+
in: ids,
|
|
65
|
+
},
|
|
66
|
+
},
|
|
67
|
+
overrideAccess: Boolean(overrideAccess),
|
|
68
|
+
showHiddenFields: Boolean(showHiddenFields),
|
|
69
|
+
disableErrors: true,
|
|
70
|
+
req,
|
|
71
|
+
});
|
|
72
|
+
// For each returned doc, find index in original keys
|
|
73
|
+
// Inject doc within docs array if index exists
|
|
74
|
+
result.docs.forEach((doc) => {
|
|
75
|
+
const docKey = JSON.stringify([collection, doc.id, depth, currentDepth, locale, fallbackLocale, overrideAccess, showHiddenFields]);
|
|
76
|
+
const docsIndex = keys.findIndex((key) => key === docKey);
|
|
77
|
+
if (docsIndex > -1) {
|
|
78
|
+
docs[docsIndex] = doc;
|
|
79
|
+
}
|
|
80
|
+
});
|
|
81
|
+
});
|
|
82
|
+
await Promise.all(results);
|
|
83
|
+
// Return docs array,
|
|
84
|
+
// which has now been injected with all fetched docs
|
|
85
|
+
// and should match the length of the incoming keys arg
|
|
86
|
+
return docs;
|
|
87
|
+
};
|
|
88
|
+
const getDataLoader = (req) => new dataloader_1.default(batchAndLoadDocs(req));
|
|
89
|
+
exports.getDataLoader = getDataLoader;
|
|
90
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGF0YWxvYWRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb2xsZWN0aW9ucy9kYXRhbG9hZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLDREQUFxRDtBQUlyRCxzRUFBc0U7QUFFdEUsa0ZBQWtGO0FBQ2xGLGdFQUFnRTtBQUNoRSx5RkFBeUY7QUFFekYscUZBQXFGO0FBQ3JGLG1FQUFtRTtBQUVuRSxNQUFNLGdCQUFnQixHQUFHLENBQUMsR0FBbUIsRUFBbUMsRUFBRSxDQUFDLEtBQUssRUFBRSxJQUFjLEVBQXlCLEVBQUU7SUFDakksTUFBTSxFQUFFLE9BQU8sRUFBRSxHQUFHLEdBQUcsQ0FBQztJQUV4QixnRUFBZ0U7SUFDaEUsaUVBQWlFO0lBQ2pFLE1BQU0sSUFBSSxHQUEwQixJQUFJLENBQUMsR0FBRyxDQUFDLEdBQUcsRUFBRSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBRXpELGlDQUFpQztJQUNqQyxrR0FBa0c7SUFFbEcsc0NBQXNDO0lBRXRDLElBQUk7SUFDSiwyQ0FBMkM7SUFDM0MsNkNBQTZDO0lBQzdDLHVEQUF1RDtJQUN2RCw2QkFBNkI7SUFDN0IsNEJBQTRCO0lBQzVCLGdDQUFnQztJQUNoQyxPQUFPO0lBQ1AsV0FBVztJQUNYLEtBQUs7SUFFTCxNQUFNLGVBQWUsR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUMsT0FBTyxFQUFFLEdBQUcsRUFBRSxFQUFFO1FBQ25ELE1BQU0sQ0FBQyxVQUFVLEVBQUUsRUFBRSxFQUFFLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSxFQUFFLGNBQWMsRUFBRSxjQUFjLEVBQUUsZ0JBQWdCLENBQUMsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBRXhILE1BQU0sYUFBYSxHQUFHO1lBQ3BCLFVBQVU7WUFDVixLQUFLO1lBQ0wsWUFBWTtZQUNaLE1BQU07WUFDTixjQUFjO1lBQ2QsY0FBYztZQUNkLGdCQUFnQjtTQUNqQixDQUFDO1FBRUYsTUFBTSxRQUFRLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUUvQyxPQUFPO1lBQ0wsR0FBRyxPQUFPO1lBQ1YsQ0FBQyxRQUFRLENBQUMsRUFBRTtnQkFDVixHQUFHLE9BQU8sQ0FBQyxRQUFRLENBQUMsSUFBSSxFQUFFO2dCQUMxQixFQUFFO2FBQ0g7U0FDRixDQUFDO0lBQ0osQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDO0lBRVAsZ0NBQWdDO0lBRWhDLE1BQU0sT0FBTyxHQUFHLE1BQU0sQ0FBQyxPQUFPLENBQUMsZUFBZSxDQUFDLENBQUMsR0FBRyxDQUFDLEtBQUssRUFBRSxDQUFDLFFBQVEsRUFBRSxHQUFHLENBQUMsRUFBRSxFQUFFO1FBQzVFLE1BQU0sQ0FBQyxVQUFVLEVBQUUsS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLEVBQUUsY0FBYyxFQUFFLGNBQWMsRUFBRSxnQkFBZ0IsQ0FBQyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUM7UUFFekgsTUFBTSxNQUFNLEdBQUcsTUFBTSxPQUFPLENBQUMsSUFBSSxDQUFDO1lBQ2hDLFVBQVU7WUFDVixNQUFNO1lBQ04sY0FBYztZQUNkLEtBQUs7WUFDTCxZQUFZO1lBQ1osVUFBVSxFQUFFLEtBQUs7WUFDakIsS0FBSyxFQUFFO2dCQUNMLEVBQUUsRUFBRTtvQkFDRixFQUFFLEVBQUUsR0FBRztpQkFDUjthQUNGO1lBQ0QsY0FBYyxFQUFFLE9BQU8sQ0FBQyxjQUFjLENBQUM7WUFDdkMsZ0JBQWdCLEVBQUUsT0FBTyxDQUFDLGdCQUFnQixDQUFDO1lBQzNDLGFBQWEsRUFBRSxJQUFJO1lBQ25CLEdBQUc7U0FDSixDQUFDLENBQUM7UUFFSCxxREFBcUQ7UUFDckQsK0NBQStDO1FBRS9DLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUMsR0FBRyxFQUFFLEVBQUU7WUFDMUIsTUFBTSxNQUFNLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDLFVBQVUsRUFBRSxHQUFHLENBQUMsRUFBRSxFQUFFLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSxFQUFFLGNBQWMsRUFBRSxjQUFjLEVBQUUsZ0JBQWdCLENBQUMsQ0FBQyxDQUFDO1lBQ25JLE1BQU0sU0FBUyxHQUFHLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUFDLEdBQUcsS0FBSyxNQUFNLENBQUMsQ0FBQztZQUUxRCxJQUFJLFNBQVMsR0FBRyxDQUFDLENBQUMsRUFBRTtnQkFDbEIsSUFBSSxDQUFDLFNBQVMsQ0FBQyxHQUFHLEdBQUcsQ0FBQzthQUN2QjtRQUNILENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQyxDQUFDLENBQUM7SUFFSCxNQUFNLE9BQU8sQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUM7SUFFM0IscUJBQXFCO0lBQ3JCLG9EQUFvRDtJQUNwRCx1REFBdUQ7SUFDdkQsT0FBTyxJQUFJLENBQUM7QUFDZCxDQUFDLENBQUM7QUFFSyxNQUFNLGFBQWEsR0FBRyxDQUFDLEdBQW1CLEVBQUUsRUFBRSxDQUFDLElBQUksb0JBQVUsQ0FBQyxnQkFBZ0IsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO0FBQS9FLFFBQUEsYUFBYSxpQkFBa0UifQ==
|
|
@@ -113,7 +113,7 @@ function initCollectionsGraphQL(payload) {
|
|
|
113
113
|
payload.Query.fields[singularLabel] = {
|
|
114
114
|
type: collection.graphQL.type,
|
|
115
115
|
args: {
|
|
116
|
-
id: { type: idType },
|
|
116
|
+
id: { type: new graphql_1.GraphQLNonNull(idType) },
|
|
117
117
|
draft: { type: graphql_1.GraphQLBoolean },
|
|
118
118
|
...(payload.config.localization ? {
|
|
119
119
|
locale: { type: payload.types.localeInputType },
|
|
@@ -343,4 +343,4 @@ function initCollectionsGraphQL(payload) {
|
|
|
343
343
|
});
|
|
344
344
|
}
|
|
345
345
|
exports.default = initCollectionsGraphQL;
|
|
346
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/collections/graphql/init.ts"],"names":[],"mappings":"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"}
|
|
346
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/collections/graphql/init.ts"],"names":[],"mappings":"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"}
|
package/dist/collections/init.js
CHANGED
|
@@ -79,8 +79,9 @@ function registerCollections(ctx) {
|
|
|
79
79
|
passport_1.default.use(`${AuthCollection.config.slug}-api-key`, (0, apiKey_1.default)(ctx, AuthCollection));
|
|
80
80
|
}
|
|
81
81
|
if (Array.isArray(collection.auth.strategies)) {
|
|
82
|
-
collection.auth.strategies.forEach(({ strategy }) => {
|
|
83
|
-
|
|
82
|
+
collection.auth.strategies.forEach(({ name, strategy }, index) => {
|
|
83
|
+
const passportStrategy = typeof strategy === 'object' ? strategy : strategy(ctx);
|
|
84
|
+
passport_1.default.use(`${AuthCollection.config.slug}-${name !== null && name !== void 0 ? name : index}`, passportStrategy);
|
|
84
85
|
});
|
|
85
86
|
}
|
|
86
87
|
}
|
|
@@ -92,4 +93,4 @@ function registerCollections(ctx) {
|
|
|
92
93
|
});
|
|
93
94
|
}
|
|
94
95
|
exports.default = registerCollections;
|
|
95
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
96
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5pdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb2xsZWN0aW9ucy9pbml0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQUEsd0RBQWdDO0FBQ2hDLGdGQUE0QztBQUM1QyxzREFBOEI7QUFDOUIsd0RBQWdDO0FBQ2hDLHNGQUE0RDtBQUU1RCw2RUFBaUY7QUFDakYsd0VBQXNEO0FBQ3RELHVFQUF1RDtBQUN2RCxnRUFBa0Q7QUFDbEQsMEVBQWtEO0FBQ2xELHNFQUF3RDtBQUd4RCwyRUFBd0U7QUFDeEUsK0VBQXVEO0FBQ3ZELHNFQUE4QztBQUU5QyxTQUF3QixtQkFBbUIsQ0FBQyxHQUFZO0lBQ3RELEdBQUcsQ0FBQyxNQUFNLENBQUMsV0FBVyxHQUFHLEdBQUcsQ0FBQyxNQUFNLENBQUMsV0FBVyxDQUFDLEdBQUcsQ0FBQyxDQUFDLFVBQXFDLEVBQUUsRUFBRTtRQUM1RixNQUFNLG1CQUFtQixHQUFHLFVBQVUsQ0FBQztRQUV2QyxNQUFNLE1BQU0sR0FBRyxJQUFBLHFCQUFxQixFQUFDLG1CQUFtQixFQUFFLEdBQUcsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUV0RSxJQUFJLFVBQVUsQ0FBQyxJQUFJLElBQUksQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLG9CQUFvQixFQUFFO1lBQzVELE1BQU0sQ0FBQyxNQUFNLENBQUMsaUNBQXFCLEVBQUU7Z0JBQ25DLGFBQWEsRUFBRSxPQUFPO2FBQ3ZCLENBQUMsQ0FBQztZQUdILE1BQU0sRUFBRSxnQkFBZ0IsRUFBRSxRQUFRLEVBQUUsR0FBRyxVQUFVLENBQUMsSUFBSSxDQUFDO1lBRXZELElBQUksZ0JBQWdCLEdBQUcsQ0FBQyxFQUFFO2dCQU94QixzQ0FBc0M7Z0JBQ3RDLE1BQU0sQ0FBQyxPQUFPLENBQUMsZ0JBQWdCLEdBQUcsVUFBaUQsRUFBRTtvQkFDbkYsbUNBQW1DO29CQUNuQyxJQUFJLElBQUksQ0FBQyxTQUFTLElBQUksSUFBSSxDQUFDLFNBQVMsR0FBRyxJQUFJLENBQUMsR0FBRyxFQUFFLEVBQUU7d0JBQ2pELE9BQU8sSUFBSSxDQUFDLFNBQVMsQ0FBQzs0QkFDcEIsSUFBSSxFQUFFLEVBQUUsYUFBYSxFQUFFLENBQUMsRUFBRTs0QkFDMUIsTUFBTSxFQUFFLEVBQUUsU0FBUyxFQUFFLENBQUMsRUFBRTt5QkFDekIsRUFBRSxFQUFFLENBQUMsQ0FBQztxQkFDUjtvQkFFRCxNQUFNLE9BQU8sR0FBNkIsRUFBRSxJQUFJLEVBQUUsRUFBRSxhQUFhLEVBQUUsQ0FBQyxFQUFFLEVBQUUsQ0FBQztvQkFDekUsNkRBQTZEO29CQUM3RCxJQUFJLElBQUksQ0FBQyxhQUFhLEdBQUcsQ0FBQyxJQUFJLGdCQUFnQixJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRTt3QkFDaEUsT0FBTyxDQUFDLElBQUksR0FBRyxFQUFFLFNBQVMsRUFBRSxJQUFJLENBQUMsR0FBRyxFQUFFLEdBQUcsUUFBUSxFQUFFLENBQUM7cUJBQ3JEO29CQUNELE9BQU8sSUFBSSxDQUFDLFNBQVMsQ0FBQyxPQUE0QixFQUFFLEVBQUUsQ0FBQyxDQUFDO2dCQUMxRCxDQUFDLENBQUM7Z0JBRUYsc0NBQXNDO2dCQUN0QyxNQUFNLENBQUMsT0FBTyxDQUFDLGtCQUFrQixHQUFHLFVBQVUsRUFBRTtvQkFDOUMsT0FBTyxJQUFJLENBQUMsU0FBUyxDQUFDO3dCQUNwQixJQUFJLEVBQUUsRUFBRSxhQUFhLEVBQUUsQ0FBQyxFQUFFO3dCQUMxQixNQUFNLEVBQUUsRUFBRSxTQUFTLEVBQUUsQ0FBQyxFQUFFO3FCQUN6QixFQUFFLEVBQUUsQ0FBQyxDQUFDO2dCQUNULENBQUMsQ0FBQzthQUNIO1NBQ0Y7UUFFRCxJQUFJLFVBQVUsQ0FBQyxRQUFRLEVBQUU7WUFDdkIsTUFBTSxnQkFBZ0IsR0FBRyxJQUFBLDJDQUFvQixFQUFDLFVBQVUsQ0FBQyxDQUFDO1lBRTFELE1BQU0sYUFBYSxHQUFHLElBQUEscUJBQVcsRUFDL0IsR0FBRyxDQUFDLE1BQU0sRUFDVixJQUFBLG9EQUE0QixFQUFDLFVBQVUsQ0FBQyxFQUN4QztnQkFDRSxhQUFhLEVBQUUsSUFBSTtnQkFDbkIsT0FBTyxFQUFFO29CQUNQLFVBQVUsRUFBRSxJQUFJO2lCQUNqQjthQUNGLENBQ0YsQ0FBQztZQUVGLGFBQWEsQ0FBQyxNQUFNLENBQUMsOEJBQVEsRUFBRSxFQUFFLGlCQUFpQixFQUFFLElBQUksRUFBRSxDQUFDO2lCQUN4RCxNQUFNLENBQUMsb0JBQWdCLENBQUMsQ0FBQztZQUU1QixHQUFHLENBQUMsUUFBUSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsR0FBRyxrQkFBUSxDQUFDLEtBQUssQ0FBQyxnQkFBZ0IsRUFBRSxhQUFhLENBQW9CLENBQUM7U0FDcEc7UUFHRCxHQUFHLENBQUMsV0FBVyxDQUFDLG1CQUFtQixDQUFDLElBQUksQ0FBQyxHQUFHO1lBQzFDLEtBQUssRUFBRSxrQkFBUSxDQUFDLEtBQUssQ0FBQyxtQkFBbUIsQ0FBQyxJQUFJLEVBQUUsTUFBTSxDQUFvQjtZQUMxRSxNQUFNLEVBQUUsbUJBQW1CO1NBQzVCLENBQUM7UUFFRiw0QkFBNEI7UUFDNUIsSUFBSSxDQUFDLEdBQUcsQ0FBQyxLQUFLLEVBQUU7WUFDZCxNQUFNLE1BQU0sR0FBRyxpQkFBTyxDQUFDLE1BQU0sRUFBRSxDQUFDO1lBQ2hDLE1BQU0sRUFBRSxJQUFJLEVBQUUsR0FBRyxVQUFVLENBQUM7WUFFNUIsTUFBTSxDQUFDLEdBQUcsQ0FBQyxHQUFHLEVBQUUsSUFBQSx3QkFBd0IsRUFBQyxHQUFHLENBQUMsV0FBVyxDQUFDLG1CQUFtQixDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUVyRixJQUFJLFVBQVUsQ0FBQyxJQUFJLEVBQUU7Z0JBQ25CLE1BQU0sY0FBYyxHQUFHLEdBQUcsQ0FBQyxXQUFXLENBQUMsbUJBQW1CLENBQUMsSUFBSSxDQUFDLENBQUM7Z0JBRWpFLElBQUksVUFBVSxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUU7b0JBQzdCLGtCQUFRLENBQUMsR0FBRyxDQUFDLEdBQUcsY0FBYyxDQUFDLE1BQU0sQ0FBQyxJQUFJLFVBQVUsRUFBRSxJQUFBLGdCQUFjLEVBQUMsR0FBRyxFQUFFLGNBQWMsQ0FBQyxDQUFDLENBQUM7aUJBQzVGO2dCQUVELElBQUksS0FBSyxDQUFDLE9BQU8sQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxFQUFFO29CQUM3QyxVQUFVLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxPQUFPLENBQUMsQ0FBQyxFQUFFLElBQUksRUFBRSxRQUFRLEVBQUUsRUFBRSxLQUFLLEVBQUUsRUFBRTt3QkFDL0QsTUFBTSxnQkFBZ0IsR0FBRyxPQUFPLFFBQVEsS0FBSyxRQUFRLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxDQUFDO3dCQUNqRixrQkFBUSxDQUFDLEdBQUcsQ0FBQyxHQUFHLGNBQWMsQ0FBQyxNQUFNLENBQUMsSUFBSSxJQUFJLElBQUksYUFBSixJQUFJLGNBQUosSUFBSSxHQUFJLEtBQUssRUFBRSxFQUFFLGdCQUFnQixDQUFDLENBQUM7b0JBQ25GLENBQUMsQ0FBQyxDQUFDO2lCQUNKO2FBQ0Y7WUFFRCxNQUFNLFNBQVMsR0FBRyxJQUFBLHdCQUFjLEVBQUMsVUFBVSxDQUFDLENBQUM7WUFDN0MsSUFBQSx3QkFBYyxFQUFDLE1BQU0sRUFBRSxTQUFTLENBQUMsQ0FBQztZQUVsQyxHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxJQUFJLElBQUksRUFBRSxFQUFFLE1BQU0sQ0FBQyxDQUFDO1NBQ3BDO1FBRUQsT0FBTyxtQkFBbUIsQ0FBQztJQUM3QixDQUFDLENBQUMsQ0FBQztBQUNMLENBQUM7QUF6R0Qsc0NBeUdDIn0=
|
|
@@ -9,8 +9,10 @@ export declare type Arguments = {
|
|
|
9
9
|
limit?: number;
|
|
10
10
|
sort?: string;
|
|
11
11
|
depth?: number;
|
|
12
|
+
currentDepth?: number;
|
|
12
13
|
req?: PayloadRequest;
|
|
13
14
|
overrideAccess?: boolean;
|
|
15
|
+
disableErrors?: boolean;
|
|
14
16
|
pagination?: boolean;
|
|
15
17
|
showHiddenFields?: boolean;
|
|
16
18
|
draft?: boolean;
|
|
@@ -24,7 +24,7 @@ async function find(incomingArgs) {
|
|
|
24
24
|
operation: 'read',
|
|
25
25
|
})) || args;
|
|
26
26
|
}, Promise.resolve());
|
|
27
|
-
const { where, page, limit, depth, draft: draftsEnabled, collection: { Model, config: collectionConfig, }, req, req: { locale, payload, }, overrideAccess, showHiddenFields, pagination = true, } = args;
|
|
27
|
+
const { where, page, limit, depth, currentDepth, draft: draftsEnabled, collection: { Model, config: collectionConfig, }, req, req: { locale, payload, }, overrideAccess, disableErrors, showHiddenFields, pagination = true, } = args;
|
|
28
28
|
// /////////////////////////////////////
|
|
29
29
|
// Access
|
|
30
30
|
// /////////////////////////////////////
|
|
@@ -50,7 +50,22 @@ async function find(incomingArgs) {
|
|
|
50
50
|
}
|
|
51
51
|
let accessResult;
|
|
52
52
|
if (!overrideAccess) {
|
|
53
|
-
accessResult = await (0, executeAccess_1.default)({ req }, collectionConfig.access.read);
|
|
53
|
+
accessResult = await (0, executeAccess_1.default)({ req, disableErrors }, collectionConfig.access.read);
|
|
54
|
+
// If errors are disabled, and access returns false, return empty results
|
|
55
|
+
if (accessResult === false) {
|
|
56
|
+
return {
|
|
57
|
+
docs: [],
|
|
58
|
+
totalDocs: 0,
|
|
59
|
+
totalPages: 1,
|
|
60
|
+
page: 1,
|
|
61
|
+
pagingCounter: 1,
|
|
62
|
+
hasPrevPage: false,
|
|
63
|
+
hasNextPage: false,
|
|
64
|
+
prevPage: null,
|
|
65
|
+
nextPage: null,
|
|
66
|
+
limit,
|
|
67
|
+
};
|
|
68
|
+
}
|
|
54
69
|
if ((0, types_1.hasWhereAccessResult)(accessResult)) {
|
|
55
70
|
queryToBuild.where.and.push(accessResult);
|
|
56
71
|
}
|
|
@@ -75,6 +90,11 @@ async function find(incomingArgs) {
|
|
|
75
90
|
const paginatedDocs = await Model.paginate(query, optionsToExecute);
|
|
76
91
|
let result = {
|
|
77
92
|
...paginatedDocs,
|
|
93
|
+
docs: paginatedDocs.docs.map((doc) => {
|
|
94
|
+
const sanitizedDoc = JSON.parse(JSON.stringify(doc));
|
|
95
|
+
sanitizedDoc.id = sanitizedDoc._id;
|
|
96
|
+
return (0, sanitizeInternalFields_1.default)(sanitizedDoc);
|
|
97
|
+
}),
|
|
78
98
|
};
|
|
79
99
|
// /////////////////////////////////////
|
|
80
100
|
// Replace documents with drafts if available
|
|
@@ -97,8 +117,7 @@ async function find(incomingArgs) {
|
|
|
97
117
|
result = {
|
|
98
118
|
...result,
|
|
99
119
|
docs: await Promise.all(result.docs.map(async (doc) => {
|
|
100
|
-
|
|
101
|
-
let docRef = JSON.parse(docString);
|
|
120
|
+
let docRef = doc;
|
|
102
121
|
await collectionConfig.hooks.beforeRead.reduce(async (priorHook, hook) => {
|
|
103
122
|
await priorHook;
|
|
104
123
|
docRef = await hook({ req, query, doc: docRef }) || docRef;
|
|
@@ -113,6 +132,7 @@ async function find(incomingArgs) {
|
|
|
113
132
|
...result,
|
|
114
133
|
docs: await Promise.all(result.docs.map(async (doc) => (0, afterRead_1.afterRead)({
|
|
115
134
|
depth,
|
|
135
|
+
currentDepth,
|
|
116
136
|
doc,
|
|
117
137
|
entityConfig: collectionConfig,
|
|
118
138
|
overrideAccess,
|
|
@@ -138,11 +158,7 @@ async function find(incomingArgs) {
|
|
|
138
158
|
// /////////////////////////////////////
|
|
139
159
|
// Return results
|
|
140
160
|
// /////////////////////////////////////
|
|
141
|
-
result = {
|
|
142
|
-
...result,
|
|
143
|
-
docs: result.docs.map((doc) => (0, sanitizeInternalFields_1.default)(doc)),
|
|
144
|
-
};
|
|
145
161
|
return result;
|
|
146
162
|
}
|
|
147
163
|
exports.default = find;
|
|
148
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
164
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmluZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb2xsZWN0aW9ucy9vcGVyYXRpb25zL2ZpbmQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFFQSw2RUFBcUQ7QUFDckQsb0dBQTRFO0FBRzVFLDRDQUF3RDtBQUN4RCxzR0FBOEU7QUFDOUUsa0VBQStEO0FBQy9ELG9IQUE0RjtBQUU1Riw0REFBeUQ7QUFrQnpELDhEQUE4RDtBQUM5RCxLQUFLLFVBQVUsSUFBSSxDQUE2QixZQUF1Qjs7SUFDckUsSUFBSSxJQUFJLEdBQUcsWUFBWSxDQUFDO0lBRXhCLHdDQUF3QztJQUN4QywrQkFBK0I7SUFDL0Isd0NBQXdDO0lBRXhDLE1BQU0sSUFBSSxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLGVBQWUsQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFFLFNBQVMsRUFBRSxJQUFJLEVBQUUsRUFBRTtRQUNsRixNQUFNLFNBQVMsQ0FBQztRQUVoQixJQUFJLEdBQUcsQ0FBQyxNQUFNLElBQUksQ0FBQztZQUNqQixJQUFJO1lBQ0osU0FBUyxFQUFFLE1BQU07U0FDbEIsQ0FBQyxDQUFDLElBQUksSUFBSSxDQUFDO0lBQ2QsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDO0lBRXRCLE1BQU0sRUFDSixLQUFLLEVBQ0wsSUFBSSxFQUNKLEtBQUssRUFDTCxLQUFLLEVBQ0wsWUFBWSxFQUNaLEtBQUssRUFBRSxhQUFhLEVBQ3BCLFVBQVUsRUFBRSxFQUNWLEtBQUssRUFDTCxNQUFNLEVBQUUsZ0JBQWdCLEdBQ3pCLEVBQ0QsR0FBRyxFQUNILEdBQUcsRUFBRSxFQUNILE1BQU0sRUFDTixPQUFPLEdBQ1IsRUFDRCxjQUFjLEVBQ2QsYUFBYSxFQUNiLGdCQUFnQixFQUNoQixVQUFVLEdBQUcsSUFBSSxHQUNsQixHQUFHLElBQUksQ0FBQztJQUVULHdDQUF3QztJQUN4QyxTQUFTO0lBQ1Qsd0NB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
|
|
@@ -5,10 +5,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const getFileByPath_1 = __importDefault(require("../../../uploads/getFileByPath"));
|
|
7
7
|
const create_1 = __importDefault(require("../create"));
|
|
8
|
+
const dataloader_1 = require("../../dataloader");
|
|
8
9
|
async function createLocal(payload, options) {
|
|
9
10
|
var _a, _b, _c;
|
|
10
|
-
const { collection: collectionSlug, depth, locale, fallbackLocale, data, user, overrideAccess = true, disableVerificationEmail, showHiddenFields, filePath, file, overwriteExistingFiles = false, req, draft, } = options;
|
|
11
|
+
const { collection: collectionSlug, depth, locale, fallbackLocale, data, user, overrideAccess = true, disableVerificationEmail, showHiddenFields, filePath, file, overwriteExistingFiles = false, req: incomingReq, draft, } = options;
|
|
11
12
|
const collection = payload.collections[collectionSlug];
|
|
13
|
+
const req = {
|
|
14
|
+
...incomingReq || {},
|
|
15
|
+
user,
|
|
16
|
+
payloadAPI: 'local',
|
|
17
|
+
locale: locale || (incomingReq === null || incomingReq === void 0 ? void 0 : incomingReq.locale) || (((_a = payload === null || payload === void 0 ? void 0 : payload.config) === null || _a === void 0 ? void 0 : _a.localization) ? (_c = (_b = payload === null || payload === void 0 ? void 0 : payload.config) === null || _b === void 0 ? void 0 : _b.localization) === null || _c === void 0 ? void 0 : _c.defaultLocale : null),
|
|
18
|
+
fallbackLocale: fallbackLocale || (incomingReq === null || incomingReq === void 0 ? void 0 : incomingReq.fallbackLocale) || null,
|
|
19
|
+
payload,
|
|
20
|
+
files: {
|
|
21
|
+
file: file !== null && file !== void 0 ? file : (0, getFileByPath_1.default)(filePath),
|
|
22
|
+
},
|
|
23
|
+
};
|
|
24
|
+
if (!req.payloadDataLoader)
|
|
25
|
+
req.payloadDataLoader = (0, dataloader_1.getDataLoader)(req);
|
|
12
26
|
return (0, create_1.default)({
|
|
13
27
|
depth,
|
|
14
28
|
data,
|
|
@@ -18,18 +32,8 @@ async function createLocal(payload, options) {
|
|
|
18
32
|
showHiddenFields,
|
|
19
33
|
overwriteExistingFiles,
|
|
20
34
|
draft,
|
|
21
|
-
req
|
|
22
|
-
...req || {},
|
|
23
|
-
user,
|
|
24
|
-
payloadAPI: 'local',
|
|
25
|
-
locale: locale || (req === null || req === void 0 ? void 0 : req.locale) || (((_a = payload === null || payload === void 0 ? void 0 : payload.config) === null || _a === void 0 ? void 0 : _a.localization) ? (_c = (_b = payload === null || payload === void 0 ? void 0 : payload.config) === null || _b === void 0 ? void 0 : _b.localization) === null || _c === void 0 ? void 0 : _c.defaultLocale : null),
|
|
26
|
-
fallbackLocale: fallbackLocale || (req === null || req === void 0 ? void 0 : req.fallbackLocale) || null,
|
|
27
|
-
payload,
|
|
28
|
-
files: {
|
|
29
|
-
file: file !== null && file !== void 0 ? file : (0, getFileByPath_1.default)(filePath),
|
|
30
|
-
},
|
|
31
|
-
},
|
|
35
|
+
req,
|
|
32
36
|
});
|
|
33
37
|
}
|
|
34
38
|
exports.default = createLocal;
|
|
35
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
39
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JlYXRlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL2NvbGxlY3Rpb25zL29wZXJhdGlvbnMvbG9jYWwvY3JlYXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBR0EsbUZBQTJEO0FBQzNELHVEQUErQjtBQUUvQixpREFBaUQ7QUFvQmxDLEtBQUssVUFBVSxXQUFXLENBQVUsT0FBZ0IsRUFBRSxPQUFtQjs7SUFDdEYsTUFBTSxFQUNKLFVBQVUsRUFBRSxjQUFjLEVBQzFCLEtBQUssRUFDTCxNQUFNLEVBQ04sY0FBYyxFQUNkLElBQUksRUFDSixJQUFJLEVBQ0osY0FBYyxHQUFHLElBQUksRUFDckIsd0JBQXdCLEVBQ3hCLGdCQUFnQixFQUNoQixRQUFRLEVBQ1IsSUFBSSxFQUNKLHNCQUFzQixHQUFHLEtBQUssRUFDOUIsR0FBRyxFQUFFLFdBQVcsRUFDaEIsS0FBSyxHQUNOLEdBQUcsT0FBTyxDQUFDO0lBRVosTUFBTSxVQUFVLEdBQUcsT0FBTyxDQUFDLFdBQVcsQ0FBQyxjQUFjLENBQUMsQ0FBQztJQUV2RCxNQUFNLEdBQUcsR0FBRztRQUNWLEdBQUcsV0FBVyxJQUFJLEVBQUU7UUFDcEIsSUFBSTtRQUNKLFVBQVUsRUFBRSxPQUFPO1FBQ25CLE1BQU0sRUFBRSxNQUFNLEtBQUksV0FBVyxhQUFYLFdBQVcsdUJBQVgsV0FBVyxDQUFFLE1BQU0sQ0FBQSxJQUFJLENBQUMsQ0FBQSxNQUFBLE9BQU8sYUFBUCxPQUFPLHVCQUFQLE9BQU8sQ0FBRSxNQUFNLDBDQUFFLFlBQVksRUFBQyxDQUFDLENBQUMsTUFBQSxNQUFBLE9BQU8sYUFBUCxPQUFPLHVCQUFQLE9BQU8sQ0FBRSxNQUFNLDBDQUFFLFlBQVksMENBQUUsYUFBYSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUM7UUFDOUgsY0FBYyxFQUFFLGNBQWMsS0FBSSxXQUFXLGFBQVgsV0FBVyx1QkFBWCxXQUFXLENBQUUsY0FBYyxDQUFBLElBQUksSUFBSTtRQUNyRSxPQUFPO1FBQ1AsS0FBSyxFQUFFO1lBQ0wsSUFBSSxFQUFFLElBQUksYUFBSixJQUFJLGNBQUosSUFBSSxHQUFJLElBQUEsdUJBQWEsRUFBQyxRQUFRLENBQUM7U0FDdEM7S0FDZ0IsQ0FBQztJQUVwQixJQUFJLENBQUMsR0FBRyxDQUFDLGlCQUFpQjtRQUFFLEdBQUcsQ0FBQyxpQkFBaUIsR0FBRyxJQUFBLDBCQUFhLEVBQUMsR0FBRyxDQUFDLENBQUM7SUFFdkUsT0FBTyxJQUFBLGdCQUFNLEVBQUM7UUFDWixLQUFLO1FBQ0wsSUFBSTtRQUNKLFVBQVU7UUFDVixjQUFjO1FBQ2Qsd0JBQXdCO1FBQ3hCLGdCQUFnQjtRQUNoQixzQkFBc0I7UUFDdEIsS0FBSztRQUNMLEdBQUc7S0FDSixDQUFDLENBQUM7QUFDTCxDQUFDO0FBN0NELDhCQTZDQyJ9
|