diff options
author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2018-12-17 17:28:58 +0300 |
---|---|---|
committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2018-12-18 17:21:05 +0300 |
commit | 1de0aa2f1025d4a860a11e658ce5fed26fe1c4ad (patch) | |
tree | ce873d94285f0f996222bb219ea5f68ce9e172cf /lib/pleroma/web/oauth/oauth_controller.ex | |
parent | a05cb10a95901ff0daacfc17a7709f3a277f1cd4 (diff) | |
download | pleroma-1de0aa2f1025d4a860a11e658ce5fed26fe1c4ad.tar.gz |
[#114] Account confirmation email, registration as unconfirmed (config-based), auth prevention for unconfirmed.
Diffstat (limited to 'lib/pleroma/web/oauth/oauth_controller.ex')
-rw-r--r-- | lib/pleroma/web/oauth/oauth_controller.ex | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/pleroma/web/oauth/oauth_controller.ex b/lib/pleroma/web/oauth/oauth_controller.ex index 20c2e799b..10158f07e 100644 --- a/lib/pleroma/web/oauth/oauth_controller.ex +++ b/lib/pleroma/web/oauth/oauth_controller.ex @@ -31,6 +31,7 @@ defmodule Pleroma.Web.OAuth.OAuthController do }) do with %User{} = user <- User.get_by_nickname_or_email(name), true <- Pbkdf2.checkpw(password, user.password_hash), + true <- User.auth_active?(user), %App{} = app <- Repo.get_by(App, client_id: client_id), {:ok, auth} <- Authorization.create_authorization(app, user) do # Special case: Local MastodonFE. @@ -101,6 +102,7 @@ defmodule Pleroma.Web.OAuth.OAuthController do with %App{} = app <- get_app_from_request(conn, params), %User{} = user <- User.get_by_nickname_or_email(name), true <- Pbkdf2.checkpw(password, user.password_hash), + true <- User.auth_active?(user), {:ok, auth} <- Authorization.create_authorization(app, user), {:ok, token} <- Token.exchange_token(app, auth) do response = %{ |