devise_auth_proxy 0.1.15 → 0.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20805a1ba1bcb48973d41d94dca1e8d631009db673d682b4d420422ffe1ba236
-  data.tar.gz: bfb81e6096594674589512479b6a8ef1a6ce8dd379ed48b64771b9283e74bc48
+  metadata.gz: f2b0861fe8d5e53bd761613539ff5633242f7be6628bdf9d0e27eec971dbe2b1
+  data.tar.gz: a2c0f4aea50cab2071125bed3b8835eba0beef844d95c26aca0ef6f84b39c385
 SHA512:
-  metadata.gz: e49b03595c57b9388a99f55c40242da8ef2d0b00cfcf870648d4af1020a9b090a6059e2ef7e7f81651e770a738c3577460ef21d8ccae5086d07dc3d6adb93622
-  data.tar.gz: a7bf31dbf8a6923f223e4495a39b94f57bd8900d796e1de67f4e14a8310558e637eec3e5c35cfe3473a23bbf73437d8a1e5b75fd09221669d1091c9a527e929c
+  metadata.gz: 9b9c1db28587c5ece2ecfc377d9d808cb6aa3211db6e8bc48bfa11d5db973901802c783c0ccc0bf8afdbb3a36c64181ef05d04fe13c044ae971041dbb47fbacb
+  data.tar.gz: 43a767a92a0e99b2cafecc68d74e9197266dcb03fab60e174a901a5574d13a49c2fce0328fab88878155c51f07c630f359d092ea630173d06437bcab5a5b86aa

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    devise_auth_proxy (0.1.15)
+    devise_auth_proxy (0.1.20)
       devise
 
 GEM

data/lib/devise_auth_proxy.rb

@@ -3,7 +3,7 @@ require 'devise_auth_proxy/version'
 
 module DeviseAuthProxy
   class << self
-    attr_accessor :env_key, :auto_create, :auto_update, :auth_key, :attribute_map, :logout_url
+    attr_accessor :env_key, :auto_create, :auto_update, :auth_key, :attribute_map, :default_role, :logout_url
   end
 
   # request.env key for remote user name
@@ -23,6 +23,9 @@ module DeviseAuthProxy
   # Map of User model attributes to request.env keys for updating a local user when auto-creation is enabled.
   self.attribute_map = {}
 
+  # Set default role for new user.
+  self.default_role = []
+
   # Settings for redirecting to the remote user logout URL
   # Enable by including DeviseAuthProxy::Controllers::Helpers in ApplicationController
   # (it overrides Devise's after_sign_out_path_for method).
@@ -32,7 +35,7 @@ module DeviseAuthProxy
     yield self
   end
 
-  def self.remote_user_id env
+  def self.proxy_user_id(env)
     case env_key
     when Proc
       env_key.call(env)

data/lib/devise_auth_proxy/helper.rb

@@ -0,0 +1,17 @@
+module DeviseAuthProxy
+  module Helper
+
+    # Modify session controller after user log out.
+    # To redirect user to a custom url.
+    def after_sign_out_path_for(resource_or_scope)
+      DeviseAuthProxy.logout_url if proxy_user_authenticated? and DeviseAuthProxy.logout_url
+      super
+    end
+
+    private
+
+    def proxy_user_authenticated?
+      DeviseAuthProxy.proxy_user_id(request.env).present?
+    end
+  end
+end

data/lib/devise_auth_proxy/manager.rb

@@ -27,31 +27,37 @@ module DeviseAuthProxy
     end
 
     def create_user
-      unless Devise.mappings[:user].strategies.include?(:database_authenticatable)
+      unless Devise.mappings[:admin_user].strategies.include?(:database_authenticatable)
         return klass.create(user_criterion)
       end
 
       random_password = SecureRandom.hex(16)
-      attrs = user_criterion.merge({password: random_password, password_confirmation: random_password})
+      attrs = user_criterion.merge({
+                                       password: random_password,
+                                       password_confirmation: random_password,
+                                       roles: DeviseAuthProxy.default_role
+                                   })
+
+
       klass.create(attrs)
     end
 
     def update_user(user)
-      user.update_attributes(remote_user_attributes)
+      user.update_attributes(proxy_user_attributes)
     end
 
     protected
 
-    def remote_user_attributes
+    def proxy_user_attributes
       DeviseAuthProxy.attribute_map.inject({}) { |h, (k, v)| h[k] = env[v] if env.has_key?(v); h }
     end
 
     def user_criterion
-      {auth_key => remote_user_id}
+      {auth_key => proxy_user_id}
     end
 
-    def remote_user_id
-      DeviseAuthProxy.remote_user_id(env)
+    def proxy_user_id
+      DeviseAuthProxy.proxy_user_id(env)
     end
 
     def auth_key

data/lib/devise_auth_proxy/model.rb

@@ -7,7 +7,6 @@ module Devise
       extend ActiveSupport::Concern
 
       included do
-        attr_reader :current_password, :password
         def self.find_for_auth_proxy_authentication(env)
           manager = DeviseAuthProxy::Manager.new(self, env)
           manager.find_or_create_user

data/lib/devise_auth_proxy/strategy.rb

@@ -5,12 +5,16 @@ module Devise
     class AuthProxyAuthenticatable < Authenticatable
 
       def valid?
-        DeviseAuthProxy.remote_user_id(env).present?
+        DeviseAuthProxy.proxy_user_id(env).present?
       end
 
       def authenticate!
         resource = mapping.to.find_for_auth_proxy_authentication(env)
-        resource ? success!(resource) : fail
+
+        return fail(:invalid) unless resource
+
+        # remember_me(resource)
+        success!(resource)
       end
 
     end

data/lib/devise_auth_proxy/version.rb

@@ -1,3 +1,3 @@
 module DeviseAuthProxy
-  VERSION = "0.1.15"
+  VERSION = "0.1.20"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_auth_proxy
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.20
 platform: ruby
 authors:
 - QuangTK
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-29 00:00:00.000000000 Z
+date: 2020-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -44,6 +44,7 @@ files:
 - bin/setup
 - devise_auth_proxy.gemspec
 - lib/devise_auth_proxy.rb
+- lib/devise_auth_proxy/helper.rb
 - lib/devise_auth_proxy/manager.rb
 - lib/devise_auth_proxy/model.rb
 - lib/devise_auth_proxy/strategy.rb