diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-10-24 14:42:14 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-10-24 14:55:36 +0700 |
| commit | 4c1dd55c48f80f3ebdb26d1a0c1a75b7922f578c (patch) | |
| tree | f296a9b23362e59daf1eac6b669886be8dab1576 /lib/pleroma/web/oauth | |
| parent | 478f0883eb994c639923b7b27259a02bcef8708c (diff) | |
| parent | 17c237ba808d4356bb1e202e459680563b79ef99 (diff) | |
| download | pleroma-4c1dd55c48f80f3ebdb26d1a0c1a75b7922f578c.tar.gz | |
Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
Diffstat (limited to 'lib/pleroma/web/oauth')
| -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 |