fix mozilla#107: DELETE_UNVERIFIED_SUBSCRIBERS_TIMER and logic

patch
smileys2 · Aug 27, 2018 · 3f6d64f · 3f6d64f
1 parent 7c4045d
commit 3f6d64f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/.env-dist b/.env-dist
@@ -6,6 +6,8 @@ PORT=6060
 COOKIE_SECRET=3895d33b5f9730f5eb2a2067fe0a690e298f55f5e382c032fd3656863412
 
 DATABASE_URL="postgres://postgres@localhost:5432/blurts"
+# How many seconds can unverified subscribers remain in the database
+DELETE_UNVERIFIED_SUBSCRIBERS_TIMER=86400
 
 SMTP_URL=""
 

diff --git a/app-constants.js b/app-constants.js
@@ -27,6 +27,7 @@ const kEnvironmentVariables = [
   "HIBP_API_ROOT",
   "HIBP_API_TOKEN",
   "DATABASE_URL",
+  "DELETE_UNVERIFIED_SUBSCRIBERS_TIMER",
 ];
 
 const AppConstants = { };

diff --git a/db/DB.js b/db/DB.js
@@ -5,6 +5,7 @@
 const uuidv4 = require("uuid/v4");
 const Knex = require("knex");
 
+const AppConstants = require("../app-constants");
 const HIBP = require("../hibp");
 const getSha1 = require("../sha1-utils");
 
@@ -119,8 +120,11 @@ const DB = {
   },
 
   async deleteUnverifiedSubscribers() {
+    const expiredDateTime = new Date(Date.now() - AppConstants.DELETE_UNVERIFIED_SUBSCRIBERS_TIMER * 1000);
+    const expiredTimeStamp = expiredDateTime.toISOString();
     await knex("subscribers")
       .where("verified", false)
+      .andWhere("created_at", "<", expiredTimeStamp)
       .del();
   },
 

diff --git a/scripts/delete-unverified-subscribers.js b/scripts/delete-unverified-subscribers.js
@@ -3,12 +3,7 @@
 const DB = require("../db/DB");
 
 
-async function deleteUnverifiedSubscribers() {
-  await DB.deleteUnverifiedSubscribers();
-}
-
-
 (async () => {
-  await deleteUnverifiedSubscribers();
+  await DB.deleteUnverifiedSubscribers();
   process.exit();
 })();