sorcery 0.17.0 → 0.18.0

data/lib/sorcery/providers/base.rb

@@ -26,7 +26,7 @@ module Sorcery
       end
 
       def self.name
-        super.gsub(/Sorcery::Providers::/, '').downcase
+        super.gsub('Sorcery::Providers::', '').downcase
       end
 
       # Ensure that all descendant classes are loaded before run this

data/lib/sorcery/providers/facebook.rb

@@ -48,9 +48,9 @@ module Sorcery
         # Fix: replace default oauth2 options, specially to prevent the Faraday gem which
         # concatenates with "/", removing the Facebook api version
         options = {
-          site:          File.join(@site, api_version.to_s),
+          site: File.join(@site, api_version.to_s),
           authorize_url: File.join(@auth_site, api_version.to_s, auth_path),
-          token_url:     token_url
+          token_url: token_url
         }
 
         @scope = access_permissions.present? ? access_permissions.join(',') : scope

data/lib/sorcery/providers/github.rb

@@ -26,7 +26,7 @@ module Sorcery
 
         auth_hash(access_token).tap do |h|
           h[:user_info] = JSON.parse(response.body).tap do |uih|
-            uih['email'] = primary_email(access_token) if scope =~ /user/
+            uih['email'] = primary_email(access_token) if scope&.include?('user')
           end
           h[:uid] = h[:user_info]['id']
         end
@@ -48,10 +48,10 @@ module Sorcery
       end
 
       def primary_email(access_token)
-        response = access_token.get(user_info_path + '/emails')
+        response = access_token.get("#{user_info_path}/emails")
         emails = JSON.parse(response.body)
         primary = emails.find { |i| i['primary'] }
-        primary && primary['email'] || emails.first && emails.first['email']
+        (primary && primary['email']) || (emails.first && emails.first['email'])
       end
     end
   end

data/lib/sorcery/providers/heroku.rb

@@ -8,8 +8,7 @@ module Sorcery
     # config.heroku.scope = "read"
     # config.heroku.user_info_mapping = {:email => "email", :name => "email" }
 
-    # NOTE:
-    # The full path must be set for OAuth Callback URL when configuring the API Client Information on Heroku.
+    # NOTE: The full path must be set for OAuth Callback URL when configuring the API Client Information on Heroku.
 
     class Heroku < Base
       include Protocols::Oauth2

data/lib/sorcery/providers/jira.rb

@@ -13,6 +13,7 @@ module Sorcery
                     :user_info_path, :site, :signature_method, :private_key_file, :callback_url
 
       def initialize
+        super
         @configuration = {
           authorize_path: '/authorize',
           request_token_path: '/request-token',
@@ -59,8 +60,8 @@ module Sorcery
       # tries to login the user from access token
       def process_callback(params, session)
         args = {
-          oauth_verifier:       params[:oauth_verifier],
-          request_token:        session[:request_token],
+          oauth_verifier: params[:oauth_verifier],
+          request_token: session[:request_token],
           request_token_secret: session[:request_token_secret]
         }
 

data/lib/sorcery/providers/line.rb

@@ -38,11 +38,9 @@ module Sorcery
 
       # overrides oauth2#authorize_url to add bot_prompt query.
       def authorize_url(options = {})
-        options.merge!({
-          connection_opts: { params: { bot_prompt: bot_prompt } }
-        }) if bot_prompt.present?
+        options[:connection_opts] = { params: { bot_prompt: bot_prompt } } if bot_prompt.present?
 
-        super(options)
+        super
       end
 
       # tries to login the user from access token

data/lib/sorcery/providers/microsoft.rb

@@ -28,7 +28,7 @@ module Sorcery
           response_type: 'code'
         }
         options.merge!(oauth_params)
-        super(options)
+        super
       end
 
       def get_user_hash(access_token)

data/lib/sorcery/providers/twitter.rb

@@ -44,8 +44,8 @@ module Sorcery
       # tries to login the user from access token
       def process_callback(params, session)
         args = {
-          oauth_verifier:       params[:oauth_verifier],
-          request_token:        session[:request_token],
+          oauth_verifier: params[:oauth_verifier],
+          request_token: session[:request_token],
           request_token_secret: session[:request_token_secret]
         }
 

data/lib/sorcery/providers/vk.rb

@@ -26,10 +26,10 @@ module Sorcery
 
         params = {
           access_token: access_token.token,
-          uids:         access_token.params['user_id'],
-          fields:       user_info_mapping.values.join(','),
-          scope:        scope,
-          v:            api_version.to_s
+          uids: access_token.params['user_id'],
+          fields: user_info_mapping.values.join(','),
+          scope: scope,
+          v: api_version.to_s
         }
 
         response = access_token.get(user_info_url, params: params)

data/lib/sorcery/providers/xing.rb

@@ -13,6 +13,7 @@ module Sorcery
                     :user_info_path
 
       def initialize
+        super
         @configuration = {
           site: 'https://api.xing.com/v1',
           authorize_path: '/authorize',
@@ -48,8 +49,8 @@ module Sorcery
       # tries to login the user from access token
       def process_callback(params, session)
         args = {
-          oauth_verifier:       params[:oauth_verifier],
-          request_token:        session[:request_token],
+          oauth_verifier: params[:oauth_verifier],
+          request_token: session[:request_token],
           request_token_secret: session[:request_token_secret]
         }
 

data/lib/sorcery/test_helpers/internal/rails.rb

@@ -19,20 +19,16 @@ module Sorcery
 
           # remove all plugin before_actions so they won't fail other tests.
           # I don't like this way, but I didn't find another.
-          # hopefully it won't break until Rails 4.
-          chain = if Gem::Version.new(::Rails::VERSION::STRING) >= Gem::Version.new('4.1.0')
-                    SorceryController._process_action_callbacks.send :chain
-                  else
-                    SorceryController._process_action_callbacks
-                  end
-
+          callbacks = SorceryController._process_action_callbacks
+          chain = callbacks.send :chain
           chain.delete_if { |c| SUBMODULES_AUTO_ADDED_CONTROLLER_FILTERS.include?(c.filter) }
+          callbacks.instance_variable_set(:@all_callbacks, nil)
+          callbacks.instance_variable_set(:@single_callbacks, {})
 
           # configure
           ::Sorcery::Controller::Config.submodules = submodules
-          ::Sorcery::Controller::Config.user_class = nil
-          ActionController::Base.send(:include, ::Sorcery::Controller)
           ::Sorcery::Controller::Config.user_class = 'User'
+          ActionController::Base.include(::Sorcery::Controller)
 
           ::Sorcery::Controller::Config.user_config do |user|
             options.each do |property, value|
@@ -40,11 +36,6 @@ module Sorcery
             end
           end
           User.authenticates_with_sorcery!
-          return unless defined?(DataMapper) && User.ancestors.include?(DataMapper::Resource)
-
-          DataMapper.auto_migrate!
-          User.finalize
-          Authentication.finalize
         end
 
         def sorcery_controller_property_set(property, value)
@@ -62,14 +53,6 @@ module Sorcery
         def clear_user_without_logout
           subject.instance_variable_set(:@current_user, nil)
         end
-
-        if ::Rails.version < '5.0.0'
-          %w[get post put].each do |method|
-            define_method(method) do |action, options = {}|
-              super action, options[:params] || {}, options[:session]
-            end
-          end
-        end
       end
     end
   end

data/lib/sorcery/test_helpers/internal.rb

@@ -17,14 +17,14 @@ module Sorcery
       # a patch to fix a bug in testing that happens when you 'destroy' a session twice.
       # After the first destroy, the session is an ordinary hash, and then when destroy
       # is called again there's an exception.
-      class ::Hash # rubocop:disable Style/ClassAndModuleChildren
+      class ::Hash
         def destroy
           clear
         end
       end
 
       def build_new_user(attributes_hash = nil)
-        user_attributes_hash = attributes_hash || { username: 'gizmo', email: 'bla@bla.com', password: 'secret' }
+        user_attributes_hash = attributes_hash || { username: 'gizmo', email: 'bla@example.com', password: 'secret' }
         @user = User.new(user_attributes_hash)
       end
 
@@ -58,8 +58,8 @@ module Sorcery
         end
       end
 
-      def update_model(&block)
-        User.class_exec(&block)
+      def update_model(&)
+        User.class_exec(&)
       end
 
       private
@@ -70,8 +70,6 @@ module Sorcery
         User && Object.send(:remove_const, 'User')
         load 'user.rb'
 
-        return unless User.respond_to?(:reset_column_information)
-
         User.reset_column_information
       end
     end

data/lib/sorcery/test_helpers/rails/integration.rb

@@ -10,7 +10,7 @@ module Sorcery
 
           username_attr = user.sorcery_config.username_attribute_names.first
           username = user.send(username_attr)
-          page.driver.send(http_method, route, :"#{username_attr}" => username, :password => 'secret')
+          page.driver.send(http_method, route, "#{username_attr}": username, password: 'secret')
         end
 
         # Accepts route and HTTP method arguments

data/lib/sorcery/test_helpers/rails/request.rb

@@ -4,7 +4,7 @@ module Sorcery
       module Request
         # Accepts arguments for user to login, the password, route to use and HTTP method
         # Defaults - @user, 'secret', 'user_sessions_url' and http_method: POST
-        def login_user(user = nil, password = 'secret', route = nil, http_method = :post)
+        def login_user(user = nil, password = 'secret', route = nil, http_method = :post) # rubocop:disable Metrics/ParameterLists
           user ||= @user
           route ||= user_sessions_url
 

data/lib/sorcery/version.rb

@@ -1,3 +1,3 @@
 module Sorcery
-  VERSION = '0.17.0'.freeze
+  VERSION = '0.18.0'.freeze
 end

data/lib/sorcery.rb

@@ -1,6 +1,11 @@
 require 'sorcery/version'
+require 'sorcery/errors'
 
 module Sorcery
+  def self.deprecator
+    @deprecator ||= ActiveSupport::Deprecation.new(nil, 'Sorcery')
+  end
+
   require 'sorcery/model'
 
   module Adapters
@@ -82,7 +87,7 @@ module Sorcery
 
   if defined?(Mongoid::Document)
     require 'sorcery/adapters/mongoid_adapter'
-    Mongoid::Document::ClassMethods.send :include, Sorcery::Model
+    Mongoid::Document::ClassMethods.include Sorcery::Model
 
     Mongoid::Document.send :define_method, :sorcery_adapter do
       @sorcery_adapter ||= Sorcery::Adapters::MongoidAdapter.new(self)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sorcery
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Noam Ben Ari
@@ -9,10 +9,9 @@ authors:
 - Grzegorz Witek
 - Chase Gilliam
 - Josh Buker
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-08 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -57,75 +56,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 10.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 10.0.0
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '7.1'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 11.1.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 11.1.3
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.8
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.8
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -182,29 +153,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".devcontainer/Dockerfile"
-- ".devcontainer/devcontainer.json"
-- ".devcontainer/postcreate.sh"
-- ".document"
-- ".github/FUNDING.yml"
-- ".github/ISSUE_TEMPLATE.md"
-- ".github/PULL_REQUEST_TEMPLATE.md"
-- ".github/workflows/ruby.yml"
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".rubocop_todo.yml"
 - CHANGELOG.md
-- CODE_OF_CONDUCT.md
-- Gemfile
 - LICENSE.md
-- MAINTAINING.md
 - README.md
-- Rakefile
-- SECURITY.md
-- gemfiles/rails_61.gemfile
-- gemfiles/rails_70.gemfile
-- gemfiles/rails_71.gemfile
 - lib/generators/sorcery/USAGE
 - lib/generators/sorcery/helpers.rb
 - lib/generators/sorcery/install_generator.rb
@@ -237,6 +188,7 @@ files:
 - lib/sorcery/crypto_providers/sha256.rb
 - lib/sorcery/crypto_providers/sha512.rb
 - lib/sorcery/engine.rb
+- lib/sorcery/errors.rb
 - lib/sorcery/model.rb
 - lib/sorcery/model/config.rb
 - lib/sorcery/model/submodules/activity_logging.rb
@@ -277,93 +229,13 @@ files:
 - lib/sorcery/test_helpers/rails/integration.rb
 - lib/sorcery/test_helpers/rails/request.rb
 - lib/sorcery/version.rb
-- sorcery.gemspec
-- spec/active_record/user_activation_spec.rb
-- spec/active_record/user_activity_logging_spec.rb
-- spec/active_record/user_brute_force_protection_spec.rb
-- spec/active_record/user_magic_login_spec.rb
-- spec/active_record/user_oauth_spec.rb
-- spec/active_record/user_remember_me_spec.rb
-- spec/active_record/user_reset_password_spec.rb
-- spec/active_record/user_spec.rb
-- spec/controllers/controller_activity_logging_spec.rb
-- spec/controllers/controller_brute_force_protection_spec.rb
-- spec/controllers/controller_http_basic_auth_spec.rb
-- spec/controllers/controller_oauth2_spec.rb
-- spec/controllers/controller_oauth_spec.rb
-- spec/controllers/controller_remember_me_spec.rb
-- spec/controllers/controller_session_timeout_spec.rb
-- spec/controllers/controller_spec.rb
-- spec/orm/active_record.rb
-- spec/providers/example_provider_spec.rb
-- spec/providers/example_spec.rb
-- spec/providers/examples_spec.rb
-- spec/providers/vk_spec.rb
-- spec/rails_app/app/active_record/authentication.rb
-- spec/rails_app/app/active_record/user.rb
-- spec/rails_app/app/active_record/user_provider.rb
-- spec/rails_app/app/assets/config/manifest.js
-- spec/rails_app/app/controllers/application_controller.rb
-- spec/rails_app/app/controllers/sorcery_controller.rb
-- spec/rails_app/app/helpers/application_helper.rb
-- spec/rails_app/app/mailers/sorcery_mailer.rb
-- spec/rails_app/app/views/application/index.html.erb
-- spec/rails_app/app/views/layouts/application.html.erb
-- spec/rails_app/app/views/sorcery_mailer/activation_email.html.erb
-- spec/rails_app/app/views/sorcery_mailer/activation_email.text.erb
-- spec/rails_app/app/views/sorcery_mailer/activation_needed_email.html.erb
-- spec/rails_app/app/views/sorcery_mailer/activation_success_email.html.erb
-- spec/rails_app/app/views/sorcery_mailer/activation_success_email.text.erb
-- spec/rails_app/app/views/sorcery_mailer/magic_login_email.html.erb
-- spec/rails_app/app/views/sorcery_mailer/magic_login_email.text.erb
-- spec/rails_app/app/views/sorcery_mailer/reset_password_email.html.erb
-- spec/rails_app/app/views/sorcery_mailer/reset_password_email.text.erb
-- spec/rails_app/app/views/sorcery_mailer/send_unlock_token_email.text.erb
-- spec/rails_app/config.ru
-- spec/rails_app/config/application.rb
-- spec/rails_app/config/boot.rb
-- spec/rails_app/config/database.yml
-- spec/rails_app/config/environment.rb
-- spec/rails_app/config/environments/test.rb
-- spec/rails_app/config/initializers/backtrace_silencers.rb
-- spec/rails_app/config/initializers/compatible_legacy_migration.rb
-- spec/rails_app/config/initializers/inflections.rb
-- spec/rails_app/config/initializers/mime_types.rb
-- spec/rails_app/config/initializers/session_store.rb
-- spec/rails_app/config/locales/en.yml
-- spec/rails_app/config/routes.rb
-- spec/rails_app/config/secrets.yml
-- spec/rails_app/db/migrate/activation/20101224223622_add_activation_to_users.rb
-- spec/rails_app/db/migrate/activity_logging/20101224223624_add_activity_logging_to_users.rb
-- spec/rails_app/db/migrate/brute_force_protection/20101224223626_add_brute_force_protection_to_users.rb
-- spec/rails_app/db/migrate/core/20101224223620_create_users.rb
-- spec/rails_app/db/migrate/external/20101224223628_create_authentications_and_user_providers.rb
-- spec/rails_app/db/migrate/invalidate_active_sessions/20180221093235_add_invalidate_active_sessions_before_to_users.rb
-- spec/rails_app/db/migrate/magic_login/20170924151831_add_magic_login_to_users.rb
-- spec/rails_app/db/migrate/remember_me/20101224223623_add_remember_me_token_to_users.rb
-- spec/rails_app/db/migrate/reset_password/20101224223622_add_reset_password_to_users.rb
-- spec/rails_app/db/schema.rb
-- spec/rails_app/db/seeds.rb
-- spec/shared_examples/user_activation_shared_examples.rb
-- spec/shared_examples/user_activity_logging_shared_examples.rb
-- spec/shared_examples/user_brute_force_protection_shared_examples.rb
-- spec/shared_examples/user_magic_login_shared_examples.rb
-- spec/shared_examples/user_oauth_shared_examples.rb
-- spec/shared_examples/user_remember_me_shared_examples.rb
-- spec/shared_examples/user_reset_password_shared_examples.rb
-- spec/shared_examples/user_shared_examples.rb
-- spec/sorcery_crypto_providers_spec.rb
-- spec/sorcery_temporary_token_spec.rb
-- spec/spec.opts
-- spec/spec_helper.rb
-- spec/support/migration_helper.rb
-- spec/support/providers/example.rb
-- spec/support/providers/example_provider.rb
-- spec/support/providers/examples.rb
 homepage: https://github.com/Sorcery/sorcery
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/Sorcery/sorcery/issues
+  changelog_uri: https://github.com/Sorcery/sorcery/releases
+  rubygems_mfa_required: 'true'
 post_install_message: |-
   As of version 1.0 oauth/oauth2 won't be automatically bundled so you may need to add those dependencies to your Gemfile.
   You may need oauth2 if you use external providers such as any of these: https://github.com/Sorcery/sorcery/tree/master/lib/sorcery/providers
@@ -374,15 +246,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.9
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.5
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Magical authentication for Rails applications
 test_files: []

data/.devcontainer/Dockerfile

@@ -1,10 +0,0 @@
-# Which Ruby version to use. You may need to use a more restrictive version,
-# e.g. `3.0`
-ARG VARIANT=3.0
-
-# Pull Microsoft's ruby devcontainer base image
-FROM mcr.microsoft.com/devcontainers/ruby:${VARIANT}
-
-# Ensure we're running the latest bundler, as what ships with the Ruby image may
-# not be current, and bundler will auto-downgrade to match the Gemfile.lock
-RUN gem install bundler

data/.devcontainer/devcontainer.json

@@ -1,29 +0,0 @@
-{
-  "name": "Ruby",
-  "build": {
-    "dockerfile": "Dockerfile"
-  },
-
-  // Configure tool-specific properties.
-  "customizations": {
-    // Configure properties specific to VS Code.
-    "vscode": {
-      // Add the IDs of extensions you want installed when the container is created.
-      "extensions": [
-        "rebornix.Ruby"
-      ]
-    }
-  },
-
-  // Set the environment variables
-  // "runArgs": ["--env-file",".env"],
-
-  // Use 'forwardPorts' to make a list of ports inside the container available locally.
-  //   "forwardPorts": [],
-
-  // Use 'postCreateCommand' to run commands after the container is created.
-  "postCreateCommand": "bash .devcontainer/postcreate.sh",
-
-  // Set `remoteUser` to `root` to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
-  "remoteUser": "vscode"
-}

data/.devcontainer/postcreate.sh

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-bundle config set path vendor/bundle
-bundle install --jobs=1

data/.document

@@ -1,5 +0,0 @@
-lib/**/*.rb
-bin/*
-- 
-features/**/*.feature
-LICENSE.txt

data/.github/FUNDING.yml

@@ -1 +0,0 @@
-github: joshbuker

data/.github/ISSUE_TEMPLATE.md

@@ -1,24 +0,0 @@
-<!-- Please complete all sections. -->
-
-### Configuration
-
-- Sorcery Version: ``
-- Ruby Version: ``
-- Framework: ``
-- Platform: ``
-
-### Expected Behavior
-
-<!-- Tell us what should happen. -->
-
-### Actual Behavior
-
-<!-- Tell us what happens instead. -->
-
-### Steps to Reproduce
-
-<!-- Please list all steps to reproduce the issue. -->
-
-1.
-2.
-3.

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -1,7 +0,0 @@
-Please ensure your pull request includes the following:
-
-- [ ] Description of changes
-- [ ] Update to CHANGELOG.md with short description and link to pull request
-- [ ] Changes have related RSpec tests that ensure functionality does not break
-
-<!-- For the changelog, please add your entry to the HEAD section. Do not create a new release header. -->