Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding legacy error handling for co/auth endpoint #685

Merged
merged 2 commits into from
Mar 2, 2018
Merged

Adding legacy error handling for co/auth endpoint #685

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
affe16f
Adding legacy error handling for co/auth endpoint
luisrudge Mar 2, 2018
c569abc
assigning the legacy error values after normalizing them
luisrudge Mar 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/helper/response-handler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,10 @@ function wrapCallback(cb, options) {
if (err.err) {
err = err.err;
}

if (options.forceLegacyError) {
errObj.error = err.error;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This means that it's possible for errObj.code !== errObj.error ... is that intended? Maybe this should fall after where err.code and errObj.description are set and set them as equal?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

makes sense. pushed a change

errObj.error_description = err.error_description;
}
errObj.code = err.error || err.code || err.error_code || err.status || null;
errObj.description =
err.errorDescription ||
Expand Down
7 changes: 5 additions & 2 deletions src/web-auth/cross-origin-authentication.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ CrossOriginAuthentication.prototype.login = function(options, cb) {
error: 'request_error',
error_description: JSON.stringify(err)
};
return responseHandler(cb)(errorObject);
return responseHandler(cb, { forceLegacyError: true })(errorObject);
}
var popupMode = options.popup === true;
options = objectHelper.blacklist(options, ['password', 'credentialType', 'otp', 'popup']);
Expand All @@ -81,7 +81,10 @@ CrossOriginAuthentication.prototype.login = function(options, cb) {
var key = createKey(_this.baseOptions.rootUrl, data.body.co_id);
theWindow.sessionStorage[key] = data.body.co_verifier;
if (popupMode) {
_this.webMessageHandler.run(authorizeOptions, responseHandler(cb));
_this.webMessageHandler.run(
authorizeOptions,
responseHandler(cb, { forceLegacyError: true })
);
} else {
_this.webAuth.authorize(authorizeOptions);
}
Expand Down
12 changes: 9 additions & 3 deletions test/web-auth/cross-origin-authentication.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,9 @@ describe('auth0.WebAuth.crossOriginAuthentication', function() {
error_description: 'a huge error string'
},
code: 'any error',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should probably be a machine_name without spaces

description: 'a huge error string'
description: 'a huge error string',
error: 'any error',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should probably be a machine_name without spaces

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

doesn't really matter for the tests though..

error_description: 'a huge error string'
});
done();
}
Expand Down Expand Up @@ -320,7 +322,9 @@ describe('auth0.WebAuth.crossOriginAuthentication', function() {
error_description: 'a super big error message description'
},
code: 'any_error',
description: 'a super big error message description'
description: 'a super big error message description',
error: 'any_error',
error_description: 'a super big error message description'
});
expect(_this.webAuthSpy.authorize.called).to.be.eql(false);
done();
Expand Down Expand Up @@ -359,7 +363,9 @@ describe('auth0.WebAuth.crossOriginAuthentication', function() {
error_description: '{"some":"error"}'
},
code: 'request_error',
description: '{"some":"error"}'
description: '{"some":"error"}',
error: 'request_error',
error_description: '{"some":"error"}'
});
expect(_this.webAuthSpy.authorize.called).to.be.eql(false);
done();
Expand Down