Skip to content

Commit 5e89bf1

Browse files
committed
Update institution's CAS login url in admin
1 parent c405380 commit 5e89bf1

1 file changed

Lines changed: 10 additions & 6 deletions

File tree

osf/models/institution.py

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -216,12 +216,16 @@ def banner_path(self):
216216
def cas_login_url(self):
217217
if self.delegation_protocol == IntegrationType.NONE.value:
218218
return None
219-
if 'localhost' in website_settings.DOMAIN:
220-
next_param = quote(website_settings.PROTOCOL + website_settings.LOCAL_ANGULAR_URL, safe='')
221-
else:
222-
next_param = quote(website_settings.DOMAIN, safe='')
223-
service_url = quote(f'{website_settings.DOMAIN}login?next={next_param}', safe='')
224-
return f'{website_settings.CAS_SERVER_URL}/login?campaign=institution&institutionId={self._id}&service={service_url}'
219+
# Note: admin app can't use `web_url_for()` due to out of context
220+
next_url_param = quote(website_settings.DOMAIN, safe='')
221+
service_url_param = quote(f'{website_settings.DOMAIN}login?next={next_url_param}', safe='')
222+
institution_id_param = quote(self._id, safe='')
223+
return (
224+
f'{website_settings.CAS_SERVER_URL}/login'
225+
f'?campaign=institution'
226+
f'&institutionId={institution_id_param}'
227+
f'&service={service_url_param}'
228+
)
225229

226230
def update_search(self):
227231
from website.search.search import update_institution

0 commit comments

Comments
 (0)