From 5c7c7e430fe3497cb1618052db17d9ca7c467afd Mon Sep 17 00:00:00 2001 From: Florent Vilmart Date: Tue, 12 Apr 2016 07:45:46 -0400 Subject: [PATCH] Renames Unsafe to WithoutValidation --- src/Controllers/DatabaseController.js | 18 +++++++++--------- src/Controllers/HooksController.js | 2 +- src/Controllers/UserController.js | 8 ++++---- src/Routers/GlobalConfigRouter.js | 4 ++-- src/pushStatusHandler.js | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/Controllers/DatabaseController.js b/src/Controllers/DatabaseController.js index 76894ff3c7..8643684d4f 100644 --- a/src/Controllers/DatabaseController.js +++ b/src/Controllers/DatabaseController.js @@ -9,14 +9,14 @@ var Parse = require('parse/node').Parse; var Schema = require('./../Schema'); const deepcopy = require('deepcopy'); -function DatabaseController(adapter, { unsafe } = {}) { +function DatabaseController(adapter, { skipValidation } = {}) { this.adapter = adapter; // We don't want a mutable this.schema, because then you could have // one request that uses different schemas for different parts of // it. Instead, use loadSchema to get a schema. this.schemaPromise = null; - this.unsafe = !!unsafe; + this.skipValidation = !!skipValidation; this.connect(); Object.defineProperty(this, 'transform', { @@ -26,8 +26,8 @@ function DatabaseController(adapter, { unsafe } = {}) { }) } -DatabaseController.prototype.Unsafe = function() { - return new DatabaseController(this.adapter, {collectionPrefix: this.collectionPrefix, unsafe: true}); +DatabaseController.prototype.WithoutValidation = function() { + return new DatabaseController(this.adapter, {collectionPrefix: this.collectionPrefix, skipValidation: true}); } // Connects to the database. Returns a promise that resolves when the @@ -49,7 +49,7 @@ DatabaseController.prototype.dropCollection = function(className) { }; DatabaseController.prototype.validateClassName = function(className) { - if (this.unsafe) { + if (this.skipValidation) { return Promise.resolve(); } if (!Schema.classNameIsValid(className)) { @@ -167,11 +167,11 @@ DatabaseController.prototype.update = function(className, query, update, options .then(() => this.handleRelationUpdates(className, query.objectId, update)) .then(() => this.adapter.adaptiveCollection(className)) .then(collection => { - var mongoWhere = this.transform.transformWhere(schema, className, query, {validate: !this.unsafe}); + var mongoWhere = this.transform.transformWhere(schema, className, query, {validate: !this.skipValidation}); if (options.acl) { mongoWhere = this.transform.addWriteACL(mongoWhere, options.acl); } - mongoUpdate = this.transform.transformUpdate(schema, className, update, {validate: !this.unsafe}); + mongoUpdate = this.transform.transformUpdate(schema, className, update, {validate: !this.skipValidation}); if (options.many) { return collection.updateMany(mongoWhere, mongoUpdate); }else if (options.upsert) { @@ -185,7 +185,7 @@ DatabaseController.prototype.update = function(className, query, update, options return Promise.reject(new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, 'Object not found.')); } - if (this.unsafe) { + if (this.skipValidation) { return Promise.resolve(result); } return sanitizeDatabaseResult(originalUpdate, result); @@ -307,7 +307,7 @@ DatabaseController.prototype.destroy = function(className, query, options = {}) }) .then(() => this.adapter.adaptiveCollection(className)) .then(collection => { - let mongoWhere = this.transform.transformWhere(schema, className, query, {validate: !this.unsafe}); + let mongoWhere = this.transform.transformWhere(schema, className, query, {validate: !this.skipValidation}); if (options.acl) { mongoWhere = this.transform.addWriteACL(mongoWhere, options.acl); } diff --git a/src/Controllers/HooksController.js b/src/Controllers/HooksController.js index ebb4e5aa74..7e97fd5406 100644 --- a/src/Controllers/HooksController.js +++ b/src/Controllers/HooksController.js @@ -15,7 +15,7 @@ export class HooksController { constructor(applicationId:string, collectionPrefix:string = '') { this._applicationId = applicationId; this._collectionPrefix = collectionPrefix; - this.database = DatabaseAdapter.getDatabaseConnection(this._applicationId, this._collectionPrefix).Unsafe(); + this.database = DatabaseAdapter.getDatabaseConnection(this._applicationId, this._collectionPrefix).WithoutValidation(); } load() { diff --git a/src/Controllers/UserController.js b/src/Controllers/UserController.js index 74bcdebadf..be6e717592 100644 --- a/src/Controllers/UserController.js +++ b/src/Controllers/UserController.js @@ -45,7 +45,7 @@ export class UserController extends AdaptableController { // TODO: Better error here. return Promise.reject(); } - let database = this.config.database.Unsafe(); + let database = this.config.database.WithoutValidation(); return database.update('_User', { username: username, _email_verify_token: token @@ -58,7 +58,7 @@ export class UserController extends AdaptableController { } checkResetTokenValidity(username, token) { - let database = this.config.database.Unsafe(); + let database = this.config.database.WithoutValidation(); return database.find('_User', { username: username, _perishable_token: token @@ -115,7 +115,7 @@ export class UserController extends AdaptableController { setPasswordResetToken(email) { let token = randomString(25); - let database = this.config.database.Unsafe(); + let database = this.config.database.WithoutValidation(); return database.update('_User', {email: email}, {_perishable_token: token}); } @@ -153,7 +153,7 @@ export class UserController extends AdaptableController { return updateUserPassword(user.objectId, password, this.config); }).then(() => { // clear reset password token - return this.config.database.Unsafe().update('_User', { username }, { + return this.config.database.WithoutValidation().update('_User', { username }, { _perishable_token: {__op: 'Delete'} }); }); diff --git a/src/Routers/GlobalConfigRouter.js b/src/Routers/GlobalConfigRouter.js index 59b22a86c6..c6a82dbbf4 100644 --- a/src/Routers/GlobalConfigRouter.js +++ b/src/Routers/GlobalConfigRouter.js @@ -5,7 +5,7 @@ import * as middleware from "../middlewares"; export class GlobalConfigRouter extends PromiseRouter { getGlobalConfig(req) { - let database = req.config.database.Unsafe(); + let database = req.config.database.WithoutValidation(); return database.find('_GlobalConfig', { '_id': 1 }, { limit: 1 }).then((results) => { if (results.length != 1) { // If there is no config in the database - return empty config. @@ -23,7 +23,7 @@ export class GlobalConfigRouter extends PromiseRouter { acc[`params.${key}`] = params[key]; return acc; }, {}); - let database = req.config.database.Unsafe(); + let database = req.config.database.WithoutValidation(); return database.update('_GlobalConfig', {_id: 1}, update, {upsert: true}).then(() => { return Promise.resolve({ response: { result: true } }); }); diff --git a/src/pushStatusHandler.js b/src/pushStatusHandler.js index d68127e9e0..85beebd0a3 100644 --- a/src/pushStatusHandler.js +++ b/src/pushStatusHandler.js @@ -19,7 +19,7 @@ export default function pushStatusHandler(config) { let initialPromise; let pushStatus; let objectId = newObjectId(); - let database = config.database.Unsafe(); + let database = config.database.WithoutValidation(); let setInitial = function(body = {}, where, options = {source: 'rest'}) { let now = new Date();