padrino-warden 0.20.1 → 0.20.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee593e6a245f5c03c36bb809d7f3189a88821fc4
-  data.tar.gz: 583fe62715c0ba71194dc6c42ac0fc6b923fc1ca
+  metadata.gz: cd3e07388156e676902ee11236c8a52131e9f34e
+  data.tar.gz: 491574a9e19190186b88d8e203932e759ae6963e
 SHA512:
-  metadata.gz: f5729ac8622e272740ce8e26c1155ffc83dffec42c03ec6bf402eee878bf281e9c288ae93e8d2e1016423f806ae8c2f12d56a3184b3e651ddf64a423f6d264eb
-  data.tar.gz: 047e444a3011ac5e76384b393198e7beb73ab1ea104acdcfc5c6a401156db53fb50bfc099b92d8eb1f83e979e1865e0f8e079520380ae530c6362fa6864ebd16
+  metadata.gz: 4b8599420dee012c4195cadbfe69d0018b193aa2259081db68210488e2e226c6a53ee262eaaff45725fcb61360ce98dab9f1c4235779f6f046cbb7e1c4b96cab
+  data.tar.gz: b5b1c86ec1c236f936487d59be0fdc39ac433639486563b97117670cd1f8181be6503e44efa802ee9a7a7f2aa3b7b4ae8333d41bc03472d9d3628d42fe7278e0

data/README.md

@@ -87,6 +87,13 @@ end
 
 Your UserApp needs to be mounted first in Padrino! Cascading routes from the UserApp can cause exceptions, so don't use an app mounted to the root path ('/') as UserApp.
 
+## Configuration
+
+There are some options you can override to customize padrino-warden to your
+needs. Please consult the
+[wiki](https://github.com/jondot/padrino-warden/wiki/Options) page to see all
+of them.
+
 
 ## Overriding warden manager defaults
 
@@ -110,6 +117,10 @@ class SampleApp < Padrino::Application
 end
 ```
 
+## Changelog
+
+Changelog is available on the [wiki](https://github.com/jondot/padrino-warden/wiki/Changelog).
+
 ## Note on Patches/Pull Requests
 
 * Fork the project.
@@ -123,9 +134,11 @@ end
 ## Contributors
 
 * Dotan Nahum (http://github.com/jondot)
+* Michał Zając (http://github.com/Quintasan)
 
 For sinatra\_warden, thanks to: [Justin Smestad](http://github.com/jsmestad), [Daniel Neighman](http://github.com/hassox) and [Shane Hanna](http://github.com/shanna).
 
 ## Copyright
 
 Copyright (c) 2010 Dotan Nahum (jondot). See LICENSE for details.
+Copyright (c) 2015 Michał Zając (Quintasan). See LICENSE for details.

data/lib/padrino/warden.rb

@@ -9,30 +9,30 @@ require 'padrino/warden/helpers'
 module Padrino
   module Warden
     def self.registered(app, register_controller = true)
-      # Enable Sessions
-      app.set :sessions, true unless app.sessions
-      app.set :auth_failure_path, '/'
-      app.set :auth_success_path, '/'
+      # Enable sessions but allow the user to disable them explicitly
+      app.set :sessions, true unless app.respond_to?(:sessions)
+      app.set :auth_failure_path, '/' unless app.respond_to?(:auth_failure_path)
+      app.set :auth_success_path, '/' unless app.respond_to?(:auth_success_path)
 
-      # Setting this to true will store last request URL
-      # into a user's session so that to redirect back to it
-      # upon successful authentication
-      app.set :auth_use_referrer,      false
-      app.set :auth_error_message,     "You have provided invalid credentials."
-      app.set :auth_success_message,   "You have logged in successfully."
-      app.set :deauth_success_message, "You have logged out successfully."
+      # set :auth_use_referrer to true to redirect a user back to an action
+      # protected by 'login'/'authenticate' after successful login
+      app.set :auth_use_referrer, false unless app.respond_to?(:auth_use_referrer)
+
+      app.set :auth_error_message, "You have provided invalid credentials." unless app.respond_to?(:auth_error_message)
+      app.set :auth_success_message, "You have logged in successfully." unless app.respond_to?(:auth_success_message)
+      app.set :deauth_success_message, "You have logged out successfully." unless app.respond_to?(:deauth_success_message)
       # Custom map options and layout for the sessions controller
-      app.set :auth_login_template,    'sessions/login'
-      app.set :auth_login_path,  'sessions/login' unless app.respond_to?(:auth_login_path)
+      app.set :auth_login_template, 'sessions/login' unless app.respond_to?(:auth_login_template)
+      app.set :auth_login_path, 'sessions/login' unless app.respond_to?(:auth_login_path)
       app.set :auth_unauthenticated_path,'/unauthenticated' unless app.respond_to?(:auth_unauthenticated_path)
       app.set :auth_logout_path,'sessions/logout' unless app.respond_to?(:auth_logout_path)
-      app.set :auth_login_layout, true
+      app.set :auth_login_layout, true unless app.respond_to?(:auth_login_layout)
       # OAuth Specific Settings
-      app.set :auth_use_oauth, false
+      app.set :auth_use_oauth, false unless app.respond_to?(:auth_use_oauth)
       app.set :default_strategies, [:password] unless app.respond_to?(:default_strategies)
 
       app.set :warden_failure_app, app unless app.respond_to?(:warden_failure_app)
-      app.set :warden_default_scope, :session
+      app.set :warden_default_scope, :session unless app.respond_to?(:warden_default_scope)
       app.set(:warden_config) { |manager| nil }
       app.use ::Warden::Manager do |manager|
         manager.scope_defaults :session, strategies: app.default_strategies

data/lib/padrino/warden/controller.rb

@@ -13,6 +13,7 @@ module Padrino
           end
           ## /sessions/login
           get :login , map: app.auth_login_path  do
+            session.delete(:return_to)
             if settings.auth_use_oauth && !@auth_oauth_request_token.nil?
               session[:request_token] = @auth_oauth_request_token.token
               session[:request_token_secret] = @auth_oauth_request_token.secret

data/lib/padrino/warden/helpers.rb

@@ -21,6 +21,8 @@ module Padrino
 
       # Authenticate a user against defined strategies
       def authenticate(*args)
+        session[:return_to] = request.fullpath if settings.auth_use_referrer and
+          env['REQUEST_METHOD'] == 'GET'
         warden.authenticate!(*args)
       end
       alias_method :login, :authenticate

data/lib/padrino/warden/version.rb

@@ -1,5 +1,5 @@
 module Padrino
   module Warden
-    VERSION = "0.20.1"
+    VERSION = "0.20.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-warden
 version: !ruby/object:Gem::Version
-  version: 0.20.1
+  version: 0.20.2
 platform: ruby
 authors:
 - Dotan Nahum
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-25 00:00:00.000000000 Z
+date: 2015-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: warden
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: authentication system for using warden with Padrino, adopted from sinatra_warden