grape_devise_token_auth 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35ce7f0b222561a9d13f206c77ecbb509ddcfbad
-  data.tar.gz: 71300758c8f421b5700abf180286ab0a55b0ea15
+  metadata.gz: 20ce9019cdda54279d483b4e1d83494fff408872
+  data.tar.gz: d9f9365c4915ca9384124ed3d06e519ba33128d7
 SHA512:
-  metadata.gz: 896fce5fc9694288093dd293fd9dbcf76409798889afea764fa97d79211eee1fa46e5da0beeddbe958d50e5c46a22411d45cd55d988649aad79b2ff432bfcc25
-  data.tar.gz: 994295038c82feaa3b4137292ea76590827444dbeebc8885b05d3c7aed8e484da6b1d14a6991d893b7a9cedaacdf817bad6d9f9081196f0d39dfcdd63462b8a5
+  metadata.gz: 574a15895c934d5e7c309bff9021035016d40e650b00bd2e9cf25e3c88b4d6f52c9458d2b399cef2dffa4770a3568c5182b09fac845b113785c70944455bade8
+  data.tar.gz: f344a3e4e844587ffc6607e5d3f14b6af9d192033104e6a9fae97d4c65527a850ce9e7199be51e93306d5399d41fb69d21107a621bfee8bd3b225e8e35293e6a

data/CHANGELOG.md

@@ -1,3 +1,4 @@
-#Current - 0.1.2
+#Current - 0.1
+- Add a way to disable integration with warden
 - Adding a authentication helper that doesn't fail.
 

data/README.md

@@ -1,14 +1,15 @@
 # GrapeDeviseTokenAuth
 
-GrapeDeviseTokenAuth gem is a compatability layer between
-[devise_token_auth][1] and [grape][2]. It is useful when mounting a grape API
-in a rails application where [devise][3] (or `devise_token_auth` + `devise`)
-is already present. It is reliant on `devise_token_auth` and `devise`,
-therefore it is not suitable for grape where these are not present.
+GrapeDeviseTokenAuth gem is a compatibility layer between [devise_token_auth][1]
+and [grape][2]. It is useful when mounting a grape API in a rails application
+where [devise][3] (or `devise_token_auth` + `devise`) is already present. It is
+reliant on `devise_token_auth` and `devise`, therefore it is not suitable for
+grape where these are not present. If you are looking for a pure grape solution,
+you should check out [grape\_token\_auth][gta].
 
-The majority of the hard work and credit goes to [Lyann Dylan
-Hurley][4] and his fantistic [devise_token_auth][1] gem.
-I merely have ported this to work well with grape.
+The majority of the hard work and credit goes to [Lyann Dylan Hurley][4] and his
+fantastic [devise_token_auth][1] gem.  I merely have ported this to work well
+with grape.
 
 ## Installation
 
@@ -74,6 +75,20 @@ There is also a `authenticate_user` version of this helper (notice that it lacks
 
 [A full example setup can be found here][6]
 
+**Note about ignoring existing warden users**
+
+If you are having issues with users persisting across logins or you do not want
+to integrate with devise, you can disable the integration with devise during
+setup as so:
+
+```ruby
+
+GrapeDeviseTokenAuth.setup! do |config|
+  config.ignore_existing_warden_users = true
+end
+```
+
+
 ## Testing and Example
 
 Currently I am using [this repo][5] to test this gem, eventually I plan on
@@ -101,3 +116,4 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 [4]: https://github.com/lynndylanhurley
 [5]: https://github.com/mcordell/rails_grape_auth
 [6]: https://github.com/mcordell/rails_grape_auth/blob/7ca6b2f3d989fc23824aaf40fc353fc3e8de40ec/app/api/grape_api/posts.rb
+[gta]: https://github.com/mcordell/grape_token_auth

data/lib/grape_devise_token_auth/auth_headers.rb

@@ -3,7 +3,7 @@ module GrapeDeviseTokenAuth
     extend Forwardable
 
     def initialize(warden, mapping, request_start, data)
-      @resource = warden.session_serializer.fetch(mapping)
+      @resource = warden.user(:user)
       @request_start = request_start
       @data = data
     end

data/lib/grape_devise_token_auth/auth_helpers.rb

@@ -3,7 +3,7 @@ module GrapeDeviseTokenAuth
     def self.included(_base)
       Devise.mappings.keys.each do |mapping|
         define_method("current_#{mapping}") do
-          warden.session_serializer.fetch(mapping)
+          warden.user(mapping)
         end
 
         define_method("authenticate_#{mapping}") do

data/lib/grape_devise_token_auth/devise_interface.rb

@@ -8,7 +8,7 @@ module GrapeDeviseTokenAuth
     # extracted and simplified from Devise
     def set_user_in_warden(scope, resource)
       scope = Devise::Mapping.find_scope!(scope)
-      warden.session_serializer.store(resource, scope)
+      warden.set_user(resource, scope: scope, store: false)
     end
 
     def mapping_to_class(m)

data/lib/grape_devise_token_auth/token_authorizer.rb

@@ -11,8 +11,12 @@ module GrapeDeviseTokenAuth
       @resource_class =  devise_interface.mapping_to_class(mapping)
       return nil unless resource_class
 
+      # client id is not required
+      client_id = data.client_id || 'default'
+
       resource_from_existing_devise_user
-      return resource if correct_resource_type_logged_in?
+      return resource if correct_resource_type_logged_in? &&
+                         resource_does_not_have_client_token?(client_id)
 
       return nil unless data.token_prerequisites_present?
       load_user_from_uid
@@ -42,5 +46,9 @@ module GrapeDeviseTokenAuth
     def correct_resource_type_logged_in?
       resource && resource.class == resource_class
     end
+
+    def resource_does_not_have_client_token?(client_id)
+      resource.tokens[client_id].nil?
+    end
   end
 end

data/lib/grape_devise_token_auth/version.rb

@@ -1,3 +1,3 @@
 module GrapeDeviseTokenAuth
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape_devise_token_auth
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Michael Cordell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-09 00:00:00.000000000 Z
+date: 2015-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -128,9 +128,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Allows an existing devise_token_auth/rails project to authenticate a Grape
   API
 test_files: []
+has_rdoc: