Magic link expiring in certain timezones

bymayo · Jul 23, 2024 · 2f3cd84 · 2f3cd84
1 parent fc581cc
commit 2f3cd84
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Porter Changelog
 
+## 5.0.3 - 2024-07-23
+### Fixed
+- Magic link expiring in certain timezones (Thanks [@RobinWissink[](https://github.com/bymayo/craft-porter/issues/5))
+
 ## 5.0.2 - 2024-07-11
 ### Fixed
 - If password field is blank when saving a user in the CP, skip password validation

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "bymayo/porter",
     "description": "A toolkit with lots of helpers for users and accounts",
     "type": "craft-plugin",
-    "version": "5.0.2",
+    "version": "5.0.3",
     "keywords": [
         "craft",
         "cms",

diff --git a/src/services/MagicLink.php b/src/services/MagicLink.php
@@ -193,7 +193,7 @@ public function validateToken($token)
 
         $this->invalidateTokens($user);
 
-        if (DateTimeHelper::currentTimeStamp() <= (strtotime($query->dateCreated) + $this->settings->magicLinkExpirySeconds))
+        if (DateTimeHelper::currentTimeStamp() <= (DateTimeHelper::toDateTime($query->dateCreated)->format('U') + $this->settings->magicLinkExpirySeconds))
         {
 
             if (Craft::$app->getUser()->login($user))