Merge pull request #513 from datacamp/entropitor/fix-encoding

Fix html entities encoding [CT-4795]

Author: entropitor

api/controllers/TopicController.js

@@ -6,6 +6,7 @@
  */
 var Promise = require('bluebird');
 var _ = require('lodash');
+var htmlEntities = require('html-entities');
 
 
 module.exports = {
@@ -166,6 +167,8 @@ module.exports = {
           else return compareValue;
         });
         topicJSON.dcl = dcl || (topicJSON.package_version && topicJSON.package_version.package.type_id === 4); //in the list or in base r
+        // We decode html entities again (as some older packages didn't have this fix in place)
+        topicJSON.examples = htmlEntities.decode(topicJSON.examples)
         topicJSON.user_examples = userExamples;
         return topicJSON;
       });

api/models/Topic.js

@@ -8,6 +8,7 @@
 var _ = require('lodash');
 var Promise = require('bluebird');
 var sanitizeHtml = require('sanitize-html');
+var htmlEntities = require('html-entities');
 
 module.exports = {
 
@@ -237,10 +238,10 @@ module.exports = {
             topic.description = topic.description.contents;
           }
 
-          topic.examples = sanitizeHtml(topic.examples, {
+          topic.examples = htmlEntities.decode(sanitizeHtml(topic.examples, {
             allowedTags: [],
             allowedAttributes: {}
-          });
+          }));
 
           var arrayToString = function(val) {
             if (val instanceof Array) {

package-lock.json

@@ -41,6 +41,7 @@
     "grunt-sass": "^2.0.0",
     "grunt-sync": "0.2.4",
     "grunt-version-assets": "^1.1.0",
+    "html-entities": "^2.3.3",
     "include-all": "~0.1.6",
     "lodash": "^4.13.1",
     "marked": "^0.3.5",