grape_devise_auth 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e4e1810801a7a67993cbcef50d0fb9dc37a576e
-  data.tar.gz: 0bce89133725e2d990bda7c3a2494e389fc429a8
+  metadata.gz: 0b9b3d196787d6ee25e67f15ee0c23bdade1b43b
+  data.tar.gz: 2784c17dcc774bc5ecd8adaaef7ef9f36714ee4c
 SHA512:
-  metadata.gz: 7fd6901908df25c04a9577ca93cc99af64981a47011aae0e0228cd91ff91c2532c7823d3feebcdb2ba9a713af5b698fe335dae52c13f5257209368659716f426
-  data.tar.gz: 8eb4ed0faad41d749c964e7baff1b3468de9a03a4371435320a39c9f14a43d0e089ead9f4d173613b260c3cd0e09cdde79b3bf7ec62233f57717d9a96fa10e09
+  metadata.gz: ebac066932bfbadb5c22e39cd472e0263de23b600e15cb36f733cde4d18f00805f6906b0c01127b699ee0b25420bbff2b7581b9f5b57b0bef3ea33401e1fe6f4
+  data.tar.gz: 46b7f0c060874447f2d5425f30632ee0778065a3173df7ca9e256b64034af36e04d014023f664548e5663eb4e50605c0175efe0410fcdce4918d092ba65050d3

data/CHANGELOG.md

@@ -1,5 +1,12 @@
-##Current - 0.0.3  
+##Current - 0.0.4  
 
+#### Remove unnecessary code  
+#### Code refactor  
+#### Fix bug with multiple models names compatibility  
+#### Fix registration bug from version 0.0.3  
+
+
+### 0.0.3
 #### Passing ActiveRecord error message to RegistrationFailed exception
 
 

data/lib/grape_devise_auth.rb

@@ -17,9 +17,7 @@ module GrapeDeviseAuth
                    :token_lifespan,
                    :max_number_of_devices,
                    :headers_names,
-                   :remove_tokens_after_password_reset,
-                   :authenticate_all,
-                   :skip_middleware_unauthorized_error_raising
+                   :remove_tokens_after_password_reset
 
     def configuration
       @configuration ||= Configuration.new
@@ -42,4 +40,4 @@ module GrapeDeviseAuth
       )
     end
   end
-end
+end

data/lib/grape_devise_auth/auth_headers.rb

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

data/lib/grape_devise_auth/auth_helpers.rb

@@ -7,17 +7,18 @@ module GrapeDeviseAuth
         end
 
         define_method("authenticate_#{mapping}") do
-          load_auth_headers_data(mapping)
-          authorizer_data  = AuthorizerData.from_env(env)
-          devise_interface = DeviseInterface.new(authorizer_data)
-          token_authorizer = TokenAuthorizer.new(authorizer_data,
+          @authorizer_data  = AuthorizerData.from_env(env)
+          devise_interface = DeviseInterface.new(@authorizer_data)
+          token_authorizer = TokenAuthorizer.new(@authorizer_data,
                                                  devise_interface)
 
           resource = token_authorizer.authenticate_from_token(mapping)
           if resource
             devise_interface.set_user_in_warden(mapping, resource)
-            update_expiry_for_client_token(authorizer_data.client_id)
-            true
+            env[Configuration::CURRENT_AUTH_HEADERS] = AuthHeaders.new(warden,
+                                                                       mapping,
+                                                                       env[Configuration::REQUEST_START],
+                                                                       @authorizer_data).headers
           end
         end
 
@@ -33,7 +34,7 @@ module GrapeDeviseAuth
           resource = resource_class(mapping).find_by_uid(uid)
 
           if resource && valid_params?(field, uid) && resource.valid_password?(params[:password]) && (!resource.respond_to?(:active_for_authentication?) || resource.active_for_authentication?)
-            update_env_with_auth_data(resource.create_new_auth_token)
+            env[Configuration::CURRENT_AUTH_HEADERS] = resource.create_new_auth_token
             warden.set_user(resource, scope: mapping, store: false)
           end
         end
@@ -74,16 +75,13 @@ module GrapeDeviseAuth
             resource.email = declared(params)['email'].try :downcase
           end
 
-          if resource.save
-            update_env_with_auth_data(resource.create_new_auth_token)
-          else
-            resource
-          end
+          env[Configuration::CURRENT_AUTH_HEADERS] = resource.create_new_auth_token if resource.save
+          resource
         end
 
         define_method("register_#{mapping}!") do
           register = send("register_#{mapping}")
-          raise RegistrationFailed.new(register.errors) if register.errors
+          raise RegistrationFailed.new(register.errors) if register.errors.any?
           register
         end
       end
@@ -121,23 +119,5 @@ module GrapeDeviseAuth
     def find_uid(field)
       request.headers[field.to_s.capitalize] || params[field] || request.headers['Uid'] || params['uid']
     end
-
-    def load_auth_headers_data(mapping)
-      env[Configuration::UID_KEY] = find_uid(authentication_field(mapping))
-      env[Configuration::CLIENT_KEY] = request.headers['Client'] || params['client']
-      env[Configuration::ACCESS_TOKEN_KEY] = request.headers['Access-Token'] || params['access-token']
-    end
-
-    def update_expiry_for_client_token(client_id)
-      if @user
-        @client_id = client_id
-        @user.tokens[@client_id]['expiry'] = (Time.now + GrapeDeviseAuth.token_lifespan).to_i
-        @user.save
-      end
-    end
-
-    def update_env_with_auth_data(auth_data)
-      env[Configuration::CURRENT_AUTH_HEADERS] = auth_data
-    end
   end
 end

data/lib/grape_devise_auth/configuration.rb

@@ -2,24 +2,22 @@ module GrapeDeviseAuth
   class Configuration
     attr_accessor :batch_request_buffer_throttle,
                   :change_headers_on_each_request,
-                  :authenticate_all,
                   :default_provider,
                   :token_lifespan,
                   :max_number_of_devices,
                   :headers_names,
-                  :remove_tokens_after_password_reset,
-                  :skip_middleware_unauthorized_error_raising
+                  :remove_tokens_after_password_reset
 
     ACCESS_TOKEN_KEY = 'HTTP_ACCESS_TOKEN'
     EXPIRY_KEY = 'HTTP_EXPIRY'
     UID_KEY = 'HTTP_UID'
     CLIENT_KEY = 'HTTP_CLIENT'
+    REQUEST_START = 'REQUEST_START'
     CURRENT_AUTH_HEADERS = 'CURRENT_AUTH_HEADERS'
 
     def initialize
       @batch_request_buffer_throttle = 2.weeks
       @change_headers_on_each_request = true
-      @authenticate_all = false
       @default_provider = 'email'
       @token_lifespan = 2.weeks
       @max_number_of_devices = 10
@@ -29,11 +27,6 @@ module GrapeDeviseAuth
                         :'uid' => 'uid',
                         :'token-type' => 'token-type' }
       @remove_tokens_after_password_reset = false
-      @skip_middleware_unauthorized_error_raising = true
-    end
-
-    def auth_all?
-      @authenticate_all
     end
   end
 end

data/lib/grape_devise_auth/middleware.rb

@@ -1,6 +1,5 @@
 module GrapeDeviseAuth
   class Middleware
-    extend Forwardable
 
     def initialize(app, resource_name)
       @app = app
@@ -9,58 +8,17 @@ module GrapeDeviseAuth
 
     def call(env)
       setup(env)
-      begin
-        auth_all
-        responses_with_auth_headers(*@app.call(env))
-      rescue Unauthorized => _e
-        return unauthorized unless GrapeDeviseAuth.skip_middleware_unauthorized_error_raising
-        raise Unauthorized
-      end
+      responses_with_headers(*@app.call(env))
     end
 
     private
 
-    attr_reader :authorizer_data, :token_authorizer, :resource, :request_start
-    def_delegators :@authorizer_data, :warden, :token, :client_id
-
-    def auth_all
-      return if skip_auth_all?
-      user = token_authorizer.authenticate_from_token(@resource_name)
-      fail Unauthorized unless user
-      sign_in_user(user)
-    end
-
-    def skip_auth_all?
-      !GrapeDeviseAuth.configuration.auth_all?
-    end
-
     def setup(env)
-      @request_start    = Time.now
-      @authorizer_data  = AuthorizerData.from_env(env)
-      @devise_interface = DeviseInterface.new(@authorizer_data)
-      @token_authorizer = TokenAuthorizer.new(@authorizer_data,
-                                              @devise_interface)
-    end
-
-    def sign_in_user(user)
-      @devise_interface.set_user_in_warden(@resource_name, user)
-    end
-
-    def responses_with_auth_headers(status, headers, response)
-      auth_headers = AuthHeaders.new(warden, @resource_name, request_start, authorizer_data)
-      [
-        status,
-        headers.merge(auth_headers.headers),
-        response
-      ]
+      env[Configuration::REQUEST_START] = Time.now
     end
 
-    def unauthorized
-      [401,
-       { 'Content-Type' => 'application/json'
-       },
-       []
-      ]
+    def responses_with_headers(status, headers, response)
+      [ status, headers, response ]
     end
   end
 end

data/lib/grape_devise_auth/version.rb

@@ -1,3 +1,3 @@
 module GrapeDeviseAuth
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape_devise_auth
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Anton Sokolskyi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-09 00:00:00.000000000 Z
+date: 2016-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler