vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge pull request #11118 from deepeshgarg007/redirect_url

Browse source 
fix: OAUTH redirect fixes
This commit is contained in:
mergify[bot] 2020-08-17 16:01:03 +00:00 • committed by GitHub
commit aeeb3a2eff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
frappe/utils/oauth.py
View file

@ -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,14 @@ 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#workspace" if provider == 'facebook' else '/desk'
redirect_to = desk_uri if desk_user else "/me"
redirect_to = frappe.utils.get_url(redirect_to)
frappe.local.response["location"] = redirect_to