devise_multiple_token_auth 0.0.24 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f7a70f4cb3f7e15c53291d706a82f003fb75fde
-  data.tar.gz: 92fea1277fe5630fa92853effed8542c2cbdf815
+  metadata.gz: 01ab46fb5479c4f0b97e00e9ff05aecf1b192e8a
+  data.tar.gz: 5bd999cbb46235d98d748b90534c819aefc83693
 SHA512:
-  metadata.gz: 95e844294552ae8da08b150ca83b6711a714cc5394f3e5990c0c51768371afeee3b6b179db3df60aee7bcab4fd47e7c83ac28dddd141919baeddf0ede621284c
-  data.tar.gz: a0ccddfafd7a908d4b641951e79a57d333771f0111a08bd949cd25389fd007bcae9afa0ce35877a067595a45c6c7f2bd4bf60e7a9cf5672a80caa9b0bb59cb49
+  metadata.gz: edbbd08936fe1e80f075518717b02036bba200c8f968a6199535ad072ec53d40bf91c67e270dbbf7ff0fb0d36ead056d0c0019cb00d275c17bee22a9afa57e77
+  data.tar.gz: 9abdf33d9c192a82c735763da6ba482f4cb1ad19fb57b8d2a0c4924754c25b367f889bb6cc46f14c30186d07a5eddb0a6b66d2d8c1589622746393f83d3dad61

data/lib/devise_multiple_token_auth.rb

@@ -2,6 +2,7 @@ require "devise_multiple_token_auth/engine"
 require "devise_multiple_token_auth/active_record/base"
 require "devise_multiple_token_auth/version"
 require 'devise_multiple_token_auth/action_controller/base'
+require 'devise_multiple_token_auth/action_controller/api'
 module DeviseMultipleTokenAuth
   mattr_accessor :user_class
   mattr_accessor :device_expires_in_days

data/lib/devise_multiple_token_auth/action_controller/api.rb

@@ -0,0 +1,25 @@
+module DeviseMultipleTokenAuth
+  module ActionController
+    module API
+      def authenticate_token_user!
+        token = request.env['HTTP_AUTHORIZATION']
+        if token.present? && token.include?("OAuth")
+          token = token.gsub(/^OAuth\s+/, '')
+        end
+        @device = Device.includes(:user).find_by_auth_token(token)
+        if !@device || @device.expired? || @device.user == nil
+          head :unauthorized
+        else
+          @device.expires_at = Time.now + (DeviseMultipleTokenAuth.device_expires_in_days || 14).days
+          @device.save
+          sign_in(@device.user)
+          @current_user = @device.user
+        end
+      end
+    end
+  end
+end
+
+class ActionController::API
+  include DeviseMultipleTokenAuth::ActionController::API
+end

data/lib/devise_multiple_token_auth/action_controller/base.rb

@@ -6,9 +6,9 @@ module DeviseMultipleTokenAuth
         if token.present? && token.include?("OAuth")
           token = token.gsub(/^OAuth\s+/, '')
         end
-        @device = Device.find_by_auth_token(token)
+        @device = Device.includes(:user).find_by_auth_token(token)
         if !@device || @device.expired? || @device.user == nil
-          render nothing: true, status: :unauthorized
+          head :unauthorized
         else
           @device.expires_at = Time.now + (DeviseMultipleTokenAuth.device_expires_in_days || 14).days
           @device.save

data/lib/devise_multiple_token_auth/version.rb

@@ -1,3 +1,3 @@
 module DeviseMultipleTokenAuth
-  VERSION = "0.0.24"
+  VERSION = "0.0.25"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_multiple_token_auth
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
 platform: ruby
 authors:
 - Josh Juncker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-28 00:00:00.000000000 Z
+date: 2016-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -68,6 +68,7 @@ files:
 - app/models/devise_multiple_token_auth/device.rb
 - config/routes.rb
 - lib/devise_multiple_token_auth.rb
+- lib/devise_multiple_token_auth/action_controller/api.rb
 - lib/devise_multiple_token_auth/action_controller/base.rb
 - lib/devise_multiple_token_auth/active_record/base.rb
 - lib/devise_multiple_token_auth/engine.rb
@@ -109,8 +110,6 @@ files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/config/secrets.yml
-- test/dummy/db/development.sqlite3
-- test/dummy/log/development.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
@@ -140,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Multiple device token authentication for devise
@@ -174,8 +173,6 @@ test_files:
 - test/dummy/config/routes.rb
 - test/dummy/config/secrets.yml
 - test/dummy/config.ru
-- test/dummy/db/development.sqlite3
-- test/dummy/log/development.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html