datasette-secrets 0.1a3__py3-none-any.whl → 0.2__py3-none-any.whl

datasette_secrets/__init__.py

@@ -1,7 +1,7 @@
 import click
 from cryptography.fernet import Fernet
 import dataclasses
-from datasette import hookimpl, Forbidden, Permission, Response
+from datasette import hookimpl, Forbidden, Response
 from datasette.plugins import pm
 from datasette.utils import await_me_maybe, sqlite3
 import os
@@ -23,6 +23,9 @@ async def get_secret(datasette, secret_name, actor_id=None):
         return os.environ[env_var]
     # Now look it up in the database
     config = get_config(datasette)
+    if config is None:
+        return None
+    encryption_key = config["encryption_key"]
     db = get_database(datasette)
     try:
         db_secret = (
@@ -35,7 +38,7 @@ async def get_secret(datasette, secret_name, actor_id=None):
         return None
     if not db_secret:
         return None
-    key = Fernet(config["encryption_key"].encode("utf-8"))
+    key = Fernet(encryption_key.encode("utf-8"))
     decrypted = key.decrypt(db_secret["encrypted"])
     # Update the last used timestamp and actor_id
     params = (actor_id, db_secret["id"])
@@ -86,7 +89,7 @@ create table if not exists datasette_secrets (
 def get_database(datasette):
     plugin_config = datasette.plugin_config("datasette-secrets") or {}
     database = plugin_config.get("database") or "_internal"
-    if database == "_internal":
+    if database == "_internal" and hasattr(datasette, "get_internal_database"):
         return datasette.get_internal_database()
     return datasette.get_database(database)
 
@@ -105,6 +108,8 @@ def get_config(datasette):
 
 @hookimpl
 def register_permissions(datasette):
+    from datasette import Permission
+
     return [
         Permission(
             name="manage-secrets",
@@ -184,15 +189,22 @@ async def secrets_index(datasette, request):
     )
     existing_secrets = {row["name"]: dict(row) for row in existing_secrets_result.rows}
     # Try to turn updated_by into actors
-    actors = await datasette.actors_from_ids(
-        {row["updated_by"] for row in existing_secrets.values() if row["updated_by"]}
-    )
-    for secret in existing_secrets.values():
-        if secret["updated_by"]:
-            actor = actors.get(secret["updated_by"])
-            if actor:
-                display = actor.get("username") or actor.get("name") or actor.get("id")
-                secret["updated_by"] = display
+    if hasattr(datasette, "actors_from_ids"):
+        actors = await datasette.actors_from_ids(
+            {
+                row["updated_by"]
+                for row in existing_secrets.values()
+                if row["updated_by"]
+            }
+        )
+        for secret in existing_secrets.values():
+            if secret["updated_by"]:
+                actor = actors.get(secret["updated_by"])
+                if actor:
+                    display = (
+                        actor.get("username") or actor.get("name") or actor.get("id")
+                    )
+                    secret["updated_by"] = display
     unset_secrets = [
         secret
         for secret in all_secrets

{datasette_secrets-0.1a3.dist-info → datasette_secrets-0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: datasette-secrets
-Version: 0.1a3
+Version: 0.2
 Summary: Manage secrets such as API keys for use with other Datasette plugins
 Author: Datasette
 License: Apache-2.0
@@ -13,11 +13,12 @@ Classifier: License :: OSI Approved :: Apache Software License
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: datasette >=1.0a13
+Requires-Dist: datasette
 Requires-Dist: cryptography
 Provides-Extra: test
 Requires-Dist: pytest ; extra == 'test'
 Requires-Dist: pytest-asyncio ; extra == 'test'
+Requires-Dist: datasette-test >=0.3.2 ; extra == 'test'
 
 # datasette-secrets
 

datasette_secrets-0.2.dist-info/RECORD

@@ -0,0 +1,10 @@
+datasette_secrets/__init__.py,sha256=lPC5NMPvLUrwjiloohdZfdz75prGz8TEkxlIw5kyy4Q,10853
+datasette_secrets/hookspecs.py,sha256=57v14e2Y4o5eZyAgCLpuzp1KZn7CjwLXeKwfq6Zvux8,205
+datasette_secrets/templates/secrets_index.html,sha256=ZgIy_huFZQfnI6GjO0qauWEkTWhkBCM5WrT73Nqq4BY,1737
+datasette_secrets/templates/secrets_update.html,sha256=qMPLVCuKKslqw_In0aSCVobB3maPw9oaYZDQQImdRIU,1678
+datasette_secrets-0.2.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+datasette_secrets-0.2.dist-info/METADATA,sha256=BghKi7npKjiv7dvf5fojZU7AwbMKOv3WNjtrQZ6Re8c,7085
+datasette_secrets-0.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+datasette_secrets-0.2.dist-info/entry_points.txt,sha256=2083uWbPpGntxRulh8_hVaelQO-xdtjedG6rGzwPUH0,40
+datasette_secrets-0.2.dist-info/top_level.txt,sha256=ZBJKQk-DdDU9Vnwu4x79X9aaEulwGJMoLx62IZJPDaQ,18
+datasette_secrets-0.2.dist-info/RECORD,,

datasette_secrets-0.1a3.dist-info/RECORD

@@ -1,10 +0,0 @@
-datasette_secrets/__init__.py,sha256=9OBdUnpRpA6nQOoh-gerQO4vpGclFwTevyprvSDaPn8,10508
-datasette_secrets/hookspecs.py,sha256=57v14e2Y4o5eZyAgCLpuzp1KZn7CjwLXeKwfq6Zvux8,205
-datasette_secrets/templates/secrets_index.html,sha256=ZgIy_huFZQfnI6GjO0qauWEkTWhkBCM5WrT73Nqq4BY,1737
-datasette_secrets/templates/secrets_update.html,sha256=qMPLVCuKKslqw_In0aSCVobB3maPw9oaYZDQQImdRIU,1678
-datasette_secrets-0.1a3.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-datasette_secrets-0.1a3.dist-info/METADATA,sha256=pVAqjHANB1qUe6ltVsV0-JEqFeTGbKsLO_jx17z7xlU,7040
-datasette_secrets-0.1a3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-datasette_secrets-0.1a3.dist-info/entry_points.txt,sha256=2083uWbPpGntxRulh8_hVaelQO-xdtjedG6rGzwPUH0,40
-datasette_secrets-0.1a3.dist-info/top_level.txt,sha256=ZBJKQk-DdDU9Vnwu4x79X9aaEulwGJMoLx62IZJPDaQ,18
-datasette_secrets-0.1a3.dist-info/RECORD,,