payload 1.15.3 → 1.15.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/forms/Form/buildStateFromSchema/addFieldStatePromise.js +8 -0
- package/dist/admin/components/forms/Form/buildStateFromSchema/addFieldStatePromise.js.map +1 -1
- package/dist/admin/components/utilities/Auth/index.js +78 -63
- package/dist/admin/components/utilities/Auth/index.js.map +1 -1
- package/dist/admin/components/utilities/Auth/types.d.ts +1 -1
- package/dist/admin/components/views/CreateFirstUser/index.js +3 -3
- package/dist/admin/components/views/CreateFirstUser/index.js.map +1 -1
- package/dist/admin/components/views/Global/index.js +1 -1
- package/dist/admin/components/views/Global/index.js.map +1 -1
- package/dist/admin/components/views/Login/index.js +3 -3
- package/dist/admin/components/views/Login/index.js.map +1 -1
- package/dist/admin/components/views/ResetPassword/index.js +3 -3
- package/dist/admin/components/views/ResetPassword/index.js.map +1 -1
- package/dist/admin/components/views/collections/Edit/index.js +1 -1
- package/dist/admin/components/views/collections/Edit/index.js.map +1 -1
- package/dist/graphql/schema/isFieldNullable.js +1 -1
- package/dist/graphql/schema/isFieldNullable.js.map +1 -1
- package/dist/versions/drafts/queryDrafts.js +2 -1
- package/dist/versions/drafts/queryDrafts.js.map +1 -1
- package/package.json +1 -1
|
@@ -183,6 +183,14 @@ const addFieldStatePromise = async ({ field, locale, user, state, path, passesCo
|
|
|
183
183
|
});
|
|
184
184
|
break;
|
|
185
185
|
}
|
|
186
|
+
case 'relationship':
|
|
187
|
+
case 'upload': {
|
|
188
|
+
const relationshipValue = valueWithDefault && typeof valueWithDefault === 'object' && 'id' in valueWithDefault ? valueWithDefault.id : valueWithDefault;
|
|
189
|
+
fieldState.value = relationshipValue;
|
|
190
|
+
fieldState.initialValue = relationshipValue;
|
|
191
|
+
state[`${path}${field.name}`] = fieldState;
|
|
192
|
+
break;
|
|
193
|
+
}
|
|
186
194
|
default: {
|
|
187
195
|
fieldState.value = valueWithDefault;
|
|
188
196
|
fieldState.initialValue = valueWithDefault;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addFieldStatePromise.js","sourceRoot":"","sources":["../../../../../../src/admin/components/forms/Form/buildStateFromSchema/addFieldStatePromise.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"addFieldStatePromise.js","sourceRoot":"","sources":["../../../../../../src/admin/components/forms/Form/buildStateFromSchema/addFieldStatePromise.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,7 +28,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
29
|
exports.useAuth = exports.AuthProvider = void 0;
|
|
30
30
|
const react_1 = __importStar(require("react"));
|
|
31
|
-
const jwt_decode_1 = __importDefault(require("jwt-decode"));
|
|
32
31
|
const react_router_dom_1 = require("react-router-dom");
|
|
33
32
|
const modal_1 = require("@faceless-ui/modal");
|
|
34
33
|
const react_i18next_1 = require("react-i18next");
|
|
@@ -41,11 +40,12 @@ const maxTimeoutTime = 2147483647;
|
|
|
41
40
|
const AuthProvider = ({ children }) => {
|
|
42
41
|
const [user, setUser] = (0, react_1.useState)();
|
|
43
42
|
const [tokenInMemory, setTokenInMemory] = (0, react_1.useState)();
|
|
43
|
+
const [tokenExpiration, setTokenExpiration] = (0, react_1.useState)();
|
|
44
44
|
const { pathname } = (0, react_router_dom_1.useLocation)();
|
|
45
45
|
const { push } = (0, react_router_dom_1.useHistory)();
|
|
46
46
|
const config = (0, Config_1.useConfig)();
|
|
47
47
|
const { admin: { user: userSlug, inactivityRoute: logoutInactivityRoute, autoLogin, }, serverURL, routes: { admin, api, }, } = config;
|
|
48
|
-
const exp =
|
|
48
|
+
const exp = tokenExpiration;
|
|
49
49
|
const [permissions, setPermissions] = (0, react_1.useState)();
|
|
50
50
|
const { i18n } = (0, react_i18next_1.useTranslation)();
|
|
51
51
|
const { openModal, closeAllModals } = (0, modal_1.useModal)();
|
|
@@ -62,9 +62,23 @@ const AuthProvider = ({ children }) => {
|
|
|
62
62
|
}
|
|
63
63
|
closeAllModals();
|
|
64
64
|
}, [push, admin, logoutInactivityRoute, closeAllModals]);
|
|
65
|
+
const revokeTokenAndExpire = (0, react_1.useCallback)(() => {
|
|
66
|
+
setTokenInMemory(undefined);
|
|
67
|
+
setTokenExpiration(undefined);
|
|
68
|
+
}, []);
|
|
69
|
+
const setTokenAndExpiration = (0, react_1.useCallback)((json) => {
|
|
70
|
+
const token = (json === null || json === void 0 ? void 0 : json.token) || (json === null || json === void 0 ? void 0 : json.refreshedToken);
|
|
71
|
+
if (token && (json === null || json === void 0 ? void 0 : json.exp)) {
|
|
72
|
+
setTokenInMemory(token);
|
|
73
|
+
setTokenExpiration(json.exp);
|
|
74
|
+
}
|
|
75
|
+
else {
|
|
76
|
+
revokeTokenAndExpire();
|
|
77
|
+
}
|
|
78
|
+
}, [revokeTokenAndExpire]);
|
|
65
79
|
const refreshCookie = (0, react_1.useCallback)((forceRefresh) => {
|
|
66
80
|
const now = Math.round((new Date()).getTime() / 1000);
|
|
67
|
-
const remainingTime = (exp
|
|
81
|
+
const remainingTime = (typeof exp === 'number' ? exp : 0) - now;
|
|
68
82
|
if (forceRefresh || (exp && remainingTime < 120)) {
|
|
69
83
|
setTimeout(async () => {
|
|
70
84
|
try {
|
|
@@ -76,6 +90,7 @@ const AuthProvider = ({ children }) => {
|
|
|
76
90
|
if (request.status === 200) {
|
|
77
91
|
const json = await request.json();
|
|
78
92
|
setUser(json.user);
|
|
93
|
+
setTokenAndExpiration(json);
|
|
79
94
|
}
|
|
80
95
|
else {
|
|
81
96
|
setUser(null);
|
|
@@ -87,7 +102,7 @@ const AuthProvider = ({ children }) => {
|
|
|
87
102
|
}
|
|
88
103
|
}, 1000);
|
|
89
104
|
}
|
|
90
|
-
}, [
|
|
105
|
+
}, [serverURL, api, userSlug, i18n, exp, redirectToInactivityRoute, setTokenAndExpiration]);
|
|
91
106
|
const refreshCookieAsync = (0, react_1.useCallback)(async (skipSetUser) => {
|
|
92
107
|
try {
|
|
93
108
|
const request = await api_1.requests.post(`${serverURL}${api}/${userSlug}/refresh-token`, {
|
|
@@ -97,8 +112,10 @@ const AuthProvider = ({ children }) => {
|
|
|
97
112
|
});
|
|
98
113
|
if (request.status === 200) {
|
|
99
114
|
const json = await request.json();
|
|
100
|
-
if (!skipSetUser)
|
|
115
|
+
if (!skipSetUser) {
|
|
101
116
|
setUser(json.user);
|
|
117
|
+
setTokenAndExpiration(json);
|
|
118
|
+
}
|
|
102
119
|
return json.user;
|
|
103
120
|
}
|
|
104
121
|
setUser(null);
|
|
@@ -109,17 +126,12 @@ const AuthProvider = ({ children }) => {
|
|
|
109
126
|
react_toastify_1.toast.error(`Refreshing token failed: ${e.message}`);
|
|
110
127
|
return null;
|
|
111
128
|
}
|
|
112
|
-
}, [serverURL, api, userSlug, i18n, redirectToInactivityRoute]);
|
|
113
|
-
const setToken = (0, react_1.useCallback)((token) => {
|
|
114
|
-
const decoded = (0, jwt_decode_1.default)(token);
|
|
115
|
-
setUser(decoded);
|
|
116
|
-
setTokenInMemory(token);
|
|
117
|
-
}, []);
|
|
129
|
+
}, [serverURL, api, userSlug, i18n, redirectToInactivityRoute, setTokenAndExpiration]);
|
|
118
130
|
const logOut = (0, react_1.useCallback)(() => {
|
|
119
131
|
setUser(null);
|
|
120
|
-
|
|
132
|
+
revokeTokenAndExpire();
|
|
121
133
|
api_1.requests.post(`${serverURL}${api}/${userSlug}/logout`);
|
|
122
|
-
}, [serverURL, api, userSlug]);
|
|
134
|
+
}, [serverURL, api, userSlug, revokeTokenAndExpire]);
|
|
123
135
|
const refreshPermissions = (0, react_1.useCallback)(async () => {
|
|
124
136
|
try {
|
|
125
137
|
const request = await api_1.requests.get(`${serverURL}${api}/access`, {
|
|
@@ -139,58 +151,60 @@ const AuthProvider = ({ children }) => {
|
|
|
139
151
|
react_toastify_1.toast.error(`Refreshing permissions failed: ${e.message}`);
|
|
140
152
|
}
|
|
141
153
|
}, [serverURL, api, i18n]);
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
if (
|
|
152
|
-
|
|
153
|
-
if (json === null || json === void 0 ? void 0 : json.
|
|
154
|
-
|
|
155
|
-
}
|
|
156
|
-
else if (json === null || json === void 0 ? void 0 : json.token) {
|
|
157
|
-
setToken(json.token);
|
|
154
|
+
const fetchFullUser = react_1.default.useCallback(async () => {
|
|
155
|
+
try {
|
|
156
|
+
const request = await api_1.requests.get(`${serverURL}${api}/${userSlug}/me`, {
|
|
157
|
+
headers: {
|
|
158
|
+
'Accept-Language': i18n.language,
|
|
159
|
+
},
|
|
160
|
+
});
|
|
161
|
+
if (request.status === 200) {
|
|
162
|
+
const json = await request.json();
|
|
163
|
+
if (json === null || json === void 0 ? void 0 : json.user) {
|
|
164
|
+
setUser(json.user);
|
|
165
|
+
if (json === null || json === void 0 ? void 0 : json.token) {
|
|
166
|
+
setTokenAndExpiration(json);
|
|
158
167
|
}
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
}
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
}
|
|
179
|
-
else {
|
|
180
|
-
setUser(null);
|
|
168
|
+
}
|
|
169
|
+
else if (autoLogin && autoLogin.prefillOnly !== true) {
|
|
170
|
+
// auto log-in with the provided autoLogin credentials. This is used in dev mode
|
|
171
|
+
// so you don't have to log in over and over again
|
|
172
|
+
const autoLoginResult = await api_1.requests.post(`${serverURL}${api}/${userSlug}/login`, {
|
|
173
|
+
body: JSON.stringify({
|
|
174
|
+
email: autoLogin.email,
|
|
175
|
+
password: autoLogin.password,
|
|
176
|
+
}),
|
|
177
|
+
headers: {
|
|
178
|
+
'Accept-Language': i18n.language,
|
|
179
|
+
'Content-Type': 'application/json',
|
|
180
|
+
},
|
|
181
|
+
});
|
|
182
|
+
if (autoLoginResult.status === 200) {
|
|
183
|
+
const autoLoginJson = await autoLoginResult.json();
|
|
184
|
+
setUser(autoLoginJson.user);
|
|
185
|
+
if (autoLoginJson === null || autoLoginJson === void 0 ? void 0 : autoLoginJson.token) {
|
|
186
|
+
setTokenAndExpiration(autoLoginJson);
|
|
181
187
|
}
|
|
182
188
|
}
|
|
183
189
|
else {
|
|
184
190
|
setUser(null);
|
|
191
|
+
revokeTokenAndExpire();
|
|
185
192
|
}
|
|
186
193
|
}
|
|
194
|
+
else {
|
|
195
|
+
setUser(null);
|
|
196
|
+
revokeTokenAndExpire();
|
|
197
|
+
}
|
|
187
198
|
}
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
}
|
|
191
|
-
}
|
|
192
|
-
|
|
193
|
-
|
|
199
|
+
}
|
|
200
|
+
catch (e) {
|
|
201
|
+
react_toastify_1.toast.error(`Fetching user failed: ${e.message}`);
|
|
202
|
+
}
|
|
203
|
+
}, [serverURL, api, userSlug, i18n, autoLogin, setTokenAndExpiration, revokeTokenAndExpire]);
|
|
204
|
+
// On mount, get user and set
|
|
205
|
+
(0, react_1.useEffect)(() => {
|
|
206
|
+
fetchFullUser();
|
|
207
|
+
}, [fetchFullUser]);
|
|
194
208
|
// When location changes, refresh cookie
|
|
195
209
|
(0, react_1.useEffect)(() => {
|
|
196
210
|
if (id) {
|
|
@@ -209,11 +223,11 @@ const AuthProvider = ({ children }) => {
|
|
|
209
223
|
(0, react_1.useEffect)(() => {
|
|
210
224
|
let reminder;
|
|
211
225
|
const now = Math.round((new Date()).getTime() / 1000);
|
|
212
|
-
const remainingTime = exp - now;
|
|
226
|
+
const remainingTime = typeof exp === 'number' ? exp - now : 0;
|
|
213
227
|
if (remainingTime > 0) {
|
|
214
228
|
reminder = setTimeout(() => {
|
|
215
229
|
openModal('stay-logged-in');
|
|
216
|
-
}, (Math.min((remainingTime - 60) * 1000
|
|
230
|
+
}, Math.max(Math.min((remainingTime - 60) * 1000, maxTimeoutTime)));
|
|
217
231
|
}
|
|
218
232
|
return () => {
|
|
219
233
|
if (reminder)
|
|
@@ -223,18 +237,19 @@ const AuthProvider = ({ children }) => {
|
|
|
223
237
|
(0, react_1.useEffect)(() => {
|
|
224
238
|
let forceLogOut;
|
|
225
239
|
const now = Math.round((new Date()).getTime() / 1000);
|
|
226
|
-
const remainingTime = exp - now;
|
|
240
|
+
const remainingTime = typeof exp === 'number' ? exp - now : 0;
|
|
227
241
|
if (remainingTime > 0) {
|
|
228
242
|
forceLogOut = setTimeout(() => {
|
|
229
243
|
setUser(null);
|
|
244
|
+
revokeTokenAndExpire();
|
|
230
245
|
redirectToInactivityRoute();
|
|
231
|
-
}, Math.min(remainingTime * 1000, maxTimeoutTime));
|
|
246
|
+
}, Math.max(Math.min(remainingTime * 1000, maxTimeoutTime), 0));
|
|
232
247
|
}
|
|
233
248
|
return () => {
|
|
234
249
|
if (forceLogOut)
|
|
235
250
|
clearTimeout(forceLogOut);
|
|
236
251
|
};
|
|
237
|
-
}, [exp, closeAllModals, i18n, redirectToInactivityRoute]);
|
|
252
|
+
}, [exp, closeAllModals, i18n, redirectToInactivityRoute, revokeTokenAndExpire]);
|
|
238
253
|
return (react_1.default.createElement(Context.Provider, { value: {
|
|
239
254
|
user,
|
|
240
255
|
setUser,
|
|
@@ -243,8 +258,8 @@ const AuthProvider = ({ children }) => {
|
|
|
243
258
|
refreshCookieAsync,
|
|
244
259
|
refreshPermissions,
|
|
245
260
|
permissions,
|
|
246
|
-
setToken,
|
|
247
261
|
token: tokenInMemory,
|
|
262
|
+
fetchFullUser,
|
|
248
263
|
} }, children));
|
|
249
264
|
};
|
|
250
265
|
exports.AuthProvider = AuthProvider;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/admin/components/utilities/Auth/index.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAA2F;AAC3F,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/admin/components/utilities/Auth/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -5,8 +5,8 @@ export type AuthContext<T = User> = {
|
|
|
5
5
|
logOut: () => void;
|
|
6
6
|
refreshCookie: (forceRefresh?: boolean) => void;
|
|
7
7
|
refreshCookieAsync: () => Promise<User>;
|
|
8
|
-
setToken: (token: string) => void;
|
|
9
8
|
token?: string;
|
|
10
9
|
refreshPermissions: () => Promise<void>;
|
|
11
10
|
permissions?: Permissions;
|
|
11
|
+
fetchFullUser: () => Promise<void>;
|
|
12
12
|
};
|
|
@@ -17,14 +17,14 @@ require("./index.scss");
|
|
|
17
17
|
const baseClass = 'create-first-user';
|
|
18
18
|
const CreateFirstUser = (props) => {
|
|
19
19
|
const { setInitialized } = props;
|
|
20
|
-
const {
|
|
20
|
+
const { fetchFullUser } = (0, Auth_1.useAuth)();
|
|
21
21
|
const { admin: { user: userSlug }, collections, serverURL, routes: { admin, api }, } = (0, Config_1.useConfig)();
|
|
22
22
|
const { t } = (0, react_i18next_1.useTranslation)('authentication');
|
|
23
23
|
const userConfig = collections.find((collection) => collection.slug === userSlug);
|
|
24
|
-
const onSuccess = (json) => {
|
|
24
|
+
const onSuccess = async (json) => {
|
|
25
25
|
var _a;
|
|
26
26
|
if ((_a = json === null || json === void 0 ? void 0 : json.user) === null || _a === void 0 ? void 0 : _a.token) {
|
|
27
|
-
|
|
27
|
+
await fetchFullUser();
|
|
28
28
|
}
|
|
29
29
|
setInitialized(true);
|
|
30
30
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/admin/components/views/CreateFirstUser/index.tsx"],"names":[],"mappings":";;;;;AAAA,kDAA0B;AAC1B,iDAA+C;AAC/C,mDAAmD;AACnD,+CAA+C;AAC/C,sEAAsD;AACtD,gEAAwC;AACxC,4DAAoC;AACpC,4EAAoD;AACpD,0EAAiD;AACjD,gEAA4C;AAI5C,wBAAsB;AAEtB,MAAM,SAAS,GAAG,mBAAmB,CAAC;AAEtC,MAAM,eAAe,GAAoB,CAAC,KAAK,EAAE,EAAE;IACjD,MAAM,EAAE,cAAc,EAAE,GAAG,KAAK,CAAC;IACjC,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/admin/components/views/CreateFirstUser/index.tsx"],"names":[],"mappings":";;;;;AAAA,kDAA0B;AAC1B,iDAA+C;AAC/C,mDAAmD;AACnD,+CAA+C;AAC/C,sEAAsD;AACtD,gEAAwC;AACxC,4DAAoC;AACpC,4EAAoD;AACpD,0EAAiD;AACjD,gEAA4C;AAI5C,wBAAsB;AAEtB,MAAM,SAAS,GAAG,mBAAmB,CAAC;AAEtC,MAAM,eAAe,GAAoB,CAAC,KAAK,EAAE,EAAE;IACjD,MAAM,EAAE,cAAc,EAAE,GAAG,KAAK,CAAC;IACjC,MAAM,EAAE,aAAa,EAAE,GAAG,IAAA,cAAO,GAAE,CAAC;IACpC,MAAM,EACJ,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,GAC1E,GAAG,IAAA,kBAAS,GAAE,CAAC;IAChB,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,8BAAc,EAAC,gBAAgB,CAAC,CAAC;IAE/C,MAAM,UAAU,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC;IAElF,MAAM,SAAS,GAAG,KAAK,EAAE,IAAI,EAAE,EAAE;;QAC/B,IAAI,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,0CAAE,KAAK,EAAE;YACrB,MAAM,aAAa,EAAE,CAAC;SACvB;QAED,cAAc,CAAC,IAAI,CAAC,CAAC;IACvB,CAAC,CAAC;IAEF,MAAM,MAAM,GAAG;QACb;YACE,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,CAAC,CAAC,sBAAsB,CAAC;YAChC,IAAI,EAAE,OAAO;YACb,QAAQ,EAAE,IAAI;SACf,EAAE;YACD,IAAI,EAAE,UAAU;YAChB,KAAK,EAAE,CAAC,CAAC,kBAAkB,CAAC;YAC5B,IAAI,EAAE,UAAU;YAChB,QAAQ,EAAE,IAAI;SACf,EAAE;YACD,IAAI,EAAE,kBAAkB;YACxB,KAAK,EAAE,CAAC,CAAC,iBAAiB,CAAC;YAC3B,IAAI,EAAE,iBAAiB;YACvB,QAAQ,EAAE,IAAI;SACf;KACS,CAAC;IAEb,MAAM,WAAW,GAAG;QAClB,GAAG,MAAM;QACT,GAAG,UAAU,CAAC,MAAM;KACrB,CAAC;IAEF,OAAO,CACL,8BAAC,iBAAe,IAAC,SAAS,EAAE,SAAS;QACnC,0CAAK,CAAC,CAAC,iBAAiB,CAAC,CAAM;QAC/B,yCAAI,CAAC,CAAC,sBAAsB,CAAC,CAAK;QAClC,8BAAC,cAAI,IACH,KAAK,EAAE,CAAC,CAAC,iBAAiB,CAAC,EAC3B,WAAW,EAAE,CAAC,CAAC,iBAAiB,CAAC,EACjC,QAAQ,EAAE,CAAC,CAAC,gBAAgB,CAAC,GAC7B;QACF,8BAAC,cAAI,IACH,SAAS,EAAE,SAAS,EACpB,MAAM,EAAC,MAAM,EACb,QAAQ,EAAE,KAAK,EACf,MAAM,EAAE,GAAG,SAAS,GAAG,GAAG,IAAI,QAAQ,iBAAiB,EACvD,mBAAmB,EAAC,QAAQ,EAC5B,kBAAkB,EAAE,WAAW;YAE/B,8BAAC,sBAAY,IACX,WAAW,EAAE,WAAW,EACxB,UAAU,EAAE,qBAAU,GACtB;YACF,8BAAC,gBAAU,QAAE,CAAC,CAAC,gBAAgB,CAAC,CAAc,CACzC,CACS,CACnB,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,eAAe,CAAC"}
|
|
@@ -89,7 +89,7 @@ const GlobalView = (props) => {
|
|
|
89
89
|
global,
|
|
90
90
|
onSave,
|
|
91
91
|
apiURL: `${serverURL}${api}/globals/${slug}?locale=${locale}${((_a = global.versions) === null || _a === void 0 ? void 0 : _a.drafts) ? '&draft=true' : ''}`,
|
|
92
|
-
action: `${serverURL}${api}/globals/${slug}?locale=${locale}&
|
|
92
|
+
action: `${serverURL}${api}/globals/${slug}?locale=${locale}&fallback-locale=null`,
|
|
93
93
|
updatedAt: updatedAt || (dataToRender === null || dataToRender === void 0 ? void 0 : dataToRender.updatedAt),
|
|
94
94
|
} }));
|
|
95
95
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/admin/components/views/Global/index.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/admin/components/views/Global/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -22,16 +22,16 @@ const baseClass = 'login';
|
|
|
22
22
|
const Login = () => {
|
|
23
23
|
const history = (0, react_router_dom_1.useHistory)();
|
|
24
24
|
const { t } = (0, react_i18next_1.useTranslation)('authentication');
|
|
25
|
-
const { user,
|
|
25
|
+
const { user, fetchFullUser } = (0, Auth_1.useAuth)();
|
|
26
26
|
const config = (0, Config_1.useConfig)();
|
|
27
27
|
const { admin: { user: userSlug, logoutRoute, autoLogin, components: { beforeLogin, afterLogin, } = {}, }, serverURL, routes: { admin, api, }, collections, } = config;
|
|
28
28
|
const collection = collections.find(({ slug }) => slug === userSlug);
|
|
29
29
|
// Fetch 'redirect' from the query string which denotes the URL the user originally tried to visit. This is set in the Routes.tsx file when a user tries to access a protected route and is redirected to the login screen.
|
|
30
30
|
const query = new URLSearchParams((0, react_router_dom_1.useLocation)().search);
|
|
31
31
|
const redirect = query.get('redirect');
|
|
32
|
-
const onSuccess = (data) => {
|
|
32
|
+
const onSuccess = async (data) => {
|
|
33
33
|
if (data.token) {
|
|
34
|
-
|
|
34
|
+
await fetchFullUser();
|
|
35
35
|
// Ensure the redirect always starts with the admin route, and concatenate the redirect path
|
|
36
36
|
history.push(admin + (redirect || ''));
|
|
37
37
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/admin/components/views/Login/index.tsx"],"names":[],"mappings":";;;;;AAAA,kDAA0B;AAC1B,uDAAiE;AACjE,iDAAsD;AACtD,mDAAmD;AACnD,+CAA+C;AAC/C,+DAAuC;AACvC,sEAAsD;AACtD,4DAAoC;AACpC,0EAAkD;AAClD,gFAAwD;AACxD,gEAA4C;AAC5C,mEAA2C;AAC3C,gEAAwC;AACxC,oDAAkE;AAElE,wBAAsB;AAEtB,MAAM,SAAS,GAAG,OAAO,CAAC;AAE1B,MAAM,KAAK,GAAa,GAAG,EAAE;IAC3B,MAAM,OAAO,GAAG,IAAA,6BAAU,GAAE,CAAC;IAC7B,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,8BAAc,EAAC,gBAAgB,CAAC,CAAC;IAC/C,MAAM,EAAE,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/admin/components/views/Login/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -24,11 +24,11 @@ const ResetPassword = () => {
|
|
|
24
24
|
const { admin: { user: userSlug, logoutRoute }, serverURL, routes: { admin, api } } = config;
|
|
25
25
|
const { token } = (0, react_router_dom_1.useParams)();
|
|
26
26
|
const history = (0, react_router_dom_1.useHistory)();
|
|
27
|
-
const { user,
|
|
27
|
+
const { user, fetchFullUser } = (0, Auth_1.useAuth)();
|
|
28
28
|
const { t } = (0, react_i18next_1.useTranslation)('authentication');
|
|
29
|
-
const onSuccess = (data) => {
|
|
29
|
+
const onSuccess = async (data) => {
|
|
30
30
|
if (data.token) {
|
|
31
|
-
|
|
31
|
+
await fetchFullUser();
|
|
32
32
|
history.push(`${admin}`);
|
|
33
33
|
}
|
|
34
34
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/admin/components/views/ResetPassword/index.tsx"],"names":[],"mappings":";;;;;AAAA,kDAA0B;AAC1B,uDAA+D;AAC/D,mDAAuC;AACvC,iDAAsD;AACtD,mDAAmD;AACnD,+CAA+C;AAC/C,sEAAsD;AACtD,4DAAoC;AACpC,gFAAwD;AACxD,8FAAsE;AACtE,gEAA4C;AAC5C,mEAA2C;AAC3C,gEAAwC;AACxC,sFAA8D;AAE9D,wBAAsB;AAEtB,MAAM,SAAS,GAAG,gBAAgB,CAAC;AAEnC,MAAM,aAAa,GAAa,GAAG,EAAE;IACnC,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;IAC3B,MAAM,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,GAAG,MAAM,CAAC;IAC7F,MAAM,EAAE,KAAK,EAAE,GAAG,IAAA,4BAAS,GAAsB,CAAC;IAClD,MAAM,OAAO,GAAG,IAAA,6BAAU,GAAE,CAAC;IAC7B,MAAM,EAAE,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/admin/components/views/ResetPassword/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -107,7 +107,7 @@ const EditView = (props) => {
|
|
|
107
107
|
return (react_1.default.createElement(react_router_dom_1.Redirect, { to: `${admin}/not-found` }));
|
|
108
108
|
}
|
|
109
109
|
const apiURL = `${serverURL}${api}/${slug}/${id}?locale=${locale}${collection.versions.drafts ? '&draft=true' : ''}`;
|
|
110
|
-
const action = `${serverURL}${api}/${slug}${isEditing ? `/${id}` : ''}?locale=${locale}&
|
|
110
|
+
const action = `${serverURL}${api}/${slug}${isEditing ? `/${id}` : ''}?locale=${locale}&fallback-locale=null`;
|
|
111
111
|
const hasSavePermission = (isEditing && ((_a = docPermissions === null || docPermissions === void 0 ? void 0 : docPermissions.update) === null || _a === void 0 ? void 0 : _a.permission)) || (!isEditing && ((_b = docPermissions === null || docPermissions === void 0 ? void 0 : docPermissions.create) === null || _b === void 0 ? void 0 : _b.permission));
|
|
112
112
|
const isLoading = !internalState || !docPermissions || isLoadingData;
|
|
113
113
|
return (react_1.default.createElement(EditDepth_1.EditDepthContext.Provider, { value: 1 },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/admin/components/views/collections/Edit/index.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/admin/components/views/collections/Edit/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ const types_1 = require("../../fields/config/types");
|
|
|
4
4
|
const isFieldNullable = (field, force) => {
|
|
5
5
|
const hasReadAccessControl = field.access && field.access.read;
|
|
6
6
|
const condition = field.admin && field.admin.condition;
|
|
7
|
-
return !
|
|
7
|
+
return !force && !((0, types_1.fieldAffectsData)(field) && 'required' in field && field.required && !field.localized && !condition && !hasReadAccessControl);
|
|
8
8
|
};
|
|
9
9
|
exports.default = isFieldNullable;
|
|
10
10
|
//# sourceMappingURL=isFieldNullable.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"isFieldNullable.js","sourceRoot":"","sources":["../../../src/graphql/schema/isFieldNullable.ts"],"names":[],"mappings":";;AAAA,qDAAiF;AAEjF,MAAM,eAAe,GAAG,CAAC,KAAyB,EAAE,KAAc,EAAW,EAAE;IAC7E,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,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"isFieldNullable.js","sourceRoot":"","sources":["../../../src/graphql/schema/isFieldNullable.ts"],"names":[],"mappings":";;AAAA,qDAAiF;AAEjF,MAAM,eAAe,GAAG,CAAC,KAAyB,EAAE,KAAc,EAAW,EAAE;IAC7E,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,OAAO,CAAC,KAAK,IAAI,CAAC,CAAC,IAAA,wBAAgB,EAAC,KAAK,CAAC,IAAI,UAAU,IAAI,KAAK,IAAI,KAAK,CAAC,QAAQ,IAAI,CAAC,KAAK,CAAC,SAAS,IAAI,CAAC,SAAS,IAAI,CAAC,oBAAoB,CAAC,CAAC;AAClJ,CAAC,CAAC;AAEF,kBAAe,eAAe,CAAC"}
|
|
@@ -78,7 +78,8 @@ const queryDraftsV1 = async ({ accessResult, collection, req, overrideAccess, pa
|
|
|
78
78
|
const queryDraftsV2 = async ({ accessResult, collection, req, overrideAccess, payload, paginationOptions, where, }) => {
|
|
79
79
|
var _a;
|
|
80
80
|
const VersionModel = payload.versions[collection.config.slug];
|
|
81
|
-
const
|
|
81
|
+
const queryWithPrefix = (0, appendVersionToQueryKey_1.appendVersionToQueryKey)(where || {});
|
|
82
|
+
const combinedQuery = (0, combineQueries_1.combineQueries)({ latest: { equals: true } }, queryWithPrefix);
|
|
82
83
|
const versionsQuery = await VersionModel.buildQuery({
|
|
83
84
|
where: combinedQuery,
|
|
84
85
|
access: accessResult,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queryDrafts.js","sourceRoot":"","sources":["../../../src/versions/drafts/queryDrafts.ts"],"names":[],"mappings":";;;AAMA,kEAA+D;AAC/D,qCAAkD;AAClD,uEAAoE;AAmB7D,MAAM,WAAW,GAAG,KAAK,EAAwB,IAAU,EAA6B,EAAE;;IAC/F,IAAI,MAAA,MAAA,IAAI,CAAC,OAAO,CAAC,MAAM,0CAAE,QAAQ,0CAAE,eAAe,EAAE;QAClD,OAAO,aAAa,CAAC,IAAI,CAAC,CAAC;KAC5B;IAED,OAAO,aAAa,CAAC,IAAI,CAAC,CAAC;AAC7B,CAAC,CAAC;AANW,QAAA,WAAW,eAMtB;AAEF,MAAM,aAAa,GAAG,KAAK,EAAwB,EACjD,YAAY,EACZ,UAAU,EACV,GAAG,EACH,cAAc,EACd,OAAO,EACP,iBAAiB,EACjB,KAAK,EAAE,aAAa,GACf,EAA6B,EAAE;;IACpC,MAAM,YAAY,GAAG,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAoB,CAAC;IAEjF,MAAM,KAAK,GAAG,IAAA,iDAAuB,EAAC,aAAa,IAAI,EAAE,CAAC,CAAC;IAE3D,IAAI,mBAAmB,CAAC;IAExB,IAAI,IAAA,2BAAoB,EAAC,YAAY,CAAC,EAAE;QACtC,mBAAmB,GAAG,IAAA,iDAAuB,EAAC,YAAY,CAAC,CAAC;KAC7D;IAED,MAAM,YAAY,GAAG,MAAM,YAAY,CAAC,UAAU,CAAC;QACjD,KAAK;QACL,MAAM,EAAE,mBAAmB;QAC3B,GAAG;QACH,cAAc;KACf,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,YAAY,CAAC,SAAS,CAAsB;QAC5D,gCAAgC;QAChC,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE;QAC5B,iDAAiD;QACjD;YACE,MAAM,EAAE;gBACN,GAAG,EAAE,SAAS;gBACd,OAAO,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE;gBAC/B,SAAS,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE;gBACnC,SAAS,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE;aACpC;SACF;QACD,iCAAiC;QACjC,EAAE,MAAM,EAAE,YAAY,EAAE;KACzB,EAAE;QACD,YAAY,EAAE,IAAI;KACnB,CAAC,CAAC;IAEH,IAAI,MAAM,CAAC;IAEX,IAAI,iBAAiB,EAAE;QACrB,MAAM,wBAAwB,GAAG;YAC/B,GAAG,iBAAiB;YACpB,QAAQ,EAAE,MAAA,OAAO,CAAC,YAAY,0CAAE,QAAQ;YACxC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC;iBACzC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,eAAe,EAAE,KAAK,CAAC,EAAE,EAAE;gBACzC,IAAI,GAAG,GAAG,eAAe,CAAC;gBAE1B,IAAI,CAAC,CAAC,WAAW,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE;oBAChE,GAAG,GAAG,WAAW,eAAe,EAAE,CAAC;iBACpC;gBAED,OAAO;oBACL,GAAG,IAAI;oBACP,CAAC,GAAG,CAAC,EAAE,KAAK,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;iBAChC,CAAC;YACJ,CAAC,EAAE,EAAE,CAAC;SACT,CAAC;QAEF,MAAM,GAAG,MAAM,YAAY,CAAC,iBAAiB,CAAC,SAAS,EAAE,wBAAwB,CAAC,CAAC;KACpF;SAAM;QACL,MAAM,GAAG,SAAS,CAAC,IAAI,EAAE,CAAC;KAC3B;IAED,OAAO;QACL,GAAG,MAAM;QACT,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YAC9B,GAAG,EAAE,GAAG,CAAC,GAAG;YACZ,GAAG,GAAG,CAAC,OAAO;YACd,SAAS,EAAE,GAAG,CAAC,SAAS;YACxB,SAAS,EAAE,GAAG,CAAC,SAAS;SACzB,CAAC,CAAC;KACJ,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,aAAa,GAAG,KAAK,EAAwB,EACjD,YAAY,EACZ,UAAU,EACV,GAAG,EACH,cAAc,EACd,OAAO,EACP,iBAAiB,EACjB,KAAK,GACA,EAA6B,EAAE;;IACpC,MAAM,YAAY,GAAG,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"queryDrafts.js","sourceRoot":"","sources":["../../../src/versions/drafts/queryDrafts.ts"],"names":[],"mappings":"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"}
|