From 58596f5d3778414cf2d683bb706dd825053df068 Mon Sep 17 00:00:00 2001
From: icyleaf <icyleaf.cn@gmail.com>
Date: Fri, 13 Sep 2024 08:13:07 +0000
Subject: [PATCH] fix: remove address scope in openid connect default setting

---
 app/models/setting.rb         |  2 +-
 config/initializers/sentry.rb | 22 +++++-----------------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/app/models/setting.rb b/app/models/setting.rb
index 36fbe9ac5..9e8304cf9 100644
--- a/app/models/setting.rb
+++ b/app/models/setting.rb
@@ -94,7 +94,7 @@ class Setting < RailsSettings::Base
       auth_uri: ENV.fetch('OIDC_AUTH_URI', '/authorize'),
       token_uri: ENV.fetch('OIDC_TOKEN_URI', '/token'),
       userinfo_uri: ENV.fetch('OIDC_USERINFO_URI', '/userinfo'),
-      scope: ENV.fetch('OIDC_SCOPE', 'openid,email,profile,address'),
+      scope: ENV.fetch('OIDC_SCOPE', 'openid,email,profile'),
       response_type: ENV.fetch('OIDC_RESPONSE_TYPE', 'code'),
       uid_field: ENV.fetch('OIDC_UID_FIELD', 'preferred_username')
     }, validates: { json: { format: :hash } }
diff --git a/config/initializers/sentry.rb b/config/initializers/sentry.rb
index 0720247b3..31a6aa50b 100644
--- a/config/initializers/sentry.rb
+++ b/config/initializers/sentry.rb
@@ -1,19 +1,18 @@
 # frozen_string_literal: true
 
 # 默认开启 Sentry，如果不想使用设置 ZEALOT_SENTRY_DISABLE=1
-if Rails.env.production? && ActiveModel::Type::Boolean.new.cast(ENV['ZEALOT_SENTRY_DISABLE'] || false)
+# if Rails.env.production? && ActiveModel::Type::Boolean.new.cast(ENV['ZEALOT_SENTRY_DISABLE'] || false)
   Rails.configuration.to_prepare do
     Sentry.init do |config|
       config.dsn = ENV['ZEALOT_SENTRY_DNS'] || 'https://133aefa9f52448a1a7900ba9d02f93e1@o333914.ingest.us.sentry.io/1878137'
 
+      config.environment = Rails.env
+      config.enabled_environments = %w[production development]
       config.include_local_variables = true
       config.rails.report_rescued_exceptions = true
       config.breadcrumbs_logger = %i[active_support_logger sentry_logger http_logger]
-
+      config.enabled_patches << :faraday << :graphql
       config.send_default_pii = true
-      config.environment = Rails.env
-      config.enabled_environments = %w[production development]
-
       config.excluded_exceptions += [
         'ActionController::RoutingError',
         'ActiveRecord::RecordNotFound',
@@ -26,17 +25,6 @@
         'SystemExit',
       ]
 
-      config.traces_sampler = lambda do |sampling_context|
-        transaction_context = sampling_context[:transaction_context]
-        op = transaction_context[:op]
-        case op
-        when /good_job/
-          0.1
-        else
-          0.5
-        end
-      end
-
       if vcs_ref = Setting.vcs_ref.presence
         release = [Setting.version, vcs_ref]
         if docker_tag = ENV['DOCKER_TAG'].presence
@@ -46,4 +34,4 @@
       end
     end
   end
-end
+# end