@livepreso/api 6.55.2 → 6.56.1

package/src/models/deck-version.js

@@ -5,15 +5,12 @@ import "./deck.js";
 import "./asset.js";
 import "./manifest-json.js";
 
-import { Auth } from "../auth.js";
 import { BaseModel } from "./base.js";
 import { DeckLayoutModel } from "./deck-layout.js";
 import { DeckVersionScreenshotCollection } from "../collections/deck-version-screenshots.js";
 import Promise from "bluebird";
 import { TemplateCollection } from "../collections.js";
-import _ from "lodash";
 import { register } from "../state-register.js";
-import superagent from "superagent";
 
 /**
  * @constructor
@@ -178,29 +175,6 @@ export const DeckVersionModel = BaseModel.extend(
 				});
 		},
 
-		getFixtures(fixtures = {}, rootAssetUrl = this.getRootAssetUrl()) {
-			const fixturePaths = this.manifest_json.fixtures || {};
-
-			const imports = _.map(fixturePaths, (fixture, key) => {
-				const path = `${rootAssetUrl}${fixture}`;
-
-				return superagent
-					.get(path)
-					.then((response) => {
-						if (response.text) {
-							fixtures[key] = JSON.parse(response.text);
-						} else {
-							fixtures[key] = response.body || {};
-						}
-					})
-					.catch(superagent.SuperagentPromiseError, (e) => {
-						throw e;
-					});
-			});
-
-			return Promise.all(imports);
-		},
-
 		fetch(opts, ...other) {
 			const fetch = BaseModel.prototype.fetch.apply(this, [opts, ...other]);
 			const shouldFetchTemplates = opts?.fetchTemplates ?? true;
@@ -226,17 +200,17 @@ export const DeckVersionModel = BaseModel.extend(
 			);
 		},
 
-		fetchLayout: async function (presetId, scenarioID) {
+		fetchLayout: async function ({ presetID, scenarioID }) {
 			let queryParams = { version: this.version };
-			if (presetId) {
-				queryParams.preset_id = presetId;
+			if (presetID) {
+				queryParams.preset_id = presetID;
 			}
 			if (scenarioID) {
 				queryParams.scenario_id = scenarioID;
 			}
 
-			if (!this.id) {
-				return Promise.reject(new Error("DeckVersion has no ID."));
+			if (!this.deck.id) {
+				return Promise.reject(new Error("DeckVersion has no deck."));
 			}
 
 			const layout = new DeckLayoutModel(

package/src/models/manifest-json.js

@@ -1,8 +1,10 @@
+import _ from "lodash";
 import "./pack.js";
 
+import superagent from "superagent";
 import { BaseModel } from "./base.js";
 import { register } from "../state-register.js";
-import url2 from "url";
+import { resolveURL } from "../utils.js";
 
 /**
  * @constructor
@@ -135,7 +137,7 @@ export const ManifestJSONModel = BaseModel.extend(
 		getDimensionsByName(name) {
 			if (Array.isArray(this.dimensions)) {
 				const dimension = this.dimensions.find(
-					(d) => d.name?.toLowerCase() === name?.toLowerCase(),
+					(d) => d.name?.toLowerCase() === name.toLowerCase(),
 				);
 				if (!dimension) {
 					return { width: 1024, height: 767 };
@@ -166,12 +168,12 @@ export const ManifestJSONModel = BaseModel.extend(
 		getAssetPath(key = null) {
 			if (key) {
 				const [sectionKey, slideKey = null] = key.split("/");
-				const sectionKeyPath = url2.resolve(
+				const sectionKeyPath = resolveURL(
 					this.url(),
 					`sections/${sectionKey}/`,
 				);
 				if (slideKey) {
-					return url2.resolve(sectionKeyPath, `slides/${slideKey}/`);
+					return resolveURL(sectionKeyPath, `slides/${slideKey}/`);
 				}
 				return sectionKeyPath;
 			}
@@ -185,7 +187,33 @@ export const ManifestJSONModel = BaseModel.extend(
 		 * @returns {?string}
 		 */
 		getTemplateAssetPath(key) {
-			return url2.resolve(this.getAssetPath(), `templates/${key}/`);
+			return resolveURL(this.getAssetPath(), `templates/${key}/`);
+		},
+
+		async getFixtures(rootAssetUrl) {
+			const fixturePaths = this.fixtures || {};
+			const fixtures = {};
+
+			const imports = _.map(fixturePaths, (fixture, key) => {
+				const path = `${rootAssetUrl}${fixture}`;
+
+				return superagent
+					.get(path)
+					.then((response) => {
+						if (response.text) {
+							fixtures[key] = JSON.parse(response.text);
+						} else {
+							fixtures[key] = response.body || {};
+						}
+					})
+					.catch(superagent.SuperagentPromiseError, (e) => {
+						throw e;
+					});
+			});
+
+			await Promise.all(imports);
+
+			return fixtures;
 		},
 
 		url() {

package/src/models/pack.js

@@ -23,6 +23,7 @@ export const PackModel = BaseModel.extend(
 			modified_date: "date",
 			hash_digest: "string",
 			hash_algorithm: "string",
+			root_url: "string",
 		},
 
 		/**

package/src/models/timing-log.js

@@ -5,15 +5,12 @@ import "../collections/users.js";
 
 import { DATE_FORMAT, DATE_FORMAT_T } from "../utils.js";
 
-import { Auth } from "../auth.js";
 import { BaseModel } from "./base.js";
-import _ from "lodash";
 import dedent from "dedent-js";
 import { getShortURL } from "../utils.js";
 import log from "../log.js";
 import moment from "moment";
 import { register } from "../state-register.js";
-import superagent from "superagent";
 
 /**
  * @typedef Event
@@ -104,6 +101,18 @@ export const TimingLogModel = BaseModel.extend(
 			remote_attendee_set: "UserCollection",
 		},
 
+		ajaxConfig() {
+			return {
+				headers: {
+					"content-type": "application/vnd.salespreso+timinglog",
+				},
+			};
+		},
+
+		toServer() {
+			return this.toCompactFormat();
+		},
+
 		/**
 		 * Returns the current timing log model in expected compact format.
 		 * @see http://doc.dev.salespreso.com/api/tracking.html#compact-representation
@@ -198,7 +207,9 @@ export const TimingLogModel = BaseModel.extend(
 		 * timingLog.addEvent("http://client.salespreso.com/api/sections/28/", moment());
 		 * timingLog.addEvent("http://client.salespreso.com/api/slides/100/", "2016-10-27T00:42:47.045186Z");
 		 */
-		addEvent(path, timestamp) {
+		addEvent(_path, timestamp) {
+			let path = _path;
+
 			if (!path) {
 				throw new Error("A path is required");
 			}
@@ -280,33 +291,18 @@ export const TimingLogModel = BaseModel.extend(
 				return Promise.resolve(this.toJSON());
 			}
 
-			if (options && options.patch) {
-				return BaseModel.prototype.save.call(this, data, options);
-			}
-
 			this.checkEventsAscending();
 
-			const method = this.isNew() ? "post" : "put";
-
-			return superagent[method](this.url())
-				.set(Auth.headers)
-				.type("application/vnd.salespreso+timinglog")
-				.send(this.toCompactFormat())
-				.then(({ body }) => {
-					this.set(_.omit(body, ["events"]));
-					return body;
-				})
-				.catch(superagent.SuperagentPromiseError, (e) => {
-					if (e.status === 405 && e.res.body.detail.indexOf("end") > -1) {
-						// Don't send timing log events if the tracking is ended.
-						throw e;
-					}
-
-					if ((e.status >= 400 && e.status <= 499) || e.status === 503) {
-						e.message += `\nBody: ${JSON.stringify(e.res.body)}`;
-					}
+			return BaseModel.prototype.save.call(this, data, options).catch((e) => {
+				if (e.status === 405 && e.response?.body?.detail?.indexOf("end") > -1) {
 					throw e;
-				});
+				}
+
+				if ((e.status >= 400 && e.status <= 499) || e.status === 503) {
+					e.message += `\nBody: ${JSON.stringify(e.response?.body)}`;
+				}
+				throw e;
+			});
 		},
 	},
 );

package/src/presentation/presentation-deck.js

@@ -17,7 +17,7 @@ import _ from "lodash";
 import { getAssetRoot } from "../index.js";
 import log from "../log.js";
 import { register } from "../state-register";
-import url2 from "url";
+import { resolveURL } from "../utils.js";
 
 /**
  * @constructor
@@ -67,6 +67,9 @@ export const PresentationDeck = BasePresentationModel.extend(
 			version: "number",
 			namespacedKey: "string",
 			cmsvalkey_set: "array",
+			isWelcome: { type: "boolean", default: true },
+			isSlide: { type: "boolean", default: false },
+			isSection: { type: "boolean", default: false },
 		},
 
 		/**
@@ -406,8 +409,8 @@ PresentationDeck.createFromManifestJSON = function (manifestJSON, project) {
 		index: 0,
 		visible: true,
 		key: manifestJSON.key || "manifest_deck",
-		html: url2.resolve(manifestJSON.getAssetPath(), "index.html"),
-		css: url2.resolve(manifestJSON.getAssetPath(), "slide.css"),
+		html: resolveURL(manifestJSON.getAssetPath(), "index.html"),
+		css: resolveURL(manifestJSON.getAssetPath(), "slide.css"),
 		common: manifestJSON.common,
 		thumbnail: null,
 		deckID: 1,
@@ -434,8 +437,8 @@ PresentationDeck.createFromManifestJSON = function (manifestJSON, project) {
 			return {
 				key: newKey,
 				sequence,
-				html: url2.resolve(manifestJSON.getAssetPath(key), "index.html"),
-				css: url2.resolve(manifestJSON.getAssetPath(key), "slide.css"),
+				html: resolveURL(manifestJSON.getAssetPath(key), "index.html"),
+				css: resolveURL(manifestJSON.getAssetPath(key), "slide.css"),
 				title: manifestJSON.titles[key],
 				tags: manifestJSON.tags[key] || [],
 				cmsvalkey_set: [],
@@ -500,10 +503,7 @@ PresentationDeck.createFromManifestJSON = function (manifestJSON, project) {
 				key,
 				sequence: manifestJSON.templates[key].ordering,
 				index_asset: {
-					url: url2.resolve(
-						manifestJSON.getTemplateAssetPath(key),
-						"index.html",
-					),
+					url: resolveURL(manifestJSON.getTemplateAssetPath(key), "index.html"),
 				},
 				cmsvalkey_set: cmsvals,
 			};

package/src/presentation/presentation-section.js

@@ -17,7 +17,7 @@ import { PresentationSlide } from "./presentation-slide.js";
 import _ from "lodash";
 import { getAssetRoot } from "../index.js";
 import { register } from "../state-register.js";
-import url2 from "url";
+import { resolveURL } from "../utils.js";
 
 /**
  * @constructor
@@ -102,11 +102,10 @@ export const PresentationSection = BasePresentationModel.extend(
 			tagsEditable: "boolean",
 			tags: "array",
 			impostor: "boolean",
-			isWelcome: {
-				type: "boolean",
-				default: false,
-			},
 			cmsvalkey_set: "array",
+			isWelcome: { type: "boolean", default: false },
+			isSlide: { type: "boolean", default: false },
+			isSection: { type: "boolean", default: true },
 		},
 
 		/**
@@ -445,8 +444,8 @@ PresentationSection.createFromManifestJSON = function (
 		id: parseInt(_.uniqueId(), 10),
 		index,
 		title: manifestJSON.titles[sectionKey],
-		html: url2.resolve(manifestJSON.getAssetPath(sectionKey), "index.html"),
-		css: url2.resolve(manifestJSON.getAssetPath(sectionKey), "slide.css"),
+		html: resolveURL(manifestJSON.getAssetPath(sectionKey), "index.html"),
+		css: resolveURL(manifestJSON.getAssetPath(sectionKey), "slide.css"),
 		key: sectionKey,
 		sequence: manifestJSON.ordering[sectionKey] - 1,
 		thumbnail: null,
@@ -605,11 +604,32 @@ PresentationSection.createFromAutoAdjunct = function (model, opts = {}) {
 	return autoAdjunctSection;
 };
 
-PresentationSection.createFromTemplate = function (template, index, minID = 0) {
+PresentationSection.createFromTemplate = function (
+	template,
+	index,
+	minID = 0,
+	options = {},
+) {
 	const templateModel = new TemplateModel(template);
 
+	_.defaults(options, {
+		rootAssetPath: null,
+	});
+
 	const deckversion = new DeckVersionModel(templateModel.deckversion);
-	const templateAssetRoot = getAssetRoot(templateModel.index_asset.url());
+
+	let html;
+	let css;
+
+	if (options.rootAssetPath) {
+		const origPath = templateModel.index_asset.orig_path;
+		html = `${options.rootAssetPath}${origPath}/index.html`;
+		css = `${options.rootAssetPath}${origPath}/slide.css`;
+	} else {
+		const templateAssetRoot = getAssetRoot(templateModel.index_asset.url());
+		html = `${templateAssetRoot}index.html`;
+		css = `${templateAssetRoot}slide.css`;
+	}
 
 	const presentationSection = new PresentationSection({
 		id: minID + parseInt(_.uniqueId(), 10),
@@ -617,8 +637,8 @@ PresentationSection.createFromTemplate = function (template, index, minID = 0) {
 		template: templateModel,
 		key: `template-${templateModel.key}`,
 		title: templateModel.title,
-		html: `${templateAssetRoot}index.html`,
-		css: `${templateAssetRoot}slide.css`,
+		html,
+		css,
 		custom: false,
 		visible: true,
 		thumbnail: templateModel.image_256,

package/src/presentation/presentation-section.spec.js

@@ -63,6 +63,8 @@ describe("#createFromSection", () => {
 			id: 1728,
 			impostor: false,
 			index: 0,
+			isSection: true,
+			isSlide: false,
 			isWelcome: false,
 			key: "agenda",
 			namespacedKey: "agenda",
@@ -192,6 +194,8 @@ describe("#createFromAdjunctSection", () => {
 				"https://staging-test-cdn.salespreso.com/media/autoadjunct/123.png",
 			impostor: false,
 			index: 1,
+			isSection: true,
+			isSlide: false,
 			isWelcome: false,
 			key: "adjunct-1737",
 			sequence: 1,
@@ -325,6 +329,8 @@ describe("#createFromImpostorSection", () => {
 			id: 23898,
 			impostor: true,
 			index: 0,
+			isSection: true,
+			isSlide: false,
 			isWelcome: false,
 			key: "agenda",
 			namespacedKey: "test-deck/agenda",
@@ -437,6 +443,8 @@ describe("#createFromAutoAdjunct", () => {
 				"https://staging-test-cdn.salespreso.com/media/autoadjunct/123.png",
 			impostor: false,
 			index: 3,
+			isSection: true,
+			isSlide: false,
 			isWelcome: false,
 			key: "autoadjunct-five",
 			sequence: 3,

package/src/presentation/presentation-slide.js

@@ -9,7 +9,7 @@ import { PresentationSubSlide } from "./presentation-subslide.js";
 import _ from "lodash";
 import { getAssetRoot } from "../index.js";
 import { register } from "../state-register.js";
-import url2 from "url";
+import { resolveURL } from "../utils.js";
 
 /**
  * @constructor
@@ -88,6 +88,9 @@ export const PresentationSlide = BasePresentationModel.extend(
 			tagsEditable: "boolean",
 			tags: "array",
 			cmsvalkey_set: "array",
+			isWelcome: { type: "boolean", default: false },
+			isSlide: { type: "boolean", default: true },
+			isSection: { type: "boolean", default: false },
 		},
 
 		/**
@@ -365,8 +368,8 @@ PresentationSlide.createFromManifestJSON = function (
 		id: parseInt(_.uniqueId(), 10),
 		title: manifestJSON.titles[key],
 		index,
-		html: url2.resolve(manifestJSON.getAssetPath(key), "index.html"),
-		css: url2.resolve(manifestJSON.getAssetPath(key), "slide.css"),
+		html: resolveURL(manifestJSON.getAssetPath(key), "index.html"),
+		css: resolveURL(manifestJSON.getAssetPath(key), "slide.css"),
 		key: slideKey,
 		editable: false,
 		titleEditable: false,
@@ -429,9 +432,9 @@ PresentationSlide.createFromTemplate = function (
 		titleEditable: false,
 		notesEditable: false,
 		tagsEditable: false,
-		thumbnail: null,
 		custom: false,
 		visible: true,
+		thumbnail: template.image_256,
 		section: sectionID,
 		// Makes sure templates are rendered with unique IDs
 		autoAdjunctID: Number(_.uniqueId()),

package/src/presentation/presentation-slide.spec.js

@@ -52,6 +52,9 @@ describe("#createFromSlide", () => {
 			html: "https://staging-test-cdn.salespreso.com/media/pack/410/assets/sections/test-deck/slides/slide-key/index.html",
 			id: 23219,
 			index: 13,
+			isSection: false,
+			isSlide: true,
+			isWelcome: false,
 			key: "slide-key",
 			namespacedKey: "test-deck/slide-key",
 			section: 1738,
@@ -166,6 +169,9 @@ describe("#createFromAdjunctSlide", () => {
 			image:
 				"https://staging-test-cdn.salespreso.com/media/autoadjunct/123.png",
 			index: 3,
+			isSection: false,
+			isSlide: true,
+			isWelcome: false,
 			key: "adjunct-10529",
 			section: null,
 			sequence: 3,
@@ -284,6 +290,9 @@ describe("#createFromAutoAdjunct", () => {
 			image:
 				"https://staging-test-cdn.salespreso.com/media/autoadjunct/123.png",
 			index: 3,
+			isSection: false,
+			isSlide: true,
+			isWelcome: false,
 			key: "autoadjunct-three",
 			sectionKey: "",
 			sequence: 3,

package/src/sync.js

@@ -4,7 +4,6 @@ import _ from "lodash";
 import log from "./log.js";
 import { middlewares } from "./middleware.js";
 import superagent from "superagent";
-import url2 from "url";
 
 const defaults = _.defaults;
 const assign = _.assign;
@@ -30,11 +29,10 @@ export const defaultFetchURL = function ({ model }) {
 
 export const buildURL = function ({ method, model }) {
 	const url = model.url();
-	const urlParse = url2.parse(url);
 
 	// If not a GET request, strip the query params from the url
 	if (method !== "read") {
-		return url.replace(urlParse.search, "");
+		return url.split("?")[0];
 	}
 
 	return url;
@@ -144,13 +142,25 @@ export const ajaxSync = function (method, model, options) {
 	// Combine generated headers with user's headers.
 	if (ajaxConfig.headers) {
 		for (const key in ajaxConfig.headers) {
-			request.header[key.toLowerCase()] = ajaxConfig.headers[key];
+			const lowerKey = key.toLowerCase();
+			// Use superagent's .type() method to explicitly set content-type
+			// This ensures superagent respects the content-type and doesn't override it
+			if (lowerKey === "content-type") {
+				request.type(ajaxConfig.headers[key].split(";")[0]);
+			} else {
+				request.header[lowerKey] = ajaxConfig.headers[key];
+			}
 		}
 	}
 
 	if (options.headers) {
 		for (const key in options.headers) {
-			request.header[key.toLowerCase()] = options.headers[key];
+			const lowerKey = key.toLowerCase();
+			if (lowerKey === "content-type") {
+				request.type(options.headers[key].split(";")[0]);
+			} else {
+				request.header[lowerKey] = options.headers[key];
+			}
 		}
 	}
 

package/src/utils.js

@@ -1,12 +1,41 @@
 import _ from "lodash";
 /* eslint-disable no-control-regex */
-import url2 from "url";
 
 export const DATE_FORMAT = "YYYY-MM-DD HH:mm:ss.SSSSSS[Z]";
 export const DATE_FORMAT_T = "YYYY-MM-DDTHH:mm:ss.SSSSSS[Z]";
 
 export function getShortURL(url) {
-	return url2.parse(url).path;
+	if (!url) return url;
+	if (typeof url !== "string") return url;
+
+	try {
+		return new URL(url, "http://a.b").pathname;
+	} catch (e) {
+		return url;
+	}
+}
+
+/**
+ * Resolves a target URL relative to a base URL in a manner similar to a Web browser resolving an anchor tag.
+ * Matches url.resolve() behavior but handles relative bases.
+ */
+export function resolveURL(base, relative) {
+	if (!base) return relative;
+	if (!relative) return base;
+
+	const dummyBase = "http://a.b";
+	try {
+		// Try resolving normally (if base is absolute)
+		return new URL(relative, base).href;
+	} catch (e) {
+		try {
+			// If base is relative, resolve it against a dummy base, then strip it
+			const resolved = new URL(relative, new URL(base, dummyBase));
+			return resolved.href.replace(dummyBase, "");
+		} catch (e2) {
+			return relative;
+		}
+	}
 }
 
 /**