Skip to content

Make with_path_root() update existing headers rather than overwrite them #206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Parent: Changed :type: to :class: in dropbox.file_properties
merged 1 commit into from
Jul 7, 2020
Merged

Make with_path_root() update existing headers rather than overwrite them #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions dropbox/dropbox.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@
HTTP_STATUS_INVALID_PATH_ROOT = 422
TOKEN_EXPIRATION_BUFFER = 300

SELECT_ADMIN_HEADER = 'Dropbox-API-Select-Admin'

SELECT_USER_HEADER = 'Dropbox-API-Select-User'

class RouteResult(object):
"""The successful result of a call to a route."""

Expand Down Expand Up @@ -652,10 +656,11 @@ def with_path_root(self, path_root):
if not isinstance(path_root, PathRoot):
raise ValueError("path_root must be an instance of PathRoot")

new_headers = self._headers.copy() if self._headers else {}
new_headers[PATH_ROOT_HEADER] = stone_serializers.json_encode(PathRoot_validator, path_root)

return self.clone(
headers={
PATH_ROOT_HEADER: stone_serializers.json_encode(PathRoot_validator, path_root)
}
headers=new_headers
)

class Dropbox(_DropboxTransport, DropboxBase):
Expand All @@ -682,7 +687,7 @@ def as_admin(self, team_member_id):
of this admin of the team.
:rtype: Dropbox
"""
return self._get_dropbox_client_with_select_header('Dropbox-API-Select-Admin',
return self._get_dropbox_client_with_select_header(SELECT_ADMIN_HEADER,
team_member_id)

def as_user(self, team_member_id):
Expand All @@ -695,7 +700,7 @@ def as_user(self, team_member_id):
of this member of the team.
:rtype: Dropbox
"""
return self._get_dropbox_client_with_select_header('Dropbox-API-Select-User',
return self._get_dropbox_client_with_select_header(SELECT_USER_HEADER,
team_member_id)

def _get_dropbox_client_with_select_header(self, select_header_name, team_member_id):
Expand Down
12 changes: 10 additions & 2 deletions test/test_dropbox.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
session,
stone_serializers,
)
from dropbox.dropbox import PATH_ROOT_HEADER
from dropbox.dropbox import PATH_ROOT_HEADER, SELECT_USER_HEADER
from dropbox.exceptions import (
ApiError,
AuthError,
Expand Down Expand Up @@ -239,7 +239,15 @@ def test_team(self, dbxt):
@dbx_team_from_env
def test_as_user(self, dbxt):
dbx_as_user = dbxt.as_user('1')
self.assertIsInstance(dbx_as_user, Dropbox)
path_root = PathRoot.root("123")

dbx_new = dbx_as_user.with_path_root(path_root)

self.assertIsInstance(dbx_new, Dropbox)
self.assertEqual(dbx_new._headers.get(SELECT_USER_HEADER), '1')

expected = stone_serializers.json_encode(PathRoot_validator, path_root)
self.assertEqual(dbx_new._headers.get(PATH_ROOT_HEADER), expected)

@dbx_team_from_env
def test_as_admin(self, dbxt):
Expand Down