sorcery 0.9.1 → 0.16.3

data/spec/rails_app/app/controllers/sorcery_controller.rb

@@ -1,33 +1,38 @@
 require 'oauth'
 
-class SorceryController < ActionController::Base
+class SorceryController < ApplicationController
   protect_from_forgery
 
-  before_filter :require_login_from_http_basic, only: [:test_http_basic_auth]
-  before_filter :require_login, only: [:test_logout, :test_should_be_logged_in, :some_action]
+  before_action :require_login_from_http_basic, only: [:test_http_basic_auth]
+  before_action :require_login, only: %i[
+    test_logout
+    test_logout_with_forget_me
+    test_logout_with_force_forget_me
+    test_should_be_logged_in
+    some_action
+  ]
 
-  def index
-  end
+  def index; end
 
   def some_action
-    render nothing: true
+    head :ok
   end
 
   def some_action_making_a_non_persisted_change_to_the_user
     current_user.email = 'to_be_ignored'
-    render nothing: true
+    head :ok
   end
 
   def test_login
     @user = login(params[:email], params[:password])
-    render nothing: true
+    head :ok
   end
 
   def test_auto_login
     @user = User.first
     auto_login(@user)
     @result = current_user
-    render nothing: true
+    head :ok
   end
 
   def test_return_to
@@ -37,50 +42,69 @@ class SorceryController < ActionController::Base
 
   def test_logout
     logout
-    render nothing: true
+    head :ok
   end
 
   def test_logout_with_remember
     remember_me!
     logout
-    render nothing: true
+    head :ok
+  end
+
+  def test_logout_with_forget_me
+    remember_me!
+    forget_me!
+    logout
+    head :ok
+  end
+
+  def test_logout_with_force_forget_me
+    remember_me!
+    force_forget_me!
+    logout
+    head :ok
+  end
+
+  def test_invalidate_active_session
+    invalidate_active_sessions!
+    head :ok
   end
 
   def test_login_with_remember
     @user = login(params[:email], params[:password])
     remember_me!
 
-    render nothing: true
+    head :ok
   end
 
   def test_login_with_remember_in_login
     @user = login(params[:email], params[:password], params[:remember])
 
-    render nothing: true
+    head :ok
   end
 
   def test_login_from_cookie
     @user = current_user
-    render nothing: true
+    head :ok
   end
 
   def test_not_authenticated_action
-    render text: 'test_not_authenticated_action'
+    head :ok
   end
 
   def test_should_be_logged_in
-    render nothing: true
+    head :ok
   end
 
   def test_http_basic_auth
-    render text: 'HTTP Basic Auth'
+    head :ok
   end
 
   def login_at_test_twitter
     login_at(:twitter)
   end
 
-  alias :login_at_test :login_at_test_twitter
+  alias login_at_test login_at_test_twitter
 
   def login_at_test_facebook
     login_at(:facebook)
@@ -90,6 +114,18 @@ class SorceryController < ActionController::Base
     login_at(:github)
   end
 
+  def login_at_test_paypal
+    login_at(:paypal)
+  end
+
+  def login_at_test_wechat
+    login_at(:wechat)
+  end
+
+  def login_at_test_microsoft
+    login_at(:microsoft)
+  end
+
   def login_at_test_google
     login_at(:google)
   end
@@ -110,22 +146,46 @@ class SorceryController < ActionController::Base
     login_at(:salesforce)
   end
 
+  def login_at_test_slack
+    login_at(:slack)
+  end
+
+  def login_at_test_line
+    login_at(:line)
+  end
+
   def login_at_test_with_state
-    login_at(:facebook, {state: 'bla'})
+    login_at(:facebook, state: 'bla')
+  end
+
+  def login_at_test_instagram
+    login_at(:instagram)
+  end
+
+  def login_at_test_auth0
+    login_at(:auth0)
+  end
+
+  def login_at_test_discord
+    login_at(:discord)
+  end
+
+  def login_at_test_battlenet
+    login_at(:battlenet)
   end
 
   def test_login_from_twitter
-    if @user = login_from(:twitter)
+    if (@user = login_from(:twitter))
       redirect_to 'bla', notice: 'Success!'
     else
       redirect_to 'blu', alert: 'Failed!'
     end
   end
 
-  alias :test_login_from :test_login_from_twitter
+  alias test_login_from test_login_from_twitter
 
   def test_login_from_facebook
-    if @user = login_from(:facebook)
+    if (@user = login_from(:facebook))
       redirect_to 'bla', notice: 'Success!'
     else
       redirect_to 'blu', alert: 'Failed!'
@@ -133,7 +193,31 @@ class SorceryController < ActionController::Base
   end
 
   def test_login_from_github
-    if @user = login_from(:github)
+    if (@user = login_from(:github))
+      redirect_to 'bla', notice: 'Success!'
+    else
+      redirect_to 'blu', alert: 'Failed!'
+    end
+  end
+
+  def test_login_from_paypal
+    if (@user = login_from(:paypal))
+      redirect_to 'bla', notice: 'Success!'
+    else
+      redirect_to 'blu', alert: 'Failed!'
+    end
+  end
+
+  def test_login_from_wechat
+    if (@user = login_from(:wechat))
+      redirect_to 'bla', notice: 'Success!'
+    else
+      redirect_to 'blu', alert: 'Failed!'
+    end
+  end
+
+  def test_login_from_microsoft
+    if (@user = login_from(:microsoft))
       redirect_to 'bla', notice: 'Success!'
     else
       redirect_to 'blu', alert: 'Failed!'
@@ -141,7 +225,7 @@ class SorceryController < ActionController::Base
   end
 
   def test_login_from_google
-    if @user = login_from(:google)
+    if (@user = login_from(:google))
       redirect_to 'bla', notice: 'Success!'
     else
       redirect_to 'blu', alert: 'Failed!'
@@ -149,7 +233,7 @@ class SorceryController < ActionController::Base
   end
 
   def test_login_from_liveid
-    if @user = login_from(:liveid)
+    if (@user = login_from(:liveid))
       redirect_to 'bla', notice: 'Success!'
     else
       redirect_to 'blu', alert: 'Failed!'
@@ -157,7 +241,7 @@ class SorceryController < ActionController::Base
   end
 
   def test_login_from_vk
-    if @user = login_from(:vk)
+    if (@user = login_from(:vk))
       redirect_to 'bla', notice: 'Success!'
     else
       redirect_to 'blu', alert: 'Failed!'
@@ -165,7 +249,7 @@ class SorceryController < ActionController::Base
   end
 
   def test_login_from_jira
-    if @user = login_from(:jira)
+    if (@user = login_from(:jira))
       redirect_to 'bla', notice: 'Success!'
     else
       redirect_to 'blu', alert: 'Failed!'
@@ -173,7 +257,55 @@ class SorceryController < ActionController::Base
   end
 
   def test_login_from_salesforce
-    if @user = login_from(:salesforce)
+    if (@user = login_from(:salesforce))
+      redirect_to 'bla', notice: 'Success!'
+    else
+      redirect_to 'blu', alert: 'Failed!'
+    end
+  end
+
+  def test_login_from_slack
+    if (@user = login_from(:slack))
+      redirect_to 'bla', notice: 'Success!'
+    else
+      redirect_to 'blu', alert: 'Failed!'
+    end
+  end
+
+  def test_login_from_instagram
+    if (@user = login_from(:instagram))
+      redirect_to 'bla', notice: 'Success!'
+    else
+      redirect_to 'blu', alert: 'Failed!'
+    end
+  end
+
+  def test_login_from_auth0
+    if (@user = login_from(:auth0))
+      redirect_to 'bla', notice: 'Success!'
+    else
+      redirect_to 'blu', alert: 'Failed!'
+    end
+  end
+
+  def test_login_from_line
+    if @user = login_from(:line)
+      redirect_to 'bla', notice: 'Success!'
+    else
+      redirect_to 'blu', alert: 'Failed!'
+    end
+  end
+
+  def test_login_from_discord
+    if (@user = login_from(:discord))
+      redirect_to 'bla', notice: 'Success!'
+    else
+      redirect_to 'blu', alert: 'Failed!'
+    end
+  end
+
+  def test_login_from_battlenet
+    if (@user = login_from(:battlenet))
       redirect_to 'bla', notice: 'Success!'
     else
       redirect_to 'blu', alert: 'Failed!'
@@ -181,7 +313,7 @@ class SorceryController < ActionController::Base
   end
 
   def test_return_to_with_external_twitter
-    if @user = login_from(:twitter)
+    if (@user = login_from(:twitter))
       redirect_back_or_to 'bla', notice: 'Success!'
     else
       redirect_to 'blu', alert: 'Failed!'
@@ -189,17 +321,17 @@ class SorceryController < ActionController::Base
   end
 
   def test_return_to_with_external_jira
-    if @user = login_from(:jira)
+    if (@user = login_from(:jira))
       redirect_back_or_to 'bla', notice: 'Success!'
     else
       redirect_to 'blu', alert: 'Failed!'
     end
   end
 
-  alias :test_return_to_with_external :test_return_to_with_external_twitter
+  alias test_return_to_with_external test_return_to_with_external_twitter
 
   def test_return_to_with_external_facebook
-    if @user = login_from(:facebook)
+    if (@user = login_from(:facebook))
       redirect_back_or_to 'bla', notice: 'Success!'
     else
       redirect_to 'blu', alert: 'Failed!'
@@ -207,7 +339,31 @@ class SorceryController < ActionController::Base
   end
 
   def test_return_to_with_external_github
-    if @user = login_from(:github)
+    if (@user = login_from(:github))
+      redirect_back_or_to 'bla', notice: 'Success!'
+    else
+      redirect_to 'blu', alert: 'Failed!'
+    end
+  end
+
+  def test_return_to_with_external_paypal
+    if (@user = login_from(:paypal))
+      redirect_back_or_to 'bla', notice: 'Success!'
+    else
+      redirect_to 'blu', alert: 'Failed!'
+    end
+  end
+
+  def test_return_to_with_external_wechat
+    if (@user = login_from(:wechat))
+      redirect_back_or_to 'bla', notice: 'Success!'
+    else
+      redirect_to 'blu', alert: 'Failed!'
+    end
+  end
+
+  def test_return_to_with_external_microsoft
+    if (@user = login_from(:microsoft))
       redirect_back_or_to 'bla', notice: 'Success!'
     else
       redirect_to 'blu', alert: 'Failed!'
@@ -215,7 +371,7 @@ class SorceryController < ActionController::Base
   end
 
   def test_return_to_with_external_google
-    if @user = login_from(:google)
+    if (@user = login_from(:google))
       redirect_back_or_to 'bla', notice: 'Success!'
     else
       redirect_to 'blu', alert: 'Failed!'
@@ -223,7 +379,7 @@ class SorceryController < ActionController::Base
   end
 
   def test_return_to_with_external_liveid
-    if @user = login_from(:liveid)
+    if (@user = login_from(:liveid))
       redirect_back_or_to 'bla', notice: 'Success!'
     else
       redirect_to 'blu', alert: 'Failed!'
@@ -231,7 +387,7 @@ class SorceryController < ActionController::Base
   end
 
   def test_return_to_with_external_vk
-    if @user = login_from(:vk)
+    if (@user = login_from(:vk))
       redirect_back_or_to 'bla', notice: 'Success!'
     else
       redirect_to 'blu', alert: 'Failed!'
@@ -239,7 +395,55 @@ class SorceryController < ActionController::Base
   end
 
   def test_return_to_with_external_salesforce
-    if @user = login_from(:salesforce)
+    if (@user = login_from(:salesforce))
+      redirect_back_or_to 'bla', notice: 'Success!'
+    else
+      redirect_to 'blu', alert: 'Failed!'
+    end
+  end
+
+  def test_return_to_with_external_slack
+    if (@user = login_from(:slack))
+      redirect_back_or_to 'bla', notice: 'Success!'
+    else
+      redirect_to 'blu', alert: 'Failed!'
+    end
+  end
+
+  def test_return_to_with_external_instagram
+    if (@user = login_from(:instagram))
+      redirect_back_or_to 'bla', notice: 'Success!'
+    else
+      redirect_to 'blu', alert: 'Failed!'
+    end
+  end
+
+  def test_return_to_with_external_auth0
+    if (@user = login_from(:auth0))
+      redirect_back_or_to 'bla', notice: 'Success!'
+    else
+      redirect_to 'blu', alert: 'Failed!'
+    end
+  end
+
+  def test_return_to_with_external_line
+    if @user = login_from(:line)
+      redirect_back_or_to 'bla', notice: 'Success!'
+    else
+      redirect_to 'blu', alert: 'Failed!'
+    end
+  end
+
+  def test_return_to_with_external_discord
+    if (@user = login_from(:discord))
+      redirect_back_or_to 'bla', notice: 'Success!'
+    else
+      redirect_to 'blu', alert: 'Failed!'
+    end
+  end
+
+  def test_return_to_with_external_battlenet
+    if (@user = login_from(:battlenet))
       redirect_back_or_to 'bla', notice: 'Success!'
     else
       redirect_to 'blu', alert: 'Failed!'
@@ -249,7 +453,7 @@ class SorceryController < ActionController::Base
   def test_create_from_provider
     provider = params[:provider]
     login_from(provider)
-    if @user = create_from(provider)
+    if (@user = create_from(provider))
       redirect_to 'bla', notice: 'Success!'
     else
       redirect_to 'blu', alert: 'Failed!'
@@ -258,19 +462,20 @@ class SorceryController < ActionController::Base
 
   def test_add_second_provider
     provider = params[:provider]
-    if logged_in?
-      if @user = add_provider_to_user(provider)
-        redirect_to "bla", :notice => "Success!"
-      else
-        redirect_to "blu", :alert => "Failed!"
-      end
+
+    return unless logged_in?
+
+    if (@user = add_provider_to_user(provider))
+      redirect_to 'bla', notice: 'Success!'
+    else
+      redirect_to 'blu', alert: 'Failed!'
     end
   end
 
   def test_create_from_provider_with_block
     provider = params[:provider]
     login_from(provider)
-    @user = create_from(provider) do |user|
+    @user = create_from(provider) do |_user|
       # check uniqueness of email
       # User.where(email: user.email).empty?
       false
@@ -281,5 +486,4 @@ class SorceryController < ActionController::Base
       redirect_to 'blu', alert: 'Failed!'
     end
   end
-
 end

data/spec/rails_app/app/mailers/sorcery_mailer.rb

@@ -1,32 +1,38 @@
 class SorceryMailer < ActionMailer::Base
-  
-  default :from => "notifications@example.com"
-  
+  default from: 'notifications@example.com'
+
   def activation_needed_email(user)
     @user = user
-    @url  = "http://example.com/login"
-    mail(:to => user.email,
-         :subject => "Welcome to My Awesome Site")
+    @url  = 'http://example.com/login'
+    mail(to: user.email,
+         subject: 'Welcome to My Awesome Site')
   end
-  
+
   def activation_success_email(user)
     @user = user
-    @url  = "http://example.com/login"
-    mail(:to => user.email,
-         :subject => "Your account is now activated")
+    @url  = 'http://example.com/login'
+    mail(to: user.email,
+         subject: 'Your account is now activated')
   end
-  
+
   def reset_password_email(user)
     @user = user
-    @url  = "http://example.com/login"
-    mail(:to => user.email,
-         :subject => "Your password has been reset")
+    @url  = 'http://example.com/login'
+    mail(to: user.email,
+         subject: 'Your password has been reset')
   end
 
   def send_unlock_token_email(user)
     @user = user
     @url = "http://example.com/unlock/#{user.unlock_token}"
-    mail(:to => user.email,
-         :subject => "Your account has been locked due to many wrong logins")
+    mail(to: user.email,
+         subject: 'Your account has been locked due to many wrong logins')
+  end
+
+  def magic_login_email(user)
+    @user = user
+    @url  = 'http://example.com/login'
+    mail(to: user.email,
+         subject: 'Magic Login')
   end
-end
+end

data/spec/rails_app/app/views/sorcery_mailer/magic_login_email.html.erb

@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
+</head>
+<body>
+<h1>Hello, <%= @user.username %></h1>
+<p>
+  To login without a password, just follow this link: <%= @url %>.
+</p>
+<p>Have a great day!</p>
+</body>
+</html>

data/spec/rails_app/app/views/sorcery_mailer/magic_login_email.text.erb

@@ -0,0 +1,6 @@
+Hello, <%= @user.username %>
+===============================================
+
+To login without a password, just follow this link: <%= @url %>.
+
+Have a great day!

data/spec/rails_app/config/application.rb

@@ -1,22 +1,25 @@
-require File.expand_path('../boot', __FILE__)
+require File.expand_path('boot', __dir__)
 
-require "action_controller/railtie"
-require "action_mailer/railtie"
-require "rails/test_unit/railtie"
+require 'action_controller/railtie'
+require 'action_mailer/railtie'
+require 'rails/test_unit/railtie'
 
 Bundler.require :default, SORCERY_ORM
 
+# rubocop:disable Lint/HandleExceptions
 begin
   require "#{SORCERY_ORM}/railtie"
 rescue LoadError
+  # TODO: Log this issue or change require scheme.
 end
+# rubocop:enable Lint/HandleExceptions
 
-require "sorcery"
+require 'sorcery'
 
 module AppRoot
   class Application < Rails::Application
-    config.autoload_paths.reject!{ |p| p =~ /\/app\/(\w+)$/ && !%w(controllers helpers mailers views).include?($1) }
-    config.autoload_paths += [ "#{config.root}/app/#{SORCERY_ORM}" ]
+    config.autoload_paths.reject! { |p| p =~ %r{/\/app\/(\w+)$/} && !%w[controllers helpers mailers views].include?(Regexp.last_match(1)) }
+    config.autoload_paths += ["#{config.root}/app/#{SORCERY_ORM}"]
 
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
@@ -44,13 +47,15 @@ module AppRoot
     # config.action_view.javascript_expansions[:defaults] = %w(jquery rails)
 
     # Configure the default encoding used in templates for Ruby 1.9.
-    config.encoding = "utf-8"
+    config.encoding = 'utf-8'
 
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
 
     config.action_mailer.delivery_method = :test
-
     config.active_support.deprecation = :stderr
+    if Rails.version >= '5.1.0' && config.active_record.sqlite3.present?
+      config.active_record.sqlite3.represent_boolean_as_integer = true
+    end
   end
 end

data/spec/rails_app/config/boot.rb

@@ -1,4 +1,4 @@
 # Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../Gemfile', __dir__)
 
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])

data/spec/rails_app/config/environment.rb

@@ -1,5 +1,5 @@
 # Load the rails application
-require File.expand_path('../application', __FILE__)
+require File.expand_path('application', __dir__)
 
 # Initialize the rails application
 AppRoot::Application.initialize!

data/spec/rails_app/config/environments/test.rb

@@ -18,7 +18,7 @@ AppRoot::Application.configure do
   config.action_dispatch.show_exceptions = false
 
   # Disable request forgery protection in test environment
-  config.action_controller.allow_forgery_protection    = false
+  config.action_controller.allow_forgery_protection = false
 
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the

data/spec/rails_app/config/initializers/compatible_legacy_migration.rb

@@ -0,0 +1,11 @@
+module ActiveRecord
+  module CompatibleLegacyMigration
+    def self.migration_class
+      if Rails::VERSION::MAJOR >= 5
+        ActiveRecord::Migration::Current
+      else
+        ActiveRecord::Migration
+      end
+    end
+  end
+end

data/spec/rails_app/config/initializers/session_store.rb

@@ -1,6 +1,6 @@
 # Be sure to restart your server when you modify this file.
 
-AppRoot::Application.config.session_store :cookie_store, :key => '_app_root_session'
+AppRoot::Application.config.session_store :cookie_store, key: '_app_root_session'
 
 # Use the database for sessions instead of the cookie-based default,
 # which shouldn't be used to store highly confidential information
@@ -8,5 +8,5 @@ AppRoot::Application.config.session_store :cookie_store, :key => '_app_root_sess
 # AppRoot::Application.config.session_store :active_record_store
 
 if AppRoot::Application.config.respond_to?(:secret_key_base=)
-  AppRoot::Application.config.secret_key_base = "foobar"
-end
+  AppRoot::Application.config.secret_key_base = 'foobar'
+end