mirror of
https://github.com/mailcow/mailcow-dockerized.git
synced 2025-12-13 01:45:59 +00:00
Merge pull request #6407 from mailcow/fix/6396
[Web] Fix oauth2 redirect after user login
This commit is contained in:
@@ -66,6 +66,14 @@ if (isset($_POST["verify_tfa_login"])) {
|
||||
die();
|
||||
} else {
|
||||
set_user_loggedin_session($_SESSION['pending_mailcow_cc_username']);
|
||||
|
||||
if (isset($_SESSION['oauth2_request'])) {
|
||||
$oauth2_request = $_SESSION['oauth2_request'];
|
||||
unset($_SESSION['oauth2_request']);
|
||||
header('Location: ' . $oauth2_request);
|
||||
die();
|
||||
}
|
||||
|
||||
$user_details = mailbox("get", "mailbox_details", $_SESSION['mailcow_cc_username']);
|
||||
$is_dual = (!empty($_SESSION["dual-login"]["username"])) ? true : false;
|
||||
if (intval($user_details['attributes']['sogo_access']) == 1 && !$is_dual) {
|
||||
@@ -118,6 +126,12 @@ if (isset($_POST["login_user"]) && isset($_POST["pass_user"])) {
|
||||
header("Location: /mobileconfig.php");
|
||||
die();
|
||||
}
|
||||
if (isset($_SESSION['oauth2_request'])) {
|
||||
$oauth2_request = $_SESSION['oauth2_request'];
|
||||
unset($_SESSION['oauth2_request']);
|
||||
header('Location: ' . $oauth2_request);
|
||||
die();
|
||||
}
|
||||
|
||||
$user_details = mailbox("get", "mailbox_details", $login_user);
|
||||
$is_dual = (!empty($_SESSION["dual-login"]["username"])) ? true : false;
|
||||
|
||||
Reference in New Issue
Block a user