Merge branch '2130-mfa-users-oauth-login-fix' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Thu, 10 Sep 2020 18:38:48 +0000 (18:38 +0000)
committerrinpatch <rinpatch@sdf.org>
Thu, 17 Sep 2020 16:51:54 +0000 (19:51 +0300)
commit6bbd65fb0922c5e7ed4877968c3c92ff51cc12cb
tree84e10b584e177fbf0e57e9ee3142c0d1adeca90d
parent608017b7df5916b607e707627dc09d89599129ff
Merge branch '2130-mfa-users-oauth-login-fix' into 'develop'

[#2130] Fixed OAuth OOB authentication for users with enabled MFA

Closes #2130

See merge request pleroma/pleroma!2979
lib/pleroma/web/oauth/oauth_controller.ex
lib/pleroma/web/templates/o_auth/o_auth/oob_authorization_created.html.eex
lib/pleroma/web/templates/o_auth/o_auth/oob_token_exists.html.eex