Merge pull request #27376 from shariquerik/social-login-fix

fix: redirect to default path via social login

frappe/templates/includes/login/login.js

@@ -385,3 +385,5 @@ var continue_email = function (setup, prompt) {
 		$('#otp_div').prepend(email_div);
 	}
 }
+
+login.route();

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

frappe/www/login.html

@@ -94,7 +94,7 @@
 									{% if provider.icon %}
 										{{ provider.icon }}
 									{% endif %}
-									{{ _("Login With {0}").format(provider.provider_name) }}</a>
+									{{ _("Login with {0}").format(provider.provider_name) }}</a>
 							</div>
 							{% endfor %}
 						</div>