From 7fd6d98614b747ce0f70b404cee3a0abd4df2a4f Mon Sep 17 00:00:00 2001
From: Zack Spear <hi@zackspear.com>
Date: Thu, 16 Jul 2020 11:32:15 -0700
Subject: [PATCH 1/4] fix: formatting & update launchpad url

---
 dynamix.unraid.net.plg | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/dynamix.unraid.net.plg b/dynamix.unraid.net.plg
index 83d70f076..1bfeb6155 100644
--- a/dynamix.unraid.net.plg
+++ b/dynamix.unraid.net.plg
@@ -816,7 +816,7 @@ response_complete($httpcode, '{}');
 function showRegWizard() {
   <? $license_state = strtoupper(empty($var['regCheck']) ? $var['regTy'] : $var['regCheck']); ?>
   Shadowbox.open({
-    content:'https://dev.d1eohvtyc6gnee.amplifyapp.com/?ts=<?=time()?>&guid=<?=$var['flashGUID']?>&state=<?=$license_state?>&keyfile=<?=str_replace(['+','/','='], ['-','_',''], trim(base64_encode(@file_get_contents($var['regFILE']))))?>&reggen=<?=$var['regGen']?>&flashproduct=<?=$var['flashProduct']?>&flashvendor=<?=$var['flashVendor']?>&registered=<?=empty($remote['apikey'])||empty($var['regFILE'])?0:1?>&servername=<?=$var['NAME']?>&serverip=<?=$_SERVER['SERVER_ADDR']?>&internalport=<?=$_SERVER['SERVER_PORT']?>&protocol=<?=$_SERVER['REQUEST_SCHEME']?>&site='+location.origin+'&email=<?=$remote['email']?>', 
+    content:'https://registration-dev.unraid.net/?ts=<?=time()?>&guid=<?=$var['flashGUID']?>&state=<?=$license_state?>&keyfile=<?=str_replace(['+','/','='], ['-','_',''], trim(base64_encode(@file_get_contents($var['regFILE']))))?>&reggen=<?=$var['regGen']?>&flashproduct=<?=$var['flashProduct']?>&flashvendor=<?=$var['flashVendor']?>&registered=<?=empty($remote['apikey'])||empty($var['regFILE'])?0:1?>&servername=<?=$var['NAME']?>&serverip=<?=$_SERVER['SERVER_ADDR']?>&internalport=<?=$_SERVER['SERVER_PORT']?>&protocol=<?=$_SERVER['REQUEST_SCHEME']?>&site='+location.origin+'&email=<?=$remote['email']?>', 
     player: 'iframe',
     options: {modal: true, animate: false, displayNav: false, overlayOpacity: 0.8, viewportPadding: 0, showMovieControls: false}
   });
@@ -992,16 +992,16 @@ echo json_encode($arr);
 <!-- user profile component -->
 <style>
 #header {
-    z-index: 102 !important;
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -webkit-box-pack: justify;
-    -ms-flex-pack: justify;
-    justify-content: space-between;
-    -webkit-box-align: center;
-    -ms-flex-align: center;
-    align-items: center;
+  z-index: 102 !important;
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-pack: justify;
+  -ms-flex-pack: justify;
+  justify-content: space-between;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
 }
 vue-userprofile,
 unraid-user-profile {

From 929f5c2e6cb65d1f542fa4510bf759fd57fa5b27 Mon Sep 17 00:00:00 2001
From: Zack Spear <hi@zackspear.com>
Date: Thu, 16 Jul 2020 19:39:37 -0700
Subject: [PATCH 2/4] improvement: postMessage handling for safer JSON parse &
 new events

---
 dynamix.unraid.net.plg | 74 +++++++++++++++++++++++++++---------------
 1 file changed, 47 insertions(+), 27 deletions(-)

diff --git a/dynamix.unraid.net.plg b/dynamix.unraid.net.plg
index 1bfeb6155..1196a2901 100644
--- a/dynamix.unraid.net.plg
+++ b/dynamix.unraid.net.plg
@@ -833,8 +833,44 @@ function handleMessage(e) {
     hideRegWizard();
     return;
   }
+  
+  const SAFE_JSON_PARSE = (str) => {
+    try {
+      return [null, JSON.parse(str)];
+    } catch (err) {
+      return [err];
+    }
+  };
 
-  var data = JSON.parse(e.data);
+  const [err, data] = SAFE_JSON_PARSE(e.data);
+  if (err) return console.log('handleMessage', err);
+
+  const HANDLE_LICENSES = (data, e) => {
+    if (data.license) {
+      // @FIXME - instead of being a callback function of hideRegWizard()
+      // we need to implement a REDIRECT / RELOAD postMessage event so the
+      // launchpad / regwiz doesn't go away before the user closes the pop-up
+      $.get('/webGui/include/InstallKey.php', {url: data.license}, function() {
+        console.log('New license key installed: ' + data.license);
+        const payload = { 
+          event: 'LICENSE_SUCCESS',
+          message: 'New license key installed',
+          license: data.license,
+        };
+        e.source.postMessage(JSON.stringify(payload), e.origin);
+      }).fail(function() {
+        console.error('Failed to license new key: ' + data.license);
+        const payload = { 
+          event: 'LICENSE_ERROR',
+          message: 'Failed to license new key',
+          license: data.license,
+        };
+        e.source.postMessage(JSON.stringify(payload), e.origin);
+      });
+    } else {
+      console.error('KEY_PURCHASE event fired! but missing license data:', data);
+    }
+  };
 
   switch (data.event) {
     case "CLOSE_SHADOWBOX":
@@ -851,38 +887,18 @@ function handleMessage(e) {
         }
         $.post('/update.php', postargs, function() {
           console.log('dynamix/dynamix.cfg: Updated apikey under [remote] section');
-          if (!data.license) {
-            setTimeout(function(){ window.location.href = '/Main'; }, 500);
-          }
+          //if (!data.license) {
+          //  setTimeout(function(){ window.location.href = '/Main'; }, 500);
+          //}
         }).fail(function() {
           console.error('Failed to update apikey under [remote] section');
         });
       }
-      if (data.license) {
-        hideRegWizard(function (){
-          $.get('/webGui/include/InstallKey.php', {url: data.license}, function() {
-            console.log('New license key installed: ' + data.license);
-            setTimeout(function(){ window.location.href = '/Main'; }, 500);
-          }).fail(function() {
-            console.error('Failed to license new key: ' + data.license);
-          });
-        });
-      }
+      // duplicate conditional so we don't get the error from HANDLE_LICENSES()
+      if (data.license) HANDLE_LICENSES(data, e);
       break;
-    case "INSTALL_KEY":
     case "KEY_PURCHASE":
-      if (data.license) {
-        hideRegWizard(function () {
-          $.get('/webGui/include/InstallKey.php', {url: data.license}, function() {
-            console.log('New license key installed: ' + data.license);
-            setTimeout(function(){ window.location.href = '/Main'; }, 500);
-          }).fail(function() {
-            console.error('Failed to license new key: ' + data.license);
-          });
-        });
-      } else {
-        console.error('KEY_PURCHASE event fired! but missing license data:', data);
-      }
+      HANDLE_LICENSES(data, e);
       break;
     case "GET_STATE":
       $.get('/plugins/dynamix.unraid.net/include/state.php', function(newstate) {
@@ -898,6 +914,10 @@ function handleMessage(e) {
         console.error('Failed to unregister');
       });
       break;
+    case "RELOAD":
+      return window.location.reload();
+    case "REDIRECT_MAIN":
+      return window.location.href = '/Main';
     default:
       console.error('Unhandled event \'' + data.event + '\' fired. data:', data);
       break;

From 7cabdc0c86f43094b8347c631f1e37d4626226be Mon Sep 17 00:00:00 2001
From: Zack Spear <hi@zackspear.com>
Date: Thu, 16 Jul 2020 22:13:03 -0700
Subject: [PATCH 3/4] chore: remove @FIXME comment

---
 dynamix.unraid.net.plg | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/dynamix.unraid.net.plg b/dynamix.unraid.net.plg
index 1196a2901..10c25193f 100644
--- a/dynamix.unraid.net.plg
+++ b/dynamix.unraid.net.plg
@@ -843,13 +843,10 @@ function handleMessage(e) {
   };
 
   const [err, data] = SAFE_JSON_PARSE(e.data);
-  if (err) return console.log('handleMessage', err);
+  if (err) return false; // swallow json parse error
 
   const HANDLE_LICENSES = (data, e) => {
     if (data.license) {
-      // @FIXME - instead of being a callback function of hideRegWizard()
-      // we need to implement a REDIRECT / RELOAD postMessage event so the
-      // launchpad / regwiz doesn't go away before the user closes the pop-up
       $.get('/webGui/include/InstallKey.php', {url: data.license}, function() {
         console.log('New license key installed: ' + data.license);
         const payload = { 
@@ -887,9 +884,6 @@ function handleMessage(e) {
         }
         $.post('/update.php', postargs, function() {
           console.log('dynamix/dynamix.cfg: Updated apikey under [remote] section');
-          //if (!data.license) {
-          //  setTimeout(function(){ window.location.href = '/Main'; }, 500);
-          //}
         }).fail(function() {
           console.error('Failed to update apikey under [remote] section');
         });

From 830c5fc4511c03aa6ea7c31bfa3cc1cf69f64908 Mon Sep 17 00:00:00 2001
From: Eric Schultz <eric@startuperic.com>
Date: Fri, 17 Jul 2020 01:14:36 -0500
Subject: [PATCH 4/4] feat(plg): move unraid.net settings under Management
 Access

---
 dynamix.unraid.net.plg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dynamix.unraid.net.plg b/dynamix.unraid.net.plg
index 10c25193f..a42954ef3 100644
--- a/dynamix.unraid.net.plg
+++ b/dynamix.unraid.net.plg
@@ -176,7 +176,7 @@ This is work in progress. Use this for testing purposes only!
 <FILE Name="/usr/local/emhttp/plugins/dynamix.unraid.net/Unraid.net.page">
 <INLINE>
 <![CDATA[
-Menu="NetworkServices"
+Menu="ManagementAccess:100"
 Title="Unraid.net"
 Icon="icon-u-globe"
 Tag="globe"