From 589a9b1d0f58e00fac8a6f4750157288363dbe02 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Mon, 27 Jul 2020 18:12:29 +0530 Subject: [PATCH] fix: OAUTH redirect fixes --- frappe/utils/oauth.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/frappe/utils/oauth.py b/frappe/utils/oauth.py index 969623c369..b06227e289 100644 --- a/frappe/utils/oauth.py +++ b/frappe/utils/oauth.py @@ -213,6 +213,7 @@ def login_oauth_user(data=None, provider=None, state=None, email_id=None, key=No redirect_post_login( desk_user=frappe.local.response.get('message') == 'Logged In', redirect_to=redirect_to, + provider=provider ) def update_oauth_user(user, data, provider): @@ -300,12 +301,13 @@ def get_last_name(data): def get_email(data): return data.get("email") or data.get("upn") or data.get("unique_name") -def redirect_post_login(desk_user, redirect_to=None): +def redirect_post_login(desk_user, redirect_to=None, provider=None): # redirect! frappe.local.response["type"] = "redirect" if not redirect_to: # the #desktop is added to prevent a facebook redirect bug - redirect_to = "/desk#desktop" if desk_user else "/me" + desk_uri = "/desk#desktop" if provider == 'facebook' else '/desk' + redirect_to = desk_uri if desk_user else "/me" - frappe.local.response["location"] = redirect_to + frappe.local.response["location"] = frappe.utils.get_url(redirect_to)