PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Get Recaptcha working again. Add a backchannel for stage prodding.

Browse source 
Recaptcha is a special snowflake because it dynamically loads the script
and THEN renders with info from the registration request. This means we
need a back-channel for the UI component to 'tell' the stage that everything
is loaded. This Just Works which is nice.
This commit is contained in:
Kegan Dougal 2015-11-18 17:43:38 +00:00
parent 991a96cfc5
commit 3e903be73d
2 changed files with 48 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/Signup.js
View file

@ -38,8 +38,9 @@ class Register extends Signup {
this.username = null; // desired
this.email = null; // desired
this.password = null; // desired
this.params = {}; // random other stuff (e.g. query params)
this.params = {}; // random other stuff (e.g. query params, NOT params from the server)
this.credentials = null;
this.activeStage = null;
}
setClientSecret(secret) {
@ -66,6 +67,10 @@ class Register extends Signup {
return this.credentials;
}
getServerData() {
return this.data || {};
}
setStep(step) {
this._step = 'Register.' + step;
// TODO:
@ -112,6 +117,7 @@ class Register extends Signup {
var flow = self.chooseFlow(error.data.flows);
if (flow) {
console.log("Active flow => %s", JSON.stringify(flow));
var flowStage = self.firstUncompletedStageIndex(flow);
return self.startStage(flow.stages[flowStage]);
}
@ -174,6 +180,7 @@ class Register extends Signup {
}
var stage = new StageClass(MatrixClientPeg.get(), this);
this.activeStage = stage;
return stage.complete().then(function(request) {
if (request.auth) {
return self._tryRegister(request.auth);
@ -220,6 +227,13 @@ class Register extends Signup {
return otherFlow;
}
}
tellStage(stageName, data) {
if (this.activeStage && this.activeStage.type === stageName) {
console.log("Telling stage %s about something..", stageName);
this.activeStage.onReceiveData(data);
}
}
}

40
src/SignupStages.js
View file

@ -16,6 +16,10 @@ class Stage {
// Has a "message" string and an "isFatal" flag.
return q.reject("NOT IMPLEMENTED");
}
onReceiveData() {
// NOP
}
}
Stage.TYPE = "NOT IMPLEMENTED";
@ -39,12 +43,22 @@ DummyStage.TYPE = "m.login.dummy";
class RecaptchaStage extends Stage {
constructor(matrixClient, signupInstance) {
super(RecaptchaStage.TYPE, matrixClient, signupInstance);
this.defer = q.defer();
this.publicKey = null;
}
onReceiveData(data) {
if (data !== "loaded") {
return;
}
this._attemptRender();
}
complete() {
var publicKey;
if (this.signupInstance.params['m.login.recaptcha']) {
publicKey = this.signupInstance.params['m.login.recaptcha'].public_key;
var serverParams = this.signupInstance.getServerData().params;
if (serverParams && serverParams["m.login.recaptcha"]) {
publicKey = serverParams["m.login.recaptcha"].public_key;
}
if (!publicKey) {
return q.reject({
@ -53,12 +67,26 @@ class RecaptchaStage extends Stage {
isFatal: true
});
}
this.publicKey = publicKey;
this._attemptRender();
var defer = q.defer();
return this.defer.promise;
}
_attemptRender() {
if (!global.grecaptcha) {
console.error("grecaptcha not loaded!");
return;
}
if (!this.publicKey) {
console.error("No public key for recaptcha!");
return;
}
var self = this;
global.grecaptcha.render('mx_recaptcha', {
sitekey: publicKey,
sitekey: this.publicKey,
callback: function(response) {
return defer.resolve({
return self.defer.resolve({
auth: {
type: 'm.login.recaptcha',
response: response
@ -66,8 +94,6 @@ class RecaptchaStage extends Stage {
});
}
});
return defer.promise;
}
}
RecaptchaStage.TYPE = "m.login.recaptcha";