From 90cef3b257828e555ff414716c862d8b92d5fb02 Mon Sep 17 00:00:00 2001
From: Punam Dahiya <punamdahiya@yahoo.com>
Date: Mon, 19 Nov 2018 17:42:01 -0800
Subject: [PATCH] Fixes #5185 - Access settings page directly from url

---
 locales/en-US/server.ftl            | 2 --
 server/src/pages/settings/server.js | 4 ++--
 server/src/pages/settings/view.js   | 8 --------
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/locales/en-US/server.ftl b/locales/en-US/server.ftl
index 6d961456d1..32fa5f428a 100644
--- a/locales/en-US/server.ftl
+++ b/locales/en-US/server.ftl
@@ -283,11 +283,9 @@ copyImageErrorMessage = Unable to copy your shot to the clipboard.
 settingsDisconnectButton = Disconnect
     .title = Disconnect
 settingsGuestAccountMessage = Guest Account
-settingsSignInInvite = Sign in to sync across devices
 settingsSignInButton = Sign In
     .title = Sign in
 SettingsPageHeader = Firefox Screenshots Settings
-settingsDescription = You can sign in with Firefox Accounts to sync all your screenshots across devices and access them privately.
 settingsFirefoxAccountSubHeader = Firefox Account
 settingsClosePreferences =
     .title = Close preferences
diff --git a/server/src/pages/settings/server.js b/server/src/pages/settings/server.js
index 0e47dee264..e2597c231c 100644
--- a/server/src/pages/settings/server.js
+++ b/server/src/pages/settings/server.js
@@ -6,8 +6,8 @@ const app = express();
 exports.app = app;
 
 app.get("/", function(req, res) {
-  if (!(req.deviceId || req.accountId)) {
-    res.status(403).send("You must have Screenshots installed");
+  if (!req.accountId) {
+    res.redirect("/");
     return;
   }
   if (req.originalUrl === "/settings/") {
diff --git a/server/src/pages/settings/view.js b/server/src/pages/settings/view.js
index 6fb4fdaf38..e7fe4769da 100644
--- a/server/src/pages/settings/view.js
+++ b/server/src/pages/settings/view.js
@@ -75,20 +75,12 @@ class Body extends React.Component {
             <Localized id="settingsGuestAccountMessage">
               <p className="title">Guest Account</p>
             </Localized>
-            <Localized id="settingsSignInInvite">
-              <p className="info">Sign in to sync across devices</p>
-            </Localized>
             <Localized id="settingsSignInButton" attrs={{title: true}}>
               <a className="account-buttons" href="/api/fxa-oauth/login/" onClick={ this.onClickConnect.bind(this)} title="Sign in">Sign In</a>
             </Localized>
           </div>
         </div>
       );
-      subInfo = (
-        <Localized id="settingsDescription">
-          <p className="sub-info">You can sign in with Firefox Accounts to sync all your screenshots across devices and access them privately.</p>
-        </Localized>
-      );
     }
     return <div className="preferences">
       <Localized id="SettingsPageHeader">