diff --git a/frappe/templates/includes/login/login.js b/frappe/templates/includes/login/login.js index 427e4c3ee6..b6f6c066aa 100644 --- a/frappe/templates/includes/login/login.js +++ b/frappe/templates/includes/login/login.js @@ -385,3 +385,5 @@ var continue_email = function (setup, prompt) { $('#otp_div').prepend(email_div); } } + +login.route(); diff --git a/frappe/utils/oauth.py b/frappe/utils/oauth.py index adc34aea39..002ebabcf0 100644 --- a/frappe/utils/oauth.py +++ b/frappe/utils/oauth.py @@ -9,6 +9,7 @@ from typing import TYPE_CHECKING import frappe import frappe.utils from frappe import _ +from frappe.apps import get_default_path from frappe.utils.password import get_decrypted_password if TYPE_CHECKING: @@ -311,7 +312,7 @@ def redirect_post_login(desk_user: bool, redirect_to: str | None = None, provide frappe.local.response["type"] = "redirect" if not redirect_to: - desk_uri = "/app/workspace" if provider == "facebook" else "/app" + desk_uri = "/app/workspace" if provider == "facebook" else get_default_path() redirect_to = frappe.utils.get_url(desk_uri if desk_user else "/me") frappe.local.response["location"] = redirect_to diff --git a/frappe/www/login.html b/frappe/www/login.html index 067f0706a2..1d1106f7fc 100644 --- a/frappe/www/login.html +++ b/frappe/www/login.html @@ -94,7 +94,7 @@ {% if provider.icon %} {{ provider.icon }} {% endif %} - {{ _("Login With {0}").format(provider.provider_name) }} + {{ _("Login with {0}").format(provider.provider_name) }} {% endfor %}