From 53c8c6046f0d6a42043662d35e5ac810f75dd250 Mon Sep 17 00:00:00 2001 From: swve Date: Wed, 27 Dec 2023 14:07:17 +0100 Subject: [PATCH] fix: re-apply public elements fix --- apps/api/src/security/rbac/rbac.py | 4 ++-- apps/api/src/services/courses/courses.py | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/apps/api/src/security/rbac/rbac.py b/apps/api/src/security/rbac/rbac.py index 6aec4117..34098744 100644 --- a/apps/api/src/security/rbac/rbac.py +++ b/apps/api/src/security/rbac/rbac.py @@ -23,7 +23,7 @@ async def authorization_verify_if_element_is_public( if element_nature == "courses": print("looking for course") statement = select(Course).where( - Course.public is True, Course.course_uuid == element_uuid + Course.public == True, Course.course_uuid == element_uuid ) course = db_session.exec(statement).first() if course: @@ -33,7 +33,7 @@ async def authorization_verify_if_element_is_public( if element_nature == "collections": statement = select(Collection).where( - Collection.public is True, Collection.collection_uuid == element_uuid + Collection.public == True, Collection.collection_uuid == element_uuid ) collection = db_session.exec(statement).first() diff --git a/apps/api/src/services/courses/courses.py b/apps/api/src/services/courses/courses.py index 72d78d01..cd667db7 100644 --- a/apps/api/src/services/courses/courses.py +++ b/apps/api/src/services/courses/courses.py @@ -327,7 +327,7 @@ async def get_courses_orgslug( statement_public = ( select(Course) .join(Organization) - .where(Organization.slug == org_slug, Course.public is True) + .where(Organization.slug == org_slug, Course.public == True) ) statement_all = ( select(Course).join(Organization).where(Organization.slug == org_slug) @@ -376,7 +376,6 @@ async def rbac_check( res = await authorization_verify_if_element_is_public( request, course_uuid, action, db_session ) - print('res',res) return res else: res = await authorization_verify_based_on_roles_and_authorship(