rack-ninja_auth 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8664dcbebca4cf75ba1df44583f1ec0b6367547
-  data.tar.gz: 1a1d64144e71a1ca69e5fa6d7986e0a311e87a91
+  metadata.gz: be08a995d934e96d9aae93e4471d1d72d0a86b91
+  data.tar.gz: a9760e5d4ee5ba0174cf12b104a9f61ef8b28ff0
 SHA512:
-  metadata.gz: 32bb8948d54d0fd86027a0ce8cde26189c207b0834e043a2bac4a7ad12a2588df0e64cd212fadd6438a66085caa3f6806b7dc468944d3ca5351c3e187cbd582c
-  data.tar.gz: c42e88041b2c4fa9f1c9efc6fcda2e1d18b95991dc7d0d2106e213fbfcbf07d8e6f14f813f80024f3c98e18fe213952a014402d04d3e5dbd6431168ee13fea23
+  metadata.gz: e38e4d81a26880096b4e6aabb93876860da1ec9716639747693453f69ece1ddd952ff1b94dc735b7970b095fc89f7761d6e09b2b94c1d8bcb1dbee75e409e47f
+  data.tar.gz: 78c91bf7b4698bf03aab3f928bb55660816dabee679fda99980c53f667c0fb20e213755ca4a8254560d5d7bf43b11bf7889dc91f4c345f4f609b72f5ff37fdbb

data/.travis.yml

@@ -2,3 +2,5 @@ language: ruby
 rvm:
   - 2.2.2
 before_install: gem install bundler -v 1.10.6
+services:
+  - redis-server

data/lib/rack/ninja_auth/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module NinjaAuth
-    VERSION = "0.5.0"
+    VERSION = "0.5.1"
   end
 end

data/lib/rack/ninja_auth.rb

@@ -9,6 +9,7 @@ module Rack
     class Middleware < Sinatra::Base
       use Rack::Accept
       use Rack::Session::Redis,
+        path: '/',
         key: 'rack.ninja_auth',
         expire_after: 2592000,
         redis_server: ENV['NINJA_REDIS_URL'] || 'redis://127.0.0.1:6379/0/rack:ninja_auth'
@@ -17,10 +18,11 @@ module Rack
         provider :google_oauth2, ENV["NINJA_GOOGLE_CLIENT_ID"], ENV["NINJA_GOOGLE_CLIENT_SECRET"]
       end
 
-      def initialize(app, email_matcher: //, secured_routes: //, not_allowed_file: nil)
+      def initialize(app, email_matcher: //, secured_routes: //, not_allowed_file: nil, remember_original_path: true)
         $stderr.puts "Please set NINJA_GOOGLE_CLIENT_ID and NINJA_GOOGLE_CLIENT_SECRET to use NinjaAuth" unless ENV["NINJA_GOOGLE_CLIENT_ID"] && ENV["NINJA_GOOGLE_CLIENT_SECRET"]
         @main_app = app
         @email_matcher = email_matcher
+        @remember_original_path = remember_original_path
         @secured_route_matcher = secured_routes
         @not_allowed_file = not_allowed_file || ::File.expand_path('../../../views/401.html', __FILE__)
         super()
@@ -39,7 +41,8 @@ module Rack
       get '/auth/google_oauth2/callback' do
         if (request.env["omniauth.auth"].info.email.match(@email_matcher) rescue false)
           session[:user] = request.env["omniauth.auth"].info.email
-          redirect session[:redirect_to]
+          redirect_url = session[:redirect_to] if @remember_original_path
+          redirect redirect_url || '/'
         else
           redirect '/auth/failure'
         end
@@ -52,7 +55,7 @@ module Rack
       after do
         if !@hit_real_app && status == 404
           halt(403) unless env['rack-accept.request'].media_type?('text/html')
-          session[:redirect_to] = is_internal_request? ? '/' : env['REQUEST_URI']
+          session[:redirect_to] = env['REQUEST_URI'] if @remember_original_path && is_internal_request?
           redirect '/auth/google_oauth2'
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-ninja_auth
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - JP Hastings-Spital
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-12 00:00:00.000000000 Z
+date: 2016-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -183,3 +183,4 @@ signing_key:
 specification_version: 4
 summary: Secure your test rigs with google.
 test_files: []
+has_rdoc: