domenico/luci-app-tailscale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add displayName & logout

Browse Source
This commit is contained in:
asvow
2024-01-29 19:14:18 +08:00
parent 764d9576be
commit e2b63caa40
1 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
htdocs/luci-static/resources/view/tailscale/base.js
View File

@@ -34,12 +34,14 @@ function getLoginStatus() {
if (!status.AuthURL && status.BackendState == "NeedsLogin") { if (!status.AuthURL && status.BackendState == "NeedsLogin") {
fs.exec("/usr/sbin/tailscale", ["login"]); fs.exec("/usr/sbin/tailscale", ["login"]);
} }
var displayName = status.BackendState == "Running" ? status.User[status.Self.UserID].DisplayName : undefined;
return { return {
backendState: status.BackendState, backendState: status.BackendState,
authURL: status.AuthURL authURL: status.AuthURL,
displayName: displayName
}; };
}).catch(function(error) { }).catch(function(error) {
return { backendState: undefined, authURL: undefined }; return { backendState: undefined, authURL: undefined, displayName: undefined };
}); });
} }
@@ -55,17 +57,16 @@ function renderStatus(isRunning) {
return renderHTML; return renderHTML;
} }
function renderLogin(loginStatus, authURL) { function renderLogin(loginStatus, authURL, displayName) {
var spanTemp = '<span style="color:%s">%s</span>'; var spanTemp = '<span style="color:%s">%s</span>';
var renderHTML; var renderHTML;
if (loginStatus == undefined) { if (loginStatus == "NeedsLogin") {
renderHTML = String.format(spanTemp, 'orange', _('NOT RUNNING')); renderHTML = String.format('<a href="%s" target="_blank">%s</a>', authURL, _('Needs Login'));
} else if (loginStatus == "Running") {
renderHTML = String.format('<a href="%s" target="_blank">%s</a>', 'https://login.tailscale.com/admin/machines', displayName);
renderHTML += String.format('<br><a style="color:green" id="logout_button">%s</a>', _('Logout and Unbind'));
} else { } else {
if (loginStatus == "NeedsLogin") { renderHTML = String.format(spanTemp, 'orange', _('NOT RUNNING'));
renderHTML = String.format('<a href="%s" target="_blank">%s</a>', authURL, _('Needs Login'));
} else {
renderHTML = String.format(spanTemp, 'green', _('Logged In'));
}
} }
return renderHTML; return renderHTML;
@@ -83,9 +84,7 @@ return view.extend({
var m, s, o; var m, s, o;
var isRunning = data[1]; var isRunning = data[1];
var tailscaleLink = E('a', { href: 'https://login.tailscale.com/admin/machines', target: '_blank' }, _('Tailscale')); m = new form.Map('tailscale', _('Tailscale'), _('Tailscale is a cross-platform and easy to use virtual LAN.'));
var description = E('span', {}, _(' is a cross-platform and easy to use virtual LAN.'));
m = new form.Map('tailscale', _('Tailscale'), [tailscaleLink, description]);
s = m.section(form.TypedSection); s = m.section(form.TypedSection);
s.anonymous = true; s.anonymous = true;
@@ -107,7 +106,15 @@ return view.extend({
o.renderWidget = function(section_id, option_id) { o.renderWidget = function(section_id, option_id) {
poll.add(function() { poll.add(function() {
return Promise.resolve(getLoginStatus()).then(function(res) { return Promise.resolve(getLoginStatus()).then(function(res) {
document.getElementById('login_status_div').innerHTML = renderLogin(res.backendState, res.authURL); document.getElementById('login_status_div').innerHTML = renderLogin(res.backendState, res.authURL, res.displayName);
var logoutButton = document.getElementById('logout_button');
if (logoutButton) {
logoutButton.onclick = function() {
if (confirm(_('Are you sure you want to logout and unbind the current device?'))) {
fs.exec("/usr/sbin/tailscale", ["logout"]);
}
}
}
}); });
}); });
@@ -144,8 +151,7 @@ return view.extend({
o.default = o.disabled; o.default = o.disabled;
o.rmempty = false; o.rmempty = false;
o = s.option(form.Value, 'hostname', _('Hostname'), o = s.option(form.Value, 'hostname', _('Hostname'), _("Leave blank to use the device's hostname."));
_("Leave blank to use the device's hostname."));
o.default = ''; o.default = '';
o.rmempty = true; o.rmempty = true;