omniauth-elitmus 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66628d1f49a7d608bc2b2ff206503406de85ac17f99462ea2b10cb01fae47251
-  data.tar.gz: 651d6623068ebd251f538168812e20b95b6870f09dba7b57e0e44f842e8c7071
+  metadata.gz: 3bed8eb52063dadd06f0b71219cf5b0217b6fd0bdd089d1c0bdd08e1f7a7c509
+  data.tar.gz: 3b8ad318cb177a44d5caa0619a65308f4be820eaff56369aa00101055878b083
 SHA512:
-  metadata.gz: d4c1d6f64480e2fe5664c2985be332c69a5acb38867503feed8c563488dab464c2cbf9fc685cf3394ebdebf188aca3fc294e41bd8aa698cb81020e34390c5a57
-  data.tar.gz: 1bec97b55ebde3b25f336827b034971b8f03d19a8527c3aede84b76e865a47d22955c6cda8349b168c5edafe7dc610a467fc18fd0d1c40b1c56cd6a1aa94025f
+  metadata.gz: 627cab09fb250d8ed67581b029541fa58d59ea69021870928f3a2c4eeb45283146d1de69503ab7cbc6e923524b12144762317ff31fdefe974c377820068a3ef2
+  data.tar.gz: c3c1f735331208fe04135e64bf18314d9b4b725da561e5d72d1a55d9b0309eac5dd7f275f5443beaca5bcdafcc7643ef707d13a2c421eff5f6415bb6b4e2acdb

data/.github/workflows/rubyonrails.yml

@@ -13,32 +13,16 @@ on:
 jobs:
   test:
     runs-on: ubuntu-latest
-    services:
-      postgres:
-        image: postgres:11-alpine
-        ports:
-          - "5432:5432"
-        env:
-          POSTGRES_DB: rails_test
-          POSTGRES_USER: rails
-          POSTGRES_PASSWORD: password
-    env:
-      RAILS_ENV: test
-      DATABASE_URL: "postgres://rails:password@localhost:5432/rails_test"
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-      # Add or replace dependency steps here
       - name: Install Ruby and gems
-        uses: ruby/setup-ruby@78c01b705fd9d5ad960d432d3a0cfa341d50e410 # v1.179.1
+        uses: ruby/setup-ruby@v1
         with:
+          ruby-version: '4.0.5'
           bundler-cache: true
-      # Add or replace database setup steps here
-      - name: Set up database schema
-        run: bin/rails db:schema:load
-      # Add or replace test runners here
       - name: Run tests
-        run: bin/rake
+        run: bundle exec rake test
 
   lint:
     runs-on: ubuntu-latest
@@ -46,8 +30,9 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
       - name: Install Ruby and gems
-        uses: ruby/setup-ruby@78c01b705fd9d5ad960d432d3a0cfa341d50e410 # v1.179.1
+        uses: ruby/setup-ruby@v1
         with:
+          ruby-version: '4.0.5' 
           bundler-cache: true
       - name: Generate binstubs
         run: bundle binstubs bundler-audit brakeman rubocop
@@ -55,6 +40,6 @@ jobs:
       - name: Security audit dependencies
         run: bin/bundler-audit --update
       - name: Security audit application code
-        run: bin/brakeman -q -w2
+        run: bin/brakeman -q -w2 --force
       - name: Lint Ruby files
         run: bin/rubocop --parallel

data/.rubocop.yml

@@ -0,0 +1,22 @@
+AllCops:
+  NewCops: enable
+  TargetRubyVersion: 3.1
+  Exclude:
+    - 'bin/**/*'
+    - 'coverage/**/*'
+    - 'vendor/**/*'
+
+Naming/FileName:
+  Exclude:
+    - 'lib/omniauth-elitmus.rb'
+
+Style/Documentation:
+  Enabled: false
+
+Gemspec/DevelopmentDependencies:
+  Enabled: false
+
+Metrics/BlockLength:
+  Exclude:
+    - 'test/**/*'
+    - '*.gemspec'

data/Gemfile

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in ..gemspec
 gemspec
 
-platforms :rbx do
-  gem 'rubysl', '~> 2.2'
+group :development, :test do
+  gem 'brakeman'
+  gem 'bundler-audit'
+  gem 'rubocop'
 end
-
-gem "codeclimate-test-reporter", group: :test, require: nil

data/Gemfile.lock

@@ -0,0 +1,171 @@
+PATH
+  remote: .
+  specs:
+    omniauth-elitmus (0.2.1)
+      omniauth-oauth2 (~> 1.8)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    anonymous_loader (0.1.3)
+      version_gem (~> 1.1, >= 1.1.14)
+    ast (2.4.3)
+    auth-sanitizer (0.2.3)
+      version_gem (~> 1.1, >= 1.1.14)
+    base64 (0.3.0)
+    bigdecimal (4.1.2)
+    brakeman (8.0.6)
+      racc
+    bundler-audit (0.9.3)
+      bundler (>= 1.2.0)
+      thor (~> 1.0)
+    docile (1.4.1)
+    faraday (2.14.3)
+      faraday-net_http (>= 2.0, < 3.5)
+      json
+      logger
+    faraday-net_http (3.4.4)
+      net-http (~> 0.5)
+    hashie (5.1.0)
+      logger
+    json (2.21.2)
+    jwt (3.2.0)
+      base64
+    language_server-protocol (3.17.0.6)
+    lint_roller (1.1.0)
+    logger (1.7.0)
+    minitest (5.27.0)
+    mocha (2.8.2)
+      ruby2_keywords (>= 0.0.5)
+    multi_xml (0.9.1)
+      bigdecimal (>= 3.1, < 5)
+    net-http (0.9.1)
+      uri (>= 0.11.1)
+    oauth2 (2.0.25)
+      anonymous_loader (~> 0.1, >= 0.1.3)
+      auth-sanitizer (~> 0.2, >= 0.2.3)
+      faraday (>= 0.17.3, < 4.0)
+      jwt (>= 1.0, < 4.0)
+      logger (~> 1.2)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 4)
+      snaky_hash (~> 2.0, >= 2.0.7)
+      version_gem (~> 1.1, >= 1.1.14)
+    omniauth (2.1.4)
+      hashie (>= 3.4.6)
+      logger
+      rack (>= 2.2.3)
+      rack-protection
+    omniauth-oauth2 (1.9.0)
+      oauth2 (>= 2.0.2, < 3)
+      omniauth (~> 2.0)
+    parallel (2.1.0)
+    parser (3.3.12.0)
+      ast (~> 2.4.1)
+      racc
+    prism (1.9.0)
+    racc (1.8.1)
+    rack (3.2.7)
+    rack-protection (4.2.1)
+      base64 (>= 0.1.0)
+      logger (>= 1.6.0)
+      rack (>= 3.0.0, < 4)
+    rainbow (3.1.1)
+    rake (13.4.2)
+    regexp_parser (2.12.0)
+    rubocop (1.89.0)
+      json (~> 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
+      parallel (>= 1.10)
+      parser (>= 3.3.0.2)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.49.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.50.0)
+      parser (>= 3.3.7.2)
+      prism (~> 1.7)
+    ruby-progressbar (1.13.0)
+    ruby2_keywords (0.0.5)
+    simplecov (0.22.0)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.13.2)
+    simplecov_json_formatter (0.1.4)
+    snaky_hash (2.0.7)
+      hashie (>= 0.1.0, < 6)
+      version_gem (~> 1.1, >= 1.1.14)
+    thor (1.5.0)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.2.0)
+    uri (1.1.1)
+    version_gem (1.1.15)
+
+PLATFORMS
+  ruby
+  x86_64-linux
+
+DEPENDENCIES
+  brakeman
+  bundler-audit
+  minitest (~> 5.25)
+  mocha (~> 2.1)
+  omniauth-elitmus!
+  rake (~> 13.0)
+  rubocop
+  simplecov (~> 0.22)
+
+CHECKSUMS
+  anonymous_loader (0.1.3) sha256=084a18e2439144d955447dc11dfc982f41fcd1583ad32d4d55151325dc44cb55
+  ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383
+  auth-sanitizer (0.2.3) sha256=db10aac92cfbe4c64ab637eebcbe1d67395d1694798041362173370f59933e3c
+  base64 (0.3.0) sha256=27337aeabad6ffae05c265c450490628ef3ebd4b67be58257393227588f5a97b
+  bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd
+  brakeman (8.0.6) sha256=759cc69341115e6c2dcd47b6fd8649a0b9bd540e3585ac8a0a94e31c66fee386
+  bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9
+  docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e
+  faraday (2.14.3) sha256=1882247e6766615c8220b4392bf1d27f6ebb63d8e28267587cef1fb0bf37f278
+  faraday-net_http (3.4.4) sha256=0e78af151747ed1b00f33e25973b4bc220d7f16c00c39676817c8b12331eb588
+  hashie (5.1.0) sha256=c266471896f323c446ea8207f8ffac985d2718df0a0ba98651a3057096ca3870
+  json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a
+  jwt (3.2.0) sha256=5419b1fe37b1da0982bd07051f573a8b8789ab724c2aa7e785e4784a3ed217d7
+  language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0
+  lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87
+  logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203
+  minitest (5.27.0) sha256=2d3b17f8a36fe7801c1adcffdbc38233b938eb0b4966e97a6739055a45fa77d5
+  mocha (2.8.2) sha256=1f77e729db47e72b4ef776461ce20caeec2572ffdf23365b0a03608fee8f4eee
+  multi_xml (0.9.1) sha256=7ce766b59c17241ed62976caeae1fae9b2431b263398c35396239a68c4a64e57
+  net-http (0.9.1) sha256=25ba0b67c63e89df626ed8fac771d0ad24ad151a858af2cc8e6a716ca4336996
+  oauth2 (2.0.25) sha256=2f736a2f93c2caa67c1b08dc3c9889bb907d62643f3183fefaa1723cba6a82ac
+  omniauth (2.1.4) sha256=42a05b0496f0d22e1dd85d42aaf602f064e36bb47a6826a27ab55e5ba608763c
+  omniauth-elitmus (0.2.1)
+  omniauth-oauth2 (1.9.0) sha256=ed15f6d9d20991807ce114cc5b9c1453bce3645b64e51c68c90cff5ff153fee8
+  parallel (2.1.0) sha256=b35258865c2e31134c5ecb708beaaf6772adf9d5efae28e93e99260877b09356
+  parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828
+  prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85
+  racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f
+  rack (3.2.7) sha256=93e13e1c24f93556671d85d2d79fa228c3485815c50d7e2f265b5330c6528fb7
+  rack-protection (4.2.1) sha256=cf6e2842df8c55f5e4d1a4be015e603e19e9bc3a7178bae58949ccbb58558bac
+  rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a
+  rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701
+  regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb
+  rubocop (1.89.0) sha256=4dee8e3ee9c45e474834efd9e8d6fd031e8331c8dacdff0de4ad65ae0a6faae7
+  rubocop-ast (1.50.0) sha256=b9ca88300da0803ee222ad20cdb30494c0a784eed06fdc35d254b06d662788db
+  ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33
+  ruby2_keywords (0.0.5) sha256=ffd13740c573b7301cf7a2e61fc857b2a8e3d3aff32545d6f8300d8bae10e3ef
+  simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5
+  simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246
+  simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428
+  snaky_hash (2.0.7) sha256=7d02c70012a3f932e48860cd024577908300c9aa615e0cb9b450aaa749cbcb4d
+  thor (1.5.0) sha256=e3a9e55fe857e44859ce104a84675ab6e8cd59c650a49106a05f55f136425e73
+  unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42
+  unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f
+  uri (1.1.1) sha256=379fa58d27ffb1387eaada68c749d1426738bd0f654d812fcc07e7568f5c57c6
+  version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0
+
+BUNDLED WITH
+  4.0.10

data/Rakefile

@@ -1,2 +1,11 @@
-require "bundler/gem_tasks"
+# frozen_string_literal: true
 
+require 'bundler/gem_tasks'
+require 'rake/testtask'
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib' << 'test'
+  t.test_files = FileList['test/test.rb']
+end
+
+task default: :test

data/lib/omniauth/elitmus/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Omniauth
   module Elitmus
-    VERSION = "0.2.0"
+    VERSION = '0.2.1'
   end
 end

data/lib/omniauth/elitmus.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 require 'omniauth/elitmus/version'
 require 'omniauth/strategies/elitmus'

data/lib/omniauth/strategies/elitmus.rb

@@ -1,61 +1,68 @@
+# frozen_string_literal: true
+
 require 'omniauth/strategies/oauth2'
 require 'uri'
 
 module OmniAuth
-	module Strategies
-		class Elitmus < OmniAuth::Strategies::OAuth2
-			# class NoAuthorizationCodeError < StandardError; en				
-			DEFAULT_SCOPE = 'public'
-
-			#OATUH2_PROVIDER_URL = "https://www.elitmus.com"
-			option :name, :elitmus
-
-			option :client_options, {
-				:site => "https://www.elitmus.com"
-			}
-
-			option :authorize_options, [:scope, :auth_type]
-
-			uid {  raw_info['id']  }
-		
-			info do
-				prune!({
-					'email' => raw_info['email'],
-					'name' => raw_info['name']
-			 	})
-			end
-
-			extra do 
-				hash = {}
-      			hash['raw_info'] = raw_info unless skip_info?
-        		prune! hash
-			end 
-
-			def raw_info
-				@raw_info ||= access_token.get('/api/v1/me').parsed
-			end
-
-			def authorize_params
-				super.tap do |params|
-					%w[scope auth_type].each do |v|
-							if request.params[v]
-								params[v.to_sym] = request.params[v]
-							end
-					end
-					params[:scope] ||= DEFAULT_SCOPE
-				end
-			end	
-
-			def callback_url
-				options[:callback_url] || super
-			end
-
-			def prune!(hash)
-				hash.delete_if do |_, value|
-					prune!(value) if value.is_a?(Hash)
-					value.nil? || (value.respond_to?(:empty?) && value.empty?)
-        		end
-     		end
-		end
-	end
+  module Strategies
+    class Elitmus < OmniAuth::Strategies::OAuth2
+      # class NoAuthorizationCodeError < StandardError; en
+      DEFAULT_SCOPE = 'public'
+
+      # OATUH2_PROVIDER_URL = "https://www.elitmus.com"
+      option :name, :elitmus
+
+      option :client_options, {
+        site: 'https://www.elitmus.com'
+      }
+
+      option :authorize_options, %i[scope auth_type disable_external_sso]
+
+      uid {  raw_info['id'] }
+
+      info do
+        prune!({
+                 'email' => raw_info['email'],
+                 'name' => raw_info['name']
+               })
+      end
+
+      extra do
+        hash = {}
+        hash['raw_info'] = raw_info unless skip_info?
+        prune! hash
+      end
+
+      def raw_info
+        @raw_info ||= access_token.get('/api/v1/me').parsed
+      end
+
+      def authorize_params
+        super.tap do |params|
+          %w[scope auth_type disable_external_sso].each do |v|
+            params[v.to_sym] = request.params[v] if request.params[v]
+          end
+          params[:scope] ||= DEFAULT_SCOPE
+        end
+      end
+
+      def callback_url
+        # NOTE: intentionally NOT calling `super` here. OmniAuth's default
+        # callback_url is `full_host + callback_path + query_string`, where
+        # query_string is whatever happens to be on the CURRENT request. That
+        # makes redirect_uri drift between the /authorize request (which may
+        # carry extra params like disable_external_sso) and the token-exchange
+        # request (which additionally has code/state on it) - and OAuth2
+        # requires both to match exactly, so any drift breaks the exchange.
+        options[:callback_url] || (full_host + callback_path)
+      end
+
+      def prune!(hash)
+        hash.delete_if do |_, value|
+          prune!(value) if value.is_a?(Hash)
+          value.nil? || (value.respond_to?(:empty?) && value.empty?)
+        end
+      end
+    end
+  end
 end

data/lib/omniauth-elitmus.rb

@@ -1 +1,3 @@
-require 'omniauth/elitmus'
+# frozen_string_literal: true
+
+require 'omniauth/elitmus'

data/omniauth-elitmus.gemspec

@@ -1,25 +1,27 @@
-# coding: utf-8
-$:.push File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('lib', __dir__)
 require 'omniauth/elitmus/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "omniauth-elitmus"
+  spec.name          = 'omniauth-elitmus'
   spec.version       = Omniauth::Elitmus::VERSION
-  spec.authors       = ["Shireesh Jayashetty"]
-  spec.email         = ["shireesh@elitmus.com"]
+  spec.authors       = ['Shireesh Jayashetty']
+  spec.email         = ['shireesh@elitmus.com']
   spec.summary       = 'eLitmus OAuth2 Strategy for OmniAuth'
-  spec.homepage      = "https://github.com/elitmus/omniauth-elitmus"
-  spec.license       = "MIT"
+  spec.homepage      = 'https://github.com/elitmus/omniauth-elitmus'
+  spec.license       = 'MIT'
+  spec.required_ruby_version = '>= 3.1.5'
 
   spec.files         = `git ls-files`.split("\n")
-  spec.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   spec.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'omniauth-oauth2', '~> 1.8'
+  spec.add_dependency 'omniauth-oauth2', '~> 1.8'
 
   spec.add_development_dependency 'minitest', '~> 5.25'
-  spec.add_development_dependency 'mocha', '~>1.0'
-  spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'mocha', '~> 2.1'
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'simplecov', '~> 0.22'
+  spec.metadata['rubygems_mfa_required'] = 'true'
 end

data/test/helper.rb

@@ -1,9 +1,8 @@
+# frozen_string_literal: true
+
 require 'bundler/setup'
 require 'minitest/autorun'
-require 'mocha/setup'
-# require "codeclimate-test-reporter"
-# CodeClimate::TestReporter.start
-
+require 'mocha/minitest'
 require 'simplecov'
 SimpleCov.start
 
@@ -12,22 +11,23 @@ require 'omniauth/strategies/elitmus'
 OmniAuth.config.test_mode = true
 
 module BlockTestHelper
-  def test(name, &blk)
+  def test(name, &)
     method_name = "test_#{name.gsub(/\s+/, '_')}"
-    raise "Method already defined: #{method_name}" if instance_methods.include?(method_name.to_sym)
-    define_method method_name, &blk
+    raise "Method already defined: #{method_name}" if method_defined?(method_name.to_sym)
+
+    define_method(method_name, &)
   end
 end
 
 module CustomAssertions
   def assert_has_key(key, hash, msg = nil)
     msg = message(msg) { "Expected #{hash.inspect} to have key #{key.inspect}" }
-    assert hash.has_key?(key), msg
+    assert hash.key?(key), msg
   end
 
   def refute_has_key(key, hash, msg = nil)
     msg = message(msg) { "Expected #{hash.inspect} not to have key #{key.inspect}" }
-    refute hash.has_key?(key), msg
+    refute hash.key?(key), msg
   end
 end
 
@@ -59,4 +59,4 @@ class StrategyTestCase < TestCase
   end
 end
 
-Dir[File.expand_path('../support/**/*', __FILE__)].each &method(:require)
+Dir[File.expand_path('support/**/*', __dir__)].each(&method(:require))

data/test/support/shared_example.rb

@@ -1,4 +1,6 @@
-# NOTE it would be useful if this lived in omniauth-oauth2 eventually
+# frozen_string_literal: true
+
+# NOTE: it would be useful if this lived in omniauth-oauth2 eventually
 module OAuth2StrategyTests
   def self.included(base)
     base.class_eval do
@@ -8,33 +10,33 @@ module OAuth2StrategyTests
       include TokenParamsTests
     end
   end
-  
+
   module ClientTests
     extend BlockTestHelper
-    
+
     test 'should be initialized with symbolized client_options' do
-      @options = { :client_options => { 'authorize_url' => 'https://example.com' } }
+      @options = { client_options: { 'authorize_url' => 'https://example.com' } }
       assert_equal 'https://example.com', strategy.client.options[:authorize_url]
     end
   end
 
   module AuthorizeParamsTests
     extend BlockTestHelper
-    
+
     test 'should include any authorize params passed in the :authorize_params option' do
-      @options = { :authorize_params => { :foo => 'bar', :baz => 'zip' } }
+      @options = { authorize_params: { foo: 'bar', baz: 'zip' } }
       assert_equal 'bar', strategy.authorize_params['foo']
       assert_equal 'zip', strategy.authorize_params['baz']
     end
 
     test 'should include top-level options that are marked as :authorize_options' do
-      @options = { :authorize_options => [:scope, :foo], :scope => 'bar', :foo => 'baz' }
+      @options = { authorize_options: %i[scope foo], scope: 'bar', foo: 'baz' }
       assert_equal 'bar', strategy.authorize_params['scope']
       assert_equal 'baz', strategy.authorize_params['foo']
     end
-    
+
     test 'should exclude top-level options that are not passed' do
-      @options = { :authorize_options => [:bar] }
+      @options = { authorize_options: [:bar] }
       refute_has_key :bar, strategy.authorize_params
       refute_has_key 'bar', strategy.authorize_params
     end
@@ -51,7 +53,7 @@ module OAuth2StrategyTests
     end
 
     test 'should not store state in the session when present in authorize params vs. a random one' do
-      @options = { :authorize_params => { :state => 'bar' } }
+      @options = { authorize_params: { state: 'bar' } }
       refute_empty strategy.authorize_params['state']
       refute_equal 'bar', strategy.authorize_params[:state]
       refute_empty strategy.session['omniauth.state']
@@ -69,17 +71,17 @@ module OAuth2StrategyTests
 
   module TokenParamsTests
     extend BlockTestHelper
-    
+
     test 'should include any authorize params passed in the :token_params option' do
-      @options = { :token_params => { :foo => 'bar', :baz => 'zip' } }
+      @options = { token_params: { foo: 'bar', baz: 'zip' } }
       assert_equal 'bar', strategy.token_params['foo']
       assert_equal 'zip', strategy.token_params['baz']
     end
 
     test 'should include top-level options that are marked as :token_options' do
-      @options = { :token_options => [:scope, :foo], :scope => 'bar', :foo => 'baz' }
+      @options = { token_options: %i[scope foo], scope: 'bar', foo: 'baz' }
       assert_equal 'bar', strategy.token_params['scope']
       assert_equal 'baz', strategy.token_params['foo']
     end
   end
-end
+end

data/test/test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'helper'
 require 'omniauth-elitmus'
 
@@ -11,46 +13,44 @@ class ClientTest < StrategyTestCase
   end
 
   test 'has correct default authorize url' do
-    assert_equal '/oauth/authorize', strategy.client.options[:authorize_url]
+    assert_equal 'oauth/authorize', strategy.client.options[:authorize_url]
   end
 
   test 'has correct default token url' do
-    assert_equal '/oauth/token', strategy.client.options[:token_url]
+    assert_equal 'oauth/token', strategy.client.options[:token_url]
   end
 
   test 'should be initialized with only site option in symbolized client_options' do
-    @options = { :client_options => { 'site' => 'https://codephode.com' } }
+    @options = { client_options: { 'site' => 'https://codephode.com' } }
     assert_equal 'https://codephode.com', strategy.client.site
-    assert_equal '/oauth/authorize', strategy.client.options[:authorize_url]
-    assert_equal '/oauth/token', strategy.client.options[:token_url]
+    assert_equal 'oauth/authorize', strategy.client.options[:authorize_url]
+    assert_equal 'oauth/token', strategy.client.options[:token_url]
   end
 
   test 'should be initialized with site and authorize_url in symbolized client_options' do
-    @options = { :client_options => { 'site' => 'https://codephode.com', 'authorize_url' => '/custom/auth' } }
+    @options = { client_options: { 'site' => 'https://codephode.com', 'authorize_url' => '/custom/auth' } }
     assert_equal 'https://codephode.com', strategy.client.site
     assert_equal '/custom/auth', strategy.client.options[:authorize_url]
-    assert_equal '/oauth/token', strategy.client.options[:token_url]
+    assert_equal 'oauth/token', strategy.client.options[:token_url]
   end
 
-
   test 'should be initialized with site and token_url in symbolized client_options' do
-    @options = { :client_options => { 'site' => 'https://codephode.com', 'token_url' => '/custom/token' } }
+    @options = { client_options: { 'site' => 'https://codephode.com', 'token_url' => '/custom/token' } }
     assert_equal 'https://codephode.com', strategy.client.site
-    assert_equal '/oauth/authorize', strategy.client.options[:authorize_url]
+    assert_equal 'oauth/authorize', strategy.client.options[:authorize_url]
     assert_equal '/custom/token', strategy.client.options[:token_url]
   end
 
   test 'should be initialized with symbolized client_options' do
-    @options = { :client_options => { 'site' => 'https://staging.shrey.com', 'authorize_url' => '/custom/auth', 'token_url' => '/custom/token' } }
+    @options = { client_options: { 'site' => 'https://staging.shrey.com', 'authorize_url' => '/custom/auth', 'token_url' => '/custom/token' } }
     assert_equal 'https://staging.shrey.com', strategy.client.site
     assert_equal '/custom/auth', strategy.client.options[:authorize_url]
     assert_equal '/custom/token', strategy.client.options[:token_url]
   end
-
 end
 
 class CallbackUrlTest < StrategyTestCase
-  test "returns the default callback url" do
+  test 'returns the default callback url' do
     url_base = 'http://myconsumerapp.authrequest.com'
     @request.stubs(:url).returns("#{url_base}/some/page")
     strategy.stubs(:script_name).returns('') # as not to depend on Rack env
@@ -58,7 +58,7 @@ class CallbackUrlTest < StrategyTestCase
     assert_equal "#{url_base}/auth/elitmus/callback", strategy.callback_url
   end
 
-  test "returns path from callback_path option" do
+  test 'returns path from callback_path option' do
     # @options = { :callback_path => "/auth/some/custom/path/callback"}
     url_base = 'http://myconsumerapp.authrequest.com'
     @request.stubs(:url).returns("#{url_base}/page/path")
@@ -67,18 +67,16 @@ class CallbackUrlTest < StrategyTestCase
     assert_equal "#{url_base}/auth/some/custom/path/callback", strategy.callback_url
   end
 
-  test "returns url from callback_url option" do
+  test 'returns url from callback_url option' do
     url = 'http://myconsumerapp.authrequest.com/auth/elitmus/callback'
-    @options = { :callback_url => url }
+    @options = { callback_url: url }
     assert_equal url, strategy.callback_url
   end
 end
 
 class AuthorizeParamsTest < StrategyTestCase
-
-
   test 'should include top-level options with their default values if marked as :authorize_options' do
-    @options = { :authorize_options => [:scope, :foo], :foo => 'baz' }
+    @options = { authorize_options: %i[scope foo], foo: 'baz' }
     assert_equal 'public', strategy.authorize_params['scope']
     assert_equal 'baz', strategy.authorize_params['foo']
   end
@@ -94,6 +92,12 @@ class AuthorizeParamsTest < StrategyTestCase
     assert_equal 'reauthenticate', strategy.authorize_params[:auth_type]
   end
 
+  test 'includes disable_external_sso parameter from request when present' do
+    @request.stubs(:params).returns({ 'disable_external_sso' => 'true' })
+    assert strategy.authorize_params.is_a?(Hash)
+    assert_equal 'true', strategy.authorize_params[:disable_external_sso]
+  end
+
   test 'overrides default scope with parameter passed from request' do
     @request.stubs(:params).returns({ 'scope' => 'admin' })
     assert strategy.authorize_params.is_a?(Hash)
@@ -113,7 +117,7 @@ class UidTest < StrategyTestCase
 end
 
 class InfoTestOptionalDataPresent < StrategyTestCase
-   def setup
+  def setup
     super
     @raw_info ||= { 'name' => 'Fred Smith' }
     strategy.stubs(:raw_info).returns(@raw_info)
@@ -127,7 +131,6 @@ class InfoTestOptionalDataPresent < StrategyTestCase
     @raw_info['email'] = 'fred@smith.com'
     assert_equal 'fred@smith.com', strategy.info['email']
   end
-
 end
 
 class InfoTestOptionalDataNotPresent < StrategyTestCase
@@ -175,18 +178,16 @@ class RawInfoTest < StrategyTestCase
     super
     @access_token = stub('OAuth2::AccessToken')
     @appsecret_proof = 'appsecret_proof'
-    @options = {:appsecret_proof => @appsecret_proof}
+    @options = { appsecret_proof: @appsecret_proof }
   end
 
   test 'should not include raw_info in extras hash when skip_info is specified' do
-    @options = { :skip_info => true }
-    strategy.stubs(:raw_info).returns({:foo => 'bar' })
+    @options = { skip_info: true }
+    strategy.stubs(:raw_info).returns({ foo: 'bar' })
     refute_has_key 'raw_info', strategy.extra
   end
 end
 
-
-
 class CredentialsTest < StrategyTestCase
   def setup
     super
@@ -253,5 +254,4 @@ class ExtraTest < StrategyTestCase
   test 'contains raw info' do
     assert_equal({ 'raw_info' => @raw_info }, strategy.extra)
   end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-elitmus
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Shireesh Jayashetty
@@ -43,14 +43,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -69,16 +69,16 @@ dependencies:
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.22'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.22'
 email:
 - shireesh@elitmus.com
 executables: []
@@ -88,9 +88,11 @@ files:
 - ".github/workflows/generator-generic-ossf-slsa3-publish.yml"
 - ".github/workflows/rubyonrails.yml"
 - ".gitignore"
+- ".rubocop.yml"
 - ".tool-versions"
 - ".travis.yml"
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -105,7 +107,8 @@ files:
 homepage: https://github.com/elitmus/omniauth-elitmus
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib
@@ -113,7 +116,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.1.5
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -123,7 +126,4 @@ requirements: []
 rubygems_version: 4.0.10
 specification_version: 4
 summary: eLitmus OAuth2 Strategy for OmniAuth
-test_files:
-- test/helper.rb
-- test/support/shared_example.rb
-- test/test.rb
+test_files: []