X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Foauth%2Foauth_controller.ex;h=5c2b0507c9a0c8c5dc48fb0dff643986c22d55b8;hb=b6f915313f59223002a0eff88c1eefb00ca5c8f3;hp=d8d3ea5b478618031f8750439e293af217891689;hpb=2a4a4f3342bb3d2bbbd2354e858278d2e17f8654;p=akkoma

diff --git a/lib/pleroma/web/oauth/oauth_controller.ex b/lib/pleroma/web/oauth/oauth_controller.ex
index d8d3ea5b4..5c2b0507c 100644
--- a/lib/pleroma/web/oauth/oauth_controller.ex
+++ b/lib/pleroma/web/oauth/oauth_controller.ex
@@ -5,8 +5,12 @@
 defmodule Pleroma.Web.OAuth.OAuthController do
   use Pleroma.Web, :controller
 
-  alias Pleroma.Web.OAuth.{Authorization, Token, App}
-  alias Pleroma.{Repo, User}
+  alias Pleroma.Web.Auth.DatabaseAuthenticator
+  alias Pleroma.Web.OAuth.Authorization
+  alias Pleroma.Web.OAuth.Token
+  alias Pleroma.Web.OAuth.App
+  alias Pleroma.Repo
+  alias Pleroma.User
   alias Comeonin.Pbkdf2
 
   import Pleroma.Web.ControllerHelper, only: [oauth_scopes: 2]
@@ -17,46 +21,42 @@ defmodule Pleroma.Web.OAuth.OAuthController do
   action_fallback(Pleroma.Web.OAuth.FallbackController)
 
   def authorize(conn, params) do
-    params_scopes = oauth_scopes(params, nil)
+    app = Repo.get_by(App, client_id: params["client_id"])
+    available_scopes = (app && app.scopes) || []
+    scopes = oauth_scopes(params, nil) || available_scopes
 
-    scopes =
-      if params_scopes do
-        params_scopes
-      else
-        app = Repo.get_by(App, client_id: params["client_id"])
-        app && app.scopes
-      end
+    template = Pleroma.Config.get(:auth_template, "show.html")
 
-    render(conn, "show.html", %{
+    render(conn, template, %{
       response_type: params["response_type"],
       client_id: params["client_id"],
-      scopes: scopes || [],
+      available_scopes: available_scopes,
+      scopes: scopes,
       redirect_uri: params["redirect_uri"],
-      state: params["state"]
+      state: params["state"],
+      params: params
     })
   end
 
   def create_authorization(conn, %{
         "authorization" =>
           %{
-            "name" => name,
-            "password" => password,
             "client_id" => client_id,
             "redirect_uri" => redirect_uri
           } = auth_params
       }) do
-    with %User{} = user <- User.get_by_nickname_or_email(name),
-         true <- Pbkdf2.checkpw(password, user.password_hash),
-         {:auth_active, true} <- {:auth_active, User.auth_active?(user)},
+    with {_, {:ok, %User{} = user}} <- {:get_user, DatabaseAuthenticator.get_user(conn)},
          %App{} = app <- Repo.get_by(App, client_id: client_id),
          true <- redirect_uri in String.split(app.redirect_uris),
          scopes <- oauth_scopes(auth_params, []),
-         [] <- scopes -- app.scopes,
-         true <- Enum.any?(scopes),
+         {:unsupported_scopes, []} <- {:unsupported_scopes, scopes -- app.scopes},
+         # Note: `scope` param is intentionally not optional in this context
+         {:missing_scopes, false} <- {:missing_scopes, scopes == []},
+         {:auth_active, true} <- {:auth_active, User.auth_active?(user)},
          {:ok, auth} <- Authorization.create_authorization(app, user, scopes) do
-      # Special case: Local MastodonFE.
       redirect_uri =
         if redirect_uri == "." do
+          # Special case: Local MastodonFE
           mastodon_api_url(conn, :login)
         else
           redirect_uri
@@ -85,20 +85,20 @@ defmodule Pleroma.Web.OAuth.OAuthController do
           redirect(conn, external: url)
       end
     else
-      res ->
-        msg =
-          if res == {:auth_active, false},
-            do: "Account confirmation pending",
-            else: "Invalid Username/Password/Permissions"
-
-        app = Repo.get_by(App, client_id: client_id)
-        available_scopes = (app && app.scopes) || oauth_scopes(auth_params, [])
-        scope_param = Enum.join(available_scopes, " ")
-
+      {scopes_issue, _} when scopes_issue in [:unsupported_scopes, :missing_scopes] ->
         conn
-        |> put_flash(:error, msg)
+        |> put_flash(:error, "Permissions not specified.")
         |> put_status(:unauthorized)
-        |> authorize(Map.merge(auth_params, %{"scope" => scope_param}))
+        |> authorize(auth_params)
+
+      {:auth_active, false} ->
+        conn
+        |> put_flash(:error, "Account confirmation pending.")
+        |> put_status(:forbidden)
+        |> authorize(auth_params)
+
+      error ->
+        DatabaseAuthenticator.handle_error(conn, error)
     end
   end
 
@@ -190,7 +190,7 @@ defmodule Pleroma.Web.OAuth.OAuthController do
     token
     |> URI.decode()
     |> Base.url_decode64!(padding: false)
-    |> Base.url_encode64()
+    |> Base.url_encode64(padding: false)
   end
 
   defp get_app_from_request(conn, params) do