Finished prefabs API

1 files changed, 10 insertions, 14 deletions

diff --git a/web-server/opendc/models/prefab.py b/web-server/opendc/models/prefab.py
index 42c29697..70910c4a 100644
--- a/web-server/opendc/models/prefab.py
+++ b/web-server/opendc/models/prefab.py
@@ -1,6 +1,5 @@
 from opendc.models.model import Model
 from opendc.models.user import User
-from opendc.util.database import DB
 from opendc.util.exceptions import ClientError
 from opendc.util.rest import Response
 
@@ -10,21 +9,18 @@ class Prefab(Model):
 
     collection_name = 'prefabs'
 
-    def check_user_access(self, google_id, edit_access):
-        """Raises an error if the user with given [google_id] has insufficient access.
+    def check_user_access(self, google_id):
+        """Raises an error if the user with given [google_id] has insufficient access to view this prefab.
 
         :param google_id: The Google ID of the user.
-        :param edit_access: True when edit access should be checked, otherwise view access.
         """
         user = User.from_google_id(google_id)
-        authorizations = list(filter(lambda x: str(x['prefabId']) == str(self.get_id()), user.obj['authorizations']))
-        if len(authorizations) == 0 or (edit_access and authorizations[0]['authorizationLevel'] == 'VIEW'):
-            raise ClientError(Response(403, "Forbidden from retrieving prefab."))
 
-    def get_all_authorizations(self):
-        """Get all user IDs having access to this project."""
-        return [
-            str(user['_id']) for user in DB.fetch_all({'authorizations': {
-                'prefabId': self.obj['_id']
-            }}, User.collection_name)
-        ]
+        #try:
+
+        print(self.obj)
+        if self.obj['authorId'] != user.get_id() and self.obj['visibility'] == "private":
+            raise ClientError(Response(403, "Forbidden from retrieving prefab."))
+        #except KeyError:
+            # OpenDC-authored objects don't necessarily have an authorId
+        #    return