projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[#468] Merged `upstream/develop`, resolved conflicts.
[akkoma]
/
lib
/
pleroma
/
web
/
oauth
/
token.ex
diff --git
a/lib/pleroma/web/oauth/token.ex
b/lib/pleroma/web/oauth/token.ex
index 1fae5ed3a6018b222cae78ae6f768024bdd4051b..ea4d56a291ae08f5b37cadc60e4d7ef97986ebcb 100644
(file)
--- a/
lib/pleroma/web/oauth/token.ex
+++ b/
lib/pleroma/web/oauth/token.ex
@@
-7,8
+7,11
@@
defmodule Pleroma.Web.OAuth.Token do
import Ecto.Query
import Ecto.Query
- alias Pleroma.{User, Repo}
- alias Pleroma.Web.OAuth.{Token, App, Authorization}
+ alias Pleroma.User
+ alias Pleroma.Repo
+ alias Pleroma.Web.OAuth.Token
+ alias Pleroma.Web.OAuth.App
+ alias Pleroma.Web.OAuth.Authorization
schema "oauth_tokens" do
field(:token, :string)
schema "oauth_tokens" do
field(:token, :string)
@@
-30,8
+33,8
@@
defmodule Pleroma.Web.OAuth.Token do
def create_token(%App{} = app, %User{} = user, scopes \\ nil) do
scopes = scopes || app.scopes
def create_token(%App{} = app, %User{} = user, scopes \\ nil) do
scopes = scopes || app.scopes
- 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,
token = %Token{
token: token,