diff --git a/frappe/auth.py b/frappe/auth.py index 4030684cf9..0378e55c0f 100644 --- a/frappe/auth.py +++ b/frappe/auth.py @@ -12,7 +12,7 @@ import frappe.utils import frappe.utils.user from frappe import _ from frappe.core.doctype.activity_log.activity_log import add_authentication_log -from frappe.sessions import Session, clear_sessions, delete_session, get_expiry_in_seconds +from frappe.sessions import Session, clear_sessions, delete_session, get_default_path, get_expiry_in_seconds from frappe.translate import get_language from frappe.twofactor import ( authenticate_for_2factor, @@ -183,7 +183,7 @@ class LoginManager: frappe.local.cookie_manager.set_cookie("system_user", "yes") if not resume: frappe.local.response["message"] = "Logged In" - frappe.local.response["home_page"] = "/app" + frappe.local.response["home_page"] = get_default_path() or "/apps" if not resume: frappe.response["full_name"] = self.full_name diff --git a/frappe/www/login.py b/frappe/www/login.py index e4b873b25b..341b771cee 100644 --- a/frappe/www/login.py +++ b/frappe/www/login.py @@ -9,6 +9,7 @@ import frappe.utils from frappe import _ from frappe.auth import LoginManager from frappe.rate_limiter import rate_limit +from frappe.sessions import get_default_path from frappe.utils import cint, get_url from frappe.utils.data import escape_html from frappe.utils.html_utils import get_icon_html @@ -29,7 +30,7 @@ def get_context(context): if frappe.session.data.user_type == "Website User": redirect_to = get_home_page() else: - redirect_to = "/app" + redirect_to = get_default_path() or "/apps" if redirect_to != "login": frappe.local.flags.redirect_location = redirect_to