浏览代码

[fix] bypass setup_dropbox page via rest api

version-14
Saurabh 8 年前
父节点
当前提交
ee13f1bc93
共有 2 个文件被更改,包括 16 次插入5 次删除
  1. +1
    -1
      frappe/integrations/doctype/dropbox_settings/dropbox_settings.js
  2. +15
    -4
      frappe/integrations/doctype/dropbox_settings/dropbox_settings.py

+ 1
- 1
frappe/integrations/doctype/dropbox_settings/dropbox_settings.js 查看文件

@@ -25,7 +25,7 @@ frappe.ui.form.on('Dropbox Settings', {
freeze: true,
callback: function(r) {
if(!r.exc) {
window.open(r.message.redirect_to);
window.open(r.message.auth_url);
}
}
})


+ 15
- 4
frappe/integrations/doctype/dropbox_settings/dropbox_settings.py 查看文件

@@ -203,9 +203,18 @@ def get_dropbox_settings(redirect_uri=False):

@frappe.whitelist()
def get_redirect_url():
return {
"redirect_to": "{0}/setup_dropbox?site={1}".format(frappe.conf.dropbox_broker_site, get_url())
}
url = "{0}/api/method/dropbox_erpnext_broker.www.setup_dropbox.get_authotize_url".format(frappe.conf.dropbox_broker_site)

try:
response = make_post_request(url, data={"site": get_url()})
if response.get("message"):
return response["message"]

except Exception as e:
frappe.log_error()
frappe.throw(
_("Something went wrong while generating dropbox access token. Please check error log for more details.")
)

@frappe.whitelist()
def get_dropbox_authorize_url():
@@ -235,7 +244,9 @@ def dropbox_auth_finish(return_access_token=False):
app_details["app_key"],
app_details["app_secret"],
app_details["rediret_uri"],
{'dropbox-auth-csrf-token': callback.state},
{
'dropbox-auth-csrf-token': callback.state
},
"dropbox-auth-csrf-token"
)



正在加载...
取消
保存