diff options
| author | lain <lain@soykaf.club> | 2019-11-05 15:21:00 +0100 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-11-05 15:21:00 +0100 |
| commit | 1bd1f62af55e01613e6362661b36a19091c87424 (patch) | |
| tree | 519963a50af82c1a0b251f1405d663ba9ccd4714 /lib/pleroma/web/oauth/oauth_controller.ex | |
| parent | faced6236b9e2ce9675cf743068f16098b744562 (diff) | |
| parent | f11eebc18383be7d7b4b037582e4e1e08b74653b (diff) | |
| download | pleroma-1bd1f62af55e01613e6362661b36a19091c87424.tar.gz | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel
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 |