From 1c66365e9639caafae553cd13bff3eca5029c759 Mon Sep 17 00:00:00 2001
From: SmithThe4th <gsmith@bitwarden.com>
Date: Wed, 22 Feb 2023 19:25:26 -0500
Subject: [PATCH] Made correction to the domain used to domains that have been
 unverified after 72 hours. Instead of doing a greater than or equal to the
 condition is set to a fixed period 4, so domains after 4 days which are
 uneverified would not be picked up by the service (#2729)

---
 .../Repositories/OrganizationDomainRepository.cs   |  2 +-
 .../OrganizationDomain_ReadIfExpired.sql           |  5 +++--
 ...ReturningExpiredDomainsAfterSpecifiedPeriod.sql | 14 ++++++++++++++
 3 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 util/Migrator/DbScripts/2023-02-22_FixReturningExpiredDomainsAfterSpecifiedPeriod.sql

diff --git a/src/Infrastructure.EntityFramework/Repositories/OrganizationDomainRepository.cs b/src/Infrastructure.EntityFramework/Repositories/OrganizationDomainRepository.cs
index 1f3cd375e5..8b453d5e5e 100644
--- a/src/Infrastructure.EntityFramework/Repositories/OrganizationDomainRepository.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/OrganizationDomainRepository.cs
@@ -119,7 +119,7 @@ public class OrganizationDomainRepository : Repository<Core.Entities.Organizatio
         //Get domains that have not been verified after 72 hours
         var domains = dbContext.OrganizationDomains
             .AsEnumerable()
-            .Where(x => (DateTime.UtcNow - x.CreationDate).Days >= 4
+            .Where(x => (DateTime.UtcNow - x.CreationDate).Days == 4
                         && x.VerifiedDate == null)
             .ToList();
 
diff --git a/src/Sql/dbo/Stored Procedures/OrganizationDomain_ReadIfExpired.sql b/src/Sql/dbo/Stored Procedures/OrganizationDomain_ReadIfExpired.sql
index d548c97b99..b2a1a9d3fb 100644
--- a/src/Sql/dbo/Stored Procedures/OrganizationDomain_ReadIfExpired.sql	
+++ b/src/Sql/dbo/Stored Procedures/OrganizationDomain_ReadIfExpired.sql	
@@ -8,6 +8,7 @@ BEGIN
     FROM
         [dbo].[OrganizationDomain]
     WHERE
-        DATEDIFF(DAY, [CreationDate], GETUTCDATE()) >= 4 --Get domains that have not been verified after 3 days (72 hours)
+        DATEDIFF(DAY, [CreationDate], GETUTCDATE()) = 4 --Get domains that have not been verified after 3 days (72 hours)
     AND
-        [VerifiedDate] IS NULL
\ No newline at end of file
+        [VerifiedDate] IS NULL
+END
\ No newline at end of file
diff --git a/util/Migrator/DbScripts/2023-02-22_FixReturningExpiredDomainsAfterSpecifiedPeriod.sql b/util/Migrator/DbScripts/2023-02-22_FixReturningExpiredDomainsAfterSpecifiedPeriod.sql
new file mode 100644
index 0000000000..67fef99b84
--- /dev/null
+++ b/util/Migrator/DbScripts/2023-02-22_FixReturningExpiredDomainsAfterSpecifiedPeriod.sql
@@ -0,0 +1,14 @@
+CREATE OR ALTER PROCEDURE [dbo].[OrganizationDomain_ReadIfExpired]
+AS
+BEGIN
+    SET NOCOUNT OFF
+
+    SELECT
+        *
+    FROM
+        [dbo].[OrganizationDomain]
+    WHERE
+        DATEDIFF(DAY, [CreationDate], GETUTCDATE()) = 4 --Get domains that have not been verified after 3 days (72 hours)
+    AND
+        [VerifiedDate] IS NULL
+END
\ No newline at end of file