[#468] Merged `upstream/develop`, resolved conflicts.

[akkoma] / lib / pleroma / web / oauth / app.ex

diff --git a/lib/pleroma/web/oauth/app.ex b/lib/pleroma/web/oauth/app.ex
index ff52ba82e63d90b40421e801993c3607b6e2314d..3476da484b817cc8a3a27676f9ab03d02e3e532c 100644 (file)
--- a/lib/pleroma/web/oauth/app.ex
+++ b/lib/pleroma/web/oauth/app.ex
@@ -1,27 +1,38 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
 defmodule Pleroma.Web.OAuth.App do
   use Ecto.Schema
-  import Ecto.{Changeset}
+  import Ecto.Changeset
 
   schema "apps" do
-    field :client_name, :string
-    field :redirect_uris, :string
-    field :scopes, :string
-    field :website, :string
-    field :client_id, :string
-    field :client_secret, :string
+    field(:client_name, :string)
+    field(:redirect_uris, :string)
+    field(:scopes, {:array, :string}, default: [])
+    field(:website, :string)
+    field(:client_id, :string)
+    field(:client_secret, :string)
 
     timestamps()
   end
 
   def register_changeset(struct, params \\ %{}) do
-    changeset = struct
-    |> cast(params, [:client_name, :redirect_uris, :scopes, :website])
-    |> validate_required([:client_name, :redirect_uris, :scopes])
+    changeset =
+      struct
+      |> cast(params, [:client_name, :redirect_uris, :scopes, :website])
+      |> validate_required([:client_name, :redirect_uris, :scopes])
 
     if changeset.valid? do
       changeset
-      |> put_change(:client_id, :crypto.strong_rand_bytes(32) |> Base.url_encode64)
-      |> put_change(:client_secret, :crypto.strong_rand_bytes(32) |> Base.url_encode64)
+      |> put_change(
+        :client_id,
+        :crypto.strong_rand_bytes(32) |> Base.url_encode64(padding: false)
+      )
+      |> put_change(
+        :client_secret,
+        :crypto.strong_rand_bytes(32) |> Base.url_encode64(padding: false)
+      )
     else
       changeset
     end