Merge pull request #8015 from Oldiesmann/fix_tfa_logout

jdarwood007 · web-flow · commit b08968cc1e04 · 2024-01-16T18:41:10.000-08:00
Fix error when logging out with TFA enabled
diff --git a/Sources/Actions/Logout.php b/Sources/Actions/Logout.php
@@ -124,7 +124,7 @@ public function execute(bool $internal = false, bool $redirect = true): void
 		if (!empty(Config::$modSettings['tfa_mode']) && !empty(User::$me->id) && !empty($_COOKIE[Config::$cookiename . '_tfa'])) {
 			list(, , $exp) = Utils::jsonDecode($_COOKIE[Config::$cookiename . '_tfa'], true);
 
-			Cookie::setTFACookie((int) $exp - time(), $salt, Cookie::encrypt(User::$me->tfa_backup, $salt));
+			Cookie::setTFACookie((int) $exp - time(), User::$me->id, Cookie::encrypt(User::$me->tfa_backup, $salt));
 		}
 
 		session_destroy();

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ public function execute(bool $internal = false, bool $redirect = true): void`
`124`	`124`	`if (!empty(Config::$modSettings['tfa_mode']) && !empty(User::$me->id) && !empty($_COOKIE[Config::$cookiename . '_tfa'])) {`
`125`	`125`	`list(, , $exp) = Utils::jsonDecode($_COOKIE[Config::$cookiename . '_tfa'], true);`
`126`	`126`
`127`		`- Cookie::setTFACookie((int) $exp - time(), $salt, Cookie::encrypt(User::$me->tfa_backup, $salt));`
	`127`	`+ Cookie::setTFACookie((int) $exp - time(), User::$me->id, Cookie::encrypt(User::$me->tfa_backup, $salt));`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`session_destroy();`