Merge changes with upstream

1 files changed, 11 insertions, 2 deletions

diff --git a/web-server/opendc/models/topology.py b/web-server/opendc/models/topology.py
index 37b4c5c8..1c717221 100644
--- a/web-server/opendc/models/topology.py
+++ b/web-server/opendc/models/topology.py
@@ -5,11 +5,20 @@ from opendc.util.rest import Response
 
 
 class Topology(Model):
+    """Model representing a Simulation."""
+
     collection_name = 'topologies'
 
     def check_user_access(self, google_id, edit_access):
+        """Raises an error if the user with given [google_id] has insufficient access.
+
+        Checks access on the parent simulation.
+
+        :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['topologyId']) == str(self.obj['_id']),
-                                     user.obj['authorizations']))
+        authorizations = list(
+            filter(lambda x: str(x['simulationId']) == str(self.obj['simulationId']), user.obj['authorizations']))
         if len(authorizations) == 0 or (edit_access and authorizations[0]['authorizationLevel'] == 'VIEW'):
             raise ClientError(Response(403, "Forbidden from retrieving topology."))