Skip to content

Updated client.py & query.py to use rest-1.oauth.v1 when access tokens are used to authenticate with the versionOne server #45

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updated client.py & query.py to use rest-1.oauth.v1 when access tokens are used to authenticate with the versionOne server #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 24 additions & 6 deletions v1pysdk/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,11 +187,17 @@ def get_xml(self, path, query='', postdata=None):
return document

def get_asset_xml(self, asset_type_name, oid, moment=None):
path = '/rest-1.v1/Data/{0}/{1}/{2}'.format(asset_type_name, oid, moment) if moment else '/rest-1.v1/Data/{0}/{1}'.format(asset_type_name, oid)
if self.token:
path = '/rest-1.oauth.v1/Data/{0}/{1}/{2}'.format(asset_type_name, oid, moment) if moment else '/rest-1.oauth.v1/Data/{0}/{1}'.format(asset_type_name, oid)
else:
path = '/rest-1.v1/Data/{0}/{1}/{2}'.format(asset_type_name, oid, moment) if moment else '/rest-1.v1/Data/{0}/{1}'.format(asset_type_name, oid)
return self.get_xml(path)

def get_query_xml(self, asset_type_name, where=None, sel=None):
path = '/rest-1.v1/Data/{0}'.format(asset_type_name)
if self.token:
path = '/rest-1..oauth.v1/Data/{0}'.format(asset_type_name)
else:
path = '/rest-1.v1/Data/{0}'.format(asset_type_name)
query = {}
if where is not None:
query['Where'] = where
Expand All @@ -204,25 +210,37 @@ def get_meta_xml(self, asset_type_name):
return self.get_xml(path)

def execute_operation(self, asset_type_name, oid, opname):
path = '/rest-1.v1/Data/{0}/{1}'.format(asset_type_name, oid)
if self.token:
path = '/rest-1.oauth.v1/Data/{0}/{1}'.format(asset_type_name, oid)
else:
path = '/rest-1.v1/Data/{0}/{1}'.format(asset_type_name, oid)
query = {'op': opname}
return self.get_xml(path, query=query, postdata={})

def get_attr(self, asset_type_name, oid, attrname, moment=None):
path = '/rest-1.v1/Data/{0}/{1}/{3}/{2}'.format(asset_type_name, oid, attrname, moment) if moment else '/rest-1.v1/Data/{0}/{1}/{2}'.format(asset_type_name, oid, attrname)
if self.token:
path = '/rest-1.oauth.v1/Data/{0}/{1}/{3}/{2}'.format(asset_type_name, oid, attrname, moment) if moment else '/rest-1.oauth.v1/Data/{0}/{1}/{2}'.format(asset_type_name, oid, attrname)
else:
path = '/rest-1.v1/Data/{0}/{1}/{3}/{2}'.format(asset_type_name, oid, attrname, moment) if moment else '/rest-1.v1/Data/{0}/{1}/{2}'.format(asset_type_name, oid, attrname)
return self.get_xml(path)

def create_asset(self, asset_type_name, xmldata, context_oid=''):
body = ElementTree.tostring(xmldata, encoding="utf-8")
query = {}
if context_oid:
query = {'ctx': context_oid}
path = '/rest-1.v1/Data/{0}'.format(asset_type_name)
if self.token:
path = '/rest-1.oauth.v1/Data/{0}'.format(asset_type_name)
else:
path = '/rest-1.v1/Data/{0}'.format(asset_type_name)
return self.get_xml(path, query=query, postdata=body)

def update_asset(self, asset_type_name, oid, update_doc):
newdata = ElementTree.tostring(update_doc, encoding='utf-8')
path = '/rest-1.v1/Data/{0}/{1}'.format(asset_type_name, oid)
if self.token:
path = '/rest-1.oauth.v1/Data/{0}/{1}'.format(asset_type_name, oid)
else:
path = '/rest-1.v1/Data/{0}/{1}'.format(asset_type_name, oid)
return self.get_xml(path, postdata=newdata)


Expand Down
9 changes: 7 additions & 2 deletions v1pysdk/query.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class V1Query(object):
select list and the query criteria, then iterate over the object to execute
and use the query results."""

def __init__(self, asset_class, sel_string=None, filterexpr=None):
def __init__(self, asset_class, sel_string=None, filterexpr=None, tokenFlag=False):
"Takes the asset class we will be querying"
self.asset_class = asset_class
self.where_terms = {}
Expand All @@ -17,6 +17,7 @@ def __init__(self, asset_class, sel_string=None, filterexpr=None):
self.sel_string = sel_string
self.empty_sel = sel_string is None
self.where_string = filterexpr
self.token = tokenFlag

def __iter__(self):
"Iterate over the results."
Expand All @@ -39,7 +40,11 @@ def get_where_string(self):

def run_single_query(self, url_params={}, api="Data"):
urlquery = urlencode(url_params)
urlpath = '/rest-1.v1/{1}/{0}'.format(self.asset_class._v1_asset_type_name, api)
# need to determine if using access token how to od for /rest-1.oauth.v1/....
if self.token:
urlpath = '/rest-1.oauth.v1/{1}/{0}'.format(self.asset_class._v1_asset_type_name, api)
else:
urlpath = '/rest-1.v1/{1}/{0}'.format(self.asset_class._v1_asset_type_name, api)
# warning: tight coupling ahead
xml = self.asset_class._v1_v1meta.server.get_xml(urlpath, query=urlquery)
return xml
Expand Down