From 7b3aa6fef0a989df43252744f9a28983fa51c3a0 Mon Sep 17 00:00:00 2001
From: fortuna <fortuna@users.noreply.github.com>
Date: Thu, 6 Jun 2019 18:38:40 -0400
Subject: [PATCH 1/4] Make TOS a dialog

---
 .../ui_components/app-root.html               | 276 ++++++++----------
 ...-tos-view.html => outline-tos-dialog.html} |  41 +--
 src/server_manager/web_app/app.ts             |   9 +
 3 files changed, 159 insertions(+), 167 deletions(-)
 rename src/server_manager/ui_components/{outline-tos-view.html => outline-tos-dialog.html} (60%)

diff --git a/src/server_manager/ui_components/app-root.html b/src/server_manager/ui_components/app-root.html
index df288c62a..82ce5b5ed 100644
--- a/src/server_manager/ui_components/app-root.html
+++ b/src/server_manager/ui_components/app-root.html
@@ -36,7 +36,7 @@
 <link rel="import" href="./outline-region-picker-step.html">
 <link rel="import" href="./outline-server-progress-step.html">
 <link rel="import" href="./outline-server-view.html">
-<link rel="import" href="./outline-tos-view.html">
+<link rel="import" href="./outline-tos-dialog.html">
 
 <dom-module id="app-root">
   <template>
@@ -74,6 +74,9 @@
         height: 20px;
         width: 20px;
       }
+      #drawerLayout {
+        height: 100%;
+      }
       #appDrawer {
         --app-drawer-content-container: {
           color: var(--medium-gray);
@@ -288,158 +291,154 @@
       }
     </style>
 
-    <outline-tos-view id="tosView" has-accepted-terms-of-service={{userAcceptedTos}} hidden$="{{hasAcceptedTos}}"></outline-tos-view>
-
-    <div hidden$="{{!hasAcceptedTos}}">
-      <!-- This responsive width sets the minimum layout area to 648px.  -->
-      <app-drawer-layout id="drawerLayout" responsive-width="886px" on-narrow-changed="_computeShouldShowSideBar" class$="[[sideBarMarginClass]]">
-        <app-drawer id="appDrawer" slot="drawer" on-opened-changed="_computeShouldShowSideBar">
-          <app-toolbar class="toolbar" hidden$="[[shouldShowSideBar]]">
-            <paper-icon-button icon="menu" on-click="_toggleAppDrawer"></paper-icon-button>
-            <div main-title><img src="images/outline-manager-logo.svg"></div>
-          </app-toolbar>
-
-          <!-- Servers section -->
-          <div class="servers">
-            <!-- DigitalOcean servers -->
-            <div class="servers-section" hidden$="{{!isSignedInToDigitalOcean}}">
-              <div class="servers-header">
-                <span>DigitalOcean servers</span>
-                <paper-menu-button horizontal-align="left" class="" close-on-activate no-animations dynamic-align no-overlap>
-                  <paper-icon-button icon="more-vert" slot="dropdown-trigger"></paper-icon-button>
-                  <div class="do-overflow-menu" slot="dropdown-content">
-                    <h4>Disconnect DigitalOcean account</h4>
-                    <div class="account-info"><img src="images/digital_ocean_logo.svg" />{{adminEmail}}</div>
-                    <div class="sign-out-button" on-tap="signOutTapped">Disconnect</div>
-                  </div>
-                </paper-menu-button>
-              </div>
-              <div class="servers-container">
-                <template is="dom-repeat" items="{{serverList}}" as="server" filter="_isServerManaged" sort="_sortServersByName">
-                  <div class$="server {{_computeServerClasses(selectedServer, server)}}" data-server$=[[server]] on-tap="_showServer">
-                    <img class="server-icon" src$="images/{{_computeServerImage(selectedServer, server)}}" />
-                    <span>{{server.name}}</span>
-                  </div>
-                </template>
-              </div>
-            </div>
-            <!-- Manual servers -->
-            <div class="servers-section" hidden$="{{!hasManualServers}}">
-              <div class="servers-header">
-                <span>Servers</span>
-              </div>
-              <div class="servers-container">
-                <template is="dom-repeat" items="{{serverList}}" as="server" filter="_isServerManual" sort="_sortServersByName">
-                  <div class$="server {{_computeServerClasses(selectedServer, server)}}" data-server$=[[server]] on-tap="_showServer">
-                    <img class="server-icon" src$="images/{{_computeServerImage(selectedServer, server)}}" />
-                    <span>{{server.name}}</span>
-                  </div>
-                </template>
-              </div>
-            </div>
-          </div>
-
-          <!-- Add server -->
-          <div class="add-server-section" on-tap="showIntro">
-            <paper-icon-item>
-              <iron-icon icon="add" slot="item-icon"></iron-icon>Add server
-            </paper-icon-item>
-          </div>
+    <!-- This responsive width sets the minimum layout area to 648px.  -->
+    <app-drawer-layout id="drawerLayout" responsive-width="886px" on-narrow-changed="_computeShouldShowSideBar" class$="[[sideBarMarginClass]]">
+      <app-drawer id="appDrawer" slot="drawer" on-opened-changed="_computeShouldShowSideBar">
+        <app-toolbar class="toolbar" hidden$="[[shouldShowSideBar]]">
+          <paper-icon-button icon="menu" on-click="_toggleAppDrawer"></paper-icon-button>
+          <div main-title><img src="images/outline-manager-logo.svg"></div>
+        </app-toolbar>
 
-          <!-- Links section -->
-          <paper-listbox on-tap="maybeCloseDrawer">
-            <a href="https://s3.amazonaws.com/outline-vpn/index.html#/en/support/dataCollection">Data collection</a>
-            <span on-tap="submitFeedbackTapped">Feedback</span>
-            <a href="https://s3.amazonaws.com/outline-vpn/index.html#/en/support/">Help</a>
-            <span on-tap="aboutTapped">About</span>
-            <div class="legal-links">
-              <a href="https://www.google.com/policies/privacy/">Privacy</a>
-              <a href="https://s3.amazonaws.com/outline-vpn/static_downloads/Outline-Terms-of-Service.html">Terms</a>
-              <span on-tap="showLicensesTapped">Licenses</span>
+        <!-- Servers section -->
+        <div class="servers">
+          <!-- DigitalOcean servers -->
+          <div class="servers-section" hidden$="{{!isSignedInToDigitalOcean}}">
+            <div class="servers-header">
+              <span>DigitalOcean servers</span>
+              <paper-menu-button horizontal-align="left" class="" close-on-activate no-animations dynamic-align no-overlap>
+                <paper-icon-button icon="more-vert" slot="dropdown-trigger"></paper-icon-button>
+                <div class="do-overflow-menu" slot="dropdown-content">
+                  <h4>Disconnect DigitalOcean account</h4>
+                  <div class="account-info"><img src="images/digital_ocean_logo.svg" />{{adminEmail}}</div>
+                  <div class="sign-out-button" on-tap="signOutTapped">Disconnect</div>
+                </div>
+              </paper-menu-button>
             </div>
-          </paper-listbox>
-        </app-drawer>
-
-        <app-header-layout>
-          <div class="app-container">
-            <iron-pages attr-for-selected='id' selected='{{ currentPage }}'>
-              <outline-intro-step id='intro' is-signed-in-to-digital-ocean='{{isSignedInToDigitalOcean}}' digital-ocean-email='{{adminEmail}}'></outline-intro-step>
-              <outline-do-oauth-step id='digitalOceanOauth'></outline-do-oauth-step>
-              <outline-manual-server-entry id='manualEntry'></outline-manual-server-entry>
-              <outline-region-picker-step id='regionPicker'></outline-region-picker-step>
-              <outline-server-progress-step id='serverProgressStep'></outline-server-progress-step>
-              <div id="serverView">
-                <template is="dom-repeat" items="{{serverList}}" as="server">
-                  <outline-server-view id="serverView-{{_base64Encode(server.id)}}" hidden$="{{!_isServerSelected(selectedServer, server)}}"></outline-server-view>
-                </template>
-              </div>
-            </iron-pages>
-          </div>
-        </app-header-layout>
-      </app-drawer-layout>
-
-      <!-- Side bar -->
-      <app-drawer id="sideBar" opened$="[[shouldShowSideBar]]" persistent>
-        <div class="side-bar-container">
-          <div class="side-bar-section menu">
-            <paper-icon-button icon="menu" on-click="_toggleAppDrawer"></paper-icon-button>
-          </div>
-          <div class="servers">
-            <!-- DigitalOcean servers -->
-            <div class="side-bar-section servers-section" hidden$="{{!isSignedInToDigitalOcean}}">
-              <img class="provider-icon" src="images/do_white_logo.svg"/>
+            <div class="servers-container">
               <template is="dom-repeat" items="{{serverList}}" as="server" filter="_isServerManaged" sort="_sortServersByName">
                 <div class$="server {{_computeServerClasses(selectedServer, server)}}" data-server$=[[server]] on-tap="_showServer">
                   <img class="server-icon" src$="images/{{_computeServerImage(selectedServer, server)}}" />
+                  <span>{{server.name}}</span>
                 </div>
               </template>
             </div>
-            <!-- Manual servers -->
-            <div class="side-bar-section servers-section" hidden$="{{!hasManualServers}}">
-              <img class="provider-icon" src="images/cloud.svg"/>
+          </div>
+          <!-- Manual servers -->
+          <div class="servers-section" hidden$="{{!hasManualServers}}">
+            <div class="servers-header">
+              <span>Servers</span>
+            </div>
+            <div class="servers-container">
               <template is="dom-repeat" items="{{serverList}}" as="server" filter="_isServerManual" sort="_sortServersByName">
                 <div class$="server {{_computeServerClasses(selectedServer, server)}}" data-server$=[[server]] on-tap="_showServer">
                   <img class="server-icon" src$="images/{{_computeServerImage(selectedServer, server)}}" />
+                  <span>{{server.name}}</span>
                 </div>
               </template>
             </div>
           </div>
-          <div class="side-bar-section add-server-section" on-tap="showIntro">
-              <paper-icon-item>
-                <iron-icon icon="add" slot="item-icon"></iron-icon>
-              </paper-icon-item>
-            </div>
         </div>
-      </app-drawer>
 
-      <paper-toast id='toast'><paper-icon-button icon='icons:close' on-tap='closeError'></paper-icon-button></paper-toast>
+        <!-- Add server -->
+        <div class="add-server-section" on-tap="showIntro">
+          <paper-icon-item>
+            <iron-icon icon="add" slot="item-icon"></iron-icon>Add server
+          </paper-icon-item>
+        </div>
 
-      <!-- Modal dialogs must be outside the app container; otherwise the backdrop covers them.  -->
-      <outline-feedback-dialog id='feedbackDialog'></outline-feedback-dialog>
-      <outline-about-dialog id='aboutDialog' outline-version='[[outlineVersion]]'></outline-about-dialog>
-      <outline-modal-dialog id='modalDialog'></outline-modal-dialog>
-      <outline-share-dialog id="shareDialog"></outline-share-dialog>
-      <outline-metrics-option-dialog id="metricsDialog"></outline-metrics-option-dialog>
+        <!-- Links section -->
+        <paper-listbox on-tap="maybeCloseDrawer">
+          <a href="https://s3.amazonaws.com/outline-vpn/index.html#/en/support/dataCollection">Data collection</a>
+          <span on-tap="submitFeedbackTapped">Feedback</span>
+          <a href="https://s3.amazonaws.com/outline-vpn/index.html#/en/support/">Help</a>
+          <span on-tap="aboutTapped">About</span>
+          <div class="legal-links">
+            <a href="https://www.google.com/policies/privacy/">Privacy</a>
+            <a href="https://s3.amazonaws.com/outline-vpn/static_downloads/Outline-Terms-of-Service.html">Terms</a>
+            <span on-tap="showLicensesTapped">Licenses</span>
+          </div>
+        </paper-listbox>
+      </app-drawer>
 
-      <paper-dialog id="getConnectedDialog" modal>
-        <!-- iframe gets inserted here once we are given the invite URL. -->
-        <div class="buttons">
-          <paper-button on-tap="closeGetConnectedDialog" autofocus>Close</paper-button>
+      <app-header-layout>
+        <div class="app-container">
+          <iron-pages attr-for-selected='id' selected='{{ currentPage }}'>
+            <outline-intro-step id='intro' is-signed-in-to-digital-ocean='{{isSignedInToDigitalOcean}}' digital-ocean-email='{{adminEmail}}'></outline-intro-step>
+            <outline-do-oauth-step id='digitalOceanOauth'></outline-do-oauth-step>
+            <outline-manual-server-entry id='manualEntry'></outline-manual-server-entry>
+            <outline-region-picker-step id='regionPicker'></outline-region-picker-step>
+            <outline-server-progress-step id='serverProgressStep'></outline-server-progress-step>
+            <div id="serverView">
+              <template is="dom-repeat" items="{{serverList}}" as="server">
+                <outline-server-view id="serverView-{{_base64Encode(server.id)}}" hidden$="{{!_isServerSelected(selectedServer, server)}}"></outline-server-view>
+              </template>
+            </div>
+          </iron-pages>
         </div>
-      </paper-dialog>
+      </app-header-layout>
+    </app-drawer-layout>
 
-      <paper-dialog id="licenses" modal restoreFocusOnClose>
-        <paper-dialog-scrollable>
-          <code id="licensesText">
-            Could not load license.txt.
-          </code>
-        </paper-dialog-scrollable>
-        <div class="buttons">
-          <paper-button dialog-dismiss autofocus>Close</paper-button>
+    <!-- Side bar -->
+    <app-drawer id="sideBar" opened$="[[shouldShowSideBar]]" persistent>
+      <div class="side-bar-container">
+        <div class="side-bar-section menu">
+          <paper-icon-button icon="menu" on-click="_toggleAppDrawer"></paper-icon-button>
         </div>
-      </paper-dialog>
+        <div class="servers">
+          <!-- DigitalOcean servers -->
+          <div class="side-bar-section servers-section" hidden$="{{!isSignedInToDigitalOcean}}">
+            <img class="provider-icon" src="images/do_white_logo.svg"/>
+            <template is="dom-repeat" items="{{serverList}}" as="server" filter="_isServerManaged" sort="_sortServersByName">
+              <div class$="server {{_computeServerClasses(selectedServer, server)}}" data-server$=[[server]] on-tap="_showServer">
+                <img class="server-icon" src$="images/{{_computeServerImage(selectedServer, server)}}" />
+              </div>
+            </template>
+          </div>
+          <!-- Manual servers -->
+          <div class="side-bar-section servers-section" hidden$="{{!hasManualServers}}">
+            <img class="provider-icon" src="images/cloud.svg"/>
+            <template is="dom-repeat" items="{{serverList}}" as="server" filter="_isServerManual" sort="_sortServersByName">
+              <div class$="server {{_computeServerClasses(selectedServer, server)}}" data-server$=[[server]] on-tap="_showServer">
+                <img class="server-icon" src$="images/{{_computeServerImage(selectedServer, server)}}" />
+              </div>
+            </template>
+          </div>
+        </div>
+        <div class="side-bar-section add-server-section" on-tap="showIntro">
+            <paper-icon-item>
+              <iron-icon icon="add" slot="item-icon"></iron-icon>
+            </paper-icon-item>
+          </div>
+      </div>
+    </app-drawer>
+
+    <paper-toast id='toast'><paper-icon-button icon='icons:close' on-tap='closeError'></paper-icon-button></paper-toast>
 
-    </div>
+    <!-- Modal dialogs must be outside the app container; otherwise the backdrop covers them.  -->
+    <outline-tos-dialog id="tosDialog"></outline-tos-dialog>
+    <outline-feedback-dialog id='feedbackDialog'></outline-feedback-dialog>
+    <outline-about-dialog id='aboutDialog' outline-version='[[outlineVersion]]'></outline-about-dialog>
+    <outline-modal-dialog id='modalDialog'></outline-modal-dialog>
+    <outline-share-dialog id="shareDialog"></outline-share-dialog>
+    <outline-metrics-option-dialog id="metricsDialog"></outline-metrics-option-dialog>
+
+    <paper-dialog id="getConnectedDialog" modal>
+      <!-- iframe gets inserted here once we are given the invite URL. -->
+      <div class="buttons">
+        <paper-button on-tap="closeGetConnectedDialog" autofocus>Close</paper-button>
+      </div>
+    </paper-dialog>
+
+    <paper-dialog id="licenses" modal restoreFocusOnClose>
+      <paper-dialog-scrollable>
+        <code id="licensesText">
+          Could not load license.txt.
+        </code>
+      </paper-dialog-scrollable>
+      <div class="buttons">
+        <paper-button dialog-dismiss autofocus>Close</paper-button>
+      </div>
+    </paper-dialog>
   </template>
   <script>
     const TOS_ACK_LOCAL_STORAGE_KEY = 'tos-ack';
@@ -467,15 +466,6 @@ <h4>Disconnect DigitalOcean account</h4>
           computed: '_computeIsSignedInToDigitalOcean(adminEmail)'
         },
         outlineVersion: String,
-        userAcceptedTos: {
-          type: Boolean,
-           // Get notified when the user clicks the OK button in the ToS view
-          observer: '_userAcceptedTosChanged',
-        },
-        hasAcceptedTos: {
-          type: Boolean,
-          computed: '_computeHasAcceptedTermsOfService(userAcceptedTos)'
-        },
         currentPage: {
           type: String,
           value: 'intro'
@@ -620,14 +610,6 @@ <h4>Disconnect DigitalOcean account</h4>
       _computeHasManualServers: function(serverList) {
         return this.serverList.filter(server => !server.isManaged).length > 0;
       },
-      _userAcceptedTosChanged: function(userAcceptedTos) {
-        if (userAcceptedTos) {
-          window.localStorage[TOS_ACK_LOCAL_STORAGE_KEY] = Date.now();
-        }
-      },
-      _computeHasAcceptedTermsOfService: function(userAcceptedTos) {
-        return userAcceptedTos || !!window.localStorage[TOS_ACK_LOCAL_STORAGE_KEY];
-      },
       _toggleAppDrawer: function() {
         const drawerNarrow = this.$.drawerLayout.narrow;
         const forceNarrow = this.$.drawerLayout.forceNarrow;
diff --git a/src/server_manager/ui_components/outline-tos-view.html b/src/server_manager/ui_components/outline-tos-dialog.html
similarity index 60%
rename from src/server_manager/ui_components/outline-tos-view.html
rename to src/server_manager/ui_components/outline-tos-dialog.html
index 1b90af8d4..e05fc3178 100644
--- a/src/server_manager/ui_components/outline-tos-view.html
+++ b/src/server_manager/ui_components/outline-tos-dialog.html
@@ -13,21 +13,23 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
+<link rel='import' href='../bower_components/paper-dialog/paper-dialog.html'>
 
-<dom-module id='outline-tos-view'>
+<dom-module id='outline-tos-dialog'>
   <template>
     <style include='cloud-install-styles'></style>
     <style>
-      :host {
+      #dialog {
         background-color: #263238;
         height: 100%;
         width: 100%;
-        position: absolute;
-        z-index: 1000;
+        max-height: 100%;
+        max-width: 100%;
       }
       .container {
         height: 85%;
         display: flex;
+        flex-direction: column;
         align-items: center;
         justify-content: center;
       }
@@ -48,27 +50,26 @@
         margin-left: 12px;
       }
     </style>
-    <div class="container">
-      <img id="logo" src="images/launcher-icon.png" />
-    </div>
-    <div id="tos">
-        <span>I have read and understood the <a href="https://s3.amazonaws.com/outline-vpn/static_downloads/Outline-Terms-of-Service.html">Outline Terms of Service</a>.</span>
-        <paper-button on-tap="acceptTermsOfService">OK</button>
-    </div>
+    <paper-dialog id="dialog" modal>
+      <div class="container">
+        <img id="logo" src="images/launcher-icon.png" />
+        <div id="tos">
+            <span>I have read and understood the <a href="https://s3.amazonaws.com/outline-vpn/static_downloads/Outline-Terms-of-Service.html">Outline Terms of Service</a>.</span>
+            <paper-button dialog-confirm on-tap="acceptTermsOfService">OK</button>
+        </div>
+      </div>
+    </paper-dialog>
   </template>
   <script>
     Polymer({
-      is: 'outline-tos-view',
-      properties: {
-        hasAcceptedTermsOfService: {
-          type: Boolean,
-          value: false,
-          notify: true,
-        }
+      is: 'outline-tos-dialog',
+      open: function () {
+        this.$.dialog.open();
       },
       acceptTermsOfService: function() {
-        this.hasAcceptedTermsOfService = true;
-      },
+        this.$.dialog.close();
+        this.fire('TermsOfServiceAccepted');
+      }
     });
   </script>
 </dom-module>
diff --git a/src/server_manager/web_app/app.ts b/src/server_manager/web_app/app.ts
index 0c5a73a84..d5657bd71 100644
--- a/src/server_manager/web_app/app.ts
+++ b/src/server_manager/web_app/app.ts
@@ -36,6 +36,8 @@ interface PolymerEvent extends Event {
 //   https://www.digitalocean.com/help/referral-program/
 const DIGITALOCEAN_REFERRAL_CODE = '5ddb4219b716';
 
+const TOS_ACK_LOCAL_STORAGE_KEY = 'tos-ack';
+
 interface UiAccessKey {
   id: string;
   placeholderName: string;
@@ -92,6 +94,10 @@ export class App {
       private digitalOceanTokenManager: TokenManager) {
     appRoot.setAttribute('outline-version', this.version);
 
+    appRoot.addEventListener('TermsOfServiceAccepted', (event: PolymerEvent) => {
+      window.localStorage[TOS_ACK_LOCAL_STORAGE_KEY] = Date.now();
+    });
+
     appRoot.addEventListener('ConnectToDigitalOcean', (event: PolymerEvent) => {
       this.connectToDigitalOcean();
     });
@@ -215,6 +221,9 @@ export class App {
   }
 
   async start(): Promise<void> {
+    if (!window.localStorage[TOS_ACK_LOCAL_STORAGE_KEY]) {
+      this.appRoot.$.tosDialog.open();
+    }
     this.showIntro();
     await this.syncDisplayServersToUi();
 

From 405f61ba0988c716eb8a216861d6d397a084061b Mon Sep 17 00:00:00 2001
From: fortuna <fortuna@users.noreply.github.com>
Date: Fri, 7 Jun 2019 13:18:14 -0400
Subject: [PATCH 2/4] Remove TOS constant

---
 src/server_manager/ui_components/app-root.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/server_manager/ui_components/app-root.html b/src/server_manager/ui_components/app-root.html
index 82ce5b5ed..b00feb3f1 100644
--- a/src/server_manager/ui_components/app-root.html
+++ b/src/server_manager/ui_components/app-root.html
@@ -441,7 +441,6 @@ <h4>Disconnect DigitalOcean account</h4>
     </paper-dialog>
   </template>
   <script>
-    const TOS_ACK_LOCAL_STORAGE_KEY = 'tos-ack';
     Polymer({
       is: 'app-root',
       properties: {

From 9a070778c4c9d18ab4e89e45102636e26a5dbb9e Mon Sep 17 00:00:00 2001
From: Vinicius Fortuna <fortuna@google.com>
Date: Fri, 7 Jun 2019 18:28:52 -0400
Subject: [PATCH 3/4] Only run onUpdateDownloaded on Electron

---
 src/server_manager/web_app/app.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/server_manager/web_app/app.ts b/src/server_manager/web_app/app.ts
index d5657bd71..8b1d719bb 100644
--- a/src/server_manager/web_app/app.ts
+++ b/src/server_manager/web_app/app.ts
@@ -217,7 +217,10 @@ export class App {
       this.handleShowServerRequested(event.detail.displayServerId);
     });
 
-    onUpdateDownloaded(this.displayAppUpdateNotification.bind(this));
+    if (onUpdateDownloaded) {
+      // Only run on Electron.
+      onUpdateDownloaded(this.displayAppUpdateNotification.bind(this));
+    }
   }
 
   async start(): Promise<void> {

From 182c0fd90e6d4a6b5bb18958ca7e9bc8b1bd2458 Mon Sep 17 00:00:00 2001
From: Vinicius Fortuna <fortuna@google.com>
Date: Fri, 7 Jun 2019 19:19:15 -0400
Subject: [PATCH 4/4] Cleanup

---
 src/server_manager/web_app/app.spec.ts |  3 +--
 src/server_manager/web_app/app.ts      | 14 +++-----------
 src/server_manager/web_app/main.ts     |  7 +++----
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/src/server_manager/web_app/app.spec.ts b/src/server_manager/web_app/app.spec.ts
index 00963b2fc..5911ea872 100644
--- a/src/server_manager/web_app/app.spec.ts
+++ b/src/server_manager/web_app/app.spec.ts
@@ -222,7 +222,6 @@ function createTestApp(
     manualServerRepo?: server.ManualServerRepository,
     displayServerRepository?: FakeDisplayServerRepository,
     managedServerRepository?: FakeManagedServerRepository) {
-  const WEB_APP_URL = 'outline://fakefakefake/';
   const VERSION = '0.0.1';
   const fakeDigitalOceanSessionFactory = (accessToken: string) => {
     return new FakeDigitalOceanSession(accessToken);
@@ -242,7 +241,7 @@ function createTestApp(
     displayServerRepository = new FakeDisplayServerRepository();
   }
   return new App(
-      polymerAppRoot, WEB_APP_URL, VERSION, fakeDigitalOceanSessionFactory,
+      polymerAppRoot, VERSION, fakeDigitalOceanSessionFactory,
       fakeDigitalOceanServerRepositoryFactory, manualServerRepo, displayServerRepository,
       digitalOceanTokenManager);
 }
diff --git a/src/server_manager/web_app/app.ts b/src/server_manager/web_app/app.ts
index 8b1d719bb..15be74d5d 100644
--- a/src/server_manager/web_app/app.ts
+++ b/src/server_manager/web_app/app.ts
@@ -32,10 +32,6 @@ interface PolymerEvent extends Event {
   detail: any;
 }
 
-// The Outline DigitalOcean team's referral code:
-//   https://www.digitalocean.com/help/referral-program/
-const DIGITALOCEAN_REFERRAL_CODE = '5ddb4219b716';
-
 const TOS_ACK_LOCAL_STORAGE_KEY = 'tos-ack';
 
 interface UiAccessKey {
@@ -60,10 +56,6 @@ function convertToUiAccessKey(remoteAccessKey: server.AccessKey): UiAccessKey {
   };
 }
 
-const DIGITAL_OCEAN_CREATION_ERROR_MESSAGE = `Sorry! We couldn't create a server this time.
-  If this problem persists, it might be that your account needs to be reviewed by DigitalOcean.
-  Please log in to www.digitalocean.com and follow their instructions.`;
-
 function isManagedServer(testServer: server.Server): testServer is server.ManagedServer {
   return !!(testServer as server.ManagedServer).getHost;
 }
@@ -86,7 +78,7 @@ export class App {
   private serverBeingCreated: server.ManagedServer;
 
   constructor(
-      private appRoot: Polymer, private readonly appUrl: string, private readonly version: string,
+      private appRoot: Polymer, private readonly version: string,
       private createDigitalOceanSession: DigitalOceanSessionFactory,
       private createDigitalOceanServerRepository: DigitalOceanServerRepositoryFactory,
       private manualServerRepository: server.ManualServerRepository,
@@ -95,7 +87,7 @@ export class App {
     appRoot.setAttribute('outline-version', this.version);
 
     appRoot.addEventListener('TermsOfServiceAccepted', (event: PolymerEvent) => {
-      window.localStorage[TOS_ACK_LOCAL_STORAGE_KEY] = Date.now();
+      localStorage.setItem(TOS_ACK_LOCAL_STORAGE_KEY, Date.now().toString());
     });
 
     appRoot.addEventListener('ConnectToDigitalOcean', (event: PolymerEvent) => {
@@ -224,7 +216,7 @@ export class App {
   }
 
   async start(): Promise<void> {
-    if (!window.localStorage[TOS_ACK_LOCAL_STORAGE_KEY]) {
+    if (!localStorage.getItem(TOS_ACK_LOCAL_STORAGE_KEY)) {
       this.appRoot.$.tosDialog.open();
     }
     this.showIntro();
diff --git a/src/server_manager/web_app/main.ts b/src/server_manager/web_app/main.ts
index ebf9d8b52..4f926ac66 100644
--- a/src/server_manager/web_app/main.ts
+++ b/src/server_manager/web_app/main.ts
@@ -48,10 +48,9 @@ document.addEventListener('WebComponentsReady', () => {
 
   // Create and start the app.
   new App(
-      document.getElementById('appRoot'), document.URL, version,
-      digitalocean_api.createDigitalOceanSession, digitalOceanServerRepositoryFactory,
-      new ManualServerRepository('manualServers'), new DisplayServerRepository(),
-      new DigitalOceanTokenManager())
+      document.getElementById('appRoot'), version, digitalocean_api.createDigitalOceanSession,
+      digitalOceanServerRepositoryFactory, new ManualServerRepository('manualServers'),
+      new DisplayServerRepository(), new DigitalOceanTokenManager())
       .start();
 });