FOSS/mailcow-dockerized
0
0
Fork 0
mirror of https://github.com/mailcow/mailcow-dockerized.git synced 2026-07-25 09:04:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Imapsync] fix token badge for imapsync source

Browse Source
This commit is contained in:
FreddleSpl0it
2026-07-21 11:54:02 +02:00
parent 069b89629e
commit 6f81778e5e
5 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/web/js/build/013-mailcow.js
+26
View File
@@ -428,6 +428,32 @@ function imapsyncScopeDisplay(item) {
return escapeHtml(lang.syncjobs.source_scope_user + ': ' + us.join(', '));
}
// Auth column for a source row: auth type, and for XOAUTH2 the flow + a token-status badge.
function imapsyncAuthDisplay(item) {
var out = escapeHtml(item.auth_type);
if (item.auth_type !== 'XOAUTH2') return out;
var flow = item.oauth_flow || 'client_credentials';
var flowLabel = (flow === 'authorization_code')
? lang.syncjobs.source_flow_badge_user
: lang.syncjobs.source_flow_badge_app;
out += ' <span class="text-muted">(' + escapeHtml(flowLabel) + ')</span>';
if (flow === 'authorization_code') {
// token lives per user+source (created via the syncjob "connect"), not on the source row
return out;
}
var badge;
if (item.oauth_token_expires && item.oauth_token_expires * 1000 > Date.now()) {
badge = '<span class="badge bg-success">' + lang.syncjobs.source_token_status + ': ' + new Date(item.oauth_token_expires * 1000).toLocaleString() + '</span>';
} else if (item.oauth_last_refresh_error) {
badge = '<span class="badge bg-danger" title="' + escapeHtml(item.oauth_last_refresh_error) + '">' + lang.syncjobs.source_token_error + '</span>';
} else {
badge = '<span class="badge bg-warning">' + lang.waiting + '</span>';
}
// badge on its own line, below "XOAUTH2 (Client Credentials)"
out += '<div class="mt-1">' + badge + '</div>';
return out;
}
// (Re)build every imapsync-source dropdown from the ACL-filtered API (fresh on modal open)
function populateImapsyncSourceSelects() {
$.get("/api/v1/get/syncjob_source/all", function(sources) {
data/web/js/site/mailbox.js
+1 -10
View File
@@ -2491,16 +2491,7 @@ jQuery(function($){
dataSrc: function(json) {
$.each(json, function(i, item) {
item.endpoint = escapeHtml(item.host1 + ':' + item.port1 + ' (' + item.enc1 + ')');
item.auth_display = escapeHtml(item.auth_type);
if (item.auth_type === 'XOAUTH2') {
if (item.oauth_token_expires && item.oauth_token_expires * 1000 > Date.now()) {
item.auth_display += ' <span class="badge bg-success">' + lang.syncjobs.source_token_status + ': ' + new Date(item.oauth_token_expires * 1000).toLocaleString() + '</span>';
} else if (item.oauth_last_refresh_error) {
item.auth_display += ' <span class="badge bg-danger" title="' + escapeHtml(item.oauth_last_refresh_error) + '">' + lang.syncjobs.source_token_error + '</span>';
} else {
item.auth_display += ' <span class="badge bg-warning">' + lang.waiting + '</span>';
}
}
item.auth_display = imapsyncAuthDisplay(item);
item.visibility_display = imapsyncScopeDisplay(item);
if (item.can_edit) {
item.action = '<div class="btn-group">' +
data/web/js/site/user.js
+1 -10
View File
@@ -721,16 +721,7 @@ jQuery(function($){
dataSrc: function(json) {
$.each(json, function(i, item) {
item.endpoint = escapeHtml(item.host1 + ':' + item.port1 + ' (' + item.enc1 + ')');
item.auth_display = escapeHtml(item.auth_type);
if (item.auth_type === 'XOAUTH2') {
if (item.oauth_token_expires && item.oauth_token_expires * 1000 > Date.now()) {
item.auth_display += ' <span class="badge bg-success">' + lang.syncjobs.source_token_status + ': ' + new Date(item.oauth_token_expires * 1000).toLocaleString() + '</span>';
} else if (item.oauth_last_refresh_error) {
item.auth_display += ' <span class="badge bg-danger" title="' + escapeHtml(item.oauth_last_refresh_error) + '">' + lang.syncjobs.source_token_error + '</span>';
} else {
item.auth_display += ' <span class="badge bg-warning">' + lang.waiting + '</span>';
}
}
item.auth_display = imapsyncAuthDisplay(item);
item.visibility_display = imapsyncScopeDisplay(item);
if (acl_data.syncjobs === 1 && item.can_edit) {
item.action = '<div class="btn-group">' +
data/web/lang/lang.de-de.json
+2
View File
@@ -1256,6 +1256,8 @@
"source_oauth_flow": "OAuth2-Flow",
"source_oauth_flow_app": "App (Client Credentials)",
"source_oauth_flow_user": "Benutzer-Login (Authorization Code)",
"source_flow_badge_app": "Client Credentials",
"source_flow_badge_user": "Benutzer-Login",
"source_authorize_endpoint": "Authorize-Endpoint",
"source_userinfo_endpoint": "Userinfo-Endpoint",
"source_redirect_uri": "Redirect-URI",
data/web/lang/lang.en-gb.json
+2
View File
@@ -1263,6 +1263,8 @@
"source_oauth_flow": "OAuth2 flow",
"source_oauth_flow_app": "App (client credentials)",
"source_oauth_flow_user": "User login (authorization code)",
"source_flow_badge_app": "Client credentials",
"source_flow_badge_user": "User login",
"source_authorize_endpoint": "Authorize endpoint",
"source_userinfo_endpoint": "Userinfo endpoint",
"source_redirect_uri": "Redirect URI",