Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions aidial_client/resources/resource_permissions.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def grant(
method="POST",
url=_GRANT_URL,
json_data={
"resources": [
"resourcePermissions": [
{"url": url, "permissions": permissions}
for url in resources
],
Expand All @@ -43,7 +43,7 @@ async def grant(
method="POST",
url=_GRANT_URL,
json_data={
"resources": [
"resourcePermissions": [
{"url": url, "permissions": permissions}
for url in resources
],
Expand Down
18 changes: 11 additions & 7 deletions tests/resources/test_resource_permissions.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,9 @@ def test_grant_request_body_single_resource():
assert len(captured) == 1
body = json.loads(captured[0].content)
assert body == {
"resources": [{"url": "files/bucket/img.png", "permissions": ["READ"]}],
"resourcePermissions": [
{"url": "files/bucket/img.png", "permissions": ["READ"]}
],
"receiver": "my-app",
}

Expand All @@ -91,7 +93,9 @@ async def test_async_grant_request_body_single_resource():
assert len(captured) == 1
body = json.loads(captured[0].content)
assert body == {
"resources": [{"url": "files/bucket/img.png", "permissions": ["READ"]}],
"resourcePermissions": [
{"url": "files/bucket/img.png", "permissions": ["READ"]}
],
"receiver": "my-app",
}

Expand All @@ -105,12 +109,12 @@ def test_grant_request_body_multiple_resources():
)
body = json.loads(captured[0].content)
assert body["receiver"] == "deployment-x"
assert len(body["resources"]) == 2
assert body["resources"][0] == {
assert len(body["resourcePermissions"]) == 2
assert body["resourcePermissions"][0] == {
"url": "files/bucket/a.png",
"permissions": ["READ"],
}
assert body["resources"][1] == {
assert body["resourcePermissions"][1] == {
"url": "files/bucket/b.png",
"permissions": ["READ"],
}
Expand All @@ -124,7 +128,7 @@ def test_grant_request_body_write_permission():
permissions=["WRITE"],
)
body = json.loads(captured[0].content)
assert body["resources"][0]["permissions"] == ["WRITE"]
assert body["resourcePermissions"][0]["permissions"] == ["WRITE"]


def test_grant_request_url():
Expand Down Expand Up @@ -157,7 +161,7 @@ def test_grant_default_permissions_are_read():
receiver="my-app",
)
body = json.loads(captured[0].content)
assert body["resources"][0]["permissions"] == ["READ"]
assert body["resourcePermissions"][0]["permissions"] == ["READ"]


# ---------------------------------------------------------------------------
Expand Down
Loading