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

fix: redirect for OAuth

Browse source
This commit is contained in:
Shivam Mishra 2019-07-26 14:27:14 +05:30
parent 7c6784ed2c
commit 577f3c8897
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
frappe/public/js/frappe/router.js
View file

@ -47,6 +47,10 @@ frappe.route = function() {
if(route[0]) {
const title_cased_route = frappe.utils.to_title_case(route[0]);
if (title_cased_route === 'Desktop') {
frappe.views.pageview.show('');
}
if(route[1] && frappe.views[title_cased_route + "Factory"]) {
// has a view generator, generate!
if(!frappe.view_factory[title_cased_route]) {

2
frappe/utils/oauth.py
View file

@ -290,7 +290,7 @@ def redirect_post_login(desk_user):
frappe.local.response["type"] = "redirect"
# the #desktop is added to prevent a facebook redirect bug
frappe.local.response["location"] = "/desk#desktop" if desk_user else "/"
frappe.local.response["location"] = "/desk#desktop" if desk_user else "/me"
def oauth_decoder(data):
if isinstance(data, bytes):