Merge pull request #447 from frePPLe/17.0

Syncing from upstream frePPLe/odoo (17.0)

frepple/models/quote.py

@@ -1,11 +1,12 @@
 from dateutil import tz
 from odoo import fields, models, api, exceptions
 import time
-import jwt
 import logging
 import requests
 from datetime import datetime
 
+from ..controllers.frepplexml import encode_jwt
+
 
 logger = logging.getLogger(__name__)
 
@@ -271,9 +272,7 @@ def action_quote(self):
                 if not base_url.endswith("/"):
                     base_url += "/"
 
-                webtoken = jwt.encode(
-                    encode_params, user_company_webtoken, algorithm="HS256"
-                )
+                webtoken = encode_jwt(encode_params, user_company_webtoken)
                 if not isinstance(webtoken, str):
                     webtoken = webtoken.decode("ascii")
 

frepple/models/sale_order.py

@@ -3,10 +3,10 @@
 import logging
 from odoo import models, api, fields, exceptions
 import requests
-import jwt
 import time
 import datetime
 
+from ..controllers.frepplexml import encode_jwt
 from .quote import Quote
 
 logger = logging.getLogger(__name__)
@@ -144,9 +144,7 @@ def action_frepple_quote(self):
             if not base_url:
                 raise exceptions.UserError("frePPLe web server not configured")
 
-            webtoken = jwt.encode(
-                encode_params, user_company_webtoken, algorithm="HS256"
-            )
+            webtoken = encode_jwt(encode_params, user_company_webtoken)
             if not isinstance(webtoken, str):
                 webtoken = webtoken.decode("ascii")