Merge branch 'master-fatemi-05072018' into 'master-patch-july-2018'
Master fatemi 05072018 See merge request flectra-hq/flectra!108
This commit is contained in:
commit
b70f5ed3ab
@ -131,6 +131,8 @@ class OAuthController(http.Controller):
|
||||
def signin(self, **kw):
|
||||
state = json.loads(kw['state'])
|
||||
dbname = state['d']
|
||||
if not http.db_filter([dbname]):
|
||||
return BadRequest()
|
||||
provider = state['p']
|
||||
context = state.get('c', {})
|
||||
registry = registry_get(dbname)
|
||||
@ -180,6 +182,8 @@ class OAuthController(http.Controller):
|
||||
dbname = db_monodb()
|
||||
if not dbname:
|
||||
return BadRequest()
|
||||
if not http.db_filter([dbname]):
|
||||
return BadRequest()
|
||||
|
||||
registry = registry_get(dbname)
|
||||
with registry.cursor() as cr:
|
||||
|
@ -42,7 +42,6 @@ class AuthSignupHome(Home):
|
||||
template.sudo().with_context(
|
||||
lang=user_sudo.lang,
|
||||
auth_login=werkzeug.url_encode({'auth_login': user_sudo.email}),
|
||||
password=request.params.get('password')
|
||||
).send_mail(user_sudo.id, force_send=True)
|
||||
return super(AuthSignupHome, self).web_login(*args, **kw)
|
||||
except UserError as e:
|
||||
|
Loading…
Reference in New Issue
Block a user