omniauth-multipassword 0.4.2 → 2.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d5f7c8a3656ca4686749bd2b4d273cc1460d39ba
-  data.tar.gz: eb372de5e8f9ead660e3631e6b66c9c8ed34a158
+SHA256:
+  metadata.gz: 4c42cc59feffb560101a1ca960ea75b5099054097dc688570f814fde8a07d33a
+  data.tar.gz: d8a94787d62f2d9ab2a8435cbaa81d087a4a2332e703a560fa907e3da0c9f9d5
 SHA512:
-  metadata.gz: 513e554cf46d322762dfbff65e764aea532ff2986de7af99770d9f84383b336b63af43492a5a95b63cb853f53cdd0f2bf0f33e190550fa0898ef955657fe07a0
-  data.tar.gz: c15f2b750cba4a41c170d2a983d74d8185665f3c0e70c44895ce268f7a1bdc54a1f7d713e8b7d1e5d58441ae9dd030e665b15f66bf6636ee98303b90f20ef5ad
+  metadata.gz: caef3ce2da16ace112cb73c2f178fb3909ad5fe184f57912cc0ae50622511e6f581638c0f4ab79d84c39229486b2114cc4799d47ba1057e02129392f892e4173
+  data.tar.gz: 2bb20ced2304ba9496012e1b186619b7149fc4c19265b013305afb1ce68a3c76b12fa1d7300432f38851fe6d7e1c7fa21225f337b227da89662b47ace17d9937

data/.editorconfig

@@ -0,0 +1,12 @@
+# EditorConfig is awesome: https://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true

data/.github/workflows/test.yml

@@ -0,0 +1,46 @@
+---
+name: test
+on: push
+jobs:
+  rspec:
+    name: "Ruby ${{ matrix.ruby }}"
+    runs-on: ubuntu-20.04
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - "3.0"
+          - "2.7"
+          - "2.6"
+          - "2.5"
+
+    steps:
+      - uses: actions/checkout@master
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: True
+        env:
+          BUNDLE_WITHOUT: development
+          BUNDLE_JOBS: 4
+          BUNDLE_RETRY: 3
+
+      - run: bundle exec rspec --color
+
+  rubocop:
+    name: rubocop
+    runs-on: ubuntu-20.04
+
+    steps:
+      - uses: actions/checkout@master
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.0
+          bundler-cache: True
+        env:
+          BUNDLE_WITHOUT: development
+          BUNDLE_JOBS: 4
+          BUNDLE_RETRY: 3
+
+      - run: bundle exec rubocop --parallel --fail-level E

data/.rspec

@@ -0,0 +1 @@
+--backtrace

data/.rubocop.yml

@@ -0,0 +1,10 @@
+inherit_gem:
+  my-rubocop: default.yml
+
+AllCops:
+  TargetRubyVersion: 2.5
+  SuggestExtensions: False
+
+Naming/FileName:
+  Exclude:
+    - lib/omniauth-multipassword.rb

data/.travis.yml

@@ -2,8 +2,9 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
-- '2.1'
-- '2.0'
-- 1.9.3
-- jruby
-- rbx-2
+- '2.4.0'
+- '2.3.3'
+- '2.2.6'
+- '2.1.10'
+after_success:
+  - bundle exec codeclimate-test-reporter

data/CHANGELOG.md

@@ -0,0 +1,18 @@
+# CHANGELOG
+
+All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a Changelog](http://keepachangelog.com/).
+
+## Unreleased
+---
+
+### New
+
+### Changes
+
+### Fixes
+
+### Breaks
+* Updated strategy to OmniAuth >= 2.0
+
+

data/Gemfile

@@ -1,10 +1,20 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in omniauth-multipassword.gemspec
 gemspec
 
 gem 'rake'
-gem 'rack-test'
-gem 'rspec'
-gem 'simplecov'
-gem "codeclimate-test-reporter"
+gem 'rake-release'
+
+group :test do
+  gem 'rack-test'
+
+  gem 'rspec', '~> 3.0'
+
+  gem 'codecov', require: false
+  gem 'simplecov', require: false
+
+  gem 'my-rubocop', github: 'jgraichen/my-rubocop', ref: 'v2'
+end

data/Rakefile

@@ -1,4 +1,6 @@
-require 'bundler/gem_tasks'
+# frozen_string_literal: true
+
+require 'rake/release'
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)

data/lib/omniauth/multipassword/base.rb

@@ -1,21 +1,23 @@
+# frozen_string_literal: true
+
 module OmniAuth
   module MultiPassword
     module Base
       def self.included(base)
         base.class_eval do
-          option :title,  "Restricted Access"
-          option :fields, [ :username, :password ]
+          option :title,  'Restricted Access'
+          option :fields, %i[username password]
 
-          uid  { username }
+          uid { username }
         end
       end
 
       def username_id
-        options[:fields][0] || "username"
+        options[:fields][0] || 'username'
       end
 
       def password_id
-        options[:fields][1] || "password"
+        options[:fields][1] || 'password'
       end
 
       def username
@@ -37,11 +39,18 @@ module OmniAuth
       end
 
       def request_phase
-        OmniAuth::Form.build(:title => options.title, :url => callback_url) do |f|
-          f.text_field     "Username", username_id
-          f.password_field "Password", password_id
+        OmniAuth::Form.build(title: options.title, url: callback_url) do |f|
+          f.text_field     'Username', username_id
+          f.password_field 'Password', password_id
         end.to_response
       end
+
+      def other_phase
+        # OmniAuth, by default, disables "GET" requests for security reasons.
+        # This effectively disables showing a password form on a GET request to
+        # the `request_phase`. Instead, we hook the GET requests here.
+        return request_phase if on_request_path?
+      end
     end
   end
 end

data/lib/omniauth/multipassword/version.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module Omniauth
   module Multipassword
     module VERSION
-      MAJOR = 0
-      MINOR = 4
-      PATCH = 2
-      STAGE = nil
+      MAJOR = 2
+      MINOR = 0
+      PATCH = 0
+      STAGE = 'rc1'
 
       def self.to_s
         [MAJOR, MINOR, PATCH, STAGE].reject(&:nil?).join '.'

data/lib/omniauth/strategies/multi_password.rb

@@ -1,5 +1,7 @@
-require "omniauth"
-require "omniauth/multipassword/base"
+# frozen_string_literal: true
+
+require 'omniauth'
+require 'omniauth/multipassword/base'
 
 module OmniAuth
   module Strategies
@@ -8,12 +10,16 @@ module OmniAuth
       include OmniAuth::MultiPassword::Base
 
       def initialize(app, *args, &block)
-        super(app, *args) do end
+        super(app, *args) do
+          # Do pass an empty block, as otherwise the captured block would be
+          # passed to `super`, but this needs to be evaluate inside this
+          # middleware, not omniauth's Rack builder instance.
+        end
 
-        if block.arity == 0
-          instance_eval &block
+        if block.arity.zero?
+          instance_eval(&block)
         else
-          block.call self
+          yield self
         end
       end
 
@@ -25,16 +31,16 @@ module OmniAuth
       def authenticator(klass, *args, &block)
         unless klass.is_a?(Class)
           begin
-            klass = OmniAuth::Strategies.const_get("#{OmniAuth::Utils.camelize(klass.to_s)}")
+            klass = OmniAuth::Strategies.const_get(OmniAuth::Utils.camelize(klass.to_s).to_s)
           rescue NameError
-            raise LoadError, "Could not find matching strategy for #{klass.inspect}." +
-              "You may need to install an additional gem (such as omniauth-#{klass})."
+            raise LoadError.new("Could not find matching strategy for #{klass.inspect}." \
+                                "You may need to install an additional gem (such as omniauth-#{klass}).")
           end
         end
 
         args << block if block
         @authenticators ||= []
-        @authenticators  << [ klass, args ]
+        @authenticators  << [klass, args]
       end
 
       def callback_phase
@@ -43,7 +49,7 @@ module OmniAuth
         if authenticate(username, password)
           super
         else
-          return fail!(:invalid_credentials)
+          fail!(:invalid_credentials)
         end
       end
 
@@ -52,11 +58,9 @@ module OmniAuth
           begin
             @authenticator = auth[0].new @app, *auth[1]
             @authenticator.init_authenticator(@request, @env, username)
-            if @authenticator.authenticate(username, password)
-              return true
-            end
+            return true if @authenticator.authenticate(username, password)
           rescue Error => e
-            OmniAuth.logger.warn "OmniAuth ERR >>> " + e
+            OmniAuth.logger.warn "OmniAuth ERR >>> #{e}"
           end
           @authenticator = nil
         end
@@ -65,6 +69,7 @@ module OmniAuth
 
       def name
         return @authenticator.name if @authenticator
+
         super
       end
 

data/lib/omniauth-multipassword.rb

@@ -1,3 +1,5 @@
-require "omniauth/multipassword/base"
-require "omniauth/multipassword/version"
-require "omniauth/strategies/multi_password"
+# frozen_string_literal: true
+
+require 'omniauth/multipassword/base'
+require 'omniauth/multipassword/version'
+require 'omniauth/strategies/multi_password'

data/omniauth-multipassword.gemspec

@@ -1,20 +1,26 @@
-# -*- encoding: utf-8 -*-
-require File.expand_path('../lib/omniauth/multipassword/version', __FILE__)
+# frozen_string_literal: true
+
+require File.expand_path('lib/omniauth/multipassword/version', __dir__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Jan Graichen"]
-  gem.email         = ["jg@altimos.de"]
-  gem.description   = "A OmniAuth strategy to authenticate using different passwort strategies."
-  gem.summary       = "A OmniAuth strategy to authenticate using different passwort strategies."
-  gem.homepage      = "https://github.com/jgraichen/omniauth-multipassword"
+  gem.authors       = ['Jan Graichen']
+  gem.email         = ['jgraichen@altimos.de']
+  gem.description   = 'A OmniAuth strategy to authenticate using different passwort strategies.'
+  gem.summary       = 'A OmniAuth strategy to authenticate using different passwort strategies.'
+  gem.homepage      = 'https://github.com/jgraichen/omniauth-multipassword'
   gem.license       = 'MIT'
 
-  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  gem.required_ruby_version = '>= 2.5'
+  gem.metadata = {
+    'rubygems_mfa_required' => 'true',
+  }
+
+  gem.executables   = `git ls-files -- bin/*`.split("\n").map {|f| File.basename(f) }
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  gem.name          = "omniauth-multipassword"
-  gem.require_paths = ["lib"]
+  gem.name          = 'omniauth-multipassword'
+  gem.require_paths = ['lib']
   gem.version       = Omniauth::Multipassword::VERSION
 
-  gem.add_dependency 'omniauth', '~> 1.0'
+  gem.add_dependency 'omniauth', '~> 2.0'
 end

data/spec/omniauth/multipassword/base_spec.rb

@@ -1,48 +1,42 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'rack/test'
 
-describe OmniAuth::MultiPassword::Base do
-  let(:app) { double 'app' }
-  let(:args) { [] }
-  let(:block) { nil }
-
-  class OmniAuth::Strategy::OneTest
-    include OmniAuth::Strategy
-    include OmniAuth::MultiPassword::Base
-
-    def authenticate(username, password)
-      username == 'john' && password == 'secret'
-    end
-  end
+describe OmniAuth::MultiPassword::Base do # rubocop:disable RSpec/FilePath
+  subject { strategy }
 
+  let(:app) { instance_double(Proc) }
   let(:strategy) do
-    OmniAuth::Strategy::OneTest.new(app, *args, &block)
+    OmniAuth::Strategies::OneTest.new(app, *args, &block)
   end
-
-  subject { strategy }
+  let(:args) { [] }
+  let(:block) { nil }
 
   describe '#username_id' do
-    subject { strategy.username_id }
+    subject(:username_id) { strategy.username_id }
 
     it 'defaults to :username' do
-      is_expected.to eq :username
+      expect(username_id).to eq :username
     end
 
     context 'when configured' do
-      let(:args) { [{fields: [:user, :pass]}] }
+      let(:args) { [{fields: %i[user pass]}] }
+
       it { is_expected.to eq :user }
     end
   end
 
   describe '#password_id' do
-    subject { strategy.password_id }
+    subject(:password_id) { strategy.password_id }
 
     it 'defaults to :password' do
-      is_expected.to eq :password
+      expect(password_id).to eq :password
     end
 
     context 'when configured' do
-      let(:args) { [{fields: [:user, :pass]}] }
+      let(:args) { [{fields: %i[user pass]}] }
+
       it { is_expected.to eq :pass }
     end
   end
@@ -51,11 +45,11 @@ describe OmniAuth::MultiPassword::Base do
     include Rack::Test::Methods
 
     let(:app) do
-      Rack::Builder.new {
+      Rack::Builder.new do
         use OmniAuth::Test::PhonySession
         use OmniAuth::Strategies::OneTest
         run ->(env) { [404, {'Content-Type' => 'text/plain'}, [env.key?('omniauth.auth').to_s]] }
-      }.to_app
+      end.to_app
     end
 
     it 'shows login FORM' do

data/spec/omniauth/strategy/multi_password_spec.rb

@@ -1,36 +1,20 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'rack/test'
 
-describe OmniAuth::Strategies::MultiPassword do
+describe OmniAuth::Strategies::MultiPassword do # rubocop:disable RSpec/FilePath
   include Rack::Test::Methods
 
-  class OmniAuth::Strategies::OneTest
-    include OmniAuth::Strategy
-    include OmniAuth::MultiPassword::Base
-
-    def authenticate(username, password)
-      username == 'john' && password == 'secret'
-    end
-  end
-
-  class OmniAuth::Strategies::TwoTest
-    include OmniAuth::Strategy
-    include OmniAuth::MultiPassword::Base
-
-    def authenticate(username, password)
-      username == 'jane' && password == '1234'
-    end
-  end
-
   let(:app) do
-    Rack::Builder.new {
+    Rack::Builder.new do
       use OmniAuth::Test::PhonySession
       use OmniAuth::Strategies::MultiPassword do
         authenticator :one_test
         authenticator :two_test
       end
       run ->(env) { [404, {'Content-Type' => 'text/plain'}, [env['omniauth.auth']['uid'].to_s]] }
-    }.to_app
+    end.to_app
   end
 
   it 'shows login FORM' do
@@ -41,17 +25,20 @@ describe OmniAuth::Strategies::MultiPassword do
 
   it 'redirect on all failed strategies' do
     post '/auth/multipassword/callback', username: 'paul', password: 'wrong'
+
     expect(last_response).to be_redirect
     expect(last_response.headers['Location']).to eq '/auth/failure?message=invalid_credentials&strategy=multipassword'
   end
 
   it 'authenticates john' do
     post '/auth/multipassword/callback', username: 'john', password: 'secret'
+
     expect(last_response.body).to eq 'john'
   end
 
   it 'authenticates jane' do
     post '/auth/multipassword/callback', username: 'jane', password: '1234'
+
     expect(last_response.body).to eq 'jane'
   end
 end

data/spec/spec_helper.rb

@@ -1,30 +1,25 @@
+# frozen_string_literal: true
+
 require 'rspec'
 require 'simplecov'
 
-if ENV['CI'] || (defined?(:RUBY_ENGINE) && RUBY_ENGINE != 'rbx')
-  begin
-    require 'codeclimate-test-reporter'
-    CodeClimate::TestReporter.start
-  rescue LoadError
-  end
-  SimpleCov.start
+if ENV['CI']
+  require 'codecov'
+  SimpleCov.formatter = SimpleCov::Formatter::Codecov
 end
 
-require 'omniauth-multipassword'
-
-Dir[File.expand_path('spec/support/**/*.rb')].each {|f| require f }
-
-# Disable omniauth logger
-class NullLogger < Logger
-  def initialize(*args)
-  end
-
-  def add(*args, &block)
-  end
+SimpleCov.start do
+  add_filter 'spec'
 end
 
-OmniAuth.config.logger = NullLogger.new
+require 'omniauth-multipassword'
+
+Dir[File.expand_path('spec/support/**/*.rb')].sort.each {|f| require f }
 
 RSpec.configure do |config|
   config.order = 'random'
+
+  config.before do
+    OmniAuth.config.logger = Logger.new(IO::NULL)
+  end
 end

data/spec/support/strategies.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module OmniAuth
+  module Strategies
+    class OneTest
+      include OmniAuth::Strategy
+      include OmniAuth::MultiPassword::Base
+
+      def authenticate(username, password)
+        username == 'john' && password == 'secret'
+      end
+    end
+  end
+end
+
+module OmniAuth
+  module Strategies
+    class TwoTest
+      include OmniAuth::Strategy
+      include OmniAuth::MultiPassword::Base
+
+      def authenticate(username, password)
+        username == 'jane' && password == '1234'
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-multipassword
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 2.0.0.rc1
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-18 00:00:00.000000000 Z
+date: 2021-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -16,23 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 description: A OmniAuth strategy to authenticate using different passwort strategies.
 email:
-- jg@altimos.de
+- jgraichen@altimos.de
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".editorconfig"
+- ".github/workflows/test.yml"
 - ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -45,10 +50,12 @@ files:
 - spec/omniauth/multipassword/base_spec.rb
 - spec/omniauth/strategy/multi_password_spec.rb
 - spec/spec_helper.rb
+- spec/support/strategies.rb
 homepage: https://github.com/jgraichen/omniauth-multipassword
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -57,15 +64,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: A OmniAuth strategy to authenticate using different passwort strategies.