Skip to content

Commit

Permalink
Now auth is in place removed the flagging that this is a rest service…
Browse files Browse the repository at this point in the history
… so that the VRE has access to the file locations
  • Loading branch information
markmcdowall committed Oct 16, 2017
1 parent 952b40b commit adecc9e
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions rest/app.py
Expand Up @@ -199,7 +199,7 @@ def get(self, user_id):

if user_id is not None:
dmp_api = _get_dm_api(user_id['user_id'])
return dmp_api.get_file_by_id(user_id['user_id'], file_id, True)
return dmp_api.get_file_by_id(user_id['user_id'], file_id)

return help_usage('Forbidden', 403, ['file_id'], {})

Expand Down Expand Up @@ -515,13 +515,13 @@ def get(self, user_id):
if region is not None and assembly is not None:
files = self._get_all_files_region(dmp_api, user_id['user_id'], assembly, region)
elif file_type is not None and assembly is not None:
files = dmp_api.get_files_by_file_type(user_id['user_id'], rest=True)
files = dmp_api.get_files_by_file_type(user_id['user_id'])
elif data_type is not None and assembly is not None:
files = dmp_api.get_files_by_data_type(user_id['user_id'], rest=True)
files = dmp_api.get_files_by_data_type(user_id['user_id'])
elif assembly is not None:
files = dmp_api.get_files_by_assembly(user_id['user_id'], assembly, rest=True)
files = dmp_api.get_files_by_assembly(user_id['user_id'], assembly)
elif by_user is not None and int(by_user) == 1:
files = dmp_api.get_files_by_user(user_id['user_id'], rest=True)
files = dmp_api.get_files_by_user(user_id['user_id'])
else:
return help_usage(
None, 200,
Expand Down

0 comments on commit adecc9e

Please sign in to comment.