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

Ajax password reset #5332

Merged
merged 22 commits into from
Mar 14, 2019
Merged

Ajax password reset #5332

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
3aefd64
Merge pull request #3 from parse-community/master
moonion Jan 30, 2019
6481a5a
adapted public api route for use with ajax
Jan 30, 2019
2d50f20
Elegant error handling
Jan 30, 2019
b0e8f3d
Fixed error return
Jan 31, 2019
d2f3101
Public API error flow redone, tests
Feb 5, 2019
8e0e258
Fixed code to pre-build form
Feb 5, 2019
3c914df
Public API change password return params
Feb 5, 2019
3a7e0f7
Reverted errors in resetPassword
Feb 5, 2019
a9828cc
Fixed querystring call
Feb 5, 2019
062471f
Success test on ajax password reset
Feb 6, 2019
b5436fd
Added few more routes to tests for coverage
Feb 6, 2019
afdcb4f
More tests and redone error return slightly
Feb 6, 2019
f51db6c
Updated error text
Feb 6, 2019
0e86783
Console logs removal, renamed test, added {} to if
Mar 1, 2019
c0688b3
Wrong error sent
Mar 1, 2019
68ee2c4
Revert changes
Mar 1, 2019
a8cb050
Revert "Revert changes"
Mar 1, 2019
4bf3667
real revert of {}
Mar 1, 2019
6f82c0b
nits and test fix
dplewis Mar 14, 2019
168e5ed
Merge remote-tracking branch 'upstream/master' into ajax-password-reset
dplewis Mar 14, 2019
5342a18
fix tests
dplewis Mar 14, 2019
a8d9504
throw proper error
dplewis Mar 14, 2019
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
2 changes: 1 addition & 1 deletion spec/ValidationAndPasswordsReset.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -988,7 +988,7 @@ describe('Custom Pages, Email Verification, Password Reset', () => {
} catch (error) {
expect(error.status).not.toBe(302);
expect(error.text).toEqual(
'{"code":-1,"error":"Failed to reset password (Username/email or token is invalid)"}'
'{"code":-1,"error":"Failed to reset password: username / email / token is invalid"}'
);
}
});
Expand Down
2 changes: 1 addition & 1 deletion src/Controllers/UserController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ export class UserController extends AdaptableController {
)
.then(results => {
if (results.length != 1) {
throw undefined;
Copy link
Contributor

@acinader acinader Mar 14, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

did a little git blame sleuthing on this one.

git show 7e868b2

note the comment that used to be there:

       // Trying to verify email when not enabled
       // TODO: Better error here.

Copy link
Member

Choose a reason for hiding this comment

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

I didn't even notice that.

throw 'Failed to reset password: username / email / token is invalid';
}

if (
Expand Down
5 changes: 0 additions & 5 deletions src/Routers/PublicAPIRouter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,11 +209,6 @@ export class PublicAPIRouter extends PromiseRouter {
}
if (result.err) {
throw new Parse.Error(Parse.Error.OTHER_CAUSE, `${result.err}`);
dplewis marked this conversation as resolved.
Show resolved Hide resolved
} else {
throw new Parse.Error(
Parse.Error.OTHER_CAUSE,
'Failed to reset password (Username/email or token is invalid)'
);
}
}

Expand Down