diff --git a/selfprivacy_api/app.py b/selfprivacy_api/app.py index 7a8a25e..ded3ba2 100644 --- a/selfprivacy_api/app.py +++ b/selfprivacy_api/app.py @@ -68,7 +68,7 @@ def create_app(test_config=None): def spec(): if app.config["ENABLE_SWAGGER"] == "1": swag = swagger(app) - swag["info"]["version"] = "1.2.0" + swag["info"]["version"] = "1.2.1" swag["info"]["title"] = "SelfPrivacy API" swag["info"]["description"] = "SelfPrivacy API" swag["securityDefinitions"] = { diff --git a/selfprivacy_api/resources/common.py b/selfprivacy_api/resources/common.py index d54d954..621af9f 100644 --- a/selfprivacy_api/resources/common.py +++ b/selfprivacy_api/resources/common.py @@ -23,4 +23,4 @@ class ApiVersion(Resource): 401: description: Unauthorized """ - return {"version": "1.2.0"} + return {"version": "1.2.1"} diff --git a/selfprivacy_api/resources/services/ssh.py b/selfprivacy_api/resources/services/ssh.py index 43159d0..d9a1279 100644 --- a/selfprivacy_api/resources/services/ssh.py +++ b/selfprivacy_api/resources/services/ssh.py @@ -357,6 +357,9 @@ class SSHKeys(Resource): for key in data["ssh"]["rootKeys"]: if key == args["public_key"]: data["ssh"]["rootKeys"].remove(key) + # If rootKeys became zero length, add empty string + if len(data["ssh"]["rootKeys"]) == 0: + data["ssh"]["rootKeys"].append("") return { "message": "SSH key deleted", }, 200 diff --git a/setup.py b/setup.py index e5a98b0..a067927 100755 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup, find_packages setup( name="selfprivacy_api", - version="1.2.0", + version="1.2.1", packages=find_packages(), scripts=[ "selfprivacy_api/app.py", diff --git a/tests/services/test_ssh.py b/tests/services/test_ssh.py index 8bbe261..a02040f 100644 --- a/tests/services/test_ssh.py +++ b/tests/services/test_ssh.py @@ -305,12 +305,9 @@ def test_delete_root_key(authorized_client, root_and_admin_have_keys): "/services/ssh/keys/root", json={"public_key": "ssh-ed25519 KEY test@pc"} ) assert response.status_code == 200 - assert ( - read_json(root_and_admin_have_keys / "root_and_admin_have_keys.json")["ssh"][ - "rootKeys" - ] - == [] - ) + assert read_json(root_and_admin_have_keys / "root_and_admin_have_keys.json")["ssh"][ + "rootKeys" + ] == [""] def test_delete_root_nonexistent_key(authorized_client, root_and_admin_have_keys):