payload 1.11.2 → 1.11.3
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/components/styles.css +1 -1
- package/dist/admin/components/elements/Button/index.scss +1 -0
- package/dist/admin/components/elements/DatePicker/DatePicker.js +2 -2
- package/dist/admin/components/elements/DatePicker/DatePicker.js.map +1 -1
- package/dist/admin/components/elements/DatePicker/index.scss +57 -2
- package/dist/admin/components/forms/field-types/RichText/elements/link/LinkDrawer/baseFields.js +1 -3
- package/dist/admin/components/forms/field-types/RichText/elements/link/LinkDrawer/baseFields.js.map +1 -1
- package/dist/admin/components/utilities/Auth/index.js +104 -35
- package/dist/admin/components/utilities/Auth/index.js.map +1 -1
- package/dist/admin/components/utilities/Auth/types.d.ts +3 -1
- package/dist/admin/components/views/Account/Default.js +33 -2
- package/dist/admin/components/views/Account/Default.js.map +1 -1
- package/dist/admin/components/views/Account/index.js +10 -9
- package/dist/admin/components/views/Account/index.js.map +1 -1
- package/dist/admin/components/views/collections/Edit/Auth/index.js.map +1 -1
- package/dist/admin/components/views/collections/Edit/Default.js +7 -2
- package/dist/admin/components/views/collections/Edit/Default.js.map +1 -1
- package/dist/admin/components/views/collections/Edit/index.js +32 -16
- package/dist/admin/components/views/collections/Edit/index.js.map +1 -1
- package/dist/auth/operations/getFieldsToSign.d.ts +7 -0
- package/dist/auth/operations/getFieldsToSign.js +29 -0
- package/dist/auth/operations/getFieldsToSign.js.map +1 -0
- package/dist/auth/operations/login.js +4 -19
- package/dist/auth/operations/login.js.map +1 -1
- package/dist/auth/operations/refresh.js +27 -14
- package/dist/auth/operations/refresh.js.map +1 -1
- package/dist/config/schema.js +5 -0
- package/dist/config/schema.js.map +1 -1
- package/dist/config/types.d.ts +14 -1
- package/dist/payload.js +1 -1
- package/dist/payload.js.map +1 -1
- package/dist/utilities/logger.d.ts +1 -1
- package/dist/utilities/logger.js +2 -2
- package/dist/utilities/logger.js.map +1 -1
- package/docs/authentication/config.mdx +16 -0
- package/docs/getting-started/installation.mdx +4 -0
- package/package.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../src/admin/components/views/collections/Edit/Auth/index.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../src/admin/components/views/collections/Edit/Auth/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -56,6 +56,7 @@ const getTranslation_1 = require("../../../../../utilities/getTranslation");
|
|
|
56
56
|
const SetStepNav_1 = require("./SetStepNav");
|
|
57
57
|
const Loading_1 = require("../../../elements/Loading");
|
|
58
58
|
const formatDate_1 = require("../../../../utilities/formatDate");
|
|
59
|
+
const Auth_2 = require("../../../utilities/Auth");
|
|
59
60
|
require("./index.scss");
|
|
60
61
|
const baseClass = 'collection-edit';
|
|
61
62
|
const DefaultEditView = (props) => {
|
|
@@ -63,20 +64,24 @@ const DefaultEditView = (props) => {
|
|
|
63
64
|
const { admin: { dateFormat }, routes: { admin } } = (0, Config_1.useConfig)();
|
|
64
65
|
const { publishedDoc } = (0, DocumentInfo_1.useDocumentInfo)();
|
|
65
66
|
const { t, i18n } = (0, react_i18next_1.useTranslation)('general');
|
|
67
|
+
const { user, refreshCookieAsync } = (0, Auth_2.useAuth)();
|
|
66
68
|
const { collection, isEditing, data, onSave: onSaveFromProps, permissions, isLoading, internalState, apiURL, action, hasSavePermission, disableEyebrow, disableActions, disableLeaveWithoutSaving, customHeader, id, updatedAt, } = props;
|
|
67
69
|
const { slug, fields, admin: { useAsTitle, disableDuplicate, preview, hideAPIURL, }, versions, timestamps, auth, upload, } = collection;
|
|
68
70
|
const classes = [
|
|
69
71
|
baseClass,
|
|
70
72
|
isEditing && `${baseClass}--is-editing`,
|
|
71
73
|
].filter(Boolean).join(' ');
|
|
72
|
-
const onSave = (0, react_1.useCallback)((json) => {
|
|
74
|
+
const onSave = (0, react_1.useCallback)(async (json) => {
|
|
75
|
+
if (auth && id === user.id) {
|
|
76
|
+
await refreshCookieAsync();
|
|
77
|
+
}
|
|
73
78
|
if (typeof onSaveFromProps === 'function') {
|
|
74
79
|
onSaveFromProps({
|
|
75
80
|
...json,
|
|
76
81
|
operation: id ? 'update' : 'create',
|
|
77
82
|
});
|
|
78
83
|
}
|
|
79
|
-
}, [id, onSaveFromProps]);
|
|
84
|
+
}, [id, onSaveFromProps, auth, user, refreshCookieAsync]);
|
|
80
85
|
const operation = isEditing ? 'update' : 'create';
|
|
81
86
|
return (react_1.default.createElement(react_1.default.Fragment, null,
|
|
82
87
|
react_1.default.createElement("div", { className: classes },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Default.js","sourceRoot":"","sources":["../../../../../../src/admin/components/views/collections/Edit/Default.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAA2C;AAC3C,uDAAwC;AACxC,iDAA+C;AAC/C,sDAAsD;AACtD,wEAAgD;AAChD,+DAAuC;AACvC,oFAA4D;AAC5D,+EAAuD;AACvD,wFAAgE;AAChE,4FAAoE;AACpE,sFAA8D;AAC9D,mEAA2C;AAC3C,6EAAoD;AACpD,gFAAwD;AACxD,4FAAoE;AACpE,kDAA0B;AAC1B,oFAA4D;AAC5D,sDAA8B;AAE9B,0EAAkD;AAClD,sEAA8C;AAC9C,uDAAoD;AACpD,2DAAwD;AACxD,iDAA8C;AAC9C,kEAAkE;AAClE,4EAAwE;AACxE,qDAAkD;AAClD,4EAAyE;AACzE,6CAA0C;AAC1C,uDAAqE;AACrE,iEAA8D;
|
|
1
|
+
{"version":3,"file":"Default.js","sourceRoot":"","sources":["../../../../../../src/admin/components/views/collections/Edit/Default.tsx"],"names":[],"mappings":"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"}
|
|
@@ -49,14 +49,29 @@ const EditView = (props) => {
|
|
|
49
49
|
const locale = (0, Locale_1.useLocale)();
|
|
50
50
|
const { serverURL, routes: { admin, api } } = (0, Config_1.useConfig)();
|
|
51
51
|
const { params: { id } = {} } = (0, react_router_dom_1.useRouteMatch)();
|
|
52
|
-
const { state: locationState } = (0, react_router_dom_1.useLocation)();
|
|
53
52
|
const history = (0, react_router_dom_1.useHistory)();
|
|
54
53
|
const [internalState, setInternalState] = (0, react_1.useState)();
|
|
55
54
|
const [updatedAt, setUpdatedAt] = (0, react_1.useState)();
|
|
56
55
|
const { user } = (0, Auth_1.useAuth)();
|
|
56
|
+
const userRef = (0, react_1.useRef)(user);
|
|
57
57
|
const { getVersions, getDocPermissions, docPermissions, getDocPreferences } = (0, DocumentInfo_1.useDocumentInfo)();
|
|
58
58
|
const { t } = (0, react_i18next_1.useTranslation)('general');
|
|
59
59
|
const [{ data, isLoading: isLoadingData, isError }] = (0, usePayloadAPI_1.default)((isEditing ? `${serverURL}${api}/${slug}/${id}` : null), { initialParams: { 'fallback-locale': 'null', depth: 0, draft: 'true' }, initialData: null });
|
|
60
|
+
const buildState = (0, react_1.useCallback)(async (doc, overrides) => {
|
|
61
|
+
const preferences = await getDocPreferences();
|
|
62
|
+
const state = await (0, buildStateFromSchema_1.default)({
|
|
63
|
+
fieldSchema: overrides.fieldSchema,
|
|
64
|
+
preferences,
|
|
65
|
+
data: doc || {},
|
|
66
|
+
user: userRef.current,
|
|
67
|
+
id,
|
|
68
|
+
operation: 'update',
|
|
69
|
+
locale,
|
|
70
|
+
t,
|
|
71
|
+
...overrides,
|
|
72
|
+
});
|
|
73
|
+
setInternalState(state);
|
|
74
|
+
}, [getDocPreferences, id, locale, t]);
|
|
60
75
|
const onSave = (0, react_1.useCallback)(async (json) => {
|
|
61
76
|
var _a, _b;
|
|
62
77
|
getVersions();
|
|
@@ -66,22 +81,23 @@ const EditView = (props) => {
|
|
|
66
81
|
setRedirect(`${admin}/collections/${collection.slug}/${(_b = json === null || json === void 0 ? void 0 : json.doc) === null || _b === void 0 ? void 0 : _b.id}`);
|
|
67
82
|
}
|
|
68
83
|
else {
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
84
|
+
buildState(json.doc, {
|
|
85
|
+
fieldSchema: collection.fields,
|
|
86
|
+
});
|
|
72
87
|
}
|
|
73
|
-
}, [admin,
|
|
74
|
-
const dataToRender = (locationState === null || locationState === void 0 ? void 0 : locationState.data) || data;
|
|
88
|
+
}, [admin, getVersions, isEditing, buildState, getDocPermissions, collection]);
|
|
75
89
|
(0, react_1.useEffect)(() => {
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
90
|
+
if (fields && (isEditing ? data : true)) {
|
|
91
|
+
const awaitInternalState = async () => {
|
|
92
|
+
setUpdatedAt(data === null || data === void 0 ? void 0 : data.updatedAt);
|
|
93
|
+
buildState(data, {
|
|
94
|
+
operation: isEditing ? 'update' : 'create',
|
|
95
|
+
fieldSchema: fields,
|
|
96
|
+
});
|
|
97
|
+
};
|
|
83
98
|
awaitInternalState();
|
|
84
|
-
|
|
99
|
+
}
|
|
100
|
+
}, [isEditing, data, buildState, fields]);
|
|
85
101
|
(0, react_1.useEffect)(() => {
|
|
86
102
|
if (redirect) {
|
|
87
103
|
history.push(redirect);
|
|
@@ -98,7 +114,7 @@ const EditView = (props) => {
|
|
|
98
114
|
react_1.default.createElement(RenderCustomComponent_1.default, { DefaultComponent: Default_1.default, CustomComponent: CustomEdit, componentProps: {
|
|
99
115
|
id,
|
|
100
116
|
isLoading,
|
|
101
|
-
data
|
|
117
|
+
data,
|
|
102
118
|
collection,
|
|
103
119
|
permissions: docPermissions,
|
|
104
120
|
isEditing,
|
|
@@ -107,7 +123,7 @@ const EditView = (props) => {
|
|
|
107
123
|
hasSavePermission,
|
|
108
124
|
apiURL,
|
|
109
125
|
action,
|
|
110
|
-
updatedAt: updatedAt || (
|
|
126
|
+
updatedAt: updatedAt || (data === null || data === void 0 ? void 0 : data.updatedAt),
|
|
111
127
|
} })));
|
|
112
128
|
};
|
|
113
129
|
exports.default = EditView;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/admin/components/views/collections/Edit/index.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/admin/components/views/collections/Edit/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getFieldsToSign = void 0;
|
|
4
|
+
const types_1 = require("../../fields/config/types");
|
|
5
|
+
const getFieldsToSign = (args) => {
|
|
6
|
+
const { collectionConfig, user, email, } = args;
|
|
7
|
+
return collectionConfig.fields.reduce((signedFields, field) => {
|
|
8
|
+
const result = {
|
|
9
|
+
...signedFields,
|
|
10
|
+
};
|
|
11
|
+
if (!(0, types_1.fieldAffectsData)(field) && (0, types_1.fieldHasSubFields)(field)) {
|
|
12
|
+
field.fields.forEach((subField) => {
|
|
13
|
+
if ((0, types_1.fieldAffectsData)(subField) && subField.saveToJWT) {
|
|
14
|
+
result[subField.name] = user[subField.name];
|
|
15
|
+
}
|
|
16
|
+
});
|
|
17
|
+
}
|
|
18
|
+
if ((0, types_1.fieldAffectsData)(field) && field.saveToJWT) {
|
|
19
|
+
result[field.name] = user[field.name];
|
|
20
|
+
}
|
|
21
|
+
return result;
|
|
22
|
+
}, {
|
|
23
|
+
email,
|
|
24
|
+
id: user.id,
|
|
25
|
+
collection: collectionConfig.slug,
|
|
26
|
+
});
|
|
27
|
+
};
|
|
28
|
+
exports.getFieldsToSign = getFieldsToSign;
|
|
29
|
+
//# sourceMappingURL=getFieldsToSign.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getFieldsToSign.js","sourceRoot":"","sources":["../../../src/auth/operations/getFieldsToSign.ts"],"names":[],"mappings":";;;AAEA,qDAAuF;AAEhF,MAAM,eAAe,GAAG,CAAC,IAI/B,EAA2B,EAAE;IAC5B,MAAM,EACJ,gBAAgB,EAChB,IAAI,EACJ,KAAK,GACN,GAAG,IAAI,CAAC;IAET,OAAO,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,YAAY,EAAE,KAAY,EAAE,EAAE;QACnE,MAAM,MAAM,GAAG;YACb,GAAG,YAAY;SAChB,CAAC;QAEF,IAAI,CAAC,IAAA,wBAAgB,EAAC,KAAK,CAAC,IAAI,IAAA,yBAAiB,EAAC,KAAK,CAAC,EAAE;YACxD,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;gBAChC,IAAI,IAAA,wBAAgB,EAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,SAAS,EAAE;oBACpD,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;iBAC7C;YACH,CAAC,CAAC,CAAC;SACJ;QAED,IAAI,IAAA,wBAAgB,EAAC,KAAK,CAAC,IAAI,KAAK,CAAC,SAAS,EAAE;YAC9C,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;SACvC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC,EAAE;QACD,KAAK;QACL,EAAE,EAAE,IAAI,CAAC,EAAE;QACX,UAAU,EAAE,gBAAgB,CAAC,IAAI;KAClC,CAAC,CAAC;AACL,CAAC,CAAC;AAlCW,QAAA,eAAe,mBAkC1B"}
|
|
@@ -8,11 +8,11 @@ const errors_1 = require("../../errors");
|
|
|
8
8
|
const getCookieExpiration_1 = __importDefault(require("../../utilities/getCookieExpiration"));
|
|
9
9
|
const isLocked_1 = __importDefault(require("../isLocked"));
|
|
10
10
|
const sanitizeInternalFields_1 = __importDefault(require("../../utilities/sanitizeInternalFields"));
|
|
11
|
-
const types_1 = require("../../fields/config/types");
|
|
12
11
|
const afterRead_1 = require("../../fields/hooks/afterRead");
|
|
13
12
|
const unlock_1 = __importDefault(require("./unlock"));
|
|
14
13
|
const incrementLoginAttempts_1 = require("../strategies/local/incrementLoginAttempts");
|
|
15
14
|
const authenticate_1 = require("../strategies/local/authenticate");
|
|
15
|
+
const getFieldsToSign_1 = require("./getFieldsToSign");
|
|
16
16
|
async function login(incomingArgs) {
|
|
17
17
|
let args = incomingArgs;
|
|
18
18
|
// /////////////////////////////////////
|
|
@@ -65,25 +65,10 @@ async function login(incomingArgs) {
|
|
|
65
65
|
overrideAccess: true,
|
|
66
66
|
});
|
|
67
67
|
}
|
|
68
|
-
const fieldsToSign =
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
};
|
|
72
|
-
if (!(0, types_1.fieldAffectsData)(field) && (0, types_1.fieldHasSubFields)(field)) {
|
|
73
|
-
field.fields.forEach((subField) => {
|
|
74
|
-
if ((0, types_1.fieldAffectsData)(subField) && subField.saveToJWT) {
|
|
75
|
-
result[subField.name] = user[subField.name];
|
|
76
|
-
}
|
|
77
|
-
});
|
|
78
|
-
}
|
|
79
|
-
if ((0, types_1.fieldAffectsData)(field) && field.saveToJWT) {
|
|
80
|
-
result[field.name] = user[field.name];
|
|
81
|
-
}
|
|
82
|
-
return result;
|
|
83
|
-
}, {
|
|
68
|
+
const fieldsToSign = (0, getFieldsToSign_1.getFieldsToSign)({
|
|
69
|
+
collectionConfig,
|
|
70
|
+
user,
|
|
84
71
|
email,
|
|
85
|
-
id: user.id,
|
|
86
|
-
collection: collectionConfig.slug,
|
|
87
72
|
});
|
|
88
73
|
await collectionConfig.hooks.beforeLogin.reduce(async (priorHook, hook) => {
|
|
89
74
|
await priorHook;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../src/auth/operations/login.ts"],"names":[],"mappings":";;;;;AAAA,gEAA+B;AAG/B,yCAA+D;AAE/D,8FAAsE;AACtE,2DAAmC;AACnC,oGAA4E;
|
|
1
|
+
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../src/auth/operations/login.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,9 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
|
|
7
|
+
const url_1 = __importDefault(require("url"));
|
|
7
8
|
const errors_1 = require("../../errors");
|
|
8
9
|
const getCookieExpiration_1 = __importDefault(require("../../utilities/getCookieExpiration"));
|
|
10
|
+
const getFieldsToSign_1 = require("./getFieldsToSign");
|
|
9
11
|
async function refresh(incomingArgs) {
|
|
12
|
+
var _a;
|
|
10
13
|
let args = incomingArgs;
|
|
11
14
|
// /////////////////////////////////////
|
|
12
15
|
// beforeOperation - Collection
|
|
@@ -22,15 +25,24 @@ async function refresh(incomingArgs) {
|
|
|
22
25
|
// Refresh
|
|
23
26
|
// /////////////////////////////////////
|
|
24
27
|
const { collection: { config: collectionConfig, }, req: { payload: { secret, config, }, }, } = args;
|
|
25
|
-
const opts = {
|
|
26
|
-
expiresIn: args.collection.config.auth.tokenExpiration,
|
|
27
|
-
};
|
|
28
28
|
if (typeof args.token !== 'string')
|
|
29
29
|
throw new errors_1.Forbidden(args.req.t);
|
|
30
|
-
const
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
30
|
+
const parsedURL = url_1.default.parse(args.req.url);
|
|
31
|
+
const isGraphQL = parsedURL.pathname === config.routes.graphQL;
|
|
32
|
+
const user = await args.req.payload.findByID({
|
|
33
|
+
id: args.req.user.id,
|
|
34
|
+
collection: args.req.user.collection,
|
|
35
|
+
req: args.req,
|
|
36
|
+
depth: isGraphQL ? 0 : args.collection.config.auth.depth,
|
|
37
|
+
});
|
|
38
|
+
const fieldsToSign = (0, getFieldsToSign_1.getFieldsToSign)({
|
|
39
|
+
collectionConfig,
|
|
40
|
+
user: (_a = args === null || args === void 0 ? void 0 : args.req) === null || _a === void 0 ? void 0 : _a.user,
|
|
41
|
+
email: user === null || user === void 0 ? void 0 : user.email,
|
|
42
|
+
});
|
|
43
|
+
const refreshedToken = jsonwebtoken_1.default.sign(fieldsToSign, secret, {
|
|
44
|
+
expiresIn: collectionConfig.auth.tokenExpiration,
|
|
45
|
+
});
|
|
34
46
|
const exp = jsonwebtoken_1.default.decode(refreshedToken).exp;
|
|
35
47
|
if (args.res) {
|
|
36
48
|
const cookieOptions = {
|
|
@@ -45,26 +57,27 @@ async function refresh(incomingArgs) {
|
|
|
45
57
|
cookieOptions.domain = collectionConfig.auth.cookies.domain;
|
|
46
58
|
args.res.cookie(`${config.cookiePrefix}-token`, refreshedToken, cookieOptions);
|
|
47
59
|
}
|
|
60
|
+
let response = {
|
|
61
|
+
user,
|
|
62
|
+
refreshedToken,
|
|
63
|
+
exp,
|
|
64
|
+
};
|
|
48
65
|
// /////////////////////////////////////
|
|
49
66
|
// After Refresh - Collection
|
|
50
67
|
// /////////////////////////////////////
|
|
51
68
|
await collectionConfig.hooks.afterRefresh.reduce(async (priorHook, hook) => {
|
|
52
69
|
await priorHook;
|
|
53
|
-
|
|
70
|
+
response = (await hook({
|
|
54
71
|
req: args.req,
|
|
55
72
|
res: args.res,
|
|
56
73
|
exp,
|
|
57
74
|
token: refreshedToken,
|
|
58
|
-
})) ||
|
|
75
|
+
})) || response;
|
|
59
76
|
}, Promise.resolve());
|
|
60
77
|
// /////////////////////////////////////
|
|
61
78
|
// Return results
|
|
62
79
|
// /////////////////////////////////////
|
|
63
|
-
return
|
|
64
|
-
refreshedToken,
|
|
65
|
-
exp,
|
|
66
|
-
user: payload,
|
|
67
|
-
};
|
|
80
|
+
return response;
|
|
68
81
|
}
|
|
69
82
|
exports.default = refresh;
|
|
70
83
|
//# sourceMappingURL=refresh.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"refresh.js","sourceRoot":"","sources":["../../../src/auth/operations/refresh.ts"],"names":[],"mappings":";;;;;AAAA,gEAA+B;
|
|
1
|
+
{"version":3,"file":"refresh.js","sourceRoot":"","sources":["../../../src/auth/operations/refresh.ts"],"names":[],"mappings":"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"}
|
package/dist/config/schema.js
CHANGED
|
@@ -57,6 +57,11 @@ exports.default = joi_1.default.object({
|
|
|
57
57
|
.try(joi_1.default.string(), component),
|
|
58
58
|
logoutRoute: joi_1.default.string(),
|
|
59
59
|
inactivityRoute: joi_1.default.string(),
|
|
60
|
+
autoLogin: joi_1.default.alternatives()
|
|
61
|
+
.try(joi_1.default.object().keys({
|
|
62
|
+
email: joi_1.default.string(),
|
|
63
|
+
password: joi_1.default.string(),
|
|
64
|
+
}), joi_1.default.boolean()),
|
|
60
65
|
components: joi_1.default.object()
|
|
61
66
|
.keys({
|
|
62
67
|
routes: joi_1.default.array()
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/config/schema.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/config/schema.ts"],"names":[],"mappings":"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"}
|
package/dist/config/types.d.ts
CHANGED
|
@@ -7,7 +7,7 @@ import SMTPConnection from 'nodemailer/lib/smtp-connection';
|
|
|
7
7
|
import GraphQL from 'graphql';
|
|
8
8
|
import { ConnectOptions } from 'mongoose';
|
|
9
9
|
import React from 'react';
|
|
10
|
-
import { LoggerOptions } from 'pino';
|
|
10
|
+
import { DestinationStream, LoggerOptions } from 'pino';
|
|
11
11
|
import type { InitOptions as i18nInitOptions } from 'i18next';
|
|
12
12
|
import { Payload } from '../payload';
|
|
13
13
|
import { AfterErrorHook, CollectionConfig, SanitizedCollectionConfig } from '../collections/config/types';
|
|
@@ -81,6 +81,12 @@ export type InitOptions = {
|
|
|
81
81
|
* See Pino Docs for options: https://getpino.io/#/docs/api?id=options
|
|
82
82
|
*/
|
|
83
83
|
loggerOptions?: LoggerOptions;
|
|
84
|
+
loggerDestination?: DestinationStream;
|
|
85
|
+
/**
|
|
86
|
+
* Sometimes, with the local API, you might need to pass a config file directly, for example, serverless on Vercel
|
|
87
|
+
* The passed config should match the config file, and if it doesn't, there could be mismatches between the admin UI
|
|
88
|
+
* and the backend functionality
|
|
89
|
+
*/
|
|
84
90
|
config?: Promise<SanitizedConfig>;
|
|
85
91
|
};
|
|
86
92
|
/**
|
|
@@ -221,6 +227,13 @@ export type Config = {
|
|
|
221
227
|
logoutRoute?: string;
|
|
222
228
|
/** The route the user will be redirected to after being inactive for too long. */
|
|
223
229
|
inactivityRoute?: string;
|
|
230
|
+
/** Automatically log in as a user when visiting the admin dashboard. */
|
|
231
|
+
autoLogin?: false | {
|
|
232
|
+
/** The email address of the user to login as */
|
|
233
|
+
email: string;
|
|
234
|
+
/** The password of the user to login as */
|
|
235
|
+
password: string;
|
|
236
|
+
};
|
|
224
237
|
/**
|
|
225
238
|
* Add extra and/or replace built-in components with custom components
|
|
226
239
|
*
|
package/dist/payload.js
CHANGED
|
@@ -149,7 +149,7 @@ class BasePayload {
|
|
|
149
149
|
* @param options
|
|
150
150
|
*/
|
|
151
151
|
async init(options) {
|
|
152
|
-
this.logger = (0, logger_1.default)('payload', options.loggerOptions);
|
|
152
|
+
this.logger = (0, logger_1.default)('payload', options.loggerOptions, options.loggerDestination);
|
|
153
153
|
this.mongoURL = options.mongoURL;
|
|
154
154
|
this.mongoOptions = options.mongoOptions;
|
|
155
155
|
if (this.mongoURL) {
|
package/dist/payload.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"payload.js","sourceRoot":"","sources":["../src/payload.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"payload.js","sourceRoot":"","sources":["../src/payload.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import pino from 'pino';
|
|
2
2
|
export type PayloadLogger = pino.Logger;
|
|
3
|
-
declare const getLogger: (name?: string, options?: pino.LoggerOptions) => pino.Logger;
|
|
3
|
+
declare const getLogger: (name?: string, options?: pino.LoggerOptions, destination?: pino.DestinationStream) => pino.Logger;
|
|
4
4
|
export default getLogger;
|
package/dist/utilities/logger.js
CHANGED
|
@@ -10,10 +10,10 @@ const defaultLoggerOptions = {
|
|
|
10
10
|
translateTime: 'HH:MM:ss',
|
|
11
11
|
},
|
|
12
12
|
};
|
|
13
|
-
const getLogger = (name = 'payload', options) => (0, pino_1.default)({
|
|
13
|
+
const getLogger = (name = 'payload', options, destination) => (0, pino_1.default)({
|
|
14
14
|
name: (options === null || options === void 0 ? void 0 : options.name) || name,
|
|
15
15
|
enabled: process.env.DISABLE_LOGGING !== 'true',
|
|
16
16
|
...(options || defaultLoggerOptions),
|
|
17
|
-
});
|
|
17
|
+
}, destination);
|
|
18
18
|
exports.default = getLogger;
|
|
19
19
|
//# sourceMappingURL=logger.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/utilities/logger.ts"],"names":[],"mappings":";;;;;AAAA,gDAAwB;AAIxB,MAAM,oBAAoB,GAAG;IAC3B,WAAW,EAAE;QACX,MAAM,EAAE,cAAc;QACtB,aAAa,EAAE,UAAU;KAC1B;CACF,CAAC;AAEF,MAAM,SAAS,GAAG,CAAC,IAAI,GAAG,SAAS,EAAE,OAA4B,EAAiB,EAAE,CAAC,IAAA,cAAI,EAAC;
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/utilities/logger.ts"],"names":[],"mappings":";;;;;AAAA,gDAAwB;AAIxB,MAAM,oBAAoB,GAAG;IAC3B,WAAW,EAAE;QACX,MAAM,EAAE,cAAc;QACtB,aAAa,EAAE,UAAU;KAC1B;CACF,CAAC;AAEF,MAAM,SAAS,GAAG,CAAC,IAAI,GAAG,SAAS,EAAE,OAA4B,EAAE,WAAoC,EAAiB,EAAE,CAAC,IAAA,cAAI,EAAC;IAC9H,IAAI,EAAE,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,KAAI,IAAI;IAC3B,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,eAAe,KAAK,MAAM;IAC/C,GAAG,CAAC,OAAO,IAAI,oBAAoB,CAAC;CACrC,EAAE,WAAW,CAAC,CAAC;AAEhB,kBAAe,SAAS,CAAC"}
|
|
@@ -63,6 +63,22 @@ const response = await fetch("http://localhost:3000/api/pages", {
|
|
|
63
63
|
|
|
64
64
|
Payload ensures that the same, uniform access control is used across all authentication strategies. This enables you to utilize your existing access control configurations with both API keys and the standard email/password authentication. This consistency can aid in maintaining granular control over your API keys.
|
|
65
65
|
|
|
66
|
+
#### API Key *Only* Authentication
|
|
67
|
+
|
|
68
|
+
If you want to use API keys as the only authentication method for a collection, you can disable the default local strategy by setting `disableLocalStrategy` to `true` on the collection's `auth` property. This will disable the ability to authenticate with email and password, and will only allow for authentication via API key.
|
|
69
|
+
|
|
70
|
+
```ts
|
|
71
|
+
import { CollectionConfig } from 'payload/types';
|
|
72
|
+
|
|
73
|
+
export const Customers: CollectionConfig = {
|
|
74
|
+
slug: 'customers',
|
|
75
|
+
auth: {
|
|
76
|
+
useAPIKey: true,
|
|
77
|
+
disableLocalStrategy: true,
|
|
78
|
+
}
|
|
79
|
+
};
|
|
80
|
+
```
|
|
81
|
+
|
|
66
82
|
### Forgot Password
|
|
67
83
|
|
|
68
84
|
You can customize how the Forgot Password workflow operates with the following options on the `auth.forgotPassword` property:
|
|
@@ -140,6 +140,10 @@ A boolean that when set to `true` tells Payload to start in local-only mode whic
|
|
|
140
140
|
|
|
141
141
|
Specify options for the built-in Pino logger that Payload uses for internal logging. See [Pino Docs](https://getpino.io/#/docs/api?id=options) for more info on what is available.
|
|
142
142
|
|
|
143
|
+
##### `loggerDestination`
|
|
144
|
+
|
|
145
|
+
Specify destination stream for the built-in Pino logger that Payload uses for internal logging. See [Pino Docs](https://getpino.io/#/docs/api?id=pino-destination) for more info on what is available.
|
|
146
|
+
|
|
143
147
|
##### `onInit`
|
|
144
148
|
|
|
145
149
|
A function that is called immediately following startup that receives the Payload instance as it's only argument.
|