Fixes mozilla-services#5185 - Access settings page directly from url

punamdahiya · Nov 20, 2018 · 90cef3b · 90cef3b
1 parent acecc07
commit 90cef3b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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">