zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-08-17 23:14:11 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix redirect bug and fix permission issue

Browse source
This commit is contained in:
zandercymatics 2024-08-21 09:42:31 -06:00
parent 729ce4c9f7
commit ba2add8bc8
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/registrar/models/user.py
View file

@ -202,6 +202,9 @@ class User(AbstractUser):
def _has_portfolio_permission(self, portfolio, portfolio_permission): def _has_portfolio_permission(self, portfolio, portfolio_permission):
"""The views should only call this function when testing for perms and not rely on roles.""" """The views should only call this function when testing for perms and not rely on roles."""
if not portfolio:
return False
portfolio_perms = self.portfolio_permissions.filter(portfolio=portfolio, user=self).first() portfolio_perms = self.portfolio_permissions.filter(portfolio=portfolio, user=self).first()
if not portfolio_perms: if not portfolio_perms:
return False return False
@ -383,6 +386,8 @@ class User(AbstractUser):
self.check_domain_invitations_on_login() self.check_domain_invitations_on_login()
self.check_portfolio_invitations_on_login() self.check_portfolio_invitations_on_login()
# NOTE TO DAVE: I'd simply suggest that we move these functions outside of the user object,
# and move them to some sort of utility file. That way we aren't calling request inside here.
def is_org_user(self, request): def is_org_user(self, request):
has_organization_feature_flag = flag_is_active(request, "organization_feature") has_organization_feature_flag = flag_is_active(request, "organization_feature")
portfolio = request.session.get("portfolio") portfolio = request.session.get("portfolio")

2
src/registrar/registrar_middleware.py
View file

@ -157,7 +157,7 @@ class CheckPortfolioMiddleware:
request.session["portfolio"] = None request.session["portfolio"] = None
if request.session["portfolio"] is not None and current_path == self.home: if request.session["portfolio"] is not None and current_path == self.home:
if request.user.has_base_portfolio_permission(request.session["portfolio"]): if request.user.is_org_user(request):
if request.user.has_domains_portfolio_permission(request.session["portfolio"]): if request.user.has_domains_portfolio_permission(request.session["portfolio"]):
portfolio_redirect = reverse("domains") portfolio_redirect = reverse("domains")
else: else: