Merge pull request #2452 from mozilla/merge/mk-034-account-exists

Some attempts to better address the errors happening on stage

controllers/oauth.js

@@ -65,9 +65,12 @@ async function confirmed(req, res, next, client = FxAOAuthClient) {
   //DATA REMOVAL SPECIFIC
   const post_auth_redirect = req.session.post_auth_redirect;
   let returnURL;
-
-  if (existingUser && (await checkIfOnRemovalPilotList(existingUser))) {
+  const isOnRemovalPilotList = await checkIfOnRemovalPilotList(existingUser);
+  if (isOnRemovalPilotList) {
     req.session.kanary = { onRemovalPilotList: true };
+  }
+
+  if (existingUser && isOnRemovalPilotList) {
     //if they are an existing user and on the pilot list, use pilot redirect
     if (post_auth_redirect) {
       returnURL = new URL(post_auth_redirect, AppConstants.SERVER_URL);

controllers/user.js

@@ -1444,15 +1444,10 @@ async function handleRemovalFormSignup(req, res) {
 
   if (user.kid) {
     console.error(
-      "user should have been directed to the handleRemovalAcctUpdate function if they have a kid"
-    );
-    const localeError = LocaleUtils.formatRemoveString(
-      "remove-error-account-exists"
+      "user should not be able to submit the form again if they already have a Kanary ID"
     );
 
-    return res.status(400).json({
-      error: localeError,
-    });
+    return res.redirect("/user/remove-data");
   }
 
   const {

db/DB.js

@@ -498,7 +498,7 @@ const DB = {
         kid: null,
         removal_would_pay: null,
         removal_enrolled_time: null,
-        removal_optout: true,
+        removal_optout: false, //MH TODO: reenable after debugging stage
       })
       .catch((e) => {
         console.error("error removing kanary id", e);

form-utils.js

@@ -98,7 +98,7 @@ const FormUtils = {
     return parseFloat(mode);
   },
   canShowViaParams(doShow) {
-    return ["dev", "heroku"].includes(AppConstants.NODE_ENV) && doShow;
+    return ["dev", "heroku", "stage"].includes(AppConstants.NODE_ENV) && doShow;
   },
 };