Skip to content
Snippets Groups Projects
Commit dc2987bf4240 authored by Houzefa Abbasbhay's avatar Houzefa Abbasbhay :slight_smile:
Browse files

Server URL rework: Expect an URL without path

add /api/v1 in the code.
parent 00a5d98ec497
No related branches found
Tags 11.0.2.8.0
1 merge request!24Server URL rework: Expect an URL without path
......@@ -2,6 +2,11 @@
NEWS
====
11.0.2.8.0
==========
* Server URL rework: Expect an URL without path, add /api/v1 in the code.
11.0.2.7.0
==========
......
......@@ -21,7 +21,7 @@
"name": "Redner",
"summary": """
Allows to generate transactional emails and documents in PDF or HTML format""",
"version": "11.0.2.7.0",
"version": "11.0.2.8.0",
"author": "XCG Consulting",
"category": "Technical",
"depends": ["base", "mail", "converter"],
......
......@@ -14,6 +14,8 @@
except (ImportError, IOError) as err:
_logger.debug(err)
REDNER_API_PATH = "api/v1/"
class Redner:
def __init__(self, api_key, server_url, account, timeout):
......@@ -22,6 +24,7 @@
Args:
api_key(str): provide your Redner API key.
server_url(str): Redner server URL or socket path.
For example: http://localhost:30001/
timeout(float): Timeout per Redner call, in seconds.
"""
......@@ -31,9 +34,9 @@
if server_url.startswith("/"):
self.session = requests_unixsocket.Session()
self.server_url = "http+unix://{}/api/".format(
self.server_url = "http+unix://{}/".format(
quote(server_url, safe="")
)
else:
self.session = requests.sessions.Session()
self.server_url = server_url
......@@ -35,8 +38,12 @@
quote(server_url, safe="")
)
else:
self.session = requests.sessions.Session()
self.server_url = server_url
if not self.server_url.endswith("/"):
self.server_url += "/"
self.server_url += REDNER_API_PATH
self.templates = Templates(self)
def call(self, path, http_verb="post", **params):
......@@ -157,7 +164,7 @@
"body-format": body_format,
"metadata": metadata or {},
}
return self.master.call("v1/render", http_verb="post", **params)
return self.master.call("render", http_verb="post", **params)
def account_template_add(
self,
......@@ -201,7 +208,7 @@
"version": version,
}
res = self.master.call(
"v1/template/%s" % self.master.account, http_verb="post", **params
"template/%s" % self.master.account, http_verb="post", **params
)
return res["name"]
......@@ -249,7 +256,7 @@
"version": version,
}
res = self.master.call(
"v1/template/%s/%s" % (self.master.account, template_id),
"template/%s/%s" % (self.master.account, template_id),
http_verb="put",
**params
)
......@@ -265,8 +272,7 @@
dict: API response.
"""
return self.master.call(
"v1/template/%s/%s" % (self.master.account, name),
http_verb="delete",
"template/%s/%s" % (self.master.account, name), http_verb="delete"
)
def account_template_varlist(self, name):
......@@ -283,4 +289,4 @@
params = {"account": self.master.account, "name": name}
return self.master.call("v1/varlist", **params)
return self.master.call("varlist", **params)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment