From a88a0676f7108137ad0f9c00276f56b3dd720eff Mon Sep 17 00:00:00 2001 From: Mo Bitar Date: Tue, 31 Oct 2017 13:54:11 -0500 Subject: [PATCH] Extension default value --- .../javascripts/app/frontend/models/app/extension.js | 7 ++++++- app/assets/javascripts/app/services/extensionManager.js | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/app/frontend/models/app/extension.js b/app/assets/javascripts/app/frontend/models/app/extension.js index 056d5c85a..b651d9693 100644 --- a/app/assets/javascripts/app/frontend/models/app/extension.js +++ b/app/assets/javascripts/app/frontend/models/app/extension.js @@ -51,7 +51,12 @@ class Action { class Extension extends Item { constructor(json) { super(json); - _.merge(this, json); + + if(this.encrypted === null || this.encrypted === undefined) { + // Default to encrypted on creation. + this.encrypted = true; + } + if(json.actions) { this.actions = json.actions.map(function(action){ return new Action(action); diff --git a/app/assets/javascripts/app/services/extensionManager.js b/app/assets/javascripts/app/services/extensionManager.js index ed69b0ee8..4c9613815 100644 --- a/app/assets/javascripts/app/services/extensionManager.js +++ b/app/assets/javascripts/app/services/extensionManager.js @@ -89,6 +89,10 @@ class ExtensionManager { } handleExtensionLoadExternalResponseItem(url, externalResponseItem) { + // Don't allow remote response to set these flags + delete externalResponseItem.encrypted; + delete externalResponseItem.uuid; + var extension = _.find(this.extensions, {url: url}); if(extension) { this.updateExtensionFromRemoteResponse(extension, externalResponseItem);