external/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-03-09 15:40:18 +00:00
Code Issues Releases Wiki Activity

MeshCtrl.js devicesharing improvements.

Browse source
This commit is contained in:
Ylian Saint-Hilaire 2021-10-08 19:03:51 -07:00
parent 335ca7881f
commit 1aacef0b52
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
meshctrl.js
View file

@ -1870,7 +1870,6 @@ function serverConnect() {
case 'addusertousergroup': case 'addusertousergroup':
case 'removeuserfromusergroup': case 'removeuserfromusergroup':
case 'removeDeviceShare': case 'removeDeviceShare':
case 'createDeviceShareLink':
case 'userbroadcast': { // BROADCAST case 'userbroadcast': { // BROADCAST
if ((settings.cmd == 'shell') || (settings.cmd == 'upload') || (settings.cmd == 'download')) return; if ((settings.cmd == 'shell') || (settings.cmd == 'upload') || (settings.cmd == 'download')) return;
if ((settings.multiresponse != null) && (settings.multiresponse > 1)) { settings.multiresponse--; break; } if ((settings.multiresponse != null) && (settings.multiresponse > 1)) { settings.multiresponse--; break; }
@ -1882,6 +1881,15 @@ function serverConnect() {
} }
break; break;
} }
case 'createDeviceShareLink':
if (data.result == 'OK') {
if (data.publicid) { console.log('ID: ' + data.publicid); }
console.log('URL: ' + data.url);
} else {
console.log(data.result);
}
process.exit();
break;
case 'createInviteLink': case 'createInviteLink':
if (data.responseid == 'meshctrl') { if (data.responseid == 'meshctrl') {
if (data.url) { console.log(data.url); } if (data.url) { console.log(data.url); }

1
meshuser.js
View file

@ -4718,6 +4718,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
var url = 'https://' + serverName + ':' + httpsPort + '/' + xdomain + 'sharing?c=' + inviteCookie; var url = 'https://' + serverName + ':' + httpsPort + '/' + xdomain + 'sharing?c=' + inviteCookie;
if (serverName.split('.') == 1) { url = '/' + xdomain + page + '?c=' + inviteCookie; } if (serverName.split('.') == 1) { url = '/' + xdomain + page + '?c=' + inviteCookie; }
command.url = url; command.url = url;
command.publicid = publicid;
if (command.responseid != null) { command.result = 'OK'; } if (command.responseid != null) { command.result = 'OK'; }
try { ws.send(JSON.stringify(command)); } catch (ex) { } try { ws.send(JSON.stringify(command)); } catch (ex) { }