Skip to content

Commit

Permalink
fix: check for the organization id (#26515)
Browse files Browse the repository at this point in the history 
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
@zlwaterfield @github-actions
zlwaterfield and github-actions[bot] authored Nov 29, 2024
1 parent 240192d commit 10add44
Show file tree
Hide file tree
Showing 6 changed files with 109 additions and 26 deletions.
Binary file modified frontend/__snapshots__/scenes-other-onboarding--onboarding-billing--dark.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 4 additions & 1 deletion frontend/src/layout/ErrorProjectUnavailable.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { Link } from '@posthog/lemon-ui'
import { useValues } from 'kea'
import { PageHeader } from 'lib/components/PageHeader'
import { useEffect, useState } from 'react'
import { CreateOrganizationModal } from 'scenes/organization/CreateOrganizationModal'
import { urls } from 'scenes/urls'
import { userLogic } from 'scenes/userLogic'

Expand Down Expand Up @@ -42,7 +43,9 @@ export function ErrorProjectUnavailable(): JSX.Element {
return (
<div>
<PageHeader />
{user?.team && !user.organization?.teams.some((team) => team.id === user?.team?.id) ? (
{!user?.organization ? (
<CreateOrganizationModal isVisible inline />
) : user?.team && !user.organization?.teams.some((team) => team.id === user?.team?.id) ? (
<>
<h1>Project access has been removed</h1>
<p>
Expand Down
62 changes: 62 additions & 0 deletions posthog/api/test/test_organization.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
from posthog.models.personal_api_key import PersonalAPIKey, hash_key_value
from posthog.models.utils import generate_random_token_personal
from posthog.test.base import APIBaseTest
from posthog.api.organization import OrganizationSerializer
from rest_framework.test import APIRequestFactory
from posthog.user_permissions import UserPermissions


class TestOrganizationAPI(APIBaseTest):
Expand Down Expand Up @@ -212,3 +215,62 @@ def create_organization(name: str) -> Organization:
with real world scenarios.
"""
return Organization.objects.create(name=name)


class TestOrganizationSerializer(APIBaseTest):
def setUp(self):
super().setUp()
self.factory = APIRequestFactory()
self.request = self.factory.get("/")
self.request.user = self.user

# Create a mock view with user_permissions
class MockView:
def __init__(self, user_permissions):
self.user_permissions = user_permissions

self.view = MockView(UserPermissions(self.user))
self.context = {"request": self.request, "view": self.view}

def test_get_teams_with_no_org(self):
# Clear current_team reference before deleting organization
self.user.current_team = None
self.user.current_organization = None
self.user.save()

self.organization.delete()

serializer = OrganizationSerializer(context=self.context)
self.assertEqual(serializer.user_permissions.team_ids_visible_for_user, [])

def test_get_teams_with_single_org_no_teams(self):
# Delete default team created by APIBaseTest
self.team.delete()

serializer = OrganizationSerializer(self.organization, context=self.context)
self.assertEqual(serializer.get_teams(self.organization), [])

def test_get_teams_with_single_org_multiple_teams(self):
team2 = Team.objects.create(organization=self.organization, name="Test Team 2")
team3 = Team.objects.create(organization=self.organization, name="Test Team 3")

serializer = OrganizationSerializer(self.organization, context=self.context)
teams = serializer.get_teams(self.organization)

self.assertEqual(len(teams), 3)
team_names = {team["name"] for team in teams}
self.assertEqual(team_names, {self.team.name, team2.name, team3.name})

def test_get_teams_with_multiple_orgs(self):
org2, _, _ = Organization.objects.bootstrap(self.user)
team2 = Team.objects.create(organization=org2, name="Org 2 Team")

serializer = OrganizationSerializer(self.organization, context=self.context)
teams1 = serializer.get_teams(self.organization)
teams2 = serializer.get_teams(org2)

self.assertEqual(len(teams1), 1)
self.assertEqual(teams1[0]["name"], self.team.name)

self.assertEqual(len(teams2), 2)
self.assertEqual([teams2[0]["name"], teams2[1]["name"]], ["Default project", team2.name])
18 changes: 18 additions & 0 deletions posthog/rbac/test/test_user_access_control.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
from posthog.models.organization import OrganizationMembership
from posthog.models.team.team import Team
from posthog.models.user import User
from posthog.models.organization import Organization
from posthog.rbac.user_access_control import UserAccessControl
from posthog.test.base import BaseTest

Expand Down Expand Up @@ -78,6 +79,23 @@ def test_no_organization_id_passed(self):
assert user_access_control._organization is None
assert user_access_control._user_role_ids == []

def test_organization_with_no_project_or_team(self):
organization = Organization.objects.create(name="No project or team")
user = User.objects.create_and_join(organization, "[email protected]", "testtest")
user_access_control = UserAccessControl(user, organization_id=organization.id)

assert user_access_control._organization_membership is not None
assert user_access_control._organization == organization

def test_organization_with_no_project_or_team_and_no_organization_id(self):
organization = Organization.objects.create(name="No project or team")
user = User.objects.create_and_join(organization, "[email protected]", "testtest")
user_access_control = UserAccessControl(user)

assert user_access_control._organization_membership is None
assert user_access_control._organization is None
assert user_access_control._user_role_ids == []

def test_without_available_product_features(self):
self.organization.available_product_features = []
self.organization.save()
Expand Down
2 changes: 1 addition & 1 deletion posthog/rbac/user_access_control.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ def _access_controls_filters_for_queryset(self, resource: APIScopeObject) -> dic

if self._team and resource != "project":
common_filters["team_id"] = self._team.id
else:
elif self._organization_id:
common_filters["team__organization_id"] = str(self._organization_id)

return common_filters
Expand Down
48 changes: 24 additions & 24 deletions posthog/session_recordings/test/__snapshots__/test_session_recordings.ambr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -640,12 +640,12 @@
LEFT OUTER JOIN "posthog_organizationmembership" ON ("ee_accesscontrol"."organization_member_id" = "posthog_organizationmembership"."id")
WHERE (("ee_accesscontrol"."organization_member_id" IS NULL
AND "ee_accesscontrol"."resource" = 'project'
AND "ee_accesscontrol"."resource_id" = '438'
AND "ee_accesscontrol"."resource_id" = '437'
AND "ee_accesscontrol"."role_id" IS NULL
AND "ee_accesscontrol"."team_id" = 99999)
OR ("posthog_organizationmembership"."user_id" = 99999
AND "ee_accesscontrol"."resource" = 'project'
AND "ee_accesscontrol"."resource_id" = '438'
AND "ee_accesscontrol"."resource_id" = '437'
AND "ee_accesscontrol"."role_id" IS NULL
AND "ee_accesscontrol"."team_id" = 99999)
OR ("ee_accesscontrol"."organization_member_id" IS NULL
Expand Down Expand Up @@ -1688,12 +1688,12 @@
LEFT OUTER JOIN "posthog_organizationmembership" ON ("ee_accesscontrol"."organization_member_id" = "posthog_organizationmembership"."id")
WHERE (("ee_accesscontrol"."organization_member_id" IS NULL
AND "ee_accesscontrol"."resource" = 'project'
AND "ee_accesscontrol"."resource_id" = '445'
AND "ee_accesscontrol"."resource_id" = '444'
AND "ee_accesscontrol"."role_id" IS NULL
AND "ee_accesscontrol"."team_id" = 99999)
OR ("posthog_organizationmembership"."user_id" = 99999
AND "ee_accesscontrol"."resource" = 'project'
AND "ee_accesscontrol"."resource_id" = '445'
AND "ee_accesscontrol"."resource_id" = '444'
AND "ee_accesscontrol"."role_id" IS NULL
AND "ee_accesscontrol"."team_id" = 99999)
OR ("ee_accesscontrol"."organization_member_id" IS NULL
Expand Down Expand Up @@ -2441,12 +2441,12 @@
LEFT OUTER JOIN "posthog_organizationmembership" ON ("ee_accesscontrol"."organization_member_id" = "posthog_organizationmembership"."id")
WHERE (("ee_accesscontrol"."organization_member_id" IS NULL
AND "ee_accesscontrol"."resource" = 'project'
AND "ee_accesscontrol"."resource_id" = '445'
AND "ee_accesscontrol"."resource_id" = '444'
AND "ee_accesscontrol"."role_id" IS NULL
AND "ee_accesscontrol"."team_id" = 99999)
OR ("posthog_organizationmembership"."user_id" = 99999
AND "ee_accesscontrol"."resource" = 'project'
AND "ee_accesscontrol"."resource_id" = '445'
AND "ee_accesscontrol"."resource_id" = '444'
AND "ee_accesscontrol"."role_id" IS NULL
AND "ee_accesscontrol"."team_id" = 99999)
OR ("ee_accesscontrol"."organization_member_id" IS NULL
Expand Down Expand Up @@ -3129,12 +3129,12 @@
LEFT OUTER JOIN "posthog_organizationmembership" ON ("ee_accesscontrol"."organization_member_id" = "posthog_organizationmembership"."id")
WHERE (("ee_accesscontrol"."organization_member_id" IS NULL
AND "ee_accesscontrol"."resource" = 'project'
AND "ee_accesscontrol"."resource_id" = '445'
AND "ee_accesscontrol"."resource_id" = '444'
AND "ee_accesscontrol"."role_id" IS NULL
AND "ee_accesscontrol"."team_id" = 99999)
OR ("posthog_organizationmembership"."user_id" = 99999
AND "ee_accesscontrol"."resource" = 'project'
AND "ee_accesscontrol"."resource_id" = '445'
AND "ee_accesscontrol"."resource_id" = '444'
AND "ee_accesscontrol"."role_id" IS NULL
AND "ee_accesscontrol"."team_id" = 99999)
OR ("ee_accesscontrol"."organization_member_id" IS NULL
Expand Down Expand Up @@ -3881,12 +3881,12 @@
LEFT OUTER JOIN "posthog_organizationmembership" ON ("ee_accesscontrol"."organization_member_id" = "posthog_organizationmembership"."id")
WHERE (("ee_accesscontrol"."organization_member_id" IS NULL
AND "ee_accesscontrol"."resource" = 'project'
AND "ee_accesscontrol"."resource_id" = '445'
AND "ee_accesscontrol"."resource_id" = '444'
AND "ee_accesscontrol"."role_id" IS NULL
AND "ee_accesscontrol"."team_id" = 99999)
OR ("posthog_organizationmembership"."user_id" = 99999
AND "ee_accesscontrol"."resource" = 'project'
AND "ee_accesscontrol"."resource_id" = '445'
AND "ee_accesscontrol"."resource_id" = '444'
AND "ee_accesscontrol"."role_id" IS NULL
AND "ee_accesscontrol"."team_id" = 99999)
OR ("ee_accesscontrol"."organization_member_id" IS NULL
Expand Down Expand Up @@ -4597,12 +4597,12 @@
LEFT OUTER JOIN "posthog_organizationmembership" ON ("ee_accesscontrol"."organization_member_id" = "posthog_organizationmembership"."id")
WHERE (("ee_accesscontrol"."organization_member_id" IS NULL
AND "ee_accesscontrol"."resource" = 'project'
AND "ee_accesscontrol"."resource_id" = '445'
AND "ee_accesscontrol"."resource_id" = '444'
AND "ee_accesscontrol"."role_id" IS NULL
AND "ee_accesscontrol"."team_id" = 99999)
OR ("posthog_organizationmembership"."user_id" = 99999
AND "ee_accesscontrol"."resource" = 'project'
AND "ee_accesscontrol"."resource_id" = '445'
AND "ee_accesscontrol"."resource_id" = '444'
AND "ee_accesscontrol"."role_id" IS NULL
AND "ee_accesscontrol"."team_id" = 99999)
OR ("ee_accesscontrol"."organization_member_id" IS NULL
Expand Down Expand Up @@ -5395,12 +5395,12 @@
LEFT OUTER JOIN "posthog_organizationmembership" ON ("ee_accesscontrol"."organization_member_id" = "posthog_organizationmembership"."id")
WHERE (("ee_accesscontrol"."organization_member_id" IS NULL
AND "ee_accesscontrol"."resource" = 'project'
AND "ee_accesscontrol"."resource_id" = '445'
AND "ee_accesscontrol"."resource_id" = '444'
AND "ee_accesscontrol"."role_id" IS NULL
AND "ee_accesscontrol"."team_id" = 99999)
OR ("posthog_organizationmembership"."user_id" = 99999
AND "ee_accesscontrol"."resource" = 'project'
AND "ee_accesscontrol"."resource_id" = '445'
AND "ee_accesscontrol"."resource_id" = '444'
AND "ee_accesscontrol"."role_id" IS NULL
AND "ee_accesscontrol"."team_id" = 99999)
OR ("ee_accesscontrol"."organization_member_id" IS NULL
Expand Down Expand Up @@ -5659,12 +5659,12 @@
LEFT OUTER JOIN "posthog_organizationmembership" ON ("ee_accesscontrol"."organization_member_id" = "posthog_organizationmembership"."id")
WHERE (("ee_accesscontrol"."organization_member_id" IS NULL
AND "ee_accesscontrol"."resource" = 'project'
AND "ee_accesscontrol"."resource_id" = '445'
AND "ee_accesscontrol"."resource_id" = '444'
AND "ee_accesscontrol"."role_id" IS NULL
AND "ee_accesscontrol"."team_id" = 99999)
OR ("posthog_organizationmembership"."user_id" = 99999
AND "ee_accesscontrol"."resource" = 'project'
AND "ee_accesscontrol"."resource_id" = '445'
AND "ee_accesscontrol"."resource_id" = '444'
AND "ee_accesscontrol"."role_id" IS NULL
AND "ee_accesscontrol"."team_id" = 99999)
OR ("ee_accesscontrol"."organization_member_id" IS NULL
Expand Down Expand Up @@ -6091,12 +6091,12 @@
LEFT OUTER JOIN "posthog_organizationmembership" ON ("ee_accesscontrol"."organization_member_id" = "posthog_organizationmembership"."id")
WHERE (("ee_accesscontrol"."organization_member_id" IS NULL
AND "ee_accesscontrol"."resource" = 'project'
AND "ee_accesscontrol"."resource_id" = '445'
AND "ee_accesscontrol"."resource_id" = '444'
AND "ee_accesscontrol"."role_id" IS NULL
AND "ee_accesscontrol"."team_id" = 99999)
OR ("posthog_organizationmembership"."user_id" = 99999
AND "ee_accesscontrol"."resource" = 'project'
AND "ee_accesscontrol"."resource_id" = '445'
AND "ee_accesscontrol"."resource_id" = '444'
AND "ee_accesscontrol"."role_id" IS NULL
AND "ee_accesscontrol"."team_id" = 99999)
OR ("ee_accesscontrol"."organization_member_id" IS NULL
Expand Down Expand Up @@ -6556,12 +6556,12 @@
LEFT OUTER JOIN "posthog_organizationmembership" ON ("ee_accesscontrol"."organization_member_id" = "posthog_organizationmembership"."id")
WHERE (("ee_accesscontrol"."organization_member_id" IS NULL
AND "ee_accesscontrol"."resource" = 'project'
AND "ee_accesscontrol"."resource_id" = '445'
AND "ee_accesscontrol"."resource_id" = '444'
AND "ee_accesscontrol"."role_id" IS NULL
AND "ee_accesscontrol"."team_id" = 99999)
OR ("posthog_organizationmembership"."user_id" = 99999
AND "ee_accesscontrol"."resource" = 'project'
AND "ee_accesscontrol"."resource_id" = '445'
AND "ee_accesscontrol"."resource_id" = '444'
AND "ee_accesscontrol"."role_id" IS NULL
AND "ee_accesscontrol"."team_id" = 99999)
OR ("ee_accesscontrol"."organization_member_id" IS NULL
Expand Down Expand Up @@ -7248,12 +7248,12 @@
LEFT OUTER JOIN "posthog_organizationmembership" ON ("ee_accesscontrol"."organization_member_id" = "posthog_organizationmembership"."id")
WHERE (("ee_accesscontrol"."organization_member_id" IS NULL
AND "ee_accesscontrol"."resource" = 'project'
AND "ee_accesscontrol"."resource_id" = '445'
AND "ee_accesscontrol"."resource_id" = '444'
AND "ee_accesscontrol"."role_id" IS NULL
AND "ee_accesscontrol"."team_id" = 99999)
OR ("posthog_organizationmembership"."user_id" = 99999
AND "ee_accesscontrol"."resource" = 'project'
AND "ee_accesscontrol"."resource_id" = '445'
AND "ee_accesscontrol"."resource_id" = '444'
AND "ee_accesscontrol"."role_id" IS NULL
AND "ee_accesscontrol"."team_id" = 99999)
OR ("ee_accesscontrol"."organization_member_id" IS NULL
Expand Down Expand Up @@ -7997,12 +7997,12 @@
LEFT OUTER JOIN "posthog_organizationmembership" ON ("ee_accesscontrol"."organization_member_id" = "posthog_organizationmembership"."id")
WHERE (("ee_accesscontrol"."organization_member_id" IS NULL
AND "ee_accesscontrol"."resource" = 'project'
AND "ee_accesscontrol"."resource_id" = '445'
AND "ee_accesscontrol"."resource_id" = '444'
AND "ee_accesscontrol"."role_id" IS NULL
AND "ee_accesscontrol"."team_id" = 99999)
OR ("posthog_organizationmembership"."user_id" = 99999
AND "ee_accesscontrol"."resource" = 'project'
AND "ee_accesscontrol"."resource_id" = '445'
AND "ee_accesscontrol"."resource_id" = '444'
AND "ee_accesscontrol"."role_id" IS NULL
AND "ee_accesscontrol"."team_id" = 99999)
OR ("ee_accesscontrol"."organization_member_id" IS NULL
Expand Down

0 comments on commit 10add44

Please sign in to comment.