c0e04d1a56
Continues the cross-app API-token UI unification (jump-host landed first). proxy already had the card grid and a description field, so this is a smaller diff: converts the always-visible inline create-form card into a "+ New Token" button + app.modal (matching the Add-Resource/Add-Host convention used stack-wide, per explicit direction to standardize on the modal-button approach rather than sso-manager-node's inline-card style), adds a net-new Edit modal (proxy's PUT /api-token/:id already fully supported it -- no route change needed), and replaces the static #secretModal with the same bare app.modal showToken()/copyFieldValue() pattern jump-host uses. Found and fixed a real timing bug along the way: the create flow's evalAJAX called app.modal.close() immediately before showToken() (which calls app.modal.open()) in the same synchronous tick. app.modal is a singleton, and close() immediately followed by open() collides with Bootstrap's hide-transition guard -- show() silently no-ops while _isTransitioning is still true from the just-started hide(), so the "secret revealed" modal never actually appeared after creating a token. Confirmed via a live click-through: the reveal modal stayed invisible (title set, `.show` class never added) with the close() call, and rendered correctly with it removed. Also fixed the same latent bug in jump-host's already-shipped v1.10.0 (submitApiToken() had the identical close()-then-open() sequence) and in sso-manager-node's directory.ejs (saveResource()'s OAuth-secret-reveal path, softened there by an intervening `await loadResources()` but not guaranteed race-free). Verified live: create -> reveal modal now appears correctly; Edit modal shows real created-by/on data, saves a description change, card refreshes.
321 lines
13 KiB
Plaintext
321 lines
13 KiB
Plaintext
<%- include('top') %>
|
|
<script type="text/javascript">
|
|
// Any authenticated user may view their own profile.
|
|
app.auth.forceLogin();
|
|
</script>
|
|
|
|
<style type="text/css">
|
|
.card-title{ font-weight: bold; }
|
|
.profile-label{ font-weight: bold; }
|
|
</style>
|
|
|
|
<script type="text/javascript">
|
|
|
|
function roleBadge(role){
|
|
let cls = role === 'admin' ? 'text-bg-danger'
|
|
: role === 'manager' ? 'text-bg-primary'
|
|
: role === 'viewer' ? 'text-bg-secondary' : 'text-bg-light';
|
|
return $('<span>').addClass('badge ' + cls).text(role);
|
|
}
|
|
|
|
function renderProfile(me){
|
|
$('#profile-username').text(me.username || '(unknown)');
|
|
|
|
// Access summary badges.
|
|
let $access = $('#profile-access').empty();
|
|
if(me.isAdmin){
|
|
$access.append($('<span>').addClass('badge text-bg-danger fs-6 me-1').text('Global administrator'));
|
|
}
|
|
if(me.global){
|
|
$access.append($('<span>').addClass('badge text-bg-primary fs-6 me-1').text('Global ' + me.global));
|
|
}
|
|
if(!me.isAdmin && !me.global){
|
|
$access.append($('<span>').addClass('text-muted').text('No global role.'));
|
|
}
|
|
|
|
// Groups (mark which are app-managed local groups).
|
|
let local = new Set(me.localGroups || []);
|
|
let $groups = $('#profile-groups').empty();
|
|
let groups = me.groups || [];
|
|
if(!groups.length){
|
|
$groups.append($('<span>').addClass('text-muted').text('Not a member of any group.'));
|
|
}
|
|
for(let g of groups){
|
|
let $b = $('<span>').addClass('badge me-1 mb-1 fs-6')
|
|
.addClass(local.has(g) ? 'text-bg-success' : 'text-bg-info').text(g);
|
|
if(local.has(g)) $b.append($('<i>').addClass('fa-solid fa-house-user ms-1').attr('title', 'local group'));
|
|
$groups.append($b);
|
|
}
|
|
|
|
// Per-domain roles.
|
|
let $domains = $('#profile-domains').empty();
|
|
let domains = me.domains || {};
|
|
let keys = Object.keys(domains).sort();
|
|
if(!keys.length){
|
|
$domains.append($('<tr>').append($('<td colspan="2">').addClass('text-muted').text('No per-domain roles.')));
|
|
}
|
|
for(let d of keys){
|
|
$domains.append($('<tr>')
|
|
.append($('<td>').addClass('align-middle').append($('<code>').text(d)))
|
|
.append($('<td>').addClass('align-middle').append(roleBadge(domains[d]))));
|
|
}
|
|
}
|
|
|
|
$(document).ready(function(){
|
|
app.api.get('user/me', function(error, data){
|
|
if(error) return app.messages.action(error, $('#profile-card'), 'danger');
|
|
renderProfile(data);
|
|
});
|
|
});
|
|
</script>
|
|
|
|
<div class="row justify-content-center">
|
|
<div class="col-md-8">
|
|
<div class="card shadow-lg" id="profile-card">
|
|
<div class="card-header text-center">
|
|
<span class="card-icon float-start"><i class="fa-solid fa-id-badge"></i></span>
|
|
<span class="card-title">My Profile</span>
|
|
</div>
|
|
<div class="card-header actionMessage" style="display:none"></div>
|
|
<div class="card-body">
|
|
<h3 class="mb-3"><i class="fa-solid fa-user me-2"></i><span id="profile-username">…</span></h3>
|
|
|
|
<div class="mb-3">
|
|
<div class="profile-label">Access</div>
|
|
<div id="profile-access"></div>
|
|
</div>
|
|
|
|
<div class="mb-3">
|
|
<div class="profile-label">Groups</div>
|
|
<div id="profile-groups"></div>
|
|
</div>
|
|
|
|
<div class="mb-1 profile-label">Domain permissions</div>
|
|
<div class="table-responsive">
|
|
<table class="table table-striped">
|
|
<thead><th>Domain</th><th>Role</th></thead>
|
|
<tbody id="profile-domains"></tbody>
|
|
</table>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
|
|
<script type="text/javascript">
|
|
var tokensById = {};
|
|
|
|
// Shared "reveal secret once" display -- same pattern as jump-host's
|
|
// showToken(), which sso-manager-node also uses.
|
|
function showToken(title, token){
|
|
app.modal.open({title: title, bodyHtml:
|
|
'<p class="text-danger"><i class="fa-solid fa-triangle-exclamation"></i> Save this token now — it will <strong>not</strong> be shown again.</p>'
|
|
+ '<div class="input-group"><input type="text" class="form-control font-monospace" id="revealed-token" readonly value="' + app.util.escapeHtml(token) + '">'
|
|
+ '<button class="btn btn-outline-secondary" onclick="copyFieldValue(\'#revealed-token\')" title="Copy"><i class="fa-solid fa-copy"></i></button></div>'
|
|
+ '<p class="mt-3 mb-0 text-muted small">Use it as a bearer token:<br><code>Authorization: Bearer ' + app.util.escapeHtml(token) + '</code></p>'
|
|
});
|
|
}
|
|
// Not the checkmark-flash technique some of this codebase's other copy
|
|
// buttons use -- FontAwesome replaces <i> icons with inline <svg>, so
|
|
// swapping the <i>'s class silently no-ops. A toast doesn't have that
|
|
// problem.
|
|
function copyFieldValue(sel){
|
|
var $el = $(sel);
|
|
var text = $el.val();
|
|
if(!text) return;
|
|
navigator.clipboard.writeText(text).then(function(){
|
|
app.messages.toast('Copied to clipboard', 'success');
|
|
}, function(){
|
|
app.messages.toast('Could not copy — select and copy manually', 'danger');
|
|
});
|
|
}
|
|
|
|
function fmtTime(ms){
|
|
// created_on/last_used_on come back from Redis as strings (model-redis
|
|
// only coerces fields with an explicit `type`); moment(value, "x") parses
|
|
// a numeric string-or-number as a Unix-ms timestamp, unlike new Date(str).
|
|
if(!ms || Number(ms) === 0) return '—';
|
|
var t = moment(ms, "x");
|
|
if(!t.isValid()) return '—';
|
|
return t.fromNow() + ' <span class="text-muted">(' + t.format('YYYY-MM-DD HH:mm') + ')</span>';
|
|
}
|
|
function fmtExpiry(token){
|
|
// expires_at is type:number (a real number); isExpired is a class getter
|
|
// that is NOT serialized to the client, so compute expiry here.
|
|
var exp = Number(token.expires_at);
|
|
if(!exp) return '<span class="badge text-bg-secondary">never</span>';
|
|
if(Date.now() > exp) return '<span class="badge text-bg-danger">expired</span>';
|
|
return '<span class="badge text-bg-warning text-dark">' + moment(exp, "x").fromNow() + '</span>';
|
|
}
|
|
|
|
function processToken(token){
|
|
tokensById[token.id] = token;
|
|
token.id_short = token.id.slice(0, 12) + '…';
|
|
token.expires_display = fmtExpiry(token);
|
|
token.created_display = fmtTime(token.created_on);
|
|
token.last_used_display = fmtTime(token.last_used_on);
|
|
return token;
|
|
}
|
|
|
|
function tableAJAX(){
|
|
app.apiToken.list(function(error, data){
|
|
if(error) return app.messages.action(error, $.scope.apiTokenCard.$this, 'danger');
|
|
var tokens = data.results || [];
|
|
$.scope.apiTokenCard.empty();
|
|
tokens.forEach(function(token){
|
|
$.scope.apiTokenCard.push(processToken(token));
|
|
});
|
|
$('#api-tokens-empty').toggle(tokens.length === 0);
|
|
});
|
|
}
|
|
|
|
async function revokeToken(id, name, btn){
|
|
const ok = await app.messages.confirm('Revoke API token "' + name + '"? It stops working immediately.', $(btn).closest('.card'), 'danger');
|
|
if(!ok) return;
|
|
app.apiToken.remove({id: id}, function(error, data){
|
|
if(error) return app.messages.action(error, $(btn).closest('.card'), 'danger');
|
|
$.scope.apiTokenCard.remove('id', id);
|
|
});
|
|
}
|
|
|
|
async function rotateToken(id, name, btn){
|
|
const ok = await app.messages.confirm('Rotate API token "' + name + '"? The old token stops working immediately.', $(btn).closest('.card'), 'warning');
|
|
if(!ok) return;
|
|
app.apiToken.rotate({id: id}, function(error, data){
|
|
if(error) return app.messages.action(error, $(btn).closest('.card'), 'danger');
|
|
showToken('API Token Rotated', data.token);
|
|
tableAJAX();
|
|
});
|
|
}
|
|
|
|
// Create is a native <form>+formAJAX submission (matching this app's own
|
|
// hostModal convention) rather than a JS-built payload -- the form now
|
|
// lives inside app.modal's body, rebuilt fresh on every open(), so
|
|
// .actionMessage must be a descendant of the form (not a sibling, as the
|
|
// old static create-form card had it) for formAJAX's error/success
|
|
// targeting to resolve correctly (it falls back to searching descendants
|
|
// of the form once app.modal's card-less .modal-content fails the
|
|
// closest('div.card') check).
|
|
function createApiToken(){
|
|
var $body = app.modal.open({
|
|
title: 'New API Token',
|
|
bodyHtml:
|
|
'<div class="actionMessage mb-3" style="display:none"></div>'
|
|
// Deliberately does NOT call app.modal.close() before showToken() --
|
|
// app.modal is a singleton, and close() immediately followed by
|
|
// open() in the same synchronous tick collides with Bootstrap's
|
|
// hide-transition guard (show() silently no-ops while _isTransitioning
|
|
// is still true from the just-started hide()). open() alone already
|
|
// overwrites the (already-visible) modal's content in place.
|
|
+ '<form id="newTokenForm" action="api-token/" method="post" onsubmit="formAJAX(this)" evalAJAX="showToken(\'API Token Created\', data.token); tableAJAX();">'
|
|
+ '<div class="mb-3">'
|
|
+ '<label class="form-label">Name</label>'
|
|
+ '<input type="text" class="form-control" name="name" placeholder="CI host sync" required>'
|
|
+ '</div>'
|
|
+ '<div class="mb-3">'
|
|
+ '<label class="form-label">Description</label>'
|
|
+ '<input type="text" class="form-control" name="description" placeholder="Used by the nightly sync job">'
|
|
+ '</div>'
|
|
+ '<div class="mb-3">'
|
|
+ '<label class="form-label">Expires in (days) <small class="text-muted">(0 = never)</small></label>'
|
|
+ '<input type="number" class="form-control" name="expires_in_days" value="0" min="0">'
|
|
+ '</div>'
|
|
+ '</form>',
|
|
footer: {
|
|
buttonsHtml: '<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>'
|
|
+ '<button type="submit" form="newTokenForm" class="btn btn-outline-dark"><i class="fa-solid fa-plus"></i> Create</button>',
|
|
},
|
|
});
|
|
$body.find('[name=name]').focus();
|
|
}
|
|
|
|
function editToken(id){
|
|
var t = tokensById[id]; if(!t) return;
|
|
app.modal.open({
|
|
title: 'Edit Token',
|
|
bodyHtml:
|
|
'<input type="hidden" id="edit-token-id" value="' + app.util.escapeHtml(id) + '">'
|
|
+ '<div class="mb-3">'
|
|
+ '<label class="form-label">Name</label>'
|
|
+ '<input type="text" class="form-control" id="edit-token-name" value="' + app.util.escapeHtml(t.name || '') + '">'
|
|
+ '</div>'
|
|
+ '<div class="mb-3">'
|
|
+ '<label class="form-label">Description</label>'
|
|
+ '<input type="text" class="form-control" id="edit-token-description" value="' + app.util.escapeHtml(t.description || '') + '">'
|
|
+ '</div>'
|
|
+ '<div class="mb-3">'
|
|
+ '<label class="form-label">Expires in (days, blank = keep as-is, 0 = never)</label>'
|
|
+ '<input type="number" class="form-control" id="edit-token-days" min="0">'
|
|
+ '</div>',
|
|
footer: {
|
|
metaHtml: 'Created by ' + app.util.escapeHtml(t.created_by || '—') + ' on ' + fmtTime(t.created_on),
|
|
buttonsHtml: app.modal.footerButtons({onSave: 'saveEditToken()', saveLabel: 'Save'}),
|
|
},
|
|
});
|
|
}
|
|
|
|
function saveEditToken(){
|
|
var payload = {
|
|
id: $('#edit-token-id').val(),
|
|
name: $('#edit-token-name').val(),
|
|
description: $('#edit-token-description').val(),
|
|
expires_in_days: $('#edit-token-days').val(),
|
|
};
|
|
app.apiToken.update(payload, function(error, data){
|
|
if(error) return app.messages.action((data && data.message) || 'Failed to update token', app.modal.body(), 'danger');
|
|
app.modal.close();
|
|
tableAJAX();
|
|
});
|
|
}
|
|
|
|
$(document).ready(function(){
|
|
tableAJAX();
|
|
});
|
|
</script>
|
|
|
|
<div class="row mt-3 justify-content-center">
|
|
<div class="col-md-8">
|
|
<div class="card shadow-lg">
|
|
<div class="card-header d-flex justify-content-between align-items-center">
|
|
<span><i class="fa-solid fa-key me-1"></i> API Tokens</span>
|
|
<span>
|
|
<a href="/docs/api-tokens" class="text-reset me-2" title="Help"><i class="fa-solid fa-circle-question"></i></a>
|
|
<button class="btn btn-sm btn-primary" onclick="createApiToken()"><i class="fa-solid fa-plus"></i> New token</button>
|
|
</span>
|
|
</div>
|
|
<div class="card-header actionMessage" style="display:none"></div>
|
|
<p class="text-muted small px-3 pt-3 mb-0">A personal access token lets scripts and services call the proxy management API as you, with your permissions. Treat it like a password.</p>
|
|
<div class="card-body">
|
|
<p id="api-tokens-empty" class="text-muted mb-0" style="display:none">No API tokens.</p>
|
|
<div jq-repeat="apiTokenCard" jq-index-key="id" id="apitoken-card-{{id}}" class="card shadow mb-3">
|
|
<div class="card-header">
|
|
<h5><i class="fa-solid fa-key"></i> {{ name }}</h5>
|
|
<small class="text-muted font-monospace">{{ id_short }}</small>
|
|
</div>
|
|
<div class="card-header actionMessage" style="display:none"></div>
|
|
<div class="card-body">
|
|
{{ #description }}<p>{{ description }}</p>{{ /description }}
|
|
<dl class="row mb-0">
|
|
<dt class="col-sm-3">Token ID</dt>
|
|
<dd class="col-sm-9"><code>{{ id_short }}</code></dd>
|
|
<dt class="col-sm-3">Created</dt>
|
|
<dd class="col-sm-9">{{{ created_display }}}</dd>
|
|
<dt class="col-sm-3">Last used</dt>
|
|
<dd class="col-sm-9">{{{ last_used_display }}}</dd>
|
|
<dt class="col-sm-3">Expires</dt>
|
|
<dd class="col-sm-9">{{{ expires_display }}}</dd>
|
|
</dl>
|
|
</div>
|
|
<div class="card-footer">
|
|
<button type="button" onclick="editToken('{{id}}')" class="btn btn-primary btn-sm"><i class="fa-solid fa-pen-to-square"></i> Edit</button>
|
|
<button type="button" onclick="rotateToken('{{id}}', '{{name}}', this)" class="btn btn-warning btn-sm"><i class="fa-solid fa-arrows-rotate"></i> Rotate</button>
|
|
<button type="button" onclick="revokeToken('{{id}}', '{{name}}', this)" class="btn btn-danger btn-sm float-end"><i class="fa-solid fa-trash"></i> Revoke</button>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<%- include('bottom') %>
|