diff options
| author | kaniini <nenolod@gmail.com> | 2019-01-25 05:00:47 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-01-25 05:00:47 +0000 |
| commit | c9b418e5477229017b3750c55cf3ea3d03b7e609 (patch) | |
| tree | d1b458bea76ff3ec296897de405f9e3c8578f897 /lib/pleroma/web/oauth | |
| parent | 44693fbf6e5c5ec5622207e263688e3af7d1a83a (diff) | |
| parent | 4df71cd88b2725f1838c2899b3078a74dbb0c33f (diff) | |
| download | pleroma-c9b418e5477229017b3750c55cf3ea3d03b7e609.tar.gz | |
Merge branch 'develop' into 'oembed_provider'
# Conflicts:
# lib/pleroma/activity.ex
Diffstat (limited to 'lib/pleroma/web/oauth')
| -rw-r--r-- | lib/pleroma/web/oauth/authorization.ex | 2 | ||||
| -rw-r--r-- | lib/pleroma/web/oauth/token.ex | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/oauth/authorization.ex b/lib/pleroma/web/oauth/authorization.ex index cc4b74bc5..f8c65602d 100644 --- a/lib/pleroma/web/oauth/authorization.ex +++ b/lib/pleroma/web/oauth/authorization.ex @@ -14,7 +14,7 @@ defmodule Pleroma.Web.OAuth.Authorization do field(:token, :string) field(:valid_until, :naive_datetime) field(:used, :boolean, default: false) - belongs_to(:user, Pleroma.User) + belongs_to(:user, Pleroma.User, type: Pleroma.FlakeId) belongs_to(:app, App) timestamps() diff --git a/lib/pleroma/web/oauth/token.ex b/lib/pleroma/web/oauth/token.ex index f0ebc63f6..4e01b123b 100644 --- a/lib/pleroma/web/oauth/token.ex +++ b/lib/pleroma/web/oauth/token.ex @@ -14,7 +14,7 @@ defmodule Pleroma.Web.OAuth.Token do field(:token, :string) field(:refresh_token, :string) field(:valid_until, :naive_datetime) - belongs_to(:user, Pleroma.User) + belongs_to(:user, Pleroma.User, type: Pleroma.FlakeId) belongs_to(:app, App) timestamps() |