Merge branch '26066-wrong-messsage-for-unregistered-u2f-device-on-sign-in' into 'master'
New U2F ineligible message Closes #26066 See merge request !8392
This commit is contained in:
commit
4bf9725035
|
@ -57,7 +57,7 @@
|
||||||
return function(response) {
|
return function(response) {
|
||||||
var error;
|
var error;
|
||||||
if (response.errorCode) {
|
if (response.errorCode) {
|
||||||
error = new U2FError(response.errorCode);
|
error = new U2FError(response.errorCode, 'authenticate');
|
||||||
return _this.renderError(error);
|
return _this.renderError(error);
|
||||||
} else {
|
} else {
|
||||||
return _this.renderAuthenticated(JSON.stringify(response));
|
return _this.renderAuthenticated(JSON.stringify(response));
|
||||||
|
|
|
@ -5,21 +5,21 @@
|
||||||
var bind = function(fn, me) { return function() { return fn.apply(me, arguments); }; };
|
var bind = function(fn, me) { return function() { return fn.apply(me, arguments); }; };
|
||||||
|
|
||||||
this.U2FError = (function() {
|
this.U2FError = (function() {
|
||||||
function U2FError(errorCode) {
|
function U2FError(errorCode, u2fFlowType) {
|
||||||
this.errorCode = errorCode;
|
this.errorCode = errorCode;
|
||||||
this.message = bind(this.message, this);
|
this.message = bind(this.message, this);
|
||||||
this.httpsDisabled = window.location.protocol !== 'https:';
|
this.httpsDisabled = window.location.protocol !== 'https:';
|
||||||
|
this.u2fFlowType = u2fFlowType;
|
||||||
}
|
}
|
||||||
|
|
||||||
U2FError.prototype.message = function() {
|
U2FError.prototype.message = function() {
|
||||||
switch (false) {
|
if (this.errorCode === u2f.ErrorCodes.BAD_REQUEST && this.httpsDisabled) {
|
||||||
case !(this.errorCode === u2f.ErrorCodes.BAD_REQUEST && this.httpsDisabled):
|
return 'U2F only works with HTTPS-enabled websites. Contact your administrator for more details.';
|
||||||
return "U2F only works with HTTPS-enabled websites. Contact your administrator for more details.";
|
} else if (this.errorCode === u2f.ErrorCodes.DEVICE_INELIGIBLE) {
|
||||||
case this.errorCode !== u2f.ErrorCodes.DEVICE_INELIGIBLE:
|
if (this.u2fFlowType === 'authenticate') return 'This device has not been registered with us.';
|
||||||
return "This device has already been registered with us.";
|
if (this.u2fFlowType === 'register') return 'This device has already been registered with us.';
|
||||||
default:
|
|
||||||
return "There was a problem communicating with your device.";
|
|
||||||
}
|
}
|
||||||
|
return "There was a problem communicating with your device.";
|
||||||
};
|
};
|
||||||
|
|
||||||
return U2FError;
|
return U2FError;
|
||||||
|
|
|
@ -39,7 +39,7 @@
|
||||||
return function(response) {
|
return function(response) {
|
||||||
var error;
|
var error;
|
||||||
if (response.errorCode) {
|
if (response.errorCode) {
|
||||||
error = new U2FError(response.errorCode);
|
error = new U2FError(response.errorCode, 'register');
|
||||||
return _this.renderError(error);
|
return _this.renderError(error);
|
||||||
} else {
|
} else {
|
||||||
return _this.renderRegistered(JSON.stringify(response));
|
return _this.renderRegistered(JSON.stringify(response));
|
||||||
|
|
Loading…
Reference in New Issue