rack-ninja_auth 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be08a995d934e96d9aae93e4471d1d72d0a86b91
-  data.tar.gz: a9760e5d4ee5ba0174cf12b104a9f61ef8b28ff0
+  metadata.gz: cfc4021fdd66c583d85baee880d13fd5fdace6c4
+  data.tar.gz: 390eeac41894a3e9c7ed2556d8475d059447a6b2
 SHA512:
-  metadata.gz: e38e4d81a26880096b4e6aabb93876860da1ec9716639747693453f69ece1ddd952ff1b94dc735b7970b095fc89f7761d6e09b2b94c1d8bcb1dbee75e409e47f
-  data.tar.gz: 78c91bf7b4698bf03aab3f928bb55660816dabee679fda99980c53f667c0fb20e213755ca4a8254560d5d7bf43b11bf7889dc91f4c345f4f609b72f5ff37fdbb
+  metadata.gz: 592533dbf35bc2b2e6df24702f94ca9c8dda05e6df935cac53ad17114b0045e01f14ab841e22d5301d015d22cfb6885b1380534451fc65801224382b660d8754
+  data.tar.gz: d275a906c794f819ac76fca074cac984e87ca2f9bbaf8bec3eec4c70634205823391ccf2f45eb18b7a6a7988949d08038fb698335995560cb9adc46b43b76177

data/lib/rack/ninja_auth/version.rb

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

data/lib/rack/ninja_auth.rb

@@ -18,11 +18,10 @@ 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, remember_original_path: true)
+      def initialize(app, email_matcher: //, secured_routes: //, not_allowed_file: nil)
         $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,10 +38,10 @@ module Rack
       end
 
       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_url = session[:redirect_to] if @remember_original_path
-          redirect redirect_url || '/'
+        email = request.env["omniauth.auth"].info.email rescue nil
+        if email && email.match(@email_matcher)
+          session[:user] = email
+          redirect '/'
         else
           redirect '/auth/failure'
         end
@@ -55,7 +54,6 @@ module Rack
       after do
         if !@hit_real_app && status == 404
           halt(403) unless env['rack-accept.request'].media_type?('text/html')
-          session[:redirect_to] = env['REQUEST_URI'] if @remember_original_path && is_internal_request?
           redirect '/auth/google_oauth2'
         end
       end
@@ -67,7 +65,7 @@ module Rack
       end
 
       def is_protected_request?
-        is_internal_request? || env['PATH_INFO'].match(@secured_route_matcher)
+        env['PATH_INFO'].match(@secured_route_matcher)
       end
 
       def is_internal_request?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-ninja_auth
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - JP Hastings-Spital