touth 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 469a3737bb35a3a5c9b14d4af257e0a2c7d2e0f6
-  data.tar.gz: 630d22bfbd1c42c70a376555826ec1e4aac5a585
+  metadata.gz: b5c9606601957745782f3a95f89890c4e04158f3
+  data.tar.gz: ae2ba2ffb33fc6123c1845d3a8f037bc969e6377
 SHA512:
-  metadata.gz: dfb8ea431513911ee94fa8df7997bf333b79dad68da0a3819fc5494981584693a2278c4f1600bc84e2d6043c4bb8d9ca91782b2b5b3011b25729fbfef79d30ae
-  data.tar.gz: ca035808f9b2fc84027c6a5fde3cbcbbf8ac2bf7937c3951cac4672184966b4d4057166955ff3bf267f23d0e73d0556fc4dd96983416f65c721e93ddb336d2fa
+  metadata.gz: f0a2521d1fe43298dda2b6d18bde9029e89618d24ae9c2663494668b4c33be6cb7e828a101b3860c8d0b5e8774b49bac84d9c46152db19aee2442389433f645f
+  data.tar.gz: ff8ce766e8ff563746aec8a1307283793c0950a21ac68caade746eb827de1106bad7f1c383aad89f06aa287d0a85b02720ca4fc1d5f7bdfec9049b4a9a5dbabf

data/README.md

@@ -47,7 +47,7 @@ Checking if a user is signed in, and getting the current signed-in user, the fol
 
 ### Hooks
 
-- `authenticate_token!`
+- `authenticate_user_account!`
 
 
 Usage
@@ -114,6 +114,11 @@ Touth.setup do |config|
   # Header name
   config.header_name = 'X-Access-Token'
 
+  # Allow raise access token errors.
+  # If set to true, you can use `rescue_from` method in your controller.
+  # Otherwise, it will render a blank page with unauthorized status-code.
+  config.allow_raise = false
+
 end
 ```
 

data/lib/touth.rb

@@ -17,17 +17,22 @@ module Touth
     attr_accessor :access_token_lifetime,
       :client_secret_key,
       :password_field,
-      :header_name
+      :header_name,
+      :allow_raise
 
     def initialize
       @access_token_lifetime = 60 * (24 * 60 * 60)  # 60 days
       @client_secret_key     = ''  # use SecureRandom.hex(64) to generate one
       @password_field        = :encrypted_password
       @header_name           = 'X-Access-Token'
+      @allow_raise           = false
     end
 
   end
 
+  class InvalidAccessTokenError < StandardError; end
+  class ResourceConflictError < StandardError; end
+
   class << self
 
     def setup
@@ -54,6 +59,10 @@ module Touth
 
   end
 
+  def self.get_resource_name(name)
+    name.to_s.gsub('::', '_').underscore
+  end
+
 end
 
 

data/lib/touth/action_controller_support.rb

@@ -5,39 +5,70 @@ module Touth
       mattr_accessor :access_token_resources
 
       def token_authentication_for(resource_name)
-        resource_name = resource_name.to_s
-        name = resource_name.gsub('::', '_').underscore
+        resource_name = Touth.get_resource_name resource_name
 
-        unless self.access_token_resources
-          self.access_token_resources = {}
-          before_action :authenticate_token!
-        end
+        self.access_token_resources ||= {}
 
-        define_method "#{name}_signed_in?" do
+        define_method "#{resource_name}_signed_in?" do
           !!self.class.access_token_resources[resource_name]
         end
 
-        define_method "current_#{name}" do
+        define_method "current_#{resource_name}" do
           self.class.access_token_resources[resource_name]
         end
+
+        callback_name = "authenticate_#{resource_name}!".to_sym
+
+        unless method_defined? callback_name
+          define_method callback_name do
+            authenticate_token_for! resource_name
+          end
+
+          protected callback_name
+          before_action callback_name
+        end
       end
 
     end
 
     module InstanceMethods
 
-    protected
+      protected
+
+      def authenticate_token_for!(resource_name)
+        if Touth.allow_raise
+          set_token_authorized_model resource_name
+        else
+          begin
+            set_token_authorized_model resource_name
+          rescue
+            return unauthorized_token_error
+          end
+        end
+      end
+
+      def set_token_authorized_model(resource_name)
+        resource_name = Touth.get_resource_name resource_name
 
-      def authenticate_token!
         token = request.headers[Touth.header_name]
 
         unless token && Authenticator.valid_access_token?(token)
-          render nothing: true, status: :unauthorized
-          return false
+          raise InvalidAccessTokenError, 'access token is not valid'
         end
 
         model = Authenticator.get_model token
-        self.class.access_token_resources[model.class.name] = model
+        model_name = Touth.get_resource_name model.class.name
+
+        unless model_name == resource_name
+          raise ResourceConflictError, 'attempted %s to login, expected %s' % [model, resource_name]
+        end
+
+        self.class.access_token_resources[model_name] = model
+      end
+
+      def unauthorized_token_error
+        render nothing: true, status: :unauthorized
+        false
       end
 
     end

data/lib/touth/version.rb

@@ -1,3 +1,3 @@
 module Touth
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: touth
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Yuki Iwanaga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-19 00:00:00.000000000 Z
+date: 2014-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport