Merge pull request #4746 from mozilla/MNTOR-3353

MNTOR-3353: add expiry to subscribers table

Author: mansaj

src/app/(proper_react)/(redesign)/(authenticated)/user/(dashboard)/settings/SettingsPage.test.tsx

@@ -79,6 +79,7 @@ const mockedSubscriber: SubscriberRow = {
     "5a4792b89434153f1a6262fbd6a4510c00834ff842585fc4f4d972da158f0fc0",
   fxa_refresh_token:
     "5a4792b89434153f1a6262fbd6a4510c00834ff842585fc4f4d972da158f0fc1",
+  fxa_session_expiry: new Date(0),
   fxa_uid: "12346",
   fxa_profile_json: {
     uid: "123",

src/db/migrations/20240702102931_add_fxa_expiry_to_subscribers.js

@@ -0,0 +1,19 @@
+/* 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/. */
+
+export function up(knex) {
+  return knex.schema.table('subscribers', table => {
+    table.timestamp('fxa_session_expiry').after("fxa_access_token").nullable();
+  });
+}
+
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+export function down(knex) {
+  return knex.schema.table('subscribers', table => {
+    table.dropColumn('fxa_session_expiry');
+  });
+}

src/knex-tables.d.ts

@@ -102,6 +102,7 @@ declare module "knex/types/tables" {
     signup_language: null | string;
     fxa_refresh_token: null | string;
     fxa_access_token: null | string;
+    fxa_session_expiry: null | Date;
     fxa_profile_json: null | Profile;
     fxa_uid: null | string;
     // TODO: Find unknown type
@@ -139,6 +140,7 @@ declare module "knex/types/tables" {
     | "fx_newsletter"
     | "fxa_access_token"
     | "fxa_refresh_token"
+    | "fxa_session_expiry"
     | "fxa_profile_json"
     | "fxa_uid"
     | "breaches_last_shown"

src/utils/subscriberBreaches.test.ts

@@ -32,6 +32,7 @@ const subscriber: SubscriberRow = {
     "5a4792b89434153f1a6262fbd6a4510c00834ff842585fc4f4d972da158f0fc0",
   fxa_refresh_token:
     "5a4792b89434153f1a6262fbd6a4510c00834ff842585fc4f4d972da158f0fc1",
+  fxa_session_expiry: new Date(0),
   fxa_uid: "12346",
   fxa_profile_json: {
     uid: "123",
@@ -488,6 +489,7 @@ describe("getSubBreaches", () => {
         "5a4792b89434153f1a6262fbd6a4510c00834ff842585fc4f4d972da158f0fc0",
       fxa_refresh_token:
         "5a4792b89434153f1a6262fbd6a4510c00834ff842585fc4f4d972da158f0fc1",
+      fxa_session_expiry: new Date(0),
       fxa_uid: "12346",
       fxa_profile_json: {
         uid: "123",
@@ -590,6 +592,7 @@ describe("getSubBreaches", () => {
         "5a4792b89434153f1a6262fbd6a4510c00834ff842585fc4f4d972da158f0fc0",
       fxa_refresh_token:
         "5a4792b89434153f1a6262fbd6a4510c00834ff842585fc4f4d972da158f0fc1",
+      fxa_session_expiry: new Date(0),
       fxa_uid: "12346",
       fxa_profile_json: {
         uid: "123",
@@ -688,6 +691,7 @@ describe("getSubBreaches", () => {
         "5a4792b89434153f1a6262fbd6a4510c00834ff842585fc4f4d972da158f0fc0",
       fxa_refresh_token:
         "5a4792b89434153f1a6262fbd6a4510c00834ff842585fc4f4d972da158f0fc1",
+      fxa_session_expiry: new Date(0),
       fxa_uid: "12346",
       fxa_profile_json: {
         uid: "123",
@@ -808,6 +812,7 @@ describe("getSubBreaches", () => {
         "5a4792b89434153f1a6262fbd6a4510c00834ff842585fc4f4d972da158f0fc0",
       fxa_refresh_token:
         "5a4792b89434153f1a6262fbd6a4510c00834ff842585fc4f4d972da158f0fc1",
+      fxa_session_expiry: new Date(0),
       fxa_uid: "12346",
       fxa_profile_json: {
         uid: "123",
@@ -924,6 +929,7 @@ describe("getSubBreaches", () => {
         "5a4792b89434153f1a6262fbd6a4510c00834ff842585fc4f4d972da158f0fc0",
       fxa_refresh_token:
         "5a4792b89434153f1a6262fbd6a4510c00834ff842585fc4f4d972da158f0fc1",
+      fxa_session_expiry: new Date(0),
       fxa_uid: "12346",
       fxa_profile_json: {
         uid: "123",
@@ -1040,6 +1046,7 @@ describe("getSubBreaches", () => {
         "5a4792b89434153f1a6262fbd6a4510c00834ff842585fc4f4d972da158f0fc0",
       fxa_refresh_token:
         "5a4792b89434153f1a6262fbd6a4510c00834ff842585fc4f4d972da158f0fc1",
+      fxa_session_expiry: new Date(0),
       fxa_uid: "12346",
       fxa_profile_json: {
         uid: "123",