projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'support/oauth' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
oauth
/
authorization.ex
diff --git
a/lib/pleroma/web/oauth/authorization.ex
b/lib/pleroma/web/oauth/authorization.ex
index 9039b8b4564d5d21bc56283d1f2c2cadc943c90b..3461f9983df55569fd9cad1b21e8ba6fdcb923a6 100644
(file)
--- a/
lib/pleroma/web/oauth/authorization.ex
+++ b/
lib/pleroma/web/oauth/authorization.ex
@@
-5,17
+5,18
@@
defmodule Pleroma.Web.OAuth.Authorization do
use Ecto.Schema
defmodule Pleroma.Web.OAuth.Authorization do
use Ecto.Schema
- alias Pleroma.User
alias Pleroma.Repo
alias Pleroma.Repo
- alias Pleroma.
Web.OAuth.Authorization
+ alias Pleroma.
User
alias Pleroma.Web.OAuth.App
alias Pleroma.Web.OAuth.App
+ alias Pleroma.Web.OAuth.Authorization
import Ecto.Changeset
import Ecto.Query
schema "oauth_authorizations" do
field(:token, :string)
import Ecto.Changeset
import Ecto.Query
schema "oauth_authorizations" do
field(:token, :string)
- field(:valid_until, :naive_datetime)
+ field(:scopes, {:array, :string}, default: [])
+ field(:valid_until, :naive_datetime_usec)
field(:used, :boolean, default: false)
belongs_to(:user, Pleroma.User, type: Pleroma.FlakeId)
belongs_to(:app, App)
field(:used, :boolean, default: false)
belongs_to(:user, Pleroma.User, type: Pleroma.FlakeId)
belongs_to(:app, App)
@@
-23,7
+24,8
@@
defmodule Pleroma.Web.OAuth.Authorization do
timestamps()
end
timestamps()
end
- def create_authorization(%App{} = app, %User{} = user) do
+ def create_authorization(%App{} = app, %User{} = user, scopes \\ nil) do
+ scopes = scopes || app.scopes
token = :crypto.strong_rand_bytes(32) |> Base.url_encode64(padding: false)
authorization = %Authorization{
token = :crypto.strong_rand_bytes(32) |> Base.url_encode64(padding: false)
authorization = %Authorization{
@@
-31,6
+33,7
@@
defmodule Pleroma.Web.OAuth.Authorization do
used: false,
user_id: user.id,
app_id: app.id,
used: false,
user_id: user.id,
app_id: app.id,
+ scopes: scopes,
valid_until: NaiveDateTime.add(NaiveDateTime.utc_now(), 60 * 10)
}
valid_until: NaiveDateTime.add(NaiveDateTime.utc_now(), 60 * 10)
}