pro/im_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

correct error reporting on credential validation

Browse Source
This commit is contained in:
or-else
2018-08-28 09:32:14 +03:00
parent cb4a0655a3
commit f833ec6960
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
index.js
+16 -15
View File
@@ -4471,11 +4471,11 @@ class TinodeWeb extends React.Component {
} }
// Save validation credentials, if available. // Save validation credentials, if available.
if (hash.params.code && hash.params.method) { if (hash.params.method) {
this.setState({ this.setState({ credMethod: hash.params.method });
credCode: hash.params.code, }
credMethod: hash.params.method if (hash.params.code) {
}); this.setState({ credCode: hash.params.code });
} }
// Additional parameters of panels. // Additional parameters of panels.
@@ -4521,17 +4521,16 @@ class TinodeWeb extends React.Component {
// User clicked Login button in the side panel. // User clicked Login button in the side panel.
handleLoginRequest(login, password) { handleLoginRequest(login, password) {
var instance = this;
this.setState({loginDisabled: true, login: login, password: password}); this.setState({loginDisabled: true, login: login, password: password});
this.handleError("", null); this.handleError("", null);
if (Tinode.isConnected()) { if (Tinode.isConnected()) {
this.doLogin(login, password, {meth: this.state.credMethod, resp: this.state.credCode}); this.doLogin(login, password, {meth: this.state.credMethod, resp: this.state.credCode});
} else { } else {
Tinode.connect().catch(function(err) { Tinode.connect().catch((err) => {
// Socket error // Socket error
instance.setState({loginDisabled: false}); this.setState({loginDisabled: false});
instance.handleError(err.message, "err"); this.handleError(err.message, "err");
}); });
} }
} }
@@ -4568,6 +4567,9 @@ class TinodeWeb extends React.Component {
if (promise) { if (promise) {
promise.then((ctrl) => { promise.then((ctrl) => {
if (ctrl.code >= 300 && ctrl.text === "validate credentials") { if (ctrl.code >= 300 && ctrl.text === "validate credentials") {
if (cred) {
this.handleError("Code does not match", "warn");
}
this.handleCredentialsRequest(ctrl.params); this.handleCredentialsRequest(ctrl.params);
} else { } else {
this.handleLoginSuccessful(this); this.handleLoginSuccessful(this);
@@ -4777,19 +4779,18 @@ class TinodeWeb extends React.Component {
// Actual registration of a new account. // Actual registration of a new account.
handleNewAccountRequest(login_, password_, public_, cred_, tags_) { handleNewAccountRequest(login_, password_, public_, cred_, tags_) {
var instance = this;
Tinode.connect(this.state.serverAddress) Tinode.connect(this.state.serverAddress)
.then(function() { .then(function() {
var params = Tinode.addCredential({public: public_, tags: tags_}, cred_); var params = Tinode.addCredential({public: public_, tags: tags_}, cred_);
return Tinode.createAccountBasic(login_, password_, params); return Tinode.createAccountBasic(login_, password_, params);
}).then(function(ctrl) { }).then((ctrl) => {
if (ctrl.code >= 300 && ctrl.text === "validate credentials") { if (ctrl.code >= 300 && ctrl.text === "validate credentials") {
instance.handleCredentialsRequest(ctrl.params); this.handleCredentialsRequest(ctrl.params);
} else { } else {
instance.handleLoginSuccessful(instance); this.handleLoginSuccessful(this);
} }
}).catch(function(err) { }).catch((err) => {
instance.handleError(err.message, "err"); this.handleError(err.message, "err");
}); });
} }