rack-jwt-auth 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c95eb99d16dbad324f5885d1f96851e8f1ef427
-  data.tar.gz: d501c58da2df431ac7be71b6ee07f76158ac54e2
+  metadata.gz: d6a2052e477acf5027ed8dedce21869b2780c497
+  data.tar.gz: b3103b770c27029fc0c6d9eb865d8d8c8a2577cf
 SHA512:
-  metadata.gz: cbbec767b3a5a4ae09244bedf3ee08ae067aa7397b07419b20aa0fa37b0b7bd93d77cb16c006d832c15a3a9d2580e9f45d8b280e1ef388c7a90bb3d0560bab07
-  data.tar.gz: d75926ea1e7a0d55c2f77cdaa71e6f2e860896e3b4bcb38bd42ceae0934839d1154711b3b1d67280aa1f4468304c5548225836fb2a5b8403e2725777cce630e7
+  metadata.gz: 049bc6f3a49f25795a765ce22415378d46a79458de78d7c1f4096e4a2cf077e3e6546d95fcb31f69ac23892eb520bac0c0ba4a405298163de95dd68b51cdb96c
+  data.tar.gz: bbd0aa5a7f5d032c1c7cedf4b9e209110e267df9745bc4649b79d67bc03d401613181589be80a8df462824eabb1aa5b8a5ba56a874a5b698861932f04a816ef6

data/lib/rack/jwt/auth/authenticate.rb

@@ -11,6 +11,8 @@ module Rack
           raise 'Secret must be provided' if opts[:secret].nil?
 
           @secret = opts[:secret]
+
+          @authenticated_routes   = compile_paths(opts[:only])
           @unauthenticated_routes = compile_paths(opts[:except])
         end
 
@@ -24,7 +26,11 @@ module Rack
         private
 
         def authenticated_route?(env)
-          !@unauthenticated_routes.find { |route| route =~ env['PATH_INFO']}
+          if @authenticated_routes.length > 0
+            @authenticated_routes.find { |route| route =~ env['PATH_INFO'] }
+          else
+            !@unauthenticated_routes.find { |route| route =~ env['PATH_INFO'] }
+          end
         end
 
         def with_authorization(env)

data/lib/rack/jwt/auth/version.rb

@@ -1,7 +1,7 @@
 module Rack
   module Jwt
     module Auth
-      VERSION = "0.0.2"
+      VERSION = "0.0.3"
     end
   end
 end

data/spec/authenticate_options_spec.rb

@@ -0,0 +1,82 @@
+require 'spec_helper'
+
+describe Rack::Jwt::Auth::Authenticate do
+  include Rack::Test::Methods
+
+  let(:issuer) { Rack::Jwt::Auth::AuthToken }
+
+  context "Except routes" do
+
+    let(:app) do
+      main_app = lambda { |env| [200, env, ['Hello']] }
+      Rack::Jwt::Auth::Authenticate.new(main_app, {except: ['/not_authenticated', '/not_authenticated/*'], secret: 'supertestsecret'})
+    end
+
+    it 'returns 200 ok if the request is for a route that is not authenticated' do
+      get('/not_authenticated')
+
+      expect(last_response.status).to eql(200)
+      expect(last_response.body).to   eql('Hello')
+
+      get('/not_authenticated/other')
+
+      expect(last_response.status).to eql(200)
+      expect(last_response.body).to   eql('Hello')
+
+      get('/not_authenticated/other/test')
+
+      expect(last_response.status).to eql(200)
+      expect(last_response.body).to   eql('Hello')
+    end
+
+    it 'returns 401 ok if the request is for a route that is authenticated' do
+      get('/authenticated')
+      expect(last_response.status).to eql(401)
+
+      get('/authenticated/other')
+      expect(last_response.status).to eql(401)
+
+      get('/authenticated/other/test')
+      expect(last_response.status).to eql(401)
+    end
+
+  end
+
+  context "Only routes" do
+
+    let(:app) do
+      main_app = lambda { |env| [200, env, ['Hello']] }
+      Rack::Jwt::Auth::Authenticate.new(main_app, {only: ['/authenticated', '/authenticated/*'], secret: 'supertestsecret'})
+    end
+
+    it 'returns 200 ok if the request is for a route that is not authenticated' do
+      get('/not_authenticated')
+
+      expect(last_response.status).to eql(200)
+      expect(last_response.body).to   eql('Hello')
+
+      get('/not_authenticated/other')
+
+      expect(last_response.status).to eql(200)
+      expect(last_response.body).to   eql('Hello')
+
+      get('/not_authenticated/other/test')
+
+      expect(last_response.status).to eql(200)
+      expect(last_response.body).to   eql('Hello')
+    end
+
+    it 'returns 401 ok if the request is for a route that is authenticated' do
+      get('/authenticated')
+      expect(last_response.status).to eql(401)
+
+      get('/authenticated/other')
+      expect(last_response.status).to eql(401)
+
+      get('/authenticated/other/test')
+      expect(last_response.status).to eql(401)
+    end
+
+  end
+
+end

data/spec/authenticate_spec.rb

@@ -7,23 +7,14 @@ describe Rack::Jwt::Auth::Authenticate do
 
   let(:app) do
     main_app = lambda { |env| [200, env, ['Hello']] }
-    Rack::Jwt::Auth::Authenticate.new(main_app, {except: ['/not_authenticated', '/not_authenticated/*'], secret: 'supertestsecret'})
+    Rack::Jwt::Auth::Authenticate.new(main_app, {secret: 'supertestsecret'})
   end
 
-  it 'returns 200 ok if the request is authenticated' do
-    token = issuer.issue_token({user_id: 1, username: 'test'}, 'supertestsecret')
-    get('/', {}, {'HTTP_AUTHORIZATION' => token})
-
-    expect(last_response.status).to eql(200)
-    expect(last_response.body).to   eql('Hello')
-
-    session = last_response.header['rack.jwt.session'][0]
-
-    expect(session['user_id']).to  eql(1)
-    expect(session['username']).to eql('test')
+  it 'raises an exception if no secret if provided' do
+    expect{ Rack::Jwt::Auth::Authenticate.new(main_app, {}) }.to raise_error
   end
 
-  it 'raises an exception if no secret if provided' do
+  it 'returns 200 ok if the request is authenticated' do
     token = issuer.issue_token({user_id: 1, username: 'test'}, 'supertestsecret')
     get('/', {}, {'HTTP_AUTHORIZATION' => token})
 
@@ -51,21 +42,4 @@ describe Rack::Jwt::Auth::Authenticate do
     expect(last_response.body).to   eql('Invalid Authorization')
   end
 
-  it 'returns 200 ok if the request is for a route that is not authorized' do
-    get('/not_authenticated')
-
-    expect(last_response.status).to eql(200)
-    expect(last_response.body).to   eql('Hello')
-
-    get('/not_authenticated/other')
-
-    expect(last_response.status).to eql(200)
-    expect(last_response.body).to   eql('Hello')
-
-    get('/not_authenticated/other/test')
-
-    expect(last_response.status).to eql(200)
-    expect(last_response.body).to   eql('Hello')
-  end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-jwt-auth
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - João Almeida
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-16 00:00:00.000000000 Z
+date: 2014-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jwt
@@ -98,6 +98,7 @@ files:
 - lib/rack/jwt/auth/version.rb
 - rack-jwt-auth.gemspec
 - spec/auth_token_spec.rb
+- spec/authenticate_options_spec.rb
 - spec/authenticate_spec.rb
 - spec/spec_helper.rb
 homepage: ''
@@ -126,5 +127,7 @@ specification_version: 4
 summary: Rack jwt auth middleware
 test_files:
 - spec/auth_token_spec.rb
+- spec/authenticate_options_spec.rb
 - spec/authenticate_spec.rb
 - spec/spec_helper.rb
+has_rdoc: