From 8045b1c1112defe2bbd7d6895203ebed9f92c66c Mon Sep 17 00:00:00 2001
From: Martii <martii@users.noreply.github.com>
Date: Thu, 15 Apr 2021 23:35:23 -0600
Subject: [PATCH] Enable usage of the import kill switch

* Disables *github* dep authorization which in turn disable importing. When activated use paste to site via Write Script Online or file upload via Upload Script until the dep can be successfully migrated. If authorization is enabled and there's a dep issue a 500 Server error could occur if GH changes something.
* More bookmarks... can't quite tell if it's Fx but the bookmarks are shooting low on auto browser scroll... will try another browser at a future date.
* Some verbiage clarity.

Applies to #1705
---
 libs/githubClient.js           | 2 +-
 views/pages/newScriptPage.html | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libs/githubClient.js b/libs/githubClient.js
index 2a9a34ca3..4ed5ad638 100644
--- a/libs/githubClient.js
+++ b/libs/githubClient.js
@@ -31,7 +31,7 @@ Strategy.findOne({ name: 'github' }, async function (aErr, aStrat) {
   if (aErr)
     console.error(aErr);
 
-  if (aStrat) {
+  if (aStrat && process.env.DISABLE_SCRIPT_IMPORT !== 'true') {
     // This authentication authorization is currently required to authorize this app
     //   to have the GitHub authentication callback work when the strategy `id` and `key` is found
     //   and additional usage of the `id` and `key` elsewhere in the Code
diff --git a/views/pages/newScriptPage.html b/views/pages/newScriptPage.html
index 7ac316767..e76304b46 100644
--- a/views/pages/newScriptPage.html
+++ b/views/pages/newScriptPage.html
@@ -26,14 +26,14 @@ <h4 class="list-group-item-heading"><i class="fa fa-fw fa-book"></i> UserScript
                 Are you new to {{#newJSLibrary}}library {{/newJSLibrary}}{{^newJSLibrary}}user {{/newJSLibrary}} scripting and thought you would just dive right in without reading anything? Well if you change your mind check out some of our documentation by clicking here. Special thanks go out to all of our collaborators for all their dedication and effort.
               </p>
             </a>
-            <a href="{{{newScriptEditorPageUrl}}}" class="list-group-item">
+            <a href="{{{newScriptEditorPageUrl}}}" class="list-group-item" id="write-script-online">
               <h4 class="list-group-item-heading"><i class="octicon octicon-fw octicon-pencil"></i> Write Script Online</h4>
               <p class="list-group-item-text">
                 Click here to write a script using the Ace editor</em>.
               </p>
             </a>
             <div class="list-group-item">
-              <h4 class="list-group-item-heading"><i class="fa fa-fw fa-upload"></i> Upload Script</h4>
+              <h4 class="list-group-item-heading" id="upload-script"><i class="fa fa-fw fa-upload"></i> Upload Script</h4>
               <p class="list-group-item-text">
                 <form action="{{{uploadNewScriptPageUrl}}}" method="post" enctype="multipart/form-data" class="form-horizontal">
                   <input type="hidden" name="uploadScript" value="true">
@@ -352,7 +352,7 @@ <h4>
                 </div>
                 <div id="collapse-github-instructions" class="panel-collapse collapse">
                   <div class="panel-body">
-                    <p>Optionally you may upload the script to the site first. You may also use the link at <a href="#import-script-from-github">Import Script from Github</a> to speed things up as a shortcut.</p>
+                    <p>You may use <a href="#write-script-online">Write Script Online</a> or <a href="#upload-script">Upload Script</a> to the site first to determine if there are any validation issues. When the service is available you may use the link at <a href="#import-script-from-github">Import Script from Github</a> to speed things up as a shortcut.</p>
                     <ol>
                       <li>Ensure that you have GitHub as an authentication for this site.</li>
                       <li>Ensure that you have and use a default <code>master</code> branch.</li>