Merge pull request #11 from barbossa/master

Moved sign params logic to separate method

Author: viplifes

liqpay/liqpay.py

@@ -98,7 +98,7 @@ def cnb_form(self, params):
             currency=currency if currency != 'RUR' else 'RUB',
             sandbox=int(bool(params.get('sandbox')))
         )
-        params_templ = {'data': self.cnb_data(params)}
+        params_templ = {'data': self.data_to_sign(params)}
         params_templ['signature'] = self._make_signature(self._private_key, params_templ['data'], self._private_key)
         form_action_url = urljoin(self._host, '3/checkout/')
         format_input = lambda k, v: self.INPUT_TEMPLATE.format(name=k, value=to_unicode(v))
@@ -112,12 +112,15 @@ def cnb_form(self, params):
     def cnb_signature(self, params):
         params = self._prepare_params(params)
 
-        data_to_sign = self.cnb_data(params)
+        data_to_sign = self.data_to_sign(params)
         return self._make_signature(self._private_key, data_to_sign, self._private_key)
 
     def cnb_data(self, params):
         params = self._prepare_params(params)
-        return base64.b64encode(json.dumps(params))
+        return self.data_to_sign(params)
 
     def str_to_sign(self, str):
         return base64.b64encode(hashlib.sha1(str).digest())
+
+    def data_to_sign(self, params):
+        return base64.b64encode(json.dumps(params))

liqpay/liqpay3.py

@@ -82,7 +82,7 @@ def cnb_form(self, params):
             sandbox=int(bool(params.get("sandbox")))
         )
 
-        encoded_data = self.cnb_data(params)
+        encoded_data = self.data_to_sign(params)
         params_templ = {"data": encoded_data}
 
         params_templ["signature"] = self._make_signature(self._private_key, params_templ["data"], self._private_key)
@@ -98,12 +98,15 @@ def cnb_form(self, params):
     def cnb_signature(self, params):
         params = self._prepare_params(params)
 
-        data_to_sign = self.cnb_data(params)
+        data_to_sign = self.data_to_sign(params)
         return self._make_signature(self._private_key, data_to_sign, self._private_key)
 
     def cnb_data(self, params):
         params = self._prepare_params(params)
-        return base64.b64encode(json.dumps(params).encode("utf-8")).decode("ascii")
+        return self.data_to_sign(params)
 
     def str_to_sign(self, str):
         return base64.b64encode(hashlib.sha1(str.encode("utf-8")).digest()).decode("ascii")
+
+    def data_to_sign(self, params):
+        return base64.b64encode(json.dumps(params).encode("utf-8")).decode("ascii")