' + format("Invite someone to install the mesh agent by sharing an invitation link. This link points the user to installation instructions for the \"{0}\" device group. The link is public and no account for this server is needed.", EscapeHtml(mesh.name)) + '
'; x += addHtmlValue("Link Expiration", ''); + x += addHtmlValue("Agents", ''); + x += '
';
setDialogMode(2, "Invite", 3, performAgentInvite, x, meshid);
if (features & 64) { Q('d2InviteType').focus(); d2ChangedInviteType(); } else { Q('d2inviteExpire').focus(); validateAgentInvite(); }
@@ -4971,14 +4974,18 @@
}
function d2RequestInvitationLink() {
- meshserver.send({ action: 'createInviteLink', meshid: xxdialogTag, expire: parseInt(Q('d2inviteExpire').value), flags: parseInt(Q('d2agentInviteType').value) });
+ meshserver.send({ action: 'createInviteLink', meshid: xxdialogTag, expire: parseInt(Q('d2inviteExpire').value), flags: parseInt(Q('d2agentInviteType').value), agents: parseInt(Q('d2agentType').value) });
}
function d2ChangedInviteType() {
- QV('urlInviteDiv', Q('d2InviteType').value == 0);
- QV('d2agentexpirediv', Q('agentInviteNameOs').value == 4);
- QV('emailInviteDiv', Q('d2InviteType').value == 1);
+ if (features & 64) {
+ QV('urlInviteDiv', Q('d2InviteType').value == 0);
+ QV('d2agentexpirediv', Q('agentInviteNameOs').value == 4);
+ QV('emailInviteDiv', Q('d2InviteType').value == 1);
+ }
+ QV('d2agentInstallTypeDiv', parseInt(Q('d2agentType').value) < 2);
validateAgentInvite();
+ d2RequestInvitationLink();
}
function d2CopyInviteToClip() { copyTextToClip(Q('agentInvitationLink').href); }
@@ -12758,11 +12765,15 @@
x += ''; x += addHtmlValue("Link Expiration", ''); + x += addHtmlValue("Agents", ''); + x += '
';
x += addHtmlValue("Installation Type", '');
+ x += '
';
x += '
'; x += ''; x += addHtmlValue("Invite Codes", ''); + x += addHtmlValue("Agents", ''); + x += '
';
x += addHtmlValue("Installation Type", '');
+ x += '
';
setDialogMode(2, "Invite Codes", 3, p20editmeshInviteCodeEx, x);
if (currentMesh.invite != null) {
Q('agentJoinCheck').checked = true;
Q('agentInviteCode').value = currentMesh.invite.codes.join(', ');
+ if (currentMesh.invite.ag) { Q('agentType').value = currentMesh.invite.ag; }
Q('agentInviteType').value = (currentMesh.invite.flags & 3);
}
p20editmeshInviteCodeValidate();
@@ -12780,15 +12791,17 @@
var ok = true, codes = Q('agentInviteCode').value.split(',');
for (var i in codes) { codes[i] = codes[i].trim(); if (codes[i] == '') { ok = false; } }
QE('agentInviteCode', Q('agentJoinCheck').checked);
+ QE('agentType', Q('agentJoinCheck').checked);
QE('agentInviteType', Q('agentJoinCheck').checked);
QE('idx_dlgOkButton', (Q('agentJoinCheck').checked == false) || (ok));
+ QV('d2agentInstallTypeDiv', parseInt(Q('agentType').value) < 2);
}
function p20editmeshInviteCodeEx() {
if (Q('agentJoinCheck').checked == true) {
var codes = Q('agentInviteCode').value.split(',');
for (var i in codes) { codes[i] = codes[i].trim(); }
- meshserver.send({ action: 'editmesh', meshid: currentMesh._id, invite: { codes: codes, flags: parseInt(Q('agentInviteType').value) } });
+ meshserver.send({ action: 'editmesh', meshid: currentMesh._id, invite: { codes: codes, flags: parseInt(Q('agentInviteType').value), ag: parseInt(Q('agentType').value) } });
} else {
meshserver.send({ action: 'editmesh', meshid: currentMesh._id, invite: '*' });
}
diff --git a/webserver.js b/webserver.js
index 40f5a0f3..0638e328 100644
--- a/webserver.js
+++ b/webserver.js
@@ -1895,7 +1895,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
for (var i in obj.meshes) {
if ((obj.meshes[i].domain == domain.id) && (obj.meshes[i].deleted == null) && (obj.meshes[i].invite != null) && (obj.meshes[i].invite.codes.indexOf(req.body.inviteCode) >= 0)) {
// Send invitation link, valid for 1 minute.
- res.redirect(domain.url + 'agentinvite?c=' + parent.encodeCookie({ a: 4, mid: i, f: obj.meshes[i].invite.flags, expire: 1 }, parent.invitationLinkEncryptionKey) + (req.query.key ? ('&key=' + req.query.key) : '') + (req.query.hide ? ('&hide=' + req.query.hide) : ''));
+ res.redirect(domain.url + 'agentinvite?c=' + parent.encodeCookie({ a: 4, mid: i, f: obj.meshes[i].invite.flags, ag: obj.meshes[i].invite.ag, expire: 1 }, parent.invitationLinkEncryptionKey) + (req.query.key ? ('&key=' + req.query.key) : '') + (req.query.hide ? ('&hide=' + req.query.hide) : ''));
return;
}
}
@@ -2045,6 +2045,8 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
if (mesh == null) { res.sendStatus(404); return; }
var installflags = cookie.f;
if (typeof installflags != 'number') { installflags = 0; }
+ var showagents = cookie.ag;
+ if (typeof showagents != 'number') { showagents = 0; }
parent.debug('web', 'handleAgentInviteRequest using cookie.');
// Build the mobile agent URL, this is used to connect mobile devices
@@ -2057,7 +2059,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
var magenturl = 'mc://' + agentServerName + ((agentHttpsPort != 443) ? (':' + agentHttpsPort) : '') + ((xdomain != '') ? ('/' + xdomain) : '') + ',' + obj.agentCertificateHashBase64 + ',' + mesh._id.split('/')[2];
var meshcookie = parent.encodeCookie({ m: mesh._id.split('/')[2] }, parent.invitationLinkEncryptionKey);
- render(req, res, getRenderPage('agentinvite', req, domain), getRenderArgs({ meshid: meshcookie, serverport: ((args.aliasport != null) ? args.aliasport : args.port), serverhttps: 1, servernoproxy: ((domain.agentnoproxy === true) ? '1' : '0'), meshname: encodeURIComponent(mesh.name).replace(/'/g, '%27'), installflags: installflags, magenturl: magenturl }, req, domain));
+ render(req, res, getRenderPage('agentinvite', req, domain), getRenderArgs({ meshid: meshcookie, serverport: ((args.aliasport != null) ? args.aliasport : args.port), serverhttps: 1, servernoproxy: ((domain.agentnoproxy === true) ? '1' : '0'), meshname: encodeURIComponent(mesh.name).replace(/'/g, '%27'), installflags: installflags, showagents: showagents, magenturl: magenturl }, req, domain));
} else if (req.query.m != null) {
// The MeshId is specified in the query string, use that
var mesh = obj.meshes['mesh/' + domain.id + '/' + req.query.m.toLowerCase()];
@@ -2065,6 +2067,9 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
var installflags = 0;
if (req.query.f) { installflags = parseInt(req.query.f); }
if (typeof installflags != 'number') { installflags = 0; }
+ var showagents = 0;
+ if (req.query.f) { showagents = parseInt(req.query.ag); }
+ if (typeof showagents != 'number') { showagents = 0; }
parent.debug('web', 'handleAgentInviteRequest using meshid.');
// Build the mobile agent URL, this is used to connect mobile devices
@@ -2077,7 +2082,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
var magenturl = 'mc://' + agentServerName + ((agentHttpsPort != 443) ? (':' + agentHttpsPort) : '') + ((xdomain != '') ? ('/' + xdomain) : '') + ',' + obj.agentCertificateHashBase64 + ',' + mesh._id.split('/')[2];
var meshcookie = parent.encodeCookie({ m: mesh._id.split('/')[2] }, parent.invitationLinkEncryptionKey);
- render(req, res, getRenderPage('agentinvite', req, domain), getRenderArgs({ meshid: meshcookie, serverport: ((args.aliasport != null) ? args.aliasport : args.port), serverhttps: 1, servernoproxy: ((domain.agentnoproxy === true) ? '1' : '0'), meshname: encodeURIComponent(mesh.name).replace(/'/g, '%27'), installflags: installflags, magenturl: magenturl }, req, domain));
+ render(req, res, getRenderPage('agentinvite', req, domain), getRenderArgs({ meshid: meshcookie, serverport: ((args.aliasport != null) ? args.aliasport : args.port), serverhttps: 1, servernoproxy: ((domain.agentnoproxy === true) ? '1' : '0'), meshname: encodeURIComponent(mesh.name).replace(/'/g, '%27'), installflags: installflags, showagents: showagents, magenturl: magenturl }, req, domain));
}
}