Merge branch 'feature/jobs' into 'develop'

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

diff --git a/lib/pleroma/web/oauth/token.ex b/lib/pleroma/web/oauth/token.ex
index f5594f834f57a0ca1b8304633067c656fc2294c7..71fd1b87463d70b045f8ea8bdd1d062e35f90fb7 100644 (file)
--- a/lib/pleroma/web/oauth/token.ex
+++ b/lib/pleroma/web/oauth/token.ex
@@ -31,8 +31,8 @@ defmodule Pleroma.Web.OAuth.Token do
   end
 
   def create_token(%App{} = app, %User{} = user) do
-    token = :crypto.strong_rand_bytes(32) |> Base.url_encode64()
-    refresh_token = :crypto.strong_rand_bytes(32) |> Base.url_encode64()
+    token = :crypto.strong_rand_bytes(32) |> Base.url_encode64(padding: false)
+    refresh_token = :crypto.strong_rand_bytes(32) |> Base.url_encode64(padding: false)
 
     token = %Token{
       token: token,
@@ -68,5 +68,6 @@ defmodule Pleroma.Web.OAuth.Token do
       where: t.user_id == ^user_id
     )
     |> Repo.all()
+    |> Repo.preload(:app)
   end
 end