Skip to content

redirect to Angular after CAS auth #11580

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

Open
ihorsokhanexoft wants to merge 1 commit into
base: feature/pbs-26-2
Choose a base branch
from
+14 −5
Open

redirect to Angular after CAS auth #11580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 11 additions & 2 deletions framework/auth/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,11 +382,20 @@ def login_and_register_handler(auth, login=True, campaign=None, next_url=None, l
elif auth.logged_in:
# if user is already logged in, redirect to `next_url`
data['status_code'] = http_status.HTTP_302_FOUND
data['next_url'] = next_url
data['next_url'] = (
next_url.replace('5000', '4200')
if 'localhost' in settings.DOMAIN
else next_url
)
elif login:
# `/login?next=next_url`: go to CAS login page with current request url as service url
data['status_code'] = http_status.HTTP_302_FOUND
data['next_url'] = cas.get_login_url(request.url)
cas_login_url = cas.get_login_url(request.url)
data['next_url'] = (
cas_login_url.replace('5000', '4200')
if 'localhost' in settings.DOMAIN
else cas_login_url
)
else:
# `/register?next=next_url`: land on OSF register page with request url as next url
data['status_code'] = http_status.HTTP_200_OK
Expand Down
6 changes: 3 additions & 3 deletions tests/test_auth_views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,20 +582,20 @@ def test_next_url_login_with_auth(self):
# next_url login: user with auth
data = login_and_register_handler(self.auth, next_url=self.next_url)
assert data.get('status_code') == http_status.HTTP_302_FOUND
assert data.get('next_url') == self.next_url
assert data.get('next_url') == self.next_url.replace('5000', '4200')

def test_next_url_login_without_auth(self):
# login: user without auth
request.url = web_url_for('auth_login', next=self.next_url, _absolute=True)
data = login_and_register_handler(self.no_auth, next_url=self.next_url)
assert data.get('status_code') == http_status.HTTP_302_FOUND
assert data.get('next_url') == cas.get_login_url(request.url)
assert data.get('next_url') == cas.get_login_url(request.url).replace('5000', '4200')

def test_next_url_register_with_auth(self):
# register: user with auth
data = login_and_register_handler(self.auth, login=False, next_url=self.next_url)
assert data.get('status_code') == http_status.HTTP_302_FOUND
assert data.get('next_url') == self.next_url
assert data.get('next_url') == self.next_url.replace('5000', '4200')

def test_next_url_register_without_auth(self):
# register: user without auth
Expand Down
Loading