Merge pull request #14 from cadenza-tech/refactor-authorize-params

Refactor OmniAuth::Strategies::QiitaV2#authorize_params

Author: w-masahiro-ct

lib/omniauth/strategies/qiita_v2.rb

@@ -67,11 +67,11 @@ def callback_url
 
  def authorize_params
  super.tap do |params|
- ['scope', 'state'].each do |v|
- params[v.to_sym] = request.params[v] if request.params[v]
+ options[:authorize_options].each do |key|
+ params[key] = request.params[key.to_s] unless empty?(request.params[key.to_s])
  end
  params[:scope] ||= DEFAULT_SCOPE
- session['omniauth.state'] = params[:state] if params[:state]
+ session['omniauth.state'] = params[:state] unless empty?(params[:state])
  end
  end
 
@@ -86,10 +86,14 @@ def build_access_token
  def prune!(hash)
  hash.delete_if do |_, value|
  prune!(value) if value.is_a?(Hash)
- value.nil? || (value.respond_to?(:empty?) && value.empty?)
+ empty?(value)
  end
  end
 
+ def empty?(value)
+ value.nil? || (value.respond_to?(:empty?) && value.empty?)
+ end
+
  def base_params
  {
  headers: {

spec/omniauth/strategies/qiita_v2_spec.rb

@@ -417,4 +417,46 @@
  expect(hash).to eq({ a: 1, c: 'test' })
  end
  end
+
+ describe '#empty?' do
+ it 'returns true for nil values' do
+ expect(strategy.send(:empty?, nil)).to be(true)
+ end
+
+ it 'returns true for empty strings' do
+ expect(strategy.send(:empty?, '')).to be(true)
+ end
+
+ it 'returns true for empty arrays' do
+ expect(strategy.send(:empty?, [])).to be(true)
+ end
+
+ it 'returns true for empty hashes' do
+ expect(strategy.send(:empty?, {})).to be(true)
+ end
+
+ it 'returns false for non-empty strings' do
+ expect(strategy.send(:empty?, 'value')).to be(false)
+ end
+
+ it 'returns false for non-empty arrays' do
+ expect(strategy.send(:empty?, [1, 2, 3])).to be(false)
+ end
+
+ it 'returns false for non-empty hashes' do
+ expect(strategy.send(:empty?, { key: 'value' })).to be(false)
+ end
+
+ it 'returns false for zero values' do
+ expect(strategy.send(:empty?, 0)).to be(false)
+ end
+
+ it 'returns false for false values' do
+ expect(strategy.send(:empty?, false)).to be(false)
+ end
+
+ it 'returns false for objects that do not respond to empty?' do
+ expect(strategy.send(:empty?, 123)).to be(false)
+ end
+ end
 end