Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolve #731 and #719

Browse source 
Don't clear SignMe cookie due conflict with new smctoken cookie.
This commit is contained in:
the-djmaze 2022-12-02 15:32:27 +01:00
parent 543725dd42
commit 2aca295851
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
snappymail/v/0.0.0/app/libraries/RainLoop/Actions/UserAuth.php
View file

@ -329,7 +329,8 @@ trait UserAuth
return $aResult; return $aResult;
} }
\SnappyMail\Log::notice(self::AUTH_SIGN_ME_TOKEN_KEY, 'invalid'); \SnappyMail\Log::notice(self::AUTH_SIGN_ME_TOKEN_KEY, 'invalid');
Utils::ClearCookie(self::AUTH_SIGN_ME_TOKEN_KEY); // Don't clear due to smctoken cookie missing at initialization and login checkbox
// Utils::ClearCookie(self::AUTH_SIGN_ME_TOKEN_KEY);
} }
return null; return null;
} }
@ -385,8 +386,9 @@ trait UserAuth
catch (\Throwable $oException) catch (\Throwable $oException)
{ {
\SnappyMail\Log::warning(self::AUTH_SIGN_ME_TOKEN_KEY, $oException->getMessage()); \SnappyMail\Log::warning(self::AUTH_SIGN_ME_TOKEN_KEY, $oException->getMessage());
// Don't clear due to smctoken cookie missing at initialization and login checkbox
// $this->ClearSignMeData();
} }
$this->ClearSignMeData();
} }
return null; return null;
} }