diff options
| author | lain <lain@soykaf.club> | 2019-11-08 13:27:11 +0100 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-11-08 13:27:11 +0100 |
| commit | b22ee9d9666c49d1a3b1757b275e9d303eed4afc (patch) | |
| tree | e7b4138a82c7382f2e2819f0a52481ec39cb12f3 /lib/pleroma/web/oauth/oauth_controller.ex | |
| parent | d7f9679ff2c9c4bd2b9967d7a32b5a4fe145305e (diff) | |
| parent | 278674223d36f4d789dce92cd541c47b7e19b674 (diff) | |
| download | pleroma-b22ee9d9666c49d1a3b1757b275e9d303eed4afc.tar.gz | |
Merge remote-tracking branch 'origin/develop' into reactions
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 |