Fix OAuth registration redirect_uris array support

test/pleroma/web/admin_api/controllers/o_auth_app_controller_test.exs

@@ -57,6 +57,28 @@ defmodule Pleroma.Web.AdminAPI.OAuthAppControllerTest do
              } = response
     end
 
+    test "success with redirect_uris array", %{conn: conn} do
+      base_url = Endpoint.url()
+      app_name = "Trusted app"
+
+      response =
+        conn
+        |> put_req_header("content-type", "application/json")
+        |> post("/api/pleroma/admin/oauth_app", %{
+          name: app_name,
+          redirect_uris: [base_url]
+        })
+        |> json_response_and_validate_schema(200)
+
+      assert %{
+               "client_id" => _,
+               "client_secret" => _,
+               "name" => ^app_name,
+               "redirect_uri" => ^base_url,
+               "trusted" => false
+             } = response
+    end
+
     test "with trusted", %{conn: conn} do
       base_url = Endpoint.url()
       app_name = "Trusted app"

test/pleroma/web/mastodon_api/controllers/app_controller_test.exs

@@ -61,6 +61,33 @@ defmodule Pleroma.Web.MastodonAPI.AppControllerTest do
     assert app.user_id == nil
   end
 
+  test "creates an oauth app with redirect_uris array", %{conn: conn} do
+    app_attrs = build(:oauth_app)
+
+    conn =
+      conn
+      |> put_req_header("content-type", "application/json")
+      |> post("/api/v1/apps", %{
+        client_name: app_attrs.client_name,
+        redirect_uris: [app_attrs.redirect_uris]
+      })
+
+    [app] = Repo.all(App)
+
+    expected = %{
+      "name" => app.client_name,
+      "website" => app.website,
+      "client_id" => app.client_id,
+      "client_secret" => app.client_secret,
+      "id" => app.id |> to_string(),
+      "redirect_uri" => app.redirect_uris,
+      "vapid_key" => Push.vapid_config() |> Keyword.get(:public_key)
+    }
+
+    assert expected == json_response_and_validate_schema(conn, 200)
+    assert app.user_id == nil
+  end
+
   test "creates an oauth app with a user", %{conn: conn} do
     user = insert(:user)
     app_attrs = build(:oauth_app)

test/pleroma/web/o_auth/app_test.exs

@@ -10,20 +10,20 @@ defmodule Pleroma.Web.OAuth.AppTest do
 
   describe "get_or_make/2" do
     test "gets exist app" do
-      attrs = %{client_name: "Mastodon-Local", redirect_uris: ["."]}
+      attrs = %{client_name: "Mastodon-Local", redirect_uris: "."}
       app = insert(:oauth_app, Map.merge(attrs, %{scopes: ["read", "write"]}))
       {:ok, %App{} = exist_app} = App.get_or_make(attrs, [])
       assert exist_app == app
     end
 
     test "make app" do
-      attrs = %{client_name: "Mastodon-Local", redirect_uris: ["."]}
+      attrs = %{client_name: "Mastodon-Local", redirect_uris: "."}
       {:ok, %App{} = app} = App.get_or_make(attrs, ["write"])
       assert app.scopes == ["write"]
     end
 
     test "gets exist app and updates scopes" do
-      attrs = %{client_name: "Mastodon-Local", redirect_uris: ["."]}
+      attrs = %{client_name: "Mastodon-Local", redirect_uris: "."}
       app = insert(:oauth_app, Map.merge(attrs, %{scopes: ["read", "write"]}))
       {:ok, %App{} = exist_app} = App.get_or_make(attrs, ["read", "write", "follow", "push"])
       assert exist_app.id == app.id
@@ -31,10 +31,10 @@ defmodule Pleroma.Web.OAuth.AppTest do
     end
 
     test "has unique client_id" do
-      insert(:oauth_app, client_name: "", redirect_uris: [""], client_id: "boop")
+      insert(:oauth_app, client_name: "", redirect_uris: "", client_id: "boop")
 
       error =
-        catch_error(insert(:oauth_app, client_name: "", redirect_uris: [""], client_id: "boop"))
+        catch_error(insert(:oauth_app, client_name: "", redirect_uris: "", client_id: "boop"))
 
       assert %Ecto.ConstraintError{} = error
       assert error.constraint == "apps_client_id_index"
@@ -55,7 +55,7 @@ defmodule Pleroma.Web.OAuth.AppTest do
   end
 
   test "removes orphaned apps" do
-    attrs = %{client_name: "Mastodon-Local", redirect_uris: ["."]}
+    attrs = %{client_name: "Mastodon-Local", redirect_uris: "."}
     {:ok, %App{} = old_app} = App.get_or_make(attrs, ["write"])
 
     # backdate the old app so it's within the threshold for being cleaned up
@@ -66,7 +66,7 @@ defmodule Pleroma.Web.OAuth.AppTest do
       |> Pleroma.Repo.query([one_hour_ago, old_app.id])
 
     # Create the new app after backdating the old one
-    attrs = %{client_name: "PleromaFE", redirect_uris: ["."]}
+    attrs = %{client_name: "PleromaFE", redirect_uris: "."}
     {:ok, %App{} = app} = App.get_or_make(attrs, ["write"])
 
     # Ensure the new app has a recent timestamp

test/pleroma/web/o_auth/o_auth_controller_test.exs

@@ -406,7 +406,7 @@ defmodule Pleroma.Web.OAuth.OAuthControllerTest do
   describe "GET /oauth/authorize" do
     setup do
       [
-        app: insert(:oauth_app, redirect_uris: ["https://redirect.url"]),
+        app: insert(:oauth_app, redirect_uris: "https://redirect.url"),
         conn:
           build_conn()
           |> Plug.Session.call(Plug.Session.init(@session_opts))