diff --git a/selfprivacy_api/app.py b/selfprivacy_api/app.py index ded3ba2..ffc4788 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.1" + swag["info"]["version"] = "1.2.2" 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 621af9f..1517438 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.1"} + return {"version": "1.2.2"} diff --git a/selfprivacy_api/resources/services/ssh.py b/selfprivacy_api/resources/services/ssh.py index d9a1279..3ea5a1d 100644 --- a/selfprivacy_api/resources/services/ssh.py +++ b/selfprivacy_api/resources/services/ssh.py @@ -357,9 +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 rootKeys became zero length, delete it if len(data["ssh"]["rootKeys"]) == 0: - data["ssh"]["rootKeys"].append("") + del data["ssh"]["rootKeys"] return { "message": "SSH key deleted", }, 200 diff --git a/setup.py b/setup.py index a067927..2501c3b 100755 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup, find_packages setup( name="selfprivacy_api", - version="1.2.1", + version="1.2.2", packages=find_packages(), scripts=[ "selfprivacy_api/app.py", diff --git a/tests/services/test_ssh.py b/tests/services/test_ssh.py index a02040f..5975811 100644 --- a/tests/services/test_ssh.py +++ b/tests/services/test_ssh.py @@ -305,9 +305,12 @@ 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"][ + assert ( "rootKeys" - ] == [""] + not in read_json(root_and_admin_have_keys / "root_and_admin_have_keys.json")[ + "ssh" + ] + ) def test_delete_root_nonexistent_key(authorized_client, root_and_admin_have_keys):