@livepreso/api 6.53.1 → 6.55.0

package/src/sync.js

@@ -40,7 +40,7 @@ export const buildURL = function ({ method, model }) {
 	return url;
 };
 
-export const sync = function (method) {
+export const sync = function (method, model, defaultOpts) {
 	const syncArguments = arguments;
 
 	if (method === "read") {
@@ -52,18 +52,19 @@ export const sync = function (method) {
 			}
 		});
 
-		return Promise.all(syncActions).then(() => {
-			return ajaxSync.apply(this, syncArguments);
+		return Promise.all(syncActions).then((...newOpts) => {
+			const joinedOpts = _.merge({}, defaultOpts, ...newOpts.flat());
+			return ajaxSync.call(this, method, model, joinedOpts);
 		});
 	}
-	return ajaxSync.apply(this, syncArguments);
+	return ajaxSync.call(this, method, model, defaultOpts);
 };
 
 export const ajaxSync = function (method, model, options) {
 	const type = methodMap[method];
 
 	// Default options, unless specified.
-	defaults(options || (options = {}), {
+	defaults(options || {}, {
 		emulateHTTP: false,
 		emulateJSON: false,
 	});
@@ -118,7 +119,7 @@ export const ajaxSync = function (method, model, options) {
 
 	middlewares.forEach((middleware) => {
 		if (middleware.preflight) {
-			middleware.preflight(request);
+			middleware.preflight(request, model, options);
 		}
 	});
 
@@ -155,10 +156,10 @@ export const ajaxSync = function (method, model, options) {
 
 	// TODO: Remove me when this can be moved... for now this removal is quite a complex
 	// process.
-	if (options.cached && !options.deleted) {
+	if (options.cachedResponse) {
 		return Promise.resolve(options.cachedResponse)
 			.then(getNextMiddleware(request))
-			.then(function (response) {
+			.then((response) => {
 				if (!response.data) {
 					response.data = JSON.parse(response.text);
 				}
@@ -173,7 +174,7 @@ export const ajaxSync = function (method, model, options) {
 					return response.data;
 				});
 			})
-			.catch(function (response) {
+			.catch((response) => {
 				return Promise.each(middlewares, (middleware) => {
 					return middleware.error(response, model);
 				}).then(() => {
@@ -189,9 +190,12 @@ export const ajaxSync = function (method, model, options) {
 		request
 			// Force a timeout on every request. Intermittent connections
 			// can have the request continue trying for minutes otherwise.
-			.timeout(60 * 1000)
+			// 60 seconds is the timeout the server has, so we go for 65 seconds,
+			// so we give the chance to the server to time out first - helps with
+			// debugging.
+			.timeout(65 * 1000)
 			.then(getNextMiddleware(request))
-			.then(function (response) {
+			.then((response) => {
 				let data;
 				try {
 					data = JSON.parse(response.text);
@@ -223,7 +227,7 @@ export const ajaxSync = function (method, model, options) {
 				}
 				throw e;
 			})
-			.catch(function (response) {
+			.catch((response) => {
 				return Promise.each(middlewares, (middleware) => {
 					return middleware.error(response);
 				}).then(() => {

package/src/utils.js

@@ -149,9 +149,19 @@ export function sanitizeBase64(obj, conditionFn = () => true) {
 			return { ...acc, [key]: sanitizeBase64(obj[key], conditionFn) };
 		}, {});
 	} else if (typeof obj === "string") {
-		const re = /^data:image\/[a-zA-Z]+;base64,[A-Za-z0-9+/=]+$/;
-		if (re.test(obj) && conditionFn(obj)) {
-			return "";
+		// Catch anything that looks like base64, or base64%2C (which is the encoded version)
+		// and strip it. This is a last resort, we'd prefer not to be in this position!
+		const re = /base64(,|(%2C))/;
+
+		if (re.test(obj)) {
+			// If you're a developer, let's throw an error.
+			if (process.env.NODE_ENV === "development" && !window.Cypress) {
+				throw new Error("Tried to save a base64 string. Figure out why!");
+			}
+
+			if (conditionFn?.(obj) ?? true) {
+				return "";
+			}
 		}
 	}
 	return obj;

package/src/utils.spec.js

@@ -3,6 +3,7 @@ import {
 	getShortURL,
 	removeMultiByteChars,
 	replaceHostname,
+	sanitizeBase64,
 } from "./utils.js";
 
 describe("getShortURL()", () => {
@@ -160,3 +161,29 @@ describe("replaceHostname()", () => {
 		expect(actual).toEqual(expected);
 	});
 });
+
+describe.only("sanitizeBase64()", () => {
+	["data:image/webp;base64,", "data%3Aimage%2Fwebp%3Bbase64%2C"].forEach(
+		(base64) => {
+			it("should strip base64 from string", () => {
+				expect(sanitizeBase64(base64)).toEqual("");
+			});
+
+			it("should strip base64 from array", () => {
+				expect(sanitizeBase64([base64])).toEqual([""]);
+			});
+
+			it("should strip base64 from nested object", () => {
+				expect(
+					sanitizeBase64({
+						foo: [base64],
+					}),
+				).toEqual({ foo: [""] });
+			});
+
+			it("should not strip if condition says not to", () => {
+				expect(sanitizeBase64(base64, () => false)).toEqual(base64);
+			});
+		},
+	);
+});

package/cjs/collections/created-assets.js

@@ -1,26 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.CreatedAssetCollection = void 0;
-require("../models/asset.js");
-var _base = require("./base.js");
-var _stateRegister = require("../state-register.js");
-/**
- * @constructor
- * @alias collections.CreatedAssetCollection
- * @extends collections.BaseCollection
- * @see models.AssetModel
- */
-var CreatedAssetCollection = exports.CreatedAssetCollection = _base.BaseCollection.extend(/** @lends collections.CreatedAssetCollection# */{
-  model: "AssetModel",
-  url: function url() {
-    if (!this._url && this.parent) {
-      this._url = this.getFullURLPath("".concat(this.parent.getPlainURL(), "created/"));
-    }
-    return _base.BaseCollection.prototype.url.call(this);
-  }
-});
-(0, _stateRegister.register)("CreatedAssetCollection", CreatedAssetCollection);
-//# sourceMappingURL=created-assets.js.map

package/cjs/collections/created-assets.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"created-assets.js","names":["require","_base","_stateRegister","CreatedAssetCollection","exports","BaseCollection","extend","model","url","_url","parent","getFullURLPath","concat","getPlainURL","prototype","call","register"],"sources":["../../src/collections/created-assets.js"],"sourcesContent":["import \"../models/asset.js\";\n\nimport { BaseCollection } from \"./base.js\";\nimport { register } from \"../state-register.js\";\n\n/**\n * @constructor\n * @alias collections.CreatedAssetCollection\n * @extends collections.BaseCollection\n * @see models.AssetModel\n */\nexport const CreatedAssetCollection = BaseCollection.extend(\n\t/** @lends collections.CreatedAssetCollection# */ {\n\t\tmodel: \"AssetModel\",\n\n\t\turl() {\n\t\t\tif (!this._url && this.parent) {\n\t\t\t\tthis._url = this.getFullURLPath(`${this.parent.getPlainURL()}created/`);\n\t\t\t}\n\n\t\t\treturn BaseCollection.prototype.url.call(this);\n\t\t},\n\t},\n);\n\nregister(\"CreatedAssetCollection\", CreatedAssetCollection);\n"],"mappings":";;;;;;AAAAA,OAAA;AAEA,IAAAC,KAAA,GAAAD,OAAA;AACA,IAAAE,cAAA,GAAAF,OAAA;AAEA;AACA;AACA;AACA;AACA;AACA;AACO,IAAMG,sBAAsB,GAAAC,OAAA,CAAAD,sBAAA,GAAGE,oBAAc,CAACC,MAAM,CAC1D,iDAAkD;EACjDC,KAAK,EAAE,YAAY;EAEnBC,GAAG,WAAHA,GAAGA,CAAA,EAAG;IACL,IAAI,CAAC,IAAI,CAACC,IAAI,IAAI,IAAI,CAACC,MAAM,EAAE;MAC9B,IAAI,CAACD,IAAI,GAAG,IAAI,CAACE,cAAc,IAAAC,MAAA,CAAI,IAAI,CAACF,MAAM,CAACG,WAAW,CAAC,CAAC,aAAU,CAAC;IACxE;IAEA,OAAOR,oBAAc,CAACS,SAAS,CAACN,GAAG,CAACO,IAAI,CAAC,IAAI,CAAC;EAC/C;AACD,CACD,CAAC;AAED,IAAAC,uBAAQ,EAAC,wBAAwB,EAAEb,sBAAsB,CAAC","ignoreList":[]}

package/cjs/collections/deleted-assets.js

@@ -1,26 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.DeletedAssetCollection = void 0;
-require("../models/asset.js");
-var _base = require("./base.js");
-var _stateRegister = require("../state-register.js");
-/**
- * @constructor
- * @alias collections.DeletedAssetCollection
- * @extends collections.BaseCollection
- * @see models.AssetModel
- */
-var DeletedAssetCollection = exports.DeletedAssetCollection = _base.BaseCollection.extend(/** @lends collections.DeletedAssetCollection# */{
-  model: "AssetModel",
-  url: function url() {
-    if (!this._url && this.parent) {
-      this._url = this.getFullURLPath("".concat(this.parent.getPlainURL(), "deleted/"));
-    }
-    return _base.BaseCollection.prototype.url.call(this);
-  }
-});
-(0, _stateRegister.register)("DeletedAssetCollection", DeletedAssetCollection);
-//# sourceMappingURL=deleted-assets.js.map

package/cjs/collections/deleted-assets.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"deleted-assets.js","names":["require","_base","_stateRegister","DeletedAssetCollection","exports","BaseCollection","extend","model","url","_url","parent","getFullURLPath","concat","getPlainURL","prototype","call","register"],"sources":["../../src/collections/deleted-assets.js"],"sourcesContent":["import \"../models/asset.js\";\n\nimport { BaseCollection } from \"./base.js\";\nimport { register } from \"../state-register.js\";\n\n/**\n * @constructor\n * @alias collections.DeletedAssetCollection\n * @extends collections.BaseCollection\n * @see models.AssetModel\n */\nexport const DeletedAssetCollection = BaseCollection.extend(\n\t/** @lends collections.DeletedAssetCollection# */ {\n\t\tmodel: \"AssetModel\",\n\n\t\turl() {\n\t\t\tif (!this._url && this.parent) {\n\t\t\t\tthis._url = this.getFullURLPath(`${this.parent.getPlainURL()}deleted/`);\n\t\t\t}\n\n\t\t\treturn BaseCollection.prototype.url.call(this);\n\t\t},\n\t},\n);\n\nregister(\"DeletedAssetCollection\", DeletedAssetCollection);\n"],"mappings":";;;;;;AAAAA,OAAA;AAEA,IAAAC,KAAA,GAAAD,OAAA;AACA,IAAAE,cAAA,GAAAF,OAAA;AAEA;AACA;AACA;AACA;AACA;AACA;AACO,IAAMG,sBAAsB,GAAAC,OAAA,CAAAD,sBAAA,GAAGE,oBAAc,CAACC,MAAM,CAC1D,iDAAkD;EACjDC,KAAK,EAAE,YAAY;EAEnBC,GAAG,WAAHA,GAAGA,CAAA,EAAG;IACL,IAAI,CAAC,IAAI,CAACC,IAAI,IAAI,IAAI,CAACC,MAAM,EAAE;MAC9B,IAAI,CAACD,IAAI,GAAG,IAAI,CAACE,cAAc,IAAAC,MAAA,CAAI,IAAI,CAACF,MAAM,CAACG,WAAW,CAAC,CAAC,aAAU,CAAC;IACxE;IAEA,OAAOR,oBAAc,CAACS,SAAS,CAACN,GAAG,CAACO,IAAI,CAAC,IAAI,CAAC;EAC/C;AACD,CACD,CAAC;AAED,IAAAC,uBAAQ,EAAC,wBAAwB,EAAEb,sBAAsB,CAAC","ignoreList":[]}

package/src/collections/created-assets.js

@@ -1,26 +0,0 @@
-import "../models/asset.js";
-
-import { BaseCollection } from "./base.js";
-import { register } from "../state-register.js";
-
-/**
- * @constructor
- * @alias collections.CreatedAssetCollection
- * @extends collections.BaseCollection
- * @see models.AssetModel
- */
-export const CreatedAssetCollection = BaseCollection.extend(
-	/** @lends collections.CreatedAssetCollection# */ {
-		model: "AssetModel",
-
-		url() {
-			if (!this._url && this.parent) {
-				this._url = this.getFullURLPath(`${this.parent.getPlainURL()}created/`);
-			}
-
-			return BaseCollection.prototype.url.call(this);
-		},
-	},
-);
-
-register("CreatedAssetCollection", CreatedAssetCollection);

package/src/collections/deleted-assets.js

@@ -1,26 +0,0 @@
-import "../models/asset.js";
-
-import { BaseCollection } from "./base.js";
-import { register } from "../state-register.js";
-
-/**
- * @constructor
- * @alias collections.DeletedAssetCollection
- * @extends collections.BaseCollection
- * @see models.AssetModel
- */
-export const DeletedAssetCollection = BaseCollection.extend(
-	/** @lends collections.DeletedAssetCollection# */ {
-		model: "AssetModel",
-
-		url() {
-			if (!this._url && this.parent) {
-				this._url = this.getFullURLPath(`${this.parent.getPlainURL()}deleted/`);
-			}
-
-			return BaseCollection.prototype.url.call(this);
-		},
-	},
-);
-
-register("DeletedAssetCollection", DeletedAssetCollection);