AS1024/itflow
1
0
Fork 0
mirror of https://github.com/itflow-org/itflow synced 2026-03-24 06:25:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changes for M365 oAuth

Browse Source 
- Added web-based Microsoft OAuth onboarding UI in Mail settings, including a Connect Microsoft 365 button and auto-generated callback URI display.
- Added Test OAuth Token Refresh UI section.
- Updated visibility logic so Test Email Sending and Test IMAP Connection show correctly for OAuth-based configs (not only host/password configs).
This commit is contained in:
cs2000
2026-02-04 13:23:03 +00:00
committed by GitHub
parent 65d1f59e9b
commit 6b6d847756
1 changed files with 590 additions and 495 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
admin/settings_mail.php
View File

@@ -243,6 +243,32 @@ require_once "includes/inc_all_admin.php";
</div> </div>
</div> </div>
<?php
if (defined('BASE_URL') && !empty(BASE_URL)) {
$mail_oauth_callback_uri = rtrim((string) BASE_URL, '/') . '/admin/oauth_microsoft_mail_callback.php';
} else {
$mail_oauth_callback_uri = 'https://' . rtrim((string) $config_base_url, '/') . '/admin/oauth_microsoft_mail_callback.php';
}
?>
<div class="form-group">
<label>Microsoft OAuth Connect (Web)</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-link"></i></span>
</div>
<input type="text" class="form-control" readonly value="<?php echo htmlspecialchars($mail_oauth_callback_uri); ?>">
<div class="input-group-append">
<button type="submit" name="oauth_connect_microsoft_mail" class="btn btn-outline-primary">
<i class="fas fa-fw fa-sign-in-alt mr-2"></i>Connect Microsoft 365
</button>
</div>
</div>
<small class="text-secondary">
Add this callback URI in Entra App Registration, then click Connect to authorize and store refresh token automatically.
</small>
</div>
<hr> <hr>
<button type="submit" name="edit_mail_imap_settings" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Save</button> <button type="submit" name="edit_mail_imap_settings" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Save</button>
@@ -359,7 +385,22 @@ require_once "includes/inc_all_admin.php";
</div> </div>
</div> </div>
<?php if (!empty($config_smtp_host) && !empty($config_smtp_port) && !empty($config_mail_from_email) && !empty($config_mail_from_name)) { ?> <?php
$smtp_standard_ready = !empty($config_smtp_host)
&& !empty($config_smtp_port)
&& !empty($config_mail_from_email)
&& !empty($config_mail_from_name);
$smtp_oauth_ready = ($config_smtp_provider === 'google_oauth' || $config_smtp_provider === 'microsoft_oauth')
&& !empty($config_mail_from_email)
&& !empty($config_mail_from_name)
&& !empty($config_mail_oauth_client_id)
&& !empty($config_mail_oauth_client_secret)
&& !empty($config_mail_oauth_refresh_token)
&& ($config_smtp_provider !== 'microsoft_oauth' || !empty($config_mail_oauth_tenant_id));
?>
<?php if ($smtp_standard_ready || $smtp_oauth_ready) { ?>
<div class="card card-dark"> <div class="card card-dark">
<div class="card-header py-3"> <div class="card-header py-3">
@@ -409,7 +450,21 @@ require_once "includes/inc_all_admin.php";
<?php } ?> <?php } ?>
<?php if (!empty($config_imap_username) && !empty($config_imap_password) && !empty($config_imap_host) && !empty($config_imap_port)) { ?> <?php
$imap_standard_ready = !empty($config_imap_username)
&& !empty($config_imap_password)
&& !empty($config_imap_host)
&& !empty($config_imap_port);
$imap_oauth_ready = ($config_imap_provider === 'google_oauth' || $config_imap_provider === 'microsoft_oauth')
&& !empty($config_imap_username)
&& !empty($config_mail_oauth_client_id)
&& !empty($config_mail_oauth_client_secret)
&& !empty($config_mail_oauth_refresh_token)
&& ($config_imap_provider !== 'microsoft_oauth' || !empty($config_mail_oauth_tenant_id));
?>
<?php if ($imap_standard_ready || $imap_oauth_ready) { ?>
<div class="card card-dark"> <div class="card card-dark">
<div class="card-header py-3"> <div class="card-header py-3">
@@ -428,6 +483,46 @@ require_once "includes/inc_all_admin.php";
<?php } ?> <?php } ?>
<?php
$oauth_provider_for_test = '';
if ($config_imap_provider === 'google_oauth' || $config_imap_provider === 'microsoft_oauth') {
$oauth_provider_for_test = $config_imap_provider;
} elseif ($config_smtp_provider === 'google_oauth' || $config_smtp_provider === 'microsoft_oauth') {
$oauth_provider_for_test = $config_smtp_provider;
}
$oauth_has_required_fields = !empty($oauth_provider_for_test)
&& !empty($config_mail_oauth_client_id)
&& !empty($config_mail_oauth_client_secret)
&& !empty($config_mail_oauth_refresh_token)
&& ($oauth_provider_for_test !== 'microsoft_oauth' || !empty($config_mail_oauth_tenant_id));
?>
<?php if ($oauth_has_required_fields) { ?>
<div class="card card-dark">
<div class="card-header py-3">
<h3 class="card-title"><i class="fas fa-fw fa-key mr-2"></i>Test OAuth Token Refresh</h3>
</div>
<div class="card-body">
<form action="post.php" method="post" autocomplete="off">
<input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
<input type="hidden" name="oauth_provider" value="<?php echo htmlspecialchars($oauth_provider_for_test); ?>">
<p class="text-secondary mb-3">
This validates your refresh token and stores a new access token for
<?php echo $oauth_provider_for_test === 'microsoft_oauth' ? 'Microsoft 365' : 'Google Workspace'; ?>.
</p>
<button type="submit" name="test_oauth_token_refresh" class="btn btn-success">
<i class="fas fa-fw fa-sync-alt mr-2"></i>Test OAuth Token Refresh
</button>
</form>
</div>
</div>
<?php } ?>
<script> <script>
(function(){ (function(){
function setDisabled(container, disabled){ function setDisabled(container, disabled){