sorcery 0.11.0 → 0.16.0

data/lib/sorcery/providers/vk.rb

@@ -9,7 +9,7 @@ module Sorcery
     class Vk < Base
       include Protocols::Oauth2
 
-      attr_accessor :auth_path, :token_path, :user_info_url, :scope
+      attr_accessor :auth_path, :token_path, :user_info_url, :scope, :api_version
 
       def initialize
         super
@@ -28,15 +28,16 @@ module Sorcery
           access_token: access_token.token,
           uids:         access_token.params['user_id'],
           fields:       user_info_mapping.values.join(','),
-          scope:        scope
+          scope:        scope,
+          v:            api_version.to_s
         }
 
         response = access_token.get(user_info_url, params: params)
-        if user_hash[:user_info] = JSON.parse(response.body)
+        if (user_hash[:user_info] = JSON.parse(response.body))
           user_hash[:user_info] = user_hash[:user_info]['response'][0]
           user_hash[:user_info]['full_name'] = [user_hash[:user_info]['first_name'], user_hash[:user_info]['last_name']].join(' ')
 
-          user_hash[:uid] = user_hash[:user_info]['uid']
+          user_hash[:uid] = user_hash[:user_info]['id']
           user_hash[:user_info]['email'] = access_token.params['email']
         end
         user_hash

data/lib/sorcery/providers/wechat.rb

@@ -37,10 +37,13 @@ module Sorcery
       end
 
       def get_user_hash(access_token)
-        response = access_token.get(user_info_path, params: {
-          access_token: access_token.token,
-          openid: access_token.params['openid'],
-        })
+        response = access_token.get(
+          user_info_path,
+          params: {
+            access_token: access_token.token,
+            openid: access_token.params['openid']
+          }
+        )
 
         {}.tap do |h|
           h[:user_info] = JSON.parse(response.body)
@@ -70,10 +73,9 @@ module Sorcery
           args,
           token_url: token_url,
           mode: mode,
-          param_name: param_name,
+          param_name: param_name
         )
       end
     end
   end
 end
-

data/lib/sorcery/test_helpers/internal.rb

@@ -17,7 +17,7 @@ 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
+      class ::Hash # rubocop:disable Style/ClassAndModuleChildren
         def destroy
           clear
         end
@@ -69,9 +69,10 @@ module Sorcery
       def reload_user_class
         User && Object.send(:remove_const, 'User')
         load 'user.rb'
-        if User.respond_to?(:reset_column_information)
-          User.reset_column_information
-        end
+
+        return unless User.respond_to?(:reset_column_information)
+
+        User.reset_column_information
       end
     end
   end

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

@@ -4,11 +4,11 @@ module Sorcery
       module Rails
         include ::Sorcery::TestHelpers::Rails::Controller
 
-        SUBMODULES_AUTO_ADDED_CONTROLLER_FILTERS = [
-          :register_last_activity_time_to_db,
-          :deny_banned_user,
-          :validate_session
-        ]
+        SUBMODULES_AUTO_ADDED_CONTROLLER_FILTERS = %i[
+          register_last_activity_time_to_db
+          deny_banned_user
+          validate_session
+        ].freeze
 
         def sorcery_reload!(submodules = [], options = {})
           reload_user_class
@@ -40,11 +40,11 @@ module Sorcery
             end
           end
           User.authenticates_with_sorcery!
-          if defined?(DataMapper) && User.ancestors.include?(DataMapper::Resource)
-            DataMapper.auto_migrate!
-            User.finalize
-            Authentication.finalize
-          end
+          return unless defined?(DataMapper) && User.ancestors.include?(DataMapper::Resource)
+
+          DataMapper.auto_migrate!
+          User.finalize
+          Authentication.finalize
         end
 
         def sorcery_controller_property_set(property, value)
@@ -64,7 +64,7 @@ module Sorcery
         end
 
         if ::Rails.version < '5.0.0'
-          %w(get post put).each do |method|
+          %w[get post put].each do |method|
             define_method(method) do |action, options = {}|
               super action, options[:params] || {}, options[:session]
             end

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

@@ -0,0 +1,20 @@
+module Sorcery
+  module TestHelpers
+    module Rails
+      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)
+          user ||= @user
+          route ||= user_sessions_url
+
+          username_attr = user.sorcery_config.username_attribute_names.first
+          username = user.send(username_attr)
+          password_attr = user.sorcery_config.password_attribute_name
+
+          send(http_method, route, params: { "#{username_attr}": username, "#{password_attr}": password })
+        end
+      end
+    end
+  end
+end

data/lib/sorcery/version.rb

@@ -1,3 +1,3 @@
 module Sorcery
-  VERSION = '0.11.0'
+  VERSION = '0.16.0'.freeze
 end

data/sorcery.gemspec

@@ -1,33 +1,49 @@
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'sorcery/version'
 
+# rubocop:disable Metrics/BlockLength
 Gem::Specification.new do |s|
   s.name = 'sorcery'
   s.version = Sorcery::VERSION
-  s.authors = ['Noam Ben Ari', 'Kir Shatrov', 'Grzegorz Witek', 'Chase Gilliam']
-  s.email = 'chase.gilliam@gmail.com'
+  s.authors = [
+    'Noam Ben Ari',
+    'Kir Shatrov',
+    'Grzegorz Witek',
+    'Chase Gilliam',
+    'Josh Buker'
+  ]
+  s.email = [
+    'crypto@joshbuker.com'
+  ]
+
+  # TODO: Cleanup formatting.
+  # rubocop:disable Layout/LineLength
   s.description = 'Provides common authentication needs such as signing in/out, activating by email and resetting password.'
   s.summary = 'Magical authentication for Rails applications'
   s.homepage = 'https://github.com/Sorcery/sorcery'
   s.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.\n"
   s.post_install_message += 'You may need oauth2 if you use external providers such as any of these: https://github.com/Sorcery/sorcery/tree/master/lib/sorcery/providers'
+  # rubocop:enable Layout/LineLength
 
   s.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   s.require_paths = ['lib']
 
   s.licenses = ['MIT']
 
-  s.required_ruby_version = '>= 2.0.0'
+  s.required_ruby_version = '>= 2.4.9'
 
+  s.add_dependency 'bcrypt', '~> 3.1'
   s.add_dependency 'oauth', '~> 0.4', '>= 0.4.4'
   s.add_dependency 'oauth2', '~> 1.0', '>= 0.8.0'
-  s.add_dependency 'bcrypt', '~> 3.1'
 
-  s.add_development_dependency 'yard', '~> 0.6.0'
-  s.add_development_dependency 'timecop'
+  s.add_development_dependency 'byebug', '~> 10.0.0'
+  s.add_development_dependency 'rspec-rails', '~> 3.7.0'
+  s.add_development_dependency 'rubocop'
   s.add_development_dependency 'simplecov', '>= 0.3.8'
-  s.add_development_dependency 'rspec-rails', '~> 3.5.0'
-  s.add_development_dependency 'test-unit', '~> 3.1.0'
-  s.add_development_dependency 'byebug', '~> 9.0.0'
+  s.add_development_dependency 'test-unit', '~> 3.2.0'
+  s.add_development_dependency 'timecop'
+  s.add_development_dependency 'webmock', '~> 3.3.0'
+  s.add_development_dependency 'yard', '~> 0.9.0', '>= 0.9.12'
 end
+# rubocop:enable Metrics/BlockLength

data/spec/active_record/user_activation_spec.rb

@@ -5,12 +5,12 @@ require 'shared_examples/user_activation_shared_examples'
 
 describe User, 'with activation submodule', active_record: true do
   before(:all) do
-    ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/activation")
+    MigrationHelper.migrate("#{Rails.root}/db/migrate/activation")
     User.reset_column_information
   end
 
   after(:all) do
-    ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/activation")
+    MigrationHelper.rollback("#{Rails.root}/db/migrate/activation")
   end
 
   it_behaves_like 'rails_3_activation_model'

data/spec/active_record/user_activity_logging_spec.rb

@@ -3,12 +3,12 @@ require 'shared_examples/user_activity_logging_shared_examples'
 
 describe User, 'with activity logging submodule', active_record: true do
   before(:all) do
-    ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/activity_logging")
+    MigrationHelper.migrate("#{Rails.root}/db/migrate/activity_logging")
     User.reset_column_information
   end
 
   after(:all) do
-    ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/activity_logging")
+    MigrationHelper.rollback("#{Rails.root}/db/migrate/activity_logging")
   end
 
   it_behaves_like 'rails_3_activity_logging_model'

data/spec/active_record/user_brute_force_protection_spec.rb

@@ -3,12 +3,12 @@ require 'shared_examples/user_brute_force_protection_shared_examples'
 
 describe User, 'with brute_force_protection submodule', active_record: true do
   before(:all) do
-    ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/brute_force_protection")
+    MigrationHelper.migrate("#{Rails.root}/db/migrate/brute_force_protection")
     User.reset_column_information
   end
 
   after(:all) do
-    ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/brute_force_protection")
+    MigrationHelper.rollback("#{Rails.root}/db/migrate/brute_force_protection")
   end
 
   it_behaves_like 'rails_3_brute_force_protection_model'

data/spec/active_record/user_magic_login_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+require 'shared_examples/user_magic_login_shared_examples'
+
+describe User, 'with magic_login submodule', active_record: true do
+  before(:all) do
+    MigrationHelper.migrate("#{Rails.root}/db/migrate/magic_login")
+    User.reset_column_information
+  end
+
+  after(:all) do
+    MigrationHelper.rollback("#{Rails.root}/db/migrate/magic_login")
+  end
+
+  it_behaves_like 'magic_login_model'
+end

data/spec/active_record/user_oauth_spec.rb

@@ -3,12 +3,12 @@ require 'shared_examples/user_oauth_shared_examples'
 
 describe User, 'with oauth submodule', active_record: true do
   before(:all) do
-    ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/external")
+    MigrationHelper.migrate("#{Rails.root}/db/migrate/external")
     User.reset_column_information
   end
 
   after(:all) do
-    ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/external")
+    MigrationHelper.rollback("#{Rails.root}/db/migrate/external")
   end
 
   it_behaves_like 'rails_3_oauth_model'

data/spec/active_record/user_remember_me_spec.rb

@@ -3,12 +3,12 @@ require 'shared_examples/user_remember_me_shared_examples'
 
 describe User, 'with remember_me submodule', active_record: true do
   before(:all) do
-    ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/remember_me")
+    MigrationHelper.migrate("#{Rails.root}/db/migrate/remember_me")
     User.reset_column_information
   end
 
   after(:all) do
-    ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/remember_me")
+    MigrationHelper.rollback("#{Rails.root}/db/migrate/remember_me")
   end
 
   it_behaves_like 'rails_3_remember_me_model'

data/spec/active_record/user_reset_password_spec.rb

@@ -3,12 +3,12 @@ require 'shared_examples/user_reset_password_shared_examples'
 
 describe User, 'with reset_password submodule', active_record: true do
   before(:all) do
-    ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/reset_password")
+    MigrationHelper.migrate("#{Rails.root}/db/migrate/reset_password")
     User.reset_column_information
   end
 
   after(:all) do
-    ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/reset_password")
+    MigrationHelper.rollback("#{Rails.root}/db/migrate/reset_password")
   end
 
   it_behaves_like 'rails_3_reset_password_model'

data/spec/active_record/user_spec.rb

@@ -22,16 +22,6 @@ describe User, 'with no submodules (core)', active_record: true do
   it_should_behave_like 'rails_3_core_model'
 
   describe 'external users' do
-    before(:all) do
-      ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/external")
-      User.reset_column_information
-      sorcery_reload!
-    end
-
-    after(:all) do
-      ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/external")
-    end
-
     it_should_behave_like 'external_user'
   end
 end

data/spec/controllers/controller_http_basic_auth_spec.rb

@@ -28,7 +28,7 @@ describe SorceryController, type: :controller do
       expect(User).to receive('authenticate').with('bla@bla.com', 'secret').and_return(user)
       get :test_http_basic_auth, params: {}, session: { http_authentication_used: true }
 
-      expect(response).to be_a_success
+      expect(response).to be_successful
     end
 
     it 'fails authentication if credentials are wrong' do

data/spec/controllers/controller_oauth2_spec.rb

@@ -5,7 +5,9 @@ require 'spec_helper'
 describe SorceryController, active_record: true, type: :controller do
   before(:all) do
     if SORCERY_ORM == :active_record
-      ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/external")
+      MigrationHelper.migrate("#{Rails.root}/db/migrate/external")
+      MigrationHelper.migrate("#{Rails.root}/db/migrate/activation")
+      MigrationHelper.migrate("#{Rails.root}/db/migrate/activity_logging")
       User.reset_column_information
     end
 
@@ -15,7 +17,9 @@ describe SorceryController, active_record: true, type: :controller do
 
   after(:all) do
     if SORCERY_ORM == :active_record
-      ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/external")
+      MigrationHelper.rollback("#{Rails.root}/db/migrate/external")
+      MigrationHelper.rollback("#{Rails.root}/db/migrate/activity_logging")
+      MigrationHelper.rollback("#{Rails.root}/db/migrate/activation")
     end
   end
 
@@ -112,12 +116,21 @@ describe SorceryController, active_record: true, type: :controller do
     end
 
     context 'when callback_url begin with http://' do
+      before do
+        sorcery_controller_external_property_set(:facebook, :callback_url, '/oauth/twitter/callback')
+        sorcery_controller_external_property_set(:facebook, :api_version, 'v2.2')
+      end
+
       it 'login_at redirects correctly' do
         create_new_user
         get :login_at_test_facebook
         expect(response).to be_a_redirect
         expect(response).to redirect_to("https://www.facebook.com/v2.2/dialog/oauth?client_id=#{::Sorcery::Controller::Config.facebook.key}&display=page&redirect_uri=http%3A%2F%2Ftest.host%2Foauth%2Ftwitter%2Fcallback&response_type=code&scope=email&state")
       end
+
+      after do
+        sorcery_controller_external_property_set(:facebook, :callback_url, 'http://blabla.com')
+      end
     end
 
     it "'login_from' logins if user exists" do
@@ -151,7 +164,7 @@ describe SorceryController, active_record: true, type: :controller do
       expect(flash[:notice]).to eq 'Success!'
     end
 
-    [:github, :google, :liveid, :vk, :salesforce, :paypal, :slack, :wechat, :microsoft].each do |provider|
+    %i[github google liveid vk salesforce paypal slack wechat microsoft instagram auth0 discord battlenet].each do |provider|
       describe "with #{provider}" do
         it 'login_at redirects correctly' do
           get :"login_at_test_#{provider}"
@@ -196,51 +209,75 @@ describe SorceryController, active_record: true, type: :controller do
 
   describe 'OAuth with User Activation features' do
     before(:all) do
-      if SORCERY_ORM == :active_record
-        ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/activation")
-      end
-
-      sorcery_reload!([:user_activation,:external], :user_activation_mailer => ::SorceryMailer)
-      sorcery_controller_property_set(:external_providers, [:facebook, :github, :google, :liveid, :vk, :salesforce, :paypal, :slack, :wechat, :microsoft])
+      sorcery_reload!(%i[user_activation external], user_activation_mailer: ::SorceryMailer)
+      sorcery_controller_property_set(
+        :external_providers,
+        %i[
+          facebook
+          github
+          google
+          liveid
+          vk
+          salesforce
+          paypal
+          slack
+          wechat
+          microsoft
+          instagram
+          auth0
+          line
+          discord
+          battlenet
+        ]
+      )
 
       # TODO: refactor
-      sorcery_controller_external_property_set(:facebook, :key, "eYVNBjBDi33aa9GkA3w")
-      sorcery_controller_external_property_set(:facebook, :secret, "XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8")
-      sorcery_controller_external_property_set(:facebook, :callback_url, "http://blabla.com")
-      sorcery_controller_external_property_set(:github, :key, "eYVNBjBDi33aa9GkA3w")
-      sorcery_controller_external_property_set(:github, :secret, "XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8")
-      sorcery_controller_external_property_set(:github, :callback_url, "http://blabla.com")
-      sorcery_controller_external_property_set(:google, :key, "eYVNBjBDi33aa9GkA3w")
-      sorcery_controller_external_property_set(:google, :secret, "XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8")
-      sorcery_controller_external_property_set(:google, :callback_url, "http://blabla.com")
-      sorcery_controller_external_property_set(:liveid, :key, "eYVNBjBDi33aa9GkA3w")
-      sorcery_controller_external_property_set(:liveid, :secret, "XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8")
-      sorcery_controller_external_property_set(:liveid, :callback_url, "http://blabla.com")
-      sorcery_controller_external_property_set(:vk, :key, "eYVNBjBDi33aa9GkA3w")
-      sorcery_controller_external_property_set(:vk, :secret, "XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8")
-      sorcery_controller_external_property_set(:vk, :callback_url, "http://blabla.com")
-      sorcery_controller_external_property_set(:salesforce, :key, "eYVNBjBDi33aa9GkA3w")
-      sorcery_controller_external_property_set(:salesforce, :secret, "XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8")
-      sorcery_controller_external_property_set(:salesforce, :callback_url, "http://blabla.com")
-      sorcery_controller_external_property_set(:paypal, :key, "eYVNBjBDi33aa9GkA3w")
-      sorcery_controller_external_property_set(:paypal, :secret, "XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8")
-      sorcery_controller_external_property_set(:paypal, :callback_url, "http://blabla.com")
-      sorcery_controller_external_property_set(:slack, :key, "eYVNBjBDi33aa9GkA3w")
-      sorcery_controller_external_property_set(:slack, :secret, "XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8")
-      sorcery_controller_external_property_set(:slack, :callback_url, "http://blabla.com")
-      sorcery_controller_external_property_set(:wechat, :key, "eYVNBjBDi33aa9GkA3w")
-      sorcery_controller_external_property_set(:wechat, :secret, "XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8")
-      sorcery_controller_external_property_set(:wechat, :callback_url, "http://blabla.com")
-      sorcery_controller_external_property_set(:microsoft, :key, "eYVNBjBDi33aa9GkA3w")
-      sorcery_controller_external_property_set(:microsoft, :secret, "XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8")
-      sorcery_controller_external_property_set(:microsoft, :callback_url, "http://blabla.com")
-    end
-
-    after(:all) do
-      if SORCERY_ORM == :active_record
-        ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/external")
-        ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/activation")
-      end
+      sorcery_controller_external_property_set(:facebook, :key, 'eYVNBjBDi33aa9GkA3w')
+      sorcery_controller_external_property_set(:facebook, :secret, 'XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8')
+      sorcery_controller_external_property_set(:facebook, :callback_url, 'http://blabla.com')
+      sorcery_controller_external_property_set(:github, :key, 'eYVNBjBDi33aa9GkA3w')
+      sorcery_controller_external_property_set(:github, :secret, 'XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8')
+      sorcery_controller_external_property_set(:github, :callback_url, 'http://blabla.com')
+      sorcery_controller_external_property_set(:google, :key, 'eYVNBjBDi33aa9GkA3w')
+      sorcery_controller_external_property_set(:google, :secret, 'XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8')
+      sorcery_controller_external_property_set(:google, :callback_url, 'http://blabla.com')
+      sorcery_controller_external_property_set(:liveid, :key, 'eYVNBjBDi33aa9GkA3w')
+      sorcery_controller_external_property_set(:liveid, :secret, 'XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8')
+      sorcery_controller_external_property_set(:liveid, :callback_url, 'http://blabla.com')
+      sorcery_controller_external_property_set(:vk, :key, 'eYVNBjBDi33aa9GkA3w')
+      sorcery_controller_external_property_set(:vk, :secret, 'XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8')
+      sorcery_controller_external_property_set(:vk, :callback_url, 'http://blabla.com')
+      sorcery_controller_external_property_set(:salesforce, :key, 'eYVNBjBDi33aa9GkA3w')
+      sorcery_controller_external_property_set(:salesforce, :secret, 'XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8')
+      sorcery_controller_external_property_set(:salesforce, :callback_url, 'http://blabla.com')
+      sorcery_controller_external_property_set(:paypal, :key, 'eYVNBjBDi33aa9GkA3w')
+      sorcery_controller_external_property_set(:paypal, :secret, 'XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8')
+      sorcery_controller_external_property_set(:paypal, :callback_url, 'http://blabla.com')
+      sorcery_controller_external_property_set(:slack, :key, 'eYVNBjBDi33aa9GkA3w')
+      sorcery_controller_external_property_set(:slack, :secret, 'XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8')
+      sorcery_controller_external_property_set(:slack, :callback_url, 'http://blabla.com')
+      sorcery_controller_external_property_set(:wechat, :key, 'eYVNBjBDi33aa9GkA3w')
+      sorcery_controller_external_property_set(:wechat, :secret, 'XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8')
+      sorcery_controller_external_property_set(:wechat, :callback_url, 'http://blabla.com')
+      sorcery_controller_external_property_set(:microsoft, :key, 'eYVNBjBDi33aa9GkA3w')
+      sorcery_controller_external_property_set(:microsoft, :secret, 'XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8')
+      sorcery_controller_external_property_set(:microsoft, :callback_url, 'http://blabla.com')
+      sorcery_controller_external_property_set(:instagram, :key, 'eYVNBjBDi33aa9GkA3w')
+      sorcery_controller_external_property_set(:instagram, :secret, 'XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8')
+      sorcery_controller_external_property_set(:instagram, :callback_url, 'http://blabla.com')
+      sorcery_controller_external_property_set(:auth0, :key, 'eYVNBjBDi33aa9GkA3w')
+      sorcery_controller_external_property_set(:auth0, :secret, 'XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8')
+      sorcery_controller_external_property_set(:auth0, :callback_url, 'http://blabla.com')
+      sorcery_controller_external_property_set(:auth0, :site, 'https://sorcery-test.auth0.com')
+      sorcery_controller_external_property_set(:line, :key, "eYVNBjBDi33aa9GkA3w")
+      sorcery_controller_external_property_set(:line, :secret, "XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8")
+      sorcery_controller_external_property_set(:line, :callback_url, "http://blabla.com")
+      sorcery_controller_external_property_set(:discord, :key, 'eYVNBjBDi33aa9GkA3w')
+      sorcery_controller_external_property_set(:discord, :secret, 'XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8')
+      sorcery_controller_external_property_set(:discord, :callback_url, 'http://blabla.com')
+      sorcery_controller_external_property_set(:battlenet, :key, '4c43d4862c774ca5bbde89873bf0d338')
+      sorcery_controller_external_property_set(:battlenet, :secret, 'TxY7IwKOykACd8kUxPyVGTqBs44UBDdX')
+      sorcery_controller_external_property_set(:battlenet, :callback_url, 'http://blabla.com')
     end
 
     after(:each) do
@@ -263,7 +300,7 @@ describe SorceryController, active_record: true, type: :controller do
       expect(ActionMailer::Base.deliveries.size).to eq old_size
     end
 
-    [:github, :google, :liveid, :vk, :salesforce, :paypal, :wechat, :microsoft].each do |provider|
+    %i[github google liveid vk salesforce paypal wechat microsoft instagram auth0 discord battlenet].each do |provider|
       it "does not send activation email to external users (#{provider})" do
         old_size = ActionMailer::Base.deliveries.size
         create_new_external_user provider
@@ -275,6 +312,7 @@ describe SorceryController, active_record: true, type: :controller do
         create_new_external_user provider
         old_size = ActionMailer::Base.deliveries.size
         @user.activate!
+        expect(ActionMailer::Base.deliveries.size).to eq old_size
       end
     end
   end
@@ -283,17 +321,10 @@ describe SorceryController, active_record: true, type: :controller do
     let(:user) { double('user', id: 42) }
 
     before(:all) do
-      sorcery_reload!([:activity_logging, :external])
-    end
-
-    after(:all) do
-      if SORCERY_ORM == :active_record
-        ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/external")
-        ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/activity_logging")
-      end
+      sorcery_reload!(%i[activity_logging external])
     end
 
-    %w(facebook github google liveid vk salesforce slack).each do |provider|
+    %w[facebook github google liveid vk salesforce slack discord battlenet].each do |provider|
       context "when #{provider}" do
         before(:each) do
           sorcery_controller_property_set(:register_login_time, true)
@@ -327,12 +358,12 @@ describe SorceryController, active_record: true, type: :controller do
 
   describe 'OAuth with session timeout features' do
     before(:all) do
-      sorcery_reload!([:session_timeout, :external])
+      sorcery_reload!(%i[session_timeout external])
     end
 
     let(:user) { double('user', id: 42) }
 
-    %w(facebook github google liveid vk salesforce slack).each do |provider|
+    %w[facebook github google liveid vk salesforce slack discord battlenet].each do |provider|
       context "when #{provider}" do
         before(:each) do
           sorcery_model_property_set(:authentications_class, Authentication)
@@ -369,41 +400,78 @@ describe SorceryController, active_record: true, type: :controller do
   def stub_all_oauth2_requests!
     access_token = double(OAuth2::AccessToken)
     allow(access_token).to receive(:token_param=)
+    # Needed for Instagram
+    allow(access_token).to receive(:[]).with(:client_id) { 'eYVNBjBDi33aa9GkA3w' }
     response = double(OAuth2::Response)
     allow(response).to receive(:body) {
-                         {
-                           'id' => '123',
-                           'user_id' => '123', # Needed for Salesforce
-                           'name' => 'Noam Ben Ari',
-                           'first_name' => 'Noam',
-                           'last_name' => 'Ben Ari',
-                           'link' => 'http://www.facebook.com/nbenari1',
-                           'hometown' => { 'id' => '110619208966868', 'name' => 'Haifa, Israel' },
-                           'location' => { 'id' => '106906559341067', 'name' => 'Pardes Hanah, Hefa, Israel' },
-                           'bio' => "I'm a new daddy, and enjoying it!",
-                           'gender' => 'male',
-                           'email' => 'nbenari@gmail.com',
-                           'timezone' => 2,
-                           'locale' => 'en_US',
-                           'languages' => [{ 'id' => '108405449189952', 'name' => 'Hebrew' }, { 'id' => '106059522759137', 'name' => 'English' }, { 'id' => '112624162082677', 'name' => 'Russian' }],
-                           'verified' => true,
-                           'updated_time' => '2011-02-16T20:59:38+0000',
-                           # response for VK auth
-                           'response' => [
-                             {
-                               'uid' => '123',
-                               'first_name' => 'Noam',
-                               'last_name' => 'Ben Ari'
-                             }
-                           ],
-                           'user' => {
-                             'name' => 'Sonny Whether',
-                             'id' => '123',
-                             'email' => 'bobby@example.com'
-                           },
-                           # response for wechat auth
-                           'unionid' => '123',
-                         }.to_json }
+      {
+        'id' => '123',
+        'user_id' => '123', # Needed for Salesforce
+        'sub' => '123', # Needed for Auth0
+        'name' => 'Noam Ben Ari',
+        'first_name' => 'Noam',
+        'last_name' => 'Ben Ari',
+        'link' => 'http://www.facebook.com/nbenari1',
+        'hometown' => {
+          'id' => '110619208966868',
+          'name' => 'Haifa, Israel'
+        },
+        'location' => {
+          'id' => '106906559341067',
+          'name' => 'Pardes Hanah, Hefa, Israel'
+        },
+        'bio' => "I'm a new daddy, and enjoying it!",
+        'gender' => 'male',
+        'email' => 'nbenari@gmail.com',
+        'timezone' => 2,
+        'locale' => 'en_US',
+        'languages' => [
+          {
+            'id' => '108405449189952',
+            'name' => 'Hebrew'
+          },
+          {
+            'id' => '106059522759137',
+            'name' => 'English'
+          },
+          {
+            'id' => '112624162082677',
+            'name' => 'Russian'
+          }
+        ],
+        'verified' => true,
+        'updated_time' => '2011-02-16T20:59:38+0000',
+        # response for VK auth
+        'response' => [
+          {
+            'id' => '123',
+            'first_name' => 'Noam',
+            'last_name' => 'Ben Ari'
+          }
+        ],
+        'user' => {
+          'name' => 'Sonny Whether',
+          'id' => '123',
+          'email' => 'bobby@example.com'
+        },
+        # response for wechat auth
+        'unionid' => '123',
+        # response for instagram
+        'data' => {
+          'username' => 'pnmahoney',
+          'bio' => 'turn WHAT down?',
+          'website' => '',
+          'profile_picture' => 'http://photos-d.ak.instagram.com/hphotos-ak-xpa1/10454121_417985815007395_867850883_a.jpg',
+          'full_name' => 'Patrick Mahoney',
+          'counts' => {
+            'media' => 2,
+            'followed_by' => 100,
+            'follows' => 71
+          },
+          'id' => '123'
+        }
+      }.to_json
+    }
     allow(access_token).to receive(:get) { response }
     allow(access_token).to receive(:token) { '187041a618229fdaf16613e96e1caabc1e86e46bbfad228de41520e63fe45873684c365a14417289599f3' }
     # access_token params for VK auth
@@ -412,37 +480,72 @@ describe SorceryController, active_record: true, type: :controller do
   end
 
   def set_external_property
-    sorcery_controller_property_set(:external_providers, [:facebook, :github, :google, :liveid, :vk, :salesforce, :paypal, :slack, :wechat, :microsoft])
-    sorcery_controller_external_property_set(:facebook, :key, "eYVNBjBDi33aa9GkA3w")
-    sorcery_controller_external_property_set(:facebook, :secret, "XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8")
-    sorcery_controller_external_property_set(:facebook, :callback_url, "http://blabla.com")
-    sorcery_controller_external_property_set(:github, :key, "eYVNBjBDi33aa9GkA3w")
-    sorcery_controller_external_property_set(:github, :secret, "XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8")
-    sorcery_controller_external_property_set(:github, :callback_url, "http://blabla.com")
-    sorcery_controller_external_property_set(:google, :key, "eYVNBjBDi33aa9GkA3w")
-    sorcery_controller_external_property_set(:google, :secret, "XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8")
-    sorcery_controller_external_property_set(:google, :callback_url, "http://blabla.com")
-    sorcery_controller_external_property_set(:liveid, :key, "eYVNBjBDi33aa9GkA3w")
-    sorcery_controller_external_property_set(:liveid, :secret, "XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8")
-    sorcery_controller_external_property_set(:liveid, :callback_url, "http://blabla.com")
-    sorcery_controller_external_property_set(:vk, :key, "eYVNBjBDi33aa9GkA3w")
-    sorcery_controller_external_property_set(:vk, :secret, "XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8")
-    sorcery_controller_external_property_set(:vk, :callback_url, "http://blabla.com")
-    sorcery_controller_external_property_set(:salesforce, :key, "eYVNBjBDi33aa9GkA3w")
-    sorcery_controller_external_property_set(:salesforce, :secret, "XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8")
-    sorcery_controller_external_property_set(:salesforce, :callback_url, "http://blabla.com")
-    sorcery_controller_external_property_set(:paypal, :key, "eYVNBjBDi33aa9GkA3w")
-    sorcery_controller_external_property_set(:paypal, :secret, "XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8")
-    sorcery_controller_external_property_set(:paypal, :callback_url, "http://blabla.com")
-    sorcery_controller_external_property_set(:slack, :key, "eYVNBjBDi33aa9GkA3w")
-    sorcery_controller_external_property_set(:slack, :secret, "XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8")
-    sorcery_controller_external_property_set(:slack, :callback_url, "http://blabla.com")
-    sorcery_controller_external_property_set(:wechat, :key, "eYVNBjBDi33aa9GkA3w")
-    sorcery_controller_external_property_set(:wechat, :secret, "XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8")
-    sorcery_controller_external_property_set(:wechat, :callback_url, "http://blabla.com")
-    sorcery_controller_external_property_set(:microsoft, :key, "eYVNBjBDi33aa9GkA3w")
-    sorcery_controller_external_property_set(:microsoft, :secret, "XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8")
-    sorcery_controller_external_property_set(:microsoft, :callback_url, "http://blabla.com")
+    sorcery_controller_property_set(
+      :external_providers,
+      %i[
+        facebook
+        github
+        google
+        liveid
+        vk
+        salesforce
+        paypal
+        slack
+        wechat
+        microsoft
+        instagram
+        auth0
+        line
+        discord
+        battlenet
+      ]
+    )
+    sorcery_controller_external_property_set(:facebook, :key, 'eYVNBjBDi33aa9GkA3w')
+    sorcery_controller_external_property_set(:facebook, :secret, 'XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8')
+    sorcery_controller_external_property_set(:facebook, :callback_url, 'http://blabla.com')
+    sorcery_controller_external_property_set(:github, :key, 'eYVNBjBDi33aa9GkA3w')
+    sorcery_controller_external_property_set(:github, :secret, 'XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8')
+    sorcery_controller_external_property_set(:github, :callback_url, 'http://blabla.com')
+    sorcery_controller_external_property_set(:google, :key, 'eYVNBjBDi33aa9GkA3w')
+    sorcery_controller_external_property_set(:google, :secret, 'XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8')
+    sorcery_controller_external_property_set(:google, :callback_url, 'http://blabla.com')
+    sorcery_controller_external_property_set(:liveid, :key, 'eYVNBjBDi33aa9GkA3w')
+    sorcery_controller_external_property_set(:liveid, :secret, 'XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8')
+    sorcery_controller_external_property_set(:liveid, :callback_url, 'http://blabla.com')
+    sorcery_controller_external_property_set(:vk, :key, 'eYVNBjBDi33aa9GkA3w')
+    sorcery_controller_external_property_set(:vk, :secret, 'XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8')
+    sorcery_controller_external_property_set(:vk, :callback_url, 'http://blabla.com')
+    sorcery_controller_external_property_set(:salesforce, :key, 'eYVNBjBDi33aa9GkA3w')
+    sorcery_controller_external_property_set(:salesforce, :secret, 'XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8')
+    sorcery_controller_external_property_set(:salesforce, :callback_url, 'http://blabla.com')
+    sorcery_controller_external_property_set(:paypal, :key, 'eYVNBjBDi33aa9GkA3w')
+    sorcery_controller_external_property_set(:paypal, :secret, 'XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8')
+    sorcery_controller_external_property_set(:paypal, :callback_url, 'http://blabla.com')
+    sorcery_controller_external_property_set(:slack, :key, 'eYVNBjBDi33aa9GkA3w')
+    sorcery_controller_external_property_set(:slack, :secret, 'XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8')
+    sorcery_controller_external_property_set(:slack, :callback_url, 'http://blabla.com')
+    sorcery_controller_external_property_set(:wechat, :key, 'eYVNBjBDi33aa9GkA3w')
+    sorcery_controller_external_property_set(:wechat, :secret, 'XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8')
+    sorcery_controller_external_property_set(:wechat, :callback_url, 'http://blabla.com')
+    sorcery_controller_external_property_set(:microsoft, :key, 'eYVNBjBDi33aa9GkA3w')
+    sorcery_controller_external_property_set(:microsoft, :secret, 'XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8')
+    sorcery_controller_external_property_set(:microsoft, :callback_url, 'http://blabla.com')
+    sorcery_controller_external_property_set(:instagram, :key, 'eYVNBjBDi33aa9GkA3w')
+    sorcery_controller_external_property_set(:instagram, :secret, 'XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8')
+    sorcery_controller_external_property_set(:instagram, :callback_url, 'http://blabla.com')
+    sorcery_controller_external_property_set(:auth0, :key, 'eYVNBjBDi33aa9GkA3w')
+    sorcery_controller_external_property_set(:auth0, :secret, 'XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8')
+    sorcery_controller_external_property_set(:auth0, :callback_url, 'http://blabla.com')
+    sorcery_controller_external_property_set(:auth0, :site, 'https://sorcery-test.auth0.com')
+    sorcery_controller_external_property_set(:line, :key, "eYVNBjBDi33aa9GkA3w")
+    sorcery_controller_external_property_set(:line, :secret, "XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8")
+    sorcery_controller_external_property_set(:line, :callback_url, "http://blabla.com")
+    sorcery_controller_external_property_set(:discord, :key, 'eYVNBjBDi33aa9GkA3w')
+    sorcery_controller_external_property_set(:discord, :secret, 'XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8')
+    sorcery_controller_external_property_set(:discord, :callback_url, 'http://blabla.com')
+    sorcery_controller_external_property_set(:battlenet, :key, '4c43d4862c774ca5bbde89873bf0d338')
+    sorcery_controller_external_property_set(:battlenet, :secret, 'TxY7IwKOykACd8kUxPyVGTqBs44UBDdX')
+    sorcery_controller_external_property_set(:battlenet, :callback_url, 'http://blabla.com')
   end
 
   def provider_url(provider)
@@ -455,7 +558,11 @@ describe SorceryController, active_record: true, type: :controller do
       salesforce: "https://login.salesforce.com/services/oauth2/authorize?client_id=#{::Sorcery::Controller::Config.salesforce.key}&display&redirect_uri=http%3A%2F%2Fblabla.com&response_type=code&scope#{'=' + ::Sorcery::Controller::Config.salesforce.scope unless ::Sorcery::Controller::Config.salesforce.scope.nil?}&state",
       slack: "https://slack.com/oauth/authorize?client_id=#{::Sorcery::Controller::Config.slack.key}&display&redirect_uri=http%3A%2F%2Fblabla.com&response_type=code&scope=identity.basic%2C+identity.email&state",
       wechat: "https://open.weixin.qq.com/connect/qrconnect?appid=#{::Sorcery::Controller::Config.wechat.key}&redirect_uri=http%3A%2F%2Fblabla.com&response_type=code&scope=snsapi_login&state=#wechat_redirect",
-      microsoft: "https://login.microsoftonline.com/common/oauth2/v2.0/authorize?client_id=#{::Sorcery::Controller::Config.microsoft.key}&display&redirect_uri=http%3A%2F%2Fblabla.com&response_type=code&scope=openid+email+https%3A%2F%2Fgraph.microsoft.com%2FUser.Read&state"
+      microsoft: "https://login.microsoftonline.com/common/oauth2/v2.0/authorize?client_id=#{::Sorcery::Controller::Config.microsoft.key}&display&redirect_uri=http%3A%2F%2Fblabla.com&response_type=code&scope=openid+email+https%3A%2F%2Fgraph.microsoft.com%2FUser.Read&state",
+      instagram: "https://api.instagram.com/oauth/authorize?client_id=#{::Sorcery::Controller::Config.instagram.key}&display&redirect_uri=http%3A%2F%2Fblabla.com&response_type=code&scope=#{::Sorcery::Controller::Config.instagram.scope}&state",
+      auth0: "https://sorcery-test.auth0.com/authorize?client_id=#{::Sorcery::Controller::Config.auth0.key}&display&redirect_uri=http%3A%2F%2Fblabla.com&response_type=code&scope=openid+profile+email&state",
+      discord: "https://discordapp.com/api/oauth2/authorize?client_id=#{::Sorcery::Controller::Config.discord.key}&display&redirect_uri=http%3A%2F%2Fblabla.com&response_type=code&scope=identify&state",
+      battlenet: "https://eu.battle.net/oauth/authorize?client_id=#{::Sorcery::Controller::Config.battlenet.key}&display&redirect_uri=http%3A%2F%2Fblabla.com&response_type=code&scope=openid&state"
     }[provider]
   end
 end