diff --git a/static/galene.js b/static/galene.js index f145b27..6521641 100644 --- a/static/galene.js +++ b/static/galene.js @@ -3164,23 +3164,15 @@ function parseExpiration(s) { return d; } -function protocol2Predicate() { - if(serverConnection.version === "1") - return "This server is too old"; - return null; -} - function makeTokenPredicate() { - return protocol2Predicate() || - (serverConnection.permissions.indexOf('token') < 0 ? - "You don't have permission to create tokens" : null); + return (serverConnection.permissions.indexOf('token') < 0 ? + "You don't have permission to create tokens" : null); } function editTokenPredicate() { - return protocol2Predicate() || - (serverConnection.permissions.indexOf('token') < 0 || - serverConnection.permissions.indexOf('op') < 0 ? - "You don't have permission to edit or list tokens" : null); + return (serverConnection.permissions.indexOf('token') < 0 || + serverConnection.permissions.indexOf('op') < 0 ? + "You don't have permission to edit or list tokens" : null); } /** diff --git a/static/protocol.js b/static/protocol.js index 59ab1ed..a7ede26 100644 --- a/static/protocol.js +++ b/static/protocol.js @@ -298,7 +298,7 @@ ServerConnection.prototype.connect = async function(url) { this.socket.onopen = function(e) { sc.send({ type: 'handshake', - version: ["2", "1"], + version: ["2"], id: sc.id, }); if(sc.onconnected) @@ -332,19 +332,11 @@ ServerConnection.prototype.connect = async function(url) { let m = JSON.parse(e.data); switch(m.type) { case 'handshake': { - /** @type {string} */ - let v; - if(!m.version || !(m.version instanceof Array) || - m.version.length < 1 || typeof(m.version[0]) !== 'string') { - v = null; - } else { - v = m.version[0]; - } - if(v === "1" || v === "2") { - sc.version = v; - } else { - console.warn(`Unknown protocol version ${v || m.version}`); - sc.version = "1" + if(m.version === "2") + sc.version = m.version; + else { + console.error(`Unknown protocol version ${m.version}`); + throw new Error(`Unknown protocol version ${m.version}`); } break; }