API 3.0

Author: viplifes

liqpay/liqpay.py

@@ -98,12 +98,11 @@ def cnb_form(self, params):
             currency=currency if currency != 'RUR' else 'RUB',
             sandbox=int(bool(params.get('sandbox')))
         )
-
-        params.update(signature=self.cnb_signature(params))
-        form_action_url = urljoin(self._host, 'pay/')
+        params_templ = {'data': base64.b64encode(json.dumps(params))}
+        params_templ['signature'] = self._make_signature(self._private_key, params_templ['data'], self._private_key)
+        form_action_url = urljoin(self._host, 'checkout/')
         format_input = lambda k, v: self.INPUT_TEMPLATE.format(name=k, value=to_unicode(v))
-        inputs = [format_input(k, v) for k, v in params.iteritems()]
-
+        inputs = [format_input(k, v) for k, v in params_templ.iteritems()]
         return self.FORM_TEMPLATE.format(
             action=form_action_url,
             language=language,
@@ -112,18 +111,8 @@ def cnb_form(self, params):
 
     def cnb_signature(self, params):
         params = self._prepare_params(params)
-        signature_values = [ 
-            self._private_key, 
-            to_unicode(params.get("amount", u'')),
-            to_unicode(params.get("currency", u'')),
-            to_unicode(params.get("public_key", u'')),
-            to_unicode(params.get("order_id", u'')),
-            to_unicode(params.get("type", u'')),
-            to_unicode(params.get("description", u'')),
-            to_unicode(params.get("result_url", u'')),
-            to_unicode(params.get("server_url", u''))
-        ]
-        return self._make_signature(*signature_values)
+        print base64.b64encode(json.dumps(params))
+        return self._make_signature(self._private_key, base64.b64encode(json.dumps(params)), self._private_key)
 
     def str_to_sign(self, str):
         return base64.b64encode(hashlib.sha1(str).digest())

liqpay/test.py

@@ -14,14 +14,9 @@ def test_api(self):
 
     def test_gen_form(self):
         expected_form_out = (
-            u'<form method="post" action="https://www.liqpay.com/api/pay/" accept-charset="utf-8">\n'
-            u'\t<input type="hidden" name="public_key" value=""/>\n'
-            u'\t<input type="hidden" name="description" value="\u0442\u0435\u0441\u0442"/>\n'
-            u'\t<input type="hidden" name="language" value="ru"/>\n'
-            u'\t<input type="hidden" name="sandbox" value="0"/>\n'
-            u'\t<input type="hidden" name="currency" value="UAH"/>\n'
-            u'\t<input type="hidden" name="amount" value="3940"/>\n'
-            u'\t<input type="hidden" name="signature" value="jkwtxOAipwST6+xFKfleY/4ZES0="/>\n'
+            u'<form method="post" action="https://www.liqpay.com/api/checkout/" accept-charset="utf-8">\n'
+            u'\t<input type="hidden" name="data" value="eyJwdWJsaWNfa2V5IjogIiIsICJkZXNjcmlwdGlvbiI6ICJcdTA0NDJcdTA0MzVcdTA0NDFcdTA0NDIiLCAibGFuZ3VhZ2UiOiAicnUiLCAic2FuZGJveCI6IDAsICJjdXJyZW5jeSI6ICJVQUgiLCAiYW1vdW50IjogIjM5NDAiLCAidGVzdCI6ICJjY2NjIn0="/>\n'
+            u'\t<input type="hidden" name="signature" value="Zdm/xbS30v9ZTNXrLXeW9QFVxHQ="/>\n'
             u'    <input type="image" src="//static.liqpay.com/buttons/p1ru.radius.png" name="btn_text" />\n'
             u'</form>'
         )