joe/kami-parse-server
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change name of function and variable from baseFieldName to rootFieldName (#4817)

Browse Source
This commit is contained in:
Arthur Cinader
2018-06-07 16:27:11 -07:00
committed by Florent Vilmart
parent 1427eeac5a
commit f2f92858f1
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Controllers/DatabaseController.js
View File

@@ -295,12 +295,12 @@ const untransformObjectACL = ({_rperm, _wperm, ...output}) => {
} }
/** /**
* When querying, the fieldName may be compound, extract the base fieldName * When querying, the fieldName may be compound, extract the root fieldName
* `temperature.celsius` becomes `temperature` * `temperature.celsius` becomes `temperature`
* @param {string} fieldName that may be a compound field name * @param {string} fieldName that may be a compound field name
* @returns {string} the basename of the field * @returns {string} the root name of the field
*/ */
const getBaseFieldName = (fieldName: string): string => { const getRootFieldName = (fieldName: string): string => {
return fieldName.split('.')[0] return fieldName.split('.')[0]
} }
@@ -421,8 +421,8 @@ class DatabaseController {
if (fieldName.match(/^authData\.([a-zA-Z0-9_]+)\.id$/)) { if (fieldName.match(/^authData\.([a-zA-Z0-9_]+)\.id$/)) {
throw new Parse.Error(Parse.Error.INVALID_KEY_NAME, `Invalid field name for update: ${fieldName}`); throw new Parse.Error(Parse.Error.INVALID_KEY_NAME, `Invalid field name for update: ${fieldName}`);
} }
const baseFieldName = getBaseFieldName(fieldName); const rootFieldName = getRootFieldName(fieldName);
if (!SchemaController.fieldNameIsValid(baseFieldName) && !isSpecialUpdateKey(baseFieldName)) { if (!SchemaController.fieldNameIsValid(rootFieldName) && !isSpecialUpdateKey(rootFieldName)) {
throw new Parse.Error(Parse.Error.INVALID_KEY_NAME, `Invalid field name for update: ${fieldName}`); throw new Parse.Error(Parse.Error.INVALID_KEY_NAME, `Invalid field name for update: ${fieldName}`);
} }
}); });
@@ -910,8 +910,8 @@ class DatabaseController {
if (fieldName.match(/^authData\.([a-zA-Z0-9_]+)\.id$/)) { if (fieldName.match(/^authData\.([a-zA-Z0-9_]+)\.id$/)) {
throw new Parse.Error(Parse.Error.INVALID_KEY_NAME, `Cannot sort by ${fieldName}`); throw new Parse.Error(Parse.Error.INVALID_KEY_NAME, `Cannot sort by ${fieldName}`);
} }
const baseFieldName = getBaseFieldName(fieldName); const rootFieldName = getRootFieldName(fieldName);
if (!SchemaController.fieldNameIsValid(baseFieldName)) { if (!SchemaController.fieldNameIsValid(rootFieldName)) {
throw new Parse.Error(Parse.Error.INVALID_KEY_NAME, `Invalid field name: ${fieldName}.`); throw new Parse.Error(Parse.Error.INVALID_KEY_NAME, `Invalid field name: ${fieldName}.`);
} }
}); });