Use Datasette 1.0a9 permissions, refs #55

README.md

@@ -7,6 +7,8 @@
 
 Datasette plugin for modifying table schemas
 
+> :warning: The latest alpha release depends on Datasette 1.09a. Use [version 0.7.1](https://github.com/simonw/datasette-edit-schema/blob/0.7.1/README.md) with older releases of Datasette.
+
 ## Features
 
 * Add new columns to a table
@@ -48,9 +50,9 @@ These permission checks will call the `permission_allowed()` plugin hook with th
 
 You can instead use more finely-grained permissions.
 
-- `edit-schema-create-table` allows users to create a new table. The `resource` will be the name of the database.
-- `edit-schema-alter-table` allows users to alter the schema of a table. The `resource` will be a tuple of `(database_name, table_name)`.
-- `edit-schema-drop-table` allows users to drop a table. The `resource` will be a tuple of `(database_name, table_name)`. This permission will not work on its own, you need to grant the user `edit-schema-alter-table` as well.
+- `create-table` allows users to create a new table. The `resource` will be the name of the database.
+- `drop-table` allows users to drop a table. The `resource` will be a tuple of `(database_name, table_name)`.
+- `alter-table` allows users to alter a table. The `resource` will be a tuple of `(database_name, table_name)`.
 
 ## Screenshot
 

datasette_edit_schema/__init__.py

@@ -60,9 +60,9 @@ async def can_create_table(datasette, actor, database):
         actor, "edit-schema", resource=database, default=False
     ):
         return True
-    # Or maybe they have edit-schema-create-table
+    # Or maybe they have create-table
     if await datasette.permission_allowed(
-        actor, "edit-schema-create-table", resource=database, default=False
+        actor, "create-table", resource=database, default=False
     ):
         return True
     return False
@@ -73,9 +73,8 @@ async def can_alter_table(datasette, actor, database, table):
         actor, "edit-schema", resource=database, default=False
     ):
         return True
-    # Or maybe they have edit-schema-alter-table
     if await datasette.permission_allowed(
-        actor, "edit-schema-alter-table", resource=(database, table), default=False
+        actor, "alter-table", resource=(database, table), default=False
     ):
         return True
     return False
@@ -86,9 +85,9 @@ async def can_drop_table(datasette, actor, database, table):
         actor, "edit-schema", resource=database, default=False
     ):
         return True
-    # Or maybe they have edit-schema-drop-table
+    # Or maybe they have drop-table
     if await datasette.permission_allowed(
-        actor, "edit-schema-drop-table", resource=(database, table), default=False
+        actor, "drop-table", resource=(database, table), default=False
     ):
         return True
     return False
@@ -222,7 +221,7 @@ def get_columns(conn):
 async def edit_schema_create_table(request, datasette):
     database_name = request.url_vars["database"]
     if not await can_create_table(datasette, request.actor, database_name):
-        raise Forbidden("Permission denied for edit-schema-create-table")
+        raise Forbidden("Permission denied for create-table")
     try:
         db = datasette.get_database(database_name)
     except KeyError:
@@ -309,7 +308,7 @@ async def edit_schema_table(request, datasette):
     database_name = request.url_vars["database"]
 
     if not await can_alter_table(datasette, request.actor, database_name, table):
-        raise Forbidden("Permission denied for edit-schema-alter-table")
+        raise Forbidden("Permission denied for alter-table")
 
     try:
         database = [db for db in databases if db.name == database_name][0]
@@ -592,7 +591,7 @@ def get_columns_and_schema_and_fks_and_pks_and_indexes(conn):
 
 async def drop_table(request, datasette, database, table):
     if not await can_drop_table(datasette, request.actor, database.name, table):
-        raise Forbidden("Permission denied for edit-schema-drop-table")
+        raise Forbidden("Permission denied for drop-table")
 
     def do_drop_table(conn):
         db = sqlite_utils.Database(conn)

setup.py

@@ -24,7 +24,7 @@ def get_long_description():
     packages=["datasette_edit_schema"],
     entry_points={"datasette": ["edit_schema = datasette_edit_schema"]},
     install_requires=[
-        "datasette>=0.63",
+        "datasette>=1.0a9",
         "sqlite-utils>=3.35",
     ],
     extras_require={"test": ["pytest", "pytest-asyncio", "beautifulsoup4", "html5lib"]},

tests/test_edit_schema.py

@@ -41,7 +41,6 @@ async def test_csrf_required(db_path):
     (
         (None, False),
         ("user_with_edit_schema", True),
-        ("user_with_alter_table", True),
         ("user_with_create_table", False),
         ("user_with_no_perms", False),
     ),
@@ -55,15 +54,9 @@ async def test_table_actions(permission_plugin, ds, actor_id, should_allow):
             database="data",
             resource=None,
         ),
-        Rule(
-            actor_id="user_with_alter_table",
-            action="edit-schema-alter-table",
-            database="data",
-            resource="creatures",
-        ),
         Rule(
             actor_id="user_with_create_table",
-            action="edit-schema-create-table",
+            action="create-table",
             database="data",
             resource=None,
         ),
@@ -105,8 +98,7 @@ async def test_post_without_operation_raises_error(db_path):
         (None, False),
         ("user_with_edit_schema", True),
         ("user_with_just_create_table", False),
-        ("user_with_just_alter_table", False),
-        ("user_with_alter_table_and_drop_table", True),
+        ("user_with_alter_and_drop_table", True),
     ),
 )
 async def test_drop_table(permission_plugin, db_path, actor_id, should_allow):
@@ -119,29 +111,23 @@ async def test_drop_table(permission_plugin, db_path, actor_id, should_allow):
             resource=None,
         ),
         Rule(
-            actor_id="user_with_alter_table_and_drop_table",
-            action="edit-schema-drop-table",
+            actor_id="user_with_alter_and_drop_table",
+            action="drop-table",
             database="data",
             resource="creatures",
         ),
         Rule(
-            actor_id="user_with_alter_table_and_drop_table",
-            action="edit-schema-alter-table",
+            actor_id="user_with_alter_and_drop_table",
+            action="alter-table",
             database="data",
             resource="creatures",
         ),
         Rule(
             actor_id="user_with_just_create_table",
-            action="edit-schema-create-table",
+            action="create-table",
             database="data",
             resource=None,
         ),
-        Rule(
-            actor_id="user_with_just_alter_table",
-            action="edit-schema-alter-table",
-            database="data",
-            resource="creatures",
-        ),
     ]
     db = sqlite_utils.Database(db_path)
     assert "creatures" in db.table_names()
@@ -470,7 +456,7 @@ async def test_permission_edit_schema(db_path, path):
             [
                 Rule(
                     actor_id="user",
-                    action="edit-schema-create-table",
+                    action="create-table",
                     database="data",
                     resource=None,
                 ),
@@ -481,7 +467,7 @@ async def test_permission_edit_schema(db_path, path):
             [
                 Rule(
                     actor_id="user2",
-                    action="edit-schema-create-table",
+                    action="create-table",
                     database="data",
                     resource=None,
                 ),
@@ -544,7 +530,7 @@ async def test_permission_create_table(permission_plugin, ds, rules_allow, shoul
             [
                 Rule(
                     actor_id="user",
-                    action="edit-schema-alter-table",
+                    action="alter-table",
                     database="data",
                     resource="museums",
                 ),
@@ -555,7 +541,7 @@ async def test_permission_create_table(permission_plugin, ds, rules_allow, shoul
             [
                 Rule(
                     actor_id="user2",
-                    action="edit-schema-alter-table",
+                    action="alter-table",
                     database="data",
                     resource="museums",
                 ),