8000 Project permissions fixes and tests (#527) · SnarkyPapi/server-client-python@bdc6215 · GitHub
[go: up one dir, main page]
Skip to content

Commit bdc6215

Browse files
martinbpeterst8y8
martinbpeters
authored and
t8y8
committed
Project permissions fixes and tests (tableau#527)
* Fixed project permission methods and added DELETE tests
1 parent 9c19aa3 commit bdc6215

File tree

2 files changed

+106
-12
lines changed

2 files changed

+106
-12
lines changed

‎tableauserverclient/server/endpoint/projects_endpoint.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -86,25 +86,25 @@ def populate_flow_default_permissions(self, item):
8686
self._default_permissions.populate_default_permissions(item, Permission.Resource.Flow)
8787

8888
@api(version='2.1')
89-
def update_workbook_default_permissions(self, item):
90-
self._default_permissions.update_default_permissions(item, Permission.Resource.Workbook)
89+
def update_workbook_default_permissions(self, item, rules):
90+
self._default_permissions.update_default_permissions(item, rules, Permission.Resource.Workbook)
9191

9292
@api(version='2.1')
93-
def update_datasource_default_permissions(self, item):
94-
self._default_permissions.update_default_permissions(item, Permission.Resource.Datasource)
93+
def update_datasource_default_permissions(self, item, rules):
94+
self._default_permissions.update_default_permissions(item, rules, Permission.Resource.Datasource)
9595

9696
@api(version='3.4')
97-
def update_flow_default_permissions(self, item):
98-
self._default_permissions.update_default_permissions(item, Permission.Resource.Flow)
97+
def update_flow_default_permissions(self, item, rules):
98+
self._default_permissions.update_default_permissions(item, rules, Permission.Resource.Flow)
9999

100100
@api(version='2.1')
101-
def delete_workbook_default_permissions(self, item):
102-
self._default_permissions.delete_default_permissions(item, Permission.Resource.Workbook)
101+
def delete_workbook_default_permissions(self, item, rule):
102+
self._default_permissions.delete_default_permission(item, rule, Permission.Resource.Workbook)
103103

104104
@api(version='2.1')
105-
def delete_datasource_default_permissions(self, item):
106-
self._default_permissions.delete_default_permissions(item, Permission.Resource.Datasource)
105+
def delete_datasource_default_permissions(self, item, rule):
106+
self._default_permissions.delete_default_permission(item, rule, Permission.Resource.Datasource)
107107

108108
@api(version='3.4')
109-
def delete_flow_default_permissions(self, item):
110-
self._default_permissions.delete_default_permissions(item, Permission.Resource.Flow)
109+
def delete_flow_default_permissions(self, item, rule):
110+
self._default_permissions.delete_default_permission(item, rule, Permission.Resource.Flow)

‎test/test_project.py

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,3 +152,97 @@ def test_populate_workbooks(self):
152152
TSC.Permission.Capability.AddComment: TSC.Permission.Mode.Allow,
153153
TSC.Permission.Capability.ChangeHierarchy: TSC.Permission.Mode.Allow,
154154
})
155+
156+
def test_delete_permission(self):
157+
with open(asset(POPULATE_PERMISSIONS_XML), 'rb') as f:
158+
response_xml = f.read().decode('utf-8')
159+
with requests_mock.mock() as m:
160+
m.get(self.baseurl + '/0448d2ed-590d-4fa0-b272-a2a8a24555b5/permissions', text=response_xml)
161+
162+
single_group = TSC.GroupItem('Group1')
163+
single_group._id = 'c8f2773a-c83a-11e8-8c8f-33e6d787b506'
164+
165+
single_project = TSC.ProjectItem('Project3')
166+
single_project._id = '0448d2ed-590d-4fa0-b272-a2a8a24555b5'
167+
168+
self.server.projects.populate_permissions(single_project)
169+
permissions = single_project.permissions
170+
171+
capabilities = {}
172+
173+
for permission in permissions:
174+
if permission.grantee.tag_name == "group":
175+
if permission.grantee.id == single_group._id:
176+
capabilities = permission.capabilities
177+
178+
rules = TSC.PermissionsRule(
179+
grantee=single_group,
180+
capabilities=capabilities
181+
)
182+
183+
endpoint = '{}/permissions/groups/{}'.format(single_project._id, single_group._id)
184+
m.delete('{}/{}/Read/Allow'.format(self.baseurl, endpoint), status_code=204)
185+
m.delete('{}/{}/Write/Allow'.format(self.baseurl, endpoint), status_code=204)
186+
self.server.projects.delete_permission(item=single_project, rules=rules)
187+
188+
def test_delete_workbook_default_permission(self):
189+
with open(asset(POPULATE_WORKBOOK_DEFAULT_PERMISSIONS_XML), 'rb') as f:
190+
response_xml = f.read().decode('utf-8')
191+
192+
with requests_mock.mock() as m:
193+
m.get(self.baseurl + '/9dbd2263-16b5-46e1-9c43-a76bb8ab65fb/default-permissions/workbooks',
194+
text=response_xml)
195+
196+
single_group = TSC.GroupItem('Group1')
197+
single_group._id = 'c8f2773a-c83a-11e8-8c8f-33e6d787b506'
198+
199+
single_project = TSC.ProjectItem('test', '1d0304cd-3796-429f-b815-7258370b9b74')
200+
single_project.owner_id = 'dd2239f6-ddf1-4107-981a-4cf94e415794'
201+
single_project._id = '9dbd2263-16b5-46e1-9c43-a76bb8ab65fb'
202+
203+
self.server.projects.populate_workbook_default_permissions(single_project)
204+
permissions = single_project.default_workbook_permissions
205+
206+
capabilities = {
207+
# View
208+
TSC.Permission.Capability.Read: TSC.Permission.Mode.Allow,
209+
TSC.Permission.Capability.ExportImage: TSC.Permission.Mode.Allow,
210+
TSC.Permission.Capability.ExportData: TSC.Permission.Mode.Allow,
211+
TSC.Permission.Capability.ViewComments: TSC.Permission.Mode.Allow,
212+
TSC.Permission.Capability.AddComment: TSC.Permission.Mode.Allow,
213+
214+
# Interact/Edit
215+
TSC.Permission.Capability.Filter: TSC.Permission.Mode.Allow,
216+
TSC.Permission.Capability.ViewUnderlyingData: TSC.Permission.Mode.Deny,
217+
TSC.Permission.Capability.ShareView: TSC.Permission.Mode.Allow,
218+
TSC.Permission.Capability.WebAuthoring: TSC.Permission.Mode.Allow,
219+
220+
# Edit
221+
TSC.Permission.Capability.Write: TSC.Permission.Mode.Allow,
222+
TSC.Permission.Capability.ExportXml: TSC.Permission.Mode.Allow,
223+
TSC.Permission.Capability.ChangeHierarchy: TSC.Permission.Mode.Allow,
224+
TSC.Permission.Capability.Delete: TSC.Permission.Mode.Deny,
225+
TSC.Permission.Capability.ChangePermissions: TSC.Permission.Mode.Allow
226+
}
227+
228+
rules = TSC.PermissionsRule(
229+
grantee=single_group,
230+
capabilities=capabilities
231+
)
232+
233+
endpoint = '{}/default-permissions/workbook/groups/{}'.format(single_project._id, single_group._id)
234+
m.delete('{}/{}/Read/Allow'.format(self.baseurl, endpoint), status_code=204)
235+
m.delete('{}/{}/ExportImage/Allow'.format(self.baseurl, endpoint), status_code=204)
236+
m.delete('{}/{}/ExportData/Allow'.format(self.baseurl, endpoint), status_code=204)
237+
m.delete('{}/{}/ViewComments/Allow'.format(self.baseurl, endpoint), status_code=204)
238+
m.delete('{}/{}/AddComment/Allow'.format(self.baseurl, endpoint), status_code=204)
239+
m.delete('{}/{}/Filter/Allow'.format(self.baseurl, endpoint), status_code=204)
240+
m.delete('{}/{}/ViewUnderlyingData/Deny'.format(self.baseurl, endpoint), status_code=204)
241+
m.delete('{}/{}/ShareView/Allow'.format(self.baseurl, endpoint), status_code=204)
242+
m.delete('{}/{}/WebAuthoring/Allow'.format(self.baseurl, endpoint), status_code=204)
243+
m.delete('{}/{}/Write/Allow'.format(self.baseurl, endpoint), status_code=204)
244+
m.delete('{}/{}/ExportXml/Allow'.format(self.baseurl, endpoint), status_code=204)
245+
m.delete('{}/{}/ChangeHierarchy/Allow'.format(self.baseurl, endpoint), status_code=204)
246+
m.delete('{}/{}/Delete/Deny'.format(self.baseurl, endpoint), status_code=204)
247+
m.delete('{}/{}/ChangePermissions/Allow'.format(self.baseurl, endpoint), status_code=204)
248+
self.server.projects.delete_workbook_default_permissions(item=single_project, rule=rules)

0 commit comments

Comments
 (0)
0