mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-01-23 18:41:42 +01:00
Code Issues Projects Releases Wiki Activity

Add Doorkeeper::Application.webapp helper

Browse Source
This commit is contained in:
Emelia Smith 2024-07-16 19:30:17 +02:00
parent 7fc8292ea5
commit 12c47ea754
No known key found for this signature in database
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/lib/application_extension.rb
View File

@ -19,6 +19,14 @@ module ApplicationExtension
before_destroy :close_streaming_sessions, prepend: true before_destroy :close_streaming_sessions, prepend: true
end end
class_methods do
def webapp
Doorkeeper::Application.find_by!(name: 'Web', superapp: true)
rescue ActiveRecord::RecordNotFound
Doorkeeper::Application.create!(name: 'Web', redirect_uri: Doorkeeper.configuration.native_redirect_uri, scopes: 'read write follow push', superapp: true)
end
end
def confirmation_redirect_uri def confirmation_redirect_uri
redirect_uri.lines.first.strip redirect_uri.lines.first.strip
end end

6
app/models/session_activation.rb
View File

@ -28,7 +28,7 @@ class SessionActivation < ApplicationRecord
before_create :assign_access_token before_create :assign_access_token
DEFAULT_SCOPES = %w(read write follow).freeze DEFAULT_SCOPES = Doorkeeper::Application.webapp.scopes.without('push').freeze
scope :latest, -> { order(id: :desc) } scope :latest, -> { order(id: :desc) }
@ -66,9 +66,9 @@ class SessionActivation < ApplicationRecord
def access_token_attributes def access_token_attributes
{ {
application_id: Doorkeeper::Application.find_by(superapp: true)&.id, application_id: Doorkeeper::Application.webapp.id,
resource_owner_id: user_id, resource_owner_id: user_id,
scopes: DEFAULT_SCOPES.join(' '), scopes: DEFAULT_SCOPES,
expires_in: Doorkeeper.configuration.access_token_expires_in, expires_in: Doorkeeper.configuration.access_token_expires_in,
use_refresh_token: Doorkeeper.configuration.refresh_token_enabled?, use_refresh_token: Doorkeeper.configuration.refresh_token_enabled?,
} }

4
app/models/web/push_subscription.rb
View File

@ -66,9 +66,9 @@ class Web::PushSubscription < ApplicationRecord
def find_or_create_access_token def find_or_create_access_token
Doorkeeper::AccessToken.find_or_create_for( Doorkeeper::AccessToken.find_or_create_for(
application: Doorkeeper::Application.find_by(superapp: true), application: Doorkeeper::Application.webapp,
resource_owner: user_id || session_activation.user_id, resource_owner: user_id || session_activation.user_id,
scopes: Doorkeeper::OAuth::Scopes.from_string('read write follow push'), scopes: Doorkeeper::Application.webapp.scopes,
expires_in: Doorkeeper.configuration.access_token_expires_in, expires_in: Doorkeeper.configuration.access_token_expires_in,
use_refresh_token: Doorkeeper.configuration.refresh_token_enabled? use_refresh_token: Doorkeeper.configuration.refresh_token_enabled?
) )

2
db/seeds/01_web_app.rb
View File

@ -1,3 +1,3 @@
# frozen_string_literal: true # frozen_string_literal: true
Doorkeeper::Application.create_with(name: 'Web', redirect_uri: Doorkeeper.configuration.native_redirect_uri, scopes: 'read write follow push').find_or_create_by(superapp: true) Doorkeeper::Application.webapp