From 5c72b46a4e3edc070b465f494fdf7a6c3679df7c Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 2 Oct 2024 10:45:12 -0400
Subject: [PATCH] Clean up labels on development application form (#32116)
---
app/helpers/application_helper.rb | 13 +++++--------
app/models/session_activation.rb | 4 +++-
app/views/settings/applications/_form.html.haml | 4 ++--
3 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index de00f76d36..a40580fbae 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,12 +1,6 @@
# frozen_string_literal: true
module ApplicationHelper
- DANGEROUS_SCOPES = %w(
- read
- write
- follow
- ).freeze
-
RTL_LOCALES = %i(
ar
ckb
@@ -95,8 +89,11 @@ module ApplicationHelper
Rails.env.production? ? site_title : "#{site_title} (Dev)"
end
- def class_for_scope(scope)
- 'scope-danger' if DANGEROUS_SCOPES.include?(scope.to_s)
+ def label_for_scope(scope)
+ safe_join [
+ tag.samp(scope, class: { 'scope-danger' => SessionActivation::DEFAULT_SCOPES.include?(scope.to_s) }),
+ tag.span(t("doorkeeper.scopes.#{scope}"), class: :hint),
+ ]
end
def can?(action, record)
diff --git a/app/models/session_activation.rb b/app/models/session_activation.rb
index d0a77daf0a..8b8e533d30 100644
--- a/app/models/session_activation.rb
+++ b/app/models/session_activation.rb
@@ -28,6 +28,8 @@ class SessionActivation < ApplicationRecord
before_create :assign_access_token
+ DEFAULT_SCOPES = %w(read write follow).freeze
+
class << self
def active?(id)
id && exists?(session_id: id)
@@ -64,7 +66,7 @@ class SessionActivation < ApplicationRecord
{
application_id: Doorkeeper::Application.find_by(superapp: true)&.id,
resource_owner_id: user_id,
- scopes: 'read write follow',
+ scopes: DEFAULT_SCOPES.join(' '),
expires_in: Doorkeeper.configuration.access_token_expires_in,
use_refresh_token: Doorkeeper.configuration.refresh_token_enabled?,
}
diff --git a/app/views/settings/applications/_form.html.haml b/app/views/settings/applications/_form.html.haml
index 66ea8bc12b..85fdefa0fc 100644
--- a/app/views/settings/applications/_form.html.haml
+++ b/app/views/settings/applications/_form.html.haml
@@ -18,7 +18,7 @@
.field-group
.input.with_block_label
- %label= t('activerecord.attributes.doorkeeper/application.scopes')
+ = form.label t('activerecord.attributes.doorkeeper/application.scopes'), required: true
%span.hint= t('simple_form.hints.defaults.scopes')
- Doorkeeper.configuration.scopes.group_by { |s| s.split(':').first }.each_value do |value|
@@ -29,7 +29,7 @@
hint: false,
include_blank: false,
item_wrapper_tag: 'li',
- label_method: ->(scope) { safe_join([content_tag(:samp, scope, class: class_for_scope(scope)), content_tag(:span, t("doorkeeper.scopes.#{scope}"), class: 'hint')]) },
+ label_method: ->(scope) { label_for_scope(scope) },
label: false,
required: false,
selected: form.object.scopes.all,