Merge pull request #5572 from mozilla/MNTOR-3897-1

MNTOR-3897: reactivate as a part of renew coupon code

src/app/(proper_react)/(redesign)/(authenticated)/user/plus-expiration/actions.ts

@@ -8,7 +8,7 @@ import { getSubscriberByFxaUid } from "../../../../../../db/tables/subscribers";
 import { applyChurnCouponCode } from "../../../../../functions/server/applyCoupon";
 import { getServerSession } from "../../../../../functions/server/getServerSession";
 import { logger } from "../../../../../functions/server/logging";
-
+import { reactivateAccount } from "../../../../../functions/server/reactivateAccount";
 export type ApplyRenewalCouponResult =
   | {
       success: false;
@@ -39,6 +39,7 @@ export async function applyRenewalCoupon(): Promise<ApplyRenewalCouponResult> {
   }
   try {
     await applyChurnCouponCode(subscriber);
+    await reactivateAccount(subscriber);
     return { success: true };
   } catch (e) {
     logger.error("apply_renewal_coupon_error", { error: e });

src/app/functions/server/reactivateAccount.ts

@@ -0,0 +1,43 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+import { SubscriberRow } from "knex/types/tables";
+import { logger } from "./logging";
+import { reactivate } from "../../../utils/fxa";
+import { record } from "./glean";
+
+export async function reactivateAccount(subscriber: SubscriberRow) {
+  logger.info("fxa_reactivate_user", {
+    subscriber: subscriber.id,
+  });
+
+  record("account", "reactivate", {
+    string: {
+      monitorUserId: subscriber.id.toString(),
+    },
+  });
+
+  // try to reactivate from subplat
+  if (subscriber.fxa_access_token) {
+    try {
+      await reactivate(subscriber.fxa_access_token);
+      logger.info("reactivate_from_subplat", {
+        subscriber_id: subscriber.id,
+        success: true,
+      });
+    } catch (ex) {
+      logger.error("reactivate_from_subplat", {
+        subscriber_id: subscriber.id,
+        exception: ex,
+      });
+      throw ex;
+    }
+  } else {
+    logger.error("reactivate_from_subplat_no_bearer_token", {
+      subscriber_id: subscriber.id,
+      exception: "Subscriber does not have permission or missing token",
+    });
+    throw new Error("Subscriber does not have permission or missing token");
+  }
+}

src/utils/fxa.ts

@@ -386,7 +386,10 @@ async function applyCoupon(
     }
   } catch (e) {
     if (e instanceof Error) {
-      logger.error("apply_fxa_coupon", { stack: e.stack, message: e.message });
+      logger.error(
+        "apply_fxa_coupon",
+        JSON.stringify({ stack: e.stack, message: e.message }),
+      );
     }
     throw e;
   }