diff options
| author | Maxim Filippov <colixer@gmail.com> | 2019-11-05 02:12:48 +0300 |
|---|---|---|
| committer | Maxim Filippov <colixer@gmail.com> | 2019-11-05 02:12:48 +0300 |
| commit | 43ea16870fe60578a6528e1f01bfaab68943a1bc (patch) | |
| tree | 108e2d85abfa60cea3b85cd07e0b2ab467b39668 /lib/pleroma/web/oauth/oauth_controller.ex | |
| parent | 24eecc3cb4a35376124b1fc792183d8b8dd0a9cc (diff) | |
| parent | fee127696308dbec9cff6b2a9b399cf2877cf445 (diff) | |
| download | pleroma-43ea16870fe60578a6528e1f01bfaab68943a1bc.tar.gz | |
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
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 |