diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-10-16 21:59:21 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-10-16 21:59:21 +0300 |
| commit | 10ff01acd95d42314b4eb923e5b7a7191356b73e (patch) | |
| tree | dc56d5f466ddae5d4b85e4584f21aa9270c7ebfc /lib/pleroma/web/oauth/oauth_controller.ex | |
| parent | e3b4a3e96b2ffbc6d920155cd41687414045d4d6 (diff) | |
| download | pleroma-10ff01acd95d42314b4eb923e5b7a7191356b73e.tar.gz | |
[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
Diffstat (limited to 'lib/pleroma/web/oauth/oauth_controller.ex')
| -rw-r--r-- | lib/pleroma/web/oauth/oauth_controller.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/oauth/oauth_controller.ex b/lib/pleroma/web/oauth/oauth_controller.ex index 03c9a5027..fe71aca8c 100644 --- a/lib/pleroma/web/oauth/oauth_controller.ex +++ b/lib/pleroma/web/oauth/oauth_controller.ex @@ -202,9 +202,9 @@ defmodule Pleroma.Web.OAuth.OAuthController do with {:ok, %User{} = user} <- Authenticator.get_user(conn), {:ok, app} <- Token.Utils.fetch_app(conn), {:auth_active, true} <- {:auth_active, User.auth_active?(user)}, - {:user_active, true} <- {:user_active, !user.info.deactivated}, + {:user_active, true} <- {:user_active, !user.deactivated}, {:password_reset_pending, false} <- - {:password_reset_pending, user.info.password_reset_pending}, + {:password_reset_pending, user.password_reset_pending}, {:ok, scopes} <- validate_scopes(app, params), {:ok, auth} <- Authorization.create_authorization(app, user, scopes), {:ok, token} <- Token.exchange_token(app, auth) do |