omniauth-oauth2-generic 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d322d524921259f9ade1b90b405ae14a9431418b
-  data.tar.gz: be960eff1effb4ba206adfa497d32519fc001e0d
+SHA256:
+  metadata.gz: 9ab02645e69c3bdce48457796f4cd377c415f8e82f8cfca4c92f5711fdddcc93
+  data.tar.gz: 98345a14f3197560446be7f8eecbb3a1d7a2e062d5304d2a1df3f2d3e014ec81
 SHA512:
-  metadata.gz: 56b3059fbdea79c3049c6d5e3ebb2b7196c7141a12a95cdfdc5c266ed043d7a1e9f83632232c637aeac73d3c621fc8e19036799602722660ddfd88fa6c905ab9
-  data.tar.gz: 7fa60c0e4e331df262aa3ab0dc12d72380c169d5eab3f8b3b48d6dd5d3636e7d4ab32b9ce9f349fba5e9c68ed316de164d85a9f693287d7a8734802594ce9829
+  metadata.gz: c49f629d139b7133c5322eb95efbec57da0dd7a0747e4318886c5d02a651fd3e49ae4e04e586af4f7ce54598875509460266ecb32133a2d6a68dae87a37b0422
+  data.tar.gz: 3f5118cef68d0f30213ff7eefc6bb7b8812e3e662107aeb782556eb437a0b89d9283bd987da94c51367550c2f615904a5ac14aabd04cc52ba8a93e77a2b4a1c1

data/.gitignore

@@ -1,10 +1,11 @@
 /.bundle/
 /.yardoc
-/Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/
 /pkg/
 /spec/reports/
 /tmp/
-.ruby-version
+
+# Rubymine files
+/.idea

data/.gitlab-ci.yml

@@ -0,0 +1,46 @@
+image: 'satorix/base'
+
+cache:
+  key: "$CI_PROJECT_ID"
+  paths:
+    - 'tmp/satorix/cache' # To cache buildpack gems between runs.
+
+
+.satorix: &satorix
+  script:
+    - gem install satorix --no-document
+    - satorix
+
+
+# bundler-audit
+# Patch-level verification for Bundler
+# https://github.com/rubysec/bundler-audit
+# TODO : Restore original version
+custom_bundler_audit:
+  <<: *satorix
+
+
+# RSpec
+# Behaviour Driven Development for Ruby
+# http://rspec.info/
+rspec:
+  <<: *satorix
+
+
+# RuboCop
+# A Ruby static code analyzer, based on the community Ruby style guide.
+# https://github.com/bbatsov/rubocop
+rubocop:
+  <<: *satorix
+  allow_failure: true
+
+
+
+# This is a custom job, defined at satorix/CI/deploy/rubygems.rb
+deploy_to_rubygems:
+  stage: deploy
+  only:
+    - master
+  except:
+    - schedules
+  <<: *satorix

data/.rubocop.yml

@@ -0,0 +1,48 @@
+AllCops:
+  Exclude:
+    - 'bin/**/*'
+    - 'tmp/**/*'
+    - 'vendor/**/*'
+  NewCops: enable
+
+# We develop in a higher version than is absolutely required.
+Gemspec/RequiredRubyVersion:
+  Enabled: false
+
+Layout/SpaceInsideStringInterpolation:
+  EnforcedStyle: space
+
+# TODO - fix/enable layout lines cops ------------------------------------------------------
+
+Layout/EmptyLines:
+  Enabled: false
+
+Layout/EmptyLinesAroundClassBody:
+  Enabled: false
+
+Layout/EmptyLinesAroundModuleBody:
+  Enabled: false
+
+# ------------------------------------------------------------------------------------------
+
+Layout/EmptyLineBetweenDefs:
+  NumberOfEmptyLines: 2
+
+Layout/IndentationConsistency:
+  EnforcedStyle: indented_internal_methods
+
+# Ignore spec for large contexts
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*'
+
+Naming/FileName:
+  Exclude:
+    - 'lib/omniauth-oauth2-generic.rb'
+
+Style/Documentation:
+  Enabled: false
+
+# The recommended alternative does not work for this application.
+Style/ModuleFunction:
+  Enabled: false

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.6.6

data/Gemfile

@@ -1,3 +1,7 @@
+# frozen_string_literal: true
+
+ruby File.open("#{ File.dirname(__FILE__) }/.ruby-version", &:gets).strip[/ruby-(.+)/i, 1]
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in omniauth-oauth2-generic.gemspec

data/Gemfile.lock

@@ -0,0 +1,43 @@
+PATH
+  remote: .
+  specs:
+    omniauth-oauth2-generic (0.2.5)
+      omniauth-oauth2 (~> 1.0)
+      rake
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    faraday (1.0.1)
+      multipart-post (>= 1.2, < 3)
+    hashie (4.1.0)
+    jwt (2.2.1)
+    multi_json (1.14.1)
+    multi_xml (0.6.0)
+    multipart-post (2.1.1)
+    oauth2 (1.4.4)
+      faraday (>= 0.8, < 2.0)
+      jwt (>= 1.0, < 3.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 3)
+    omniauth (1.9.1)
+      hashie (>= 3.4.6)
+      rack (>= 1.6.2, < 3)
+    omniauth-oauth2 (1.6.0)
+      oauth2 (~> 1.1)
+      omniauth (~> 1.9)
+    rack (2.2.3)
+    rake (13.0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  omniauth-oauth2-generic!
+
+RUBY VERSION
+   ruby 2.6.6p146
+
+BUNDLED WITH
+   1.17.3

data/Rakefile

@@ -1,2 +1,4 @@
-require "bundler/gem_tasks"
-task :default => :spec
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
+task default: :spec

data/bin/console

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require "bundler/setup"
-require "omniauth/satorix"
+require 'bundler/setup'
+require 'omniauth/satorix'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +11,5 @@ require "omniauth/satorix"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start

data/lib/omniauth-oauth2-generic.rb

@@ -1,2 +1,4 @@
-require "omniauth-oauth2-generic/version"
-require "omniauth/strategies/oauth2_generic"
+# frozen_string_literal: true
+
+require 'omniauth-oauth2-generic/version'
+require 'omniauth/strategies/oauth2_generic'

data/lib/omniauth-oauth2-generic/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Omniauth
   module OAuth2Generic
-    VERSION = "0.2.4"
+    VERSION = '0.2.5'
   end
 end

data/lib/omniauth/strategies/oauth2_generic.rb

@@ -1,33 +1,65 @@
+# frozen_string_literal: true
+
 require 'omniauth-oauth2'
 
 module OmniAuth
   module Strategies
     class OAuth2Generic < OmniAuth::Strategies::OAuth2
+
       option :name, 'oauth2_generic'
 
-      option :client_options, { # Defaults are set for GitLab example implementation
-        site: 'https://gitlab.com', # The URL for your OAuth 2 server
-        user_info_url: '/api/v3/user', # The endpoint on your OAuth 2 server that provides user info for the current user
-        authorize_url: '/oauth/authorize', # The authorization endpoint for your OAuth server
-        token_url: '/oauth/token' # The token request endpoint for your OAuth server
-      }
-
-      option :user_response_structure, { # info about the structure of the response from the oauth server's user_info_url (specified above)
-        root_path: [], # The default path to the user attributes (i.e. ['data', 'attributes'])
-        id_path: 'id', # The name or path to the user ID (i.e. ['data', 'id]').  Scalars are considered relative to `root_path`, Arrays are absolute paths.
-        attributes: { # Alternate paths or names for any attributes that don't match the default
-          name: 'name', # Scalars are treated as relative (i.e. 'username' would point to response['data']['attributes']['username'], given a root_path of ['data', 'attributes'])
-          email: 'email', # Arrays are treated as absolute paths (i.e. ['included', 'contacts', 0, 'email'] would point to response['included']['contacts'][0]['email'], regardless of root_path)
-          nickname: 'nickname',
-          first_name: 'first_name',
-          last_name: 'last_name',
-          location: 'location',
-          description: 'description',
-          image: 'image',
-          phone: 'phone',
-          urls: 'urls'
-        }
-      }
+      option :client_options,
+             {
+               # Defaults are set for GitLab example implementation
+
+               # The URL for your OAuth 2 server
+               site: 'https://gitlab.com',
+               # The endpoint on your OAuth 2 server that provides info for the current user
+               user_info_url: '/api/v3/user',
+               # The authorization endpoint for your OAuth server
+               authorize_url: '/oauth/authorize',
+               # The token request endpoint for your OAuth server
+               token_url: '/oauth/token'
+             }
+
+      option :user_response_structure,
+             {
+               # info about the structure of the response from the oauth server's user_info_url (specified above)
+
+               # The default path to the user attributes (i.e. ['data', 'attributes'])
+               root_path: [],
+
+               # The name or path to the user ID (i.e. ['data', 'id]').
+               # Scalars are considered relative to `root_path`, Arrays are absolute paths.
+               id_path: 'id',
+
+               # Alternate paths or names for any attributes that don't match the default
+               attributes: {
+                 # Scalars are treated as relative (i.e. 'username' would point to
+                 # response['data']['attributes']['username'], given a root_path of ['data', 'attributes'])
+                 name: 'name',
+
+                 # Arrays are treated as absolute paths (i.e. ['included', 'contacts', 0, 'email'] would point to
+                 # response['included']['contacts'][0]['email'], regardless of root_path)
+                 email: 'email',
+
+                 nickname: 'nickname',
+
+                 first_name: 'first_name',
+
+                 last_name: 'last_name',
+
+                 location: 'location',
+
+                 description: 'description',
+
+                 image: 'image',
+
+                 phone: 'phone',
+
+                 urls: 'urls'
+               }
+             }
 
       option :redirect_url
 
@@ -36,10 +68,9 @@ module OmniAuth
       end
 
       info do
-        user_paths[:attributes].inject({}) do |user_hash, (field, path)|
+        user_paths[:attributes].each_with_object({}) do |(field, path), user_hash|
           value = fetch_user_info(path)
           user_hash[field] = value if value
-          user_hash
         end
       end
 
@@ -47,32 +78,43 @@ module OmniAuth
         { raw_info: raw_info }
       end
 
+
       def raw_info
         @raw_info ||= access_token.get(options.client_options[:user_info_url]).parsed
       end
 
+
       def authorize_params
         params = super
-        Hash[params.map { |k, v| [k, v.respond_to?(:call) ? v.call(request) : v] }]
+        params.transform_values { |v| v.respond_to?(:call) ? v.call(request) : v }
       end
 
+
       private
 
-      def user_paths
-        options.user_response_structure
-      end
 
-      def fetch_user_info(path)
-        return nil unless path
-        full_path = path.is_a?(Array) ? path : Array(user_paths[:root_path]) + [path]
-        full_path.inject(raw_info) { |info, key| info[key] rescue nil }
-      end
+        def user_paths
+          options.user_response_structure
+        end
 
-      def callback_url
-        options.redirect_url || (full_host + script_name + callback_path)
-      end
+
+        def fetch_user_info(path)
+          return nil unless path
+
+          full_path = path.is_a?(Array) ? path : Array(user_paths[:root_path]) + [path]
+          full_path.inject(raw_info) do |info, key|
+            info[key]
+          rescue StandardError
+            nil
+          end
+        end
+
+
+        def callback_url
+          options.redirect_url || (full_host + script_name + callback_path)
+        end
     end
   end
 end
 
-OmniAuth.config.add_camelization 'oauth2_generic', 'OAuth2Generic'
+OmniAuth.config.add_camelization 'oauth2_generic', 'OAuth2Generic'

data/omniauth-oauth2-generic.gemspec

@@ -1,31 +1,28 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'omniauth-oauth2-generic/version'
 
-Gem::Specification.new do |spec|
-  spec.name          = "omniauth-oauth2-generic"
-  spec.version       = Omniauth::OAuth2Generic::VERSION
-  spec.authors       = ["Joe Marty"]
-  spec.email         = ["jmarty@iexposure.com"]
+Gem::Specification.new do |gem|
+  gem.name = 'omniauth-oauth2-generic'
+  gem.version = Omniauth::OAuth2Generic::VERSION
+  gem.authors = ['Satorix']
+  gem.email = ['satorix@iexposure.com']
+
+  gem.summary = 'Generic, Configurable OmniAuth Strategy for OAuth2 providers'
+  gem.description = gem.summary
+  gem.homepage = 'https://gitlab.com/satorix/omniauth-oauth2-generic'
+  gem.license = 'MIT'
 
-  spec.summary       = %q{Generic, Configurable OmniAuth Strategy for OAuth2 providers}
-  spec.description   = spec.summary
-  spec.homepage      = "https://gitlab.com/satorix/omniauth-oauth2-generic"
-  spec.license       = "MIT"
+  gem.required_ruby_version = '>= 1.9'
 
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+  gem.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.bindir        = "bin"
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  gem.require_paths = ['lib']
 
-  spec.add_dependency "omniauth-oauth2", "~> 1.0"
+  gem.add_dependency 'omniauth-oauth2', '~> 1.0'
+  gem.add_dependency 'rake'
 
-  spec.add_development_dependency "bundler", "~> 1.13"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.1"
-  spec.add_development_dependency "rack-test"
-  spec.add_development_dependency "webmock"
 end

data/satorix/CI/deploy/rubygems.rb

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+module Satorix
+  module CI
+    module Deploy
+      module Rubygems
+
+
+        require 'fileutils'
+
+
+        include Satorix::Shared::Console
+
+
+        extend self
+
+
+        def go
+          log_bench('Generating rubygems.org configuration_file...') { generate_rubygems_configuration_file }
+          log_bench('Preparing gem build directory...') { prepare_gem_build_directory }
+          log_bench('Building gem...') { build_gem }
+          built_gems.each { |gem| log_bench("Publishing #{ File.basename gem }...") { publish_gem gem } }
+        end
+
+
+        private
+
+
+          def build_gem
+            Dir.chdir(Satorix.app_dir) do
+              run_command 'bundle exec rake build'
+            end
+          end
+
+
+          def built_gems
+            Dir.glob(File.join(gem_build_directory, '*.gem')).select { |e| File.file? e }
+          end
+
+
+          def gem_build_directory
+            File.join Satorix.app_dir, 'pkg'
+          end
+
+
+          def generate_rubygems_configuration_file
+            path = File.join(Dir.home, '.gem')
+            FileUtils.mkdir_p(path) unless File.exist?(path)
+
+            file = File.join(path, 'credentials')
+            File.open(file, 'w') { |f| f.write rubygems_configuration_file_contents }
+            FileUtils.chmod 0o600, file
+          end
+
+
+          def prepare_gem_build_directory
+            run_command "rm -rf #{ gem_build_directory }"
+            FileUtils.mkdir_p gem_build_directory
+          end
+
+
+          def publish_gem(gem)
+            run_command "gem push #{ gem } --config-file #{ File.join(Dir.home, '.gem', 'credentials') }"
+          rescue RuntimeError
+            # To prevent the display of an ugly stacktrace.
+            abort "\nGem was not published!"
+          end
+
+
+          def rubygems_api_key
+            ENV['SATORIX_CI_RUBYGEMS_API_KEY']
+          end
+
+
+          def rubygems_configuration_file_contents
+            "---\n:rubygems_api_key: #{ rubygems_api_key }"
+          end
+
+
+      end
+    end
+  end
+end

data/satorix/CI/test/custom_bundler_audit.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Satorix
+  module CI
+    module Test
+      module CustomBundlerAudit
+
+        include Satorix::Shared::Console
+
+        extend self
+
+
+        def go
+          log_bench('Displaying current Ruby version...') { run_command 'ruby -v' }
+          log_bench('Installing bundler-audit...') { install_gem }
+          log_bench('Auditing Gemfile.lock...') { run_scan }
+        end
+
+
+        private
+
+
+          def install_gem
+            run_command "gem install bundler-audit --no-document --bindir #{ Satorix.bin_dir }"
+          end
+
+
+          def run_scan
+            run_command 'bundle-audit check --update  --ignore CVE-2015-9284'
+          end
+
+
+      end
+    end
+  end
+end

data/satorix/custom.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Satorix
+  module Custom
+
+    # Ensure the files required by the available_jobs method are available.
+    require_relative 'CI/deploy/rubygems.rb'
+    require_relative 'CI/test/custom_bundler_audit'
+
+
+    extend self
+
+
+    def available_jobs
+      {
+        deploy: {
+          deploy_to_rubygems: Satorix::CI::Deploy::Rubygems
+        },
+        test: {
+          custom_bundler_audit: Satorix::CI::Test::CustomBundlerAudit
+        }
+      }
+    end
+
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-oauth2-generic
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
-- Joe Marty
+- Satorix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-17 00:00:00.000000000 Z
+date: 2020-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
@@ -24,70 +24,14 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.13'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
-- !ruby/object:Gem::Dependency
-  name: rack-test
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -96,17 +40,19 @@ dependencies:
         version: '0'
 description: Generic, Configurable OmniAuth Strategy for OAuth2 providers
 email:
-- jmarty@iexposure.com
-executables:
-- console
-- setup
+- satorix@iexposure.com
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".gitlab-ci.yml"
 - ".rspec"
+- ".rubocop.yml"
+- ".ruby-version"
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.md
 - README.md
 - Rakefile
@@ -116,6 +62,9 @@ files:
 - lib/omniauth-oauth2-generic/version.rb
 - lib/omniauth/strategies/oauth2_generic.rb
 - omniauth-oauth2-generic.gemspec
+- satorix/CI/deploy/rubygems.rb
+- satorix/CI/test/custom_bundler_audit.rb
+- satorix/custom.rb
 homepage: https://gitlab.com/satorix/omniauth-oauth2-generic
 licenses:
 - MIT
@@ -128,15 +77,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Generic, Configurable OmniAuth Strategy for OAuth2 providers