From bfa52fbd6f62026aab9db8c2f9d964a2245e021f Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Sun, 10 Nov 2024 14:34:47 +0530 Subject: [PATCH] fix: get token & base url method to download invoice from client site --- crm/api/saas_billing.py | 8 +++++--- frappe-ui | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/crm/api/saas_billing.py b/crm/api/saas_billing.py index 6c3a8f94..9b508bef 100644 --- a/crm/api/saas_billing.py +++ b/crm/api/saas_billing.py @@ -28,10 +28,13 @@ def get_headers(): } @frappe.whitelist() -def generate_access_token(): +def get_token_and_base_url(): request = requests.post(f"{get_base_url()}/api/method/press.saas.api.auth.generate_access_token", headers=get_headers()) if request.status_code == 200: - return request.json()["message"] + return { + "base_url": get_base_url(), + "token": request.json()["message"], + } else: frappe.throw("Failed to generate access token") @@ -52,5 +55,4 @@ def current_site_info(): @frappe.whitelist() def saas_api(method, data={}): request = requests.post(f"{get_base_url()}/api/method/press.saas.api.{method}", headers=get_headers(), json=data) - print(request.json()) return request.json().get("message") \ No newline at end of file diff --git a/frappe-ui b/frappe-ui index 33ae5418..526e5f8b 160000 --- a/frappe-ui +++ b/frappe-ui @@ -1 +1 @@ -Subproject commit 33ae5418149bea6fe163b6e098ea765fda96f4f5 +Subproject commit 526e5f8b0651201294fcde4ecb602721bbe83368