diff --git a/genie/genie/doctype/genie_settings/genie_settings.json b/genie/genie/doctype/genie_settings/genie_settings.json index 638a3d1..03445b9 100644 --- a/genie/genie/doctype/genie_settings/genie_settings.json +++ b/genie/genie/doctype/genie_settings/genie_settings.json @@ -12,9 +12,12 @@ "support_portal_section", "support_url", "save_recording", + "enable_portal_access", "column_break_atib", "support_api_token", "max_recording_size", + "portal_user", + "portal_user_password", "section_break_tazx", "ticket_details" ], @@ -80,11 +83,31 @@ "fieldname": "enable_user_impersonation", "fieldtype": "Check", "label": "Enable User Impersonation" + }, + { + "default": "0", + "fieldname": "enable_portal_access", + "fieldtype": "Check", + "label": "Enable Portal Access" + }, + { + "depends_on": "enable_portal_access", + "fieldname": "portal_user", + "fieldtype": "Data", + "label": "Portal User", + "mandatory_depends_on": "enable_portal_access" + }, + { + "depends_on": "enable_portal_access", + "fieldname": "portal_user_password", + "fieldtype": "Password", + "label": "Portal User Password", + "mandatory_depends_on": "enable_portal_access" } ], "issingle": 1, "links": [], - "modified": "2023-11-18 11:41:53.318912", + "modified": "2024-12-28 12:55:29.461125", "modified_by": "Administrator", "module": "Genie", "name": "Genie Settings", diff --git a/genie/utils/support.py b/genie/utils/support.py index da4d89c..510d843 100644 --- a/genie/utils/support.py +++ b/genie/utils/support.py @@ -79,14 +79,15 @@ def upload_file(content): @frappe.whitelist() def get_portal_url(): settings = frappe.get_cached_doc("Genie Settings") - headers = { - "Authorization": f"token {settings.get_password('support_api_token')}", - } - response = make_request( - url=f"{settings.support_url}/api/method/frappe.auth.get_logged_user", - headers=headers, - payload={}, + url=f"{settings.support_url}/api/method/login", + headers={ + "Content-Type": "application/json", + }, + payload={ + "usr": settings.get_password("portal_user"), + "pwd": settings.get_password("portal_user_password"), + }, return_response=True )