Mercurial > hg > webaudioevaluationtool
comparison js/core.js @ 2969:6e51b9734eab
SessionKey refactor typos
author | Nicholas Jillings <n.g.r.jillings@se14.qmul.ac.uk> |
---|---|
date | Fri, 12 Jan 2018 13:17:09 +0000 |
parents | d9121773632d |
children | 6cfb6c49c331 |
comparison
equal
deleted
inserted
replaced
2968:d9121773632d | 2969:6e51b9734eab |
---|---|
3717 req.send(); | 3717 req.send(); |
3718 }) | 3718 }) |
3719 } | 3719 } |
3720 | 3720 |
3721 var requestChains = null; | 3721 var requestChains = null; |
3722 var sessionKey = null; | |
3722 var object = {}; | 3723 var object = {}; |
3723 | 3724 |
3724 Object.defineProperties(object, { | 3725 Object.defineProperties(object, { |
3725 "key": { | 3726 "key": { |
3726 "get": function () { | 3727 "get": function () { |
3727 return key; | 3728 return sessionKey; |
3728 }, | 3729 }, |
3729 "set": function (a) { | 3730 "set": function (a) { |
3730 throw ("Cannot set read-only property") | 3731 throw ("Cannot set read-only property") |
3731 } | 3732 } |
3732 }, | 3733 }, |
3738 }, | 3739 }, |
3739 "requestKey": { | 3740 "requestKey": { |
3740 "value": function () { | 3741 "value": function () { |
3741 requestChains = keyPromise().then(function (response) { | 3742 requestChains = keyPromise().then(function (response) { |
3742 function throwerror() { | 3743 function throwerror() { |
3743 key = null; | 3744 sessionKey = null; |
3744 throw ("An unspecified error occured, no server key could be generated"); | 3745 throw ("An unspecified error occured, no server key could be generated"); |
3745 } | 3746 } |
3746 var parse = new DOMParser(); | 3747 var parse = new DOMParser(); |
3747 var xml = parse.parseFromString(response, "text/xml"); | 3748 var xml = parse.parseFromString(response, "text/xml"); |
3748 if (this.request.response.length === 0) { | 3749 if (this.request.response.length === 0) { |
3749 throwerror(); | 3750 throwerror(); |
3750 } | 3751 } |
3751 if (xml.getElementsByTagName("state").length > 0) { | 3752 if (xml.getElementsByTagName("state").length > 0) { |
3752 if (xml.getElementsByTagName("state")[0].textContent == "OK") { | 3753 if (xml.getElementsByTagName("state")[0].textContent == "OK") { |
3753 key = xml.getAllElementsByTagName("key")[0].textContent; | 3754 sessionKey = xml.getAllElementsByTagName("key")[0].textContent; |
3754 this.parent.root.setAttribute("key", this.key); | 3755 this.parent.root.setAttribute("key", this.key); |
3755 this.parent.root.setAttribute("state", "empty"); | 3756 this.parent.root.setAttribute("state", "empty"); |
3756 this.update(); | 3757 this.update(); |
3757 return (true); | 3758 return (true); |
3758 } else if (xml.getElementsByTagName("state")[0].textContent == "ERROR") { | 3759 } else if (xml.getElementsByTagName("state")[0].textContent == "ERROR") { |
3759 key = null; | 3760 sessionKey = null; |
3760 console.error("Could not generate server key. Server responded with error message: \"" + xml.getElementsByTagName("message")[0].textContent + "\""); | 3761 console.error("Could not generate server key. Server responded with error message: \"" + xml.getElementsByTagName("message")[0].textContent + "\""); |
3761 return (true); | 3762 return (false); |
3762 } | 3763 } |
3763 } else { | 3764 } else { |
3764 throwerror(); | 3765 throwerror(); |
3765 } | 3766 } |
3766 return (true); | 3767 return (true); |