From 89c608dc2cd796e871ea749512a5a9bd5c5b7428 Mon Sep 17 00:00:00 2001
From: Steven Hugg <hugg@fasterlight.com>
Date: Sat, 25 May 2019 23:15:25 -0400
Subject: [PATCH] switch to HTTPS menu option

---
 index.html   |  1 +
 nanoasm      |  2 +-
 package.json |  6 ++++++
 src/ui.ts    | 19 +++++++++++++++++--
 4 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/index.html b/index.html
index 84e6b37d..00248914 100644
--- a/index.html
+++ b/index.html
@@ -63,6 +63,7 @@ if (window.location.host.endsWith('8bitworkshop.com')) {
           <hr>
           <li><a class="dropdown-item" href="#" id="item_addfile_include">Add Include File...</a></li>
           <li><a class="dropdown-item" href="#" id="item_addfile_link">Add Linked File...</a></li>
+          <li><a class="dropdown-item" href="#" id="item_switch_https" style="display:none">Switch to HTTPS...</a></li>
         </ul>
       </li>
       <li class="dropdown dropdown-submenu">
diff --git a/nanoasm b/nanoasm
index 5e79821e..53470410 160000
--- a/nanoasm
+++ b/nanoasm
@@ -1 +1 @@
-Subproject commit 5e79821e85a9e4dda78973456ed9f8a04991093c
+Subproject commit 53470410c34d2738a9f52e65bf8ffe1eabbef19b
diff --git a/package.json b/package.json
index 8c775fc8..2232c2ba 100644
--- a/package.json
+++ b/package.json
@@ -2,6 +2,12 @@
   "name": "8bitworkshop",
   "version": "3.4.0",
   "author": "Steven Hugg",
+  "description": "A programming IDE for retro hardware.",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/sehugg/8bitworkshop/"
+  },
+  "license": "GPLv3 and others, see README",
   "dependencies": {},
   "devDependencies": {
     "@types/bootbox": "^4.4.36",
diff --git a/src/ui.ts b/src/ui.ts
index c4a4e9f9..866f62a3 100644
--- a/src/ui.ts
+++ b/src/ui.ts
@@ -1910,6 +1910,10 @@ function convertLegacyVCS(store) {
 
 const useHTTPSCookieName = "__use_https";
 
+function setHTTPSCookie(val : number) {
+  document.cookie = useHTTPSCookieName + "=" + val + ";domain=8bitworkshop.com;path=/;max-age=315360000";
+}
+
 function shouldRedirectHTTPS() : boolean {
   // cookie set? either true or false
   var shouldRedir = getCookie(useHTTPSCookieName);
@@ -1918,16 +1922,27 @@ function shouldRedirectHTTPS() : boolean {
   }
   // set a 10yr cookie, value depends on if it's our first time here
   var val = hasLocalStorage && !localStorage.getItem("__lastplatform") ? 1 : 0;
-  document.cookie = useHTTPSCookieName + "=" + val + ";domain=8bitworkshop.com;path=/;max-age=315360000";
+  setHTTPSCookie(val);
   return !!val;
 }
 
+function _switchToHTTPS() {
+  bootbox.confirm('<p>Do you want to force the browser to use HTTPS from now on?</p>'+
+  '<p>WARNING: This will make all of your local files unavailable, so you should "Download All Changes" first for each platform where you have done work.</p>'+
+  '<p>You can go back to HTTP by setting the "'+useHTTPSCookieName+'" cookie to 0.</p>', (ok) => {
+    if (ok) {
+      setHTTPSCookie(1);
+      redirectToHTTPS();
+    }
+  });
+}
+
 function redirectToHTTPS() {
   if (window.location.protocol == 'http:' && window.location.host == '8bitworkshop.com') {
     if (shouldRedirectHTTPS()) {
       window.location.replace(window.location.href.replace(/^http:/, 'https:'));
     } else {
-      $("#http_warning").show(); // TODO
+      $("#item_switch_https").click(_switchToHTTPS).show();
     }
   }
 }