From 6189ec161717b923da43558a45a04770dd1ae85d Mon Sep 17 00:00:00 2001
From: Karol Wypchlo <kwypchlo@gmail.com>
Date: Wed, 9 Mar 2022 14:27:27 +0100
Subject: [PATCH 1/3] improve user communication on subscription required
 portal

---
 docker/nginx/libs/skynet/account.lua          |  3 +-
 .../src/components/Uploader/Uploader.js       | 48 ++++++++++++++++---
 2 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/docker/nginx/libs/skynet/account.lua b/docker/nginx/libs/skynet/account.lua
index 7be6013f..e7ff9033 100644
--- a/docker/nginx/libs/skynet/account.lua
+++ b/docker/nginx/libs/skynet/account.lua
@@ -78,7 +78,8 @@ function _M.has_subscription()
 end
 
 function _M.is_auth_required()
-    return os.getenv("ACCOUNTS_LIMIT_ACCESS") == "authenticated"
+    -- authentication is required if mode is set to "authenticated" or "subscription"
+    return os.getenv("ACCOUNTS_LIMIT_ACCESS") == "authenticated" or _M.is_subscription_required()
 end
 
 function _M.is_subscription_required()
diff --git a/packages/website/src/components/Uploader/Uploader.js b/packages/website/src/components/Uploader/Uploader.js
index 40ecb19a..5a48a811 100644
--- a/packages/website/src/components/Uploader/Uploader.js
+++ b/packages/website/src/components/Uploader/Uploader.js
@@ -47,15 +47,37 @@ const LogInLink = () => {
   );
 };
 
+const SubscribeLink = () => {
+  const createAccountsUrl = useAccountsUrl();
+
+  return (
+    <Link
+      href={createAccountsUrl("payments")}
+      className="uppercase underline-primary hover:text-primary transition-colors duration-200"
+    >
+      available plans
+    </Link>
+  );
+};
+
 const Uploader = () => {
   const [mode, setMode] = React.useState("file");
   const [uploads, setUploads] = React.useState([]);
 
   const { data: accounts } = useAccounts();
-  const showAccountFeatures =
-    accounts && accounts.enabled !== false && !accounts?.auth_required && !accounts?.authenticated;
-  const disabledComponent =
-    accounts && accounts.enabled !== false && accounts?.auth_required && !accounts?.authenticated;
+
+  // variables extracted from useAccounts response
+  const isAccountsEnabled = accounts?.enabled === true;
+  const isSubscriptionRequired = accounts?.subscription_required === true;
+  const isAuthRequired = isSubscriptionRequired || accounts?.auth_required === true;
+  const isAuthenticated = accounts?.authenticated === true;
+  const hasSubscription = accounts?.subscription === true;
+
+  // derive current app state and extract it into variables
+  const showAccountFeatures = isAccountsEnabled && !isAuthRequired && !isAuthenticated;
+  const showAuthenticationRequired = isAccountsEnabled && isAuthRequired && !isAuthenticated;
+  const showSubscriptionRequired = isAccountsEnabled && isAuthenticated && isSubscriptionRequired && !hasSubscription;
+  const isComponentDisabled = showAuthenticationRequired || showSubscriptionRequired;
 
   const onUploadStateChange = React.useCallback((id, state) => {
     setUploads((uploads) => {
@@ -104,7 +126,7 @@ const Uploader = () => {
   }, [inputElement, mode]);
 
   return (
-    <div className={classnames("relative", { "p-8": disabledComponent })}>
+    <div className={classnames("relative", { "p-8": isComponentDisabled })}>
       <div className="max-w-content mx-auto rounded-lg shadow bg-white z-0 relative">
         <div className="flex">
           <button
@@ -156,7 +178,7 @@ const Uploader = () => {
               {mode === "directory" && <span>Drop any folder with an index.html file to deploy to Skynet</span>}
             </h4>
           </div>
-          {!disabledComponent && (
+          {!isComponentDisabled && (
             <div className="absolute left-1/2 -bottom-4 desktop:-bottom-8">
               <div className="relative -left-1/2 transform transition-transform hover:rotate-180" role="button">
                 <Add />
@@ -204,7 +226,7 @@ const Uploader = () => {
         </div>
       )}
 
-      {disabledComponent && (
+      {showAuthenticationRequired && (
         <div className="absolute inset-0 bg-palette-500 bg-opacity-90 rounded-lg">
           <div className="flex h-full">
             <div className="m-auto">
@@ -215,6 +237,18 @@ const Uploader = () => {
           </div>
         </div>
       )}
+
+      {showSubscriptionRequired && (
+        <div className="absolute inset-0 bg-palette-500 bg-opacity-90 rounded-lg">
+          <div className="flex h-full">
+            <div className="m-auto">
+              <h4 className="font-light text-palette-100 text-lg mt-2 text-center">
+                Active subscription required - <SubscribeLink />
+              </h4>
+            </div>
+          </div>
+        </div>
+      )}
     </div>
   );
 };

From 18822edae8bb867dafbee4cc97258ea7bde74ce8 Mon Sep 17 00:00:00 2001
From: Karol Wypchlo <kwypchlo@gmail.com>
Date: Mon, 21 Mar 2022 13:24:25 +0100
Subject: [PATCH 2/3] clean up unnecessary boolean comparison

---
 packages/website/src/components/Uploader/Uploader.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/website/src/components/Uploader/Uploader.js b/packages/website/src/components/Uploader/Uploader.js
index 5a48a811..7851147a 100644
--- a/packages/website/src/components/Uploader/Uploader.js
+++ b/packages/website/src/components/Uploader/Uploader.js
@@ -67,11 +67,11 @@ const Uploader = () => {
   const { data: accounts } = useAccounts();
 
   // variables extracted from useAccounts response
-  const isAccountsEnabled = accounts?.enabled === true;
-  const isSubscriptionRequired = accounts?.subscription_required === true;
-  const isAuthRequired = isSubscriptionRequired || accounts?.auth_required === true;
-  const isAuthenticated = accounts?.authenticated === true;
-  const hasSubscription = accounts?.subscription === true;
+  const isAccountsEnabled = accounts?.enabled;
+  const isSubscriptionRequired = accounts?.subscription_required;
+  const isAuthRequired = isSubscriptionRequired || accounts?.auth_required;
+  const isAuthenticated = accounts?.authenticated;
+  const hasSubscription = accounts?.subscription;
 
   // derive current app state and extract it into variables
   const showAccountFeatures = isAccountsEnabled && !isAuthRequired && !isAuthenticated;

From d0de18fcd0270a5bda3835048b83aba6c21310c4 Mon Sep 17 00:00:00 2001
From: Karol Wypchlo <kwypchlo@gmail.com>
Date: Mon, 21 Mar 2022 13:29:48 +0100
Subject: [PATCH 3/3] explain subscription mode

---
 docker/nginx/libs/skynet/account.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker/nginx/libs/skynet/account.lua b/docker/nginx/libs/skynet/account.lua
index 7f000d6e..34fe15f5 100644
--- a/docker/nginx/libs/skynet/account.lua
+++ b/docker/nginx/libs/skynet/account.lua
@@ -78,7 +78,8 @@ function _M.has_subscription()
 end
 
 function _M.is_auth_required()
-    -- authentication is required if mode is set to "authenticated" or "subscription"
+    -- authentication is required if mode is set to "authenticated" 
+    -- or "subscription" (require active subscription to a premium plan)
     return os.getenv("ACCOUNTS_LIMIT_ACCESS") == "authenticated" or _M.is_subscription_required()
 end