From 99c1d64b3bd9ce702ddf99ecfc11dd2bcad6bfe2 Mon Sep 17 00:00:00 2001
From: Remy Sharp <remy@remysharp.com>
Date: Mon, 4 Aug 2014 17:06:11 +0100
Subject: [PATCH] Now return 404 to bad list request

---
 lib/handlers/bin.js                       |  4 ++--
 public/js/render/saved-history-preview.js | 10 ++++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/lib/handlers/bin.js b/lib/handlers/bin.js
index a4d489c5..841970b1 100644
--- a/lib/handlers/bin.js
+++ b/lib/handlers/bin.js
@@ -357,8 +357,8 @@ module.exports = Observable.extend({
 
     if (!username) {
       // FIXME tmp fix to kick out 404 infinite loop
-      return res.send('<meta http-equiv="refresh" content="0">');
-      // return next(404);
+      // return res.send('<meta http-equiv="refresh" content="0">');
+      return next(404);
     }
 
     // TODO: convert to promise
diff --git a/public/js/render/saved-history-preview.js b/public/js/render/saved-history-preview.js
index 85cac8a6..367768ee 100644
--- a/public/js/render/saved-history-preview.js
+++ b/public/js/render/saved-history-preview.js
@@ -7,6 +7,7 @@
 
   var $body = $('body'),
       loaded = false,
+      requestAttempts = 5,
       $history; // set in hookUserHistory()
 
   $document.on('history:open', function () {
@@ -31,8 +32,13 @@
         dataType: 'html',
         url: jsbin.root + '/list',
         error: function () {
-          $('#history').remove();
-          setTimeout(loadList, 500);
+          requestAttempts--;
+          if (requestAttempts > 0) {
+            $('#history').remove();
+            setTimeout(loadList, 500);
+          } else {
+            console.error('Giving up to load history');
+          }
         },
         success: function (html) {
           $('#history').remove();