Skip to content

Fix invitation pending for older invitations #3298

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

Merged
merged 3 commits into from
Jan 17, 2019
Merged

Fix invitation pending for older invitations #3298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
534bc5e
explicitly look for a False under details['is_invitation_pending'] and
Jan 17, 2019
4d12484
test that old invites (that do not have any is_invitation_pending fla…
Jan 17, 2019
c66baf7
Merge branch 'master' into fix-invitation-pending-for-old-invitations
Jan 17, 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 redash/handlers/authentication.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def render_token_login_page(template, org_slug, token):
return render_template("error.html",
error_message="Your invite link has expired. Please ask for a new one."), 400

if not user.is_invitation_pending:
if user.details.get('is_invitation_pending') is False:
return render_template("error.html",
error_message=("This invitation has already been accepted. "
"Please try resetting your password instead.")), 400
Expand Down
6 changes: 6 additions & 0 deletions tests/handlers/test_authentication.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,12 @@ def test_bad_token(self):
response = self.post_request('/invite/{}'.format('jdsnfkjdsnfkj'), data={'password': '1234'}, org=self.factory.org)
self.assertEqual(response.status_code, 400)

def test_user_invited_before_invitation_pending_check(self):
user = self.factory.create_user(details={})
token = invite_token(user)
response = self.post_request('/invite/{}'.format(token), data={'password': 'test1234'}, org=self.factory.org)
self.assertEqual(response.status_code, 302)

def test_already_active_user(self):
token = invite_token(self.factory.user)
self.post_request('/invite/{}'.format(token), data={'password': 'test1234'}, org=self.factory.org)
Expand Down