nyauth 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f37035167e1f90170a80e5e56b0523d7bc51b64e
-  data.tar.gz: 066c6ab929e8ec5a62bf4f408d907af17fb1a86e
+  metadata.gz: 5575c6f6f641ecad045a93b77c40faec4c42ab70
+  data.tar.gz: 4a052e63f7175875367985d4b5704c34a2df1eda
 SHA512:
-  metadata.gz: 6345b60be6812d70b38e502fae73fe497b342db02843c56579ffa70d5d8f57445464019d6deb59711baeb536df2b33e521b9bd94548289088e3c699a2919cb1b
-  data.tar.gz: 0fd6d78ce22fc48f4cb0a10bf7912ceedd8b1fec33db34a2dc3a167f87eb511c6fbcf9c197af15ef7bf51158ed529791dfeeff39a2ad81398b8309d8b98a6242
+  metadata.gz: 6d7949a04cca35acfa2e8a15082c245d347c50ab7bad3d064d5c065b5a1fce1fdb90690e49b3678b831a867e3a2277f43475facbd9e98b47a48861b13f3c061f
+  data.tar.gz: 3b57115fe59252703f48bedf7a7d48232b20e2a514c55b949c4711d41667c21fad63962bbea91aad14e26f85480deccd38eff6b59db6d348da5630bfb6ab33fc

data/README.md

@@ -9,7 +9,7 @@ Simple & modulable authentication gem
 ```ruby
 class ApplicationController < ActionController::Base
   include Nyauth::ControllerConcern
-  before_action -> { require_authentication! as: client_name }
+  before_action -> { require_authentication! as: nyauth_client_name }
 end
 ```
 

data/app/controllers/concerns/nyauth/client_concern.rb

@@ -8,6 +8,7 @@ module Nyauth
 
     def initialize
       @nyauth_client_classes = {}
+
       super
     end
 

data/app/controllers/concerns/nyauth/session_concern.rb

@@ -13,7 +13,7 @@ module Nyauth
     # sign_in(client)
     def sign_in(client)
       return unless client
-      store_signed_in_session(client)
+      store_signed_in_status(client)
     end
 
     # ex.)
@@ -28,6 +28,11 @@ module Nyauth
     # sign_out
     def sign_out
       reset_session
+
+      if Nyauth.configuration.use_cookie_auth
+        # ex.) cookies.signed[:user_id]
+        cookies.delete :nyauth_cookie_auth
+      end
     end
 
     # ex.)
@@ -36,6 +41,7 @@ module Nyauth
       options.reverse_merge!(as: :user)
       return if self.class.allow_actions == :all
       return if self.class.allow_actions.present? && request[:action].to_sym.in?(self.class.allow_actions)
+
       unless signed_in?(options)
         session["#{options[:as]}_return_to"] = request.url if request.get?
         redirect_to new_session_path_for(options[:as])
@@ -47,8 +53,13 @@ module Nyauth
       nyauth_nyan.session.fetch(options[:as])
     end
 
-    def store_signed_in_session(client)
+    def store_signed_in_status(client)
       nyauth_nyan.session.store(client, client.class.name.demodulize.underscore)
+
+      if Nyauth.configuration.use_cookie_auth
+        # ex.) cookies.signed[:user_id]
+        cookies.signed[:nyauth_cookie_auth] = "#{client.class.name.demodulize.underscore}:#{client.id}"
+      end
     end
 
     private

data/app/controllers/nyauth/base_controller.rb

@@ -0,0 +1,7 @@
+module Nyauth
+  class BaseController < ApplicationController
+    include Nyauth::ControllerConcern
+    self.responder = Nyauth::AppResponder
+    respond_to :html, :json
+  end
+end

data/app/controllers/nyauth/confirmation_requests_controller.rb

@@ -1,9 +1,8 @@
 module Nyauth
-  class ConfirmationRequestsController < ApplicationController
-    include Nyauth::ControllerConcern
+  class ConfirmationRequestsController < Nyauth::BaseController
     allow_everyone
     self.responder = Nyauth::AppResponder
-    respond_to :html, :json
+
     before_action :set_service
     after_action :send_mail, only: [:create], if: -> { @service.errors.blank? }
 

data/app/controllers/nyauth/confirmations_controller.rb

@@ -1,9 +1,8 @@
 module Nyauth
-  class ConfirmationsController < ApplicationController
-    include Nyauth::ControllerConcern
+  class ConfirmationsController < Nyauth::BaseController
     allow_everyone
     self.responder = ConfirmationResponder
-    respond_to :html, :json
+
     before_action :set_client
 
     def update

data/app/controllers/nyauth/passwords_controller.rb

@@ -1,10 +1,6 @@
 module Nyauth
-  class PasswordsController < ApplicationController
-    include Nyauth::ControllerConcern
+  class PasswordsController < Nyauth::BaseController
     before_action -> { require_authentication! as: nyauth_client_name }
-
-    self.responder = Nyauth::AppResponder
-    respond_to :html, :json
     before_action :set_client
 
     def edit

data/app/controllers/nyauth/registrations_controller.rb

@@ -1,9 +1,6 @@
 module Nyauth
-  class RegistrationsController < ApplicationController
-    include Nyauth::ControllerConcern
+  class RegistrationsController < Nyauth::BaseController
     allow_everyone
-    self.responder = Nyauth::AppResponder
-    respond_to :html, :json
     before_action :set_service
 
     def new

data/app/controllers/nyauth/reset_password_requests_controller.rb

@@ -1,9 +1,6 @@
 module Nyauth
-  class ResetPasswordRequestsController < ApplicationController
-    include Nyauth::ControllerConcern
+  class ResetPasswordRequestsController < Nyauth::BaseController
     allow_everyone
-    self.responder = Nyauth::AppResponder
-    respond_to :html, :json
     before_action :set_service
     after_action :send_mail, only: [:create], if: -> { @service.errors.blank? }
 

data/app/controllers/nyauth/reset_passwords_controller.rb

@@ -1,9 +1,6 @@
 module Nyauth
-  class ResetPasswordsController < ApplicationController
-    include Nyauth::ControllerConcern
+  class ResetPasswordsController < Nyauth::BaseController
     allow_everyone
-    self.responder = Nyauth::AppResponder
-    respond_to :html, :json
     before_action :set_client
 
     def edit

data/app/controllers/nyauth/sessions_controller.rb

@@ -1,10 +1,7 @@
 module Nyauth
-  class SessionsController < ApplicationController
-    include Nyauth::ControllerConcern
-    before_action -> { require_authentication! as: nyauth_client_name }
+  class SessionsController < Nyauth::BaseController
     allow_everyone only: [:new, :create]
-    self.responder = Nyauth::AppResponder
-    respond_to :html, :json
+    before_action -> { require_authentication! as: nyauth_client_name }
     before_action :set_service
 
     def new

data/app/helpers/nyauth/application_helper.rb

@@ -14,6 +14,7 @@ module Nyauth
     def detect_url_helper(feature, nyauth_client_name, *args)
       @__methods ||= Nyauth::Engine.routes.url_helpers.instance_methods + Rails.application.routes.url_helpers.instance_methods
       @__candidates ||= @__methods.reject{|m| m =~ /\A(:?rails_|_)/}.map(&:to_s)
+
       if respond_to?(:nyauth) && nyauth_client_name.to_sym == :user
         # mounted as nyauth
         detect_url_helper_for_nyauth(feature, *args)
@@ -25,6 +26,7 @@ module Nyauth
     def detect_url_helper_for_nyauth(feature, *args)
       path = @__candidates.grep(/\A#{feature}_path\z/).first
       return nil unless path
+
       nyauth.__send__(path, *args)
     end
 
@@ -34,7 +36,9 @@ module Nyauth
       else
         path = @__candidates.grep(/\A#{nyauth_client_name}_#{feature}_path\z/).first
       end
+
       return nil unless path
+
       main_app.__send__(path, *args)
     end
 

data/app/models/concerns/nyauth/authenticatable.rb

@@ -4,7 +4,6 @@ module Nyauth
     include Nyauth::PasswordDigestAbility
     include Nyauth::ResetPasswordAbility
 
-
     included do
       validates :email, presence: true
     end
@@ -13,6 +12,7 @@ module Nyauth
       def authenticate(given_email, given_password)
         record = where(email: given_email).last
         return nil unless record
+
         record.verify_password?(given_password) ? record : nil
       end
     end

data/lib/generators/nyauth/templates/nyauth_install_initializer.rb

@@ -3,6 +3,7 @@ Nyauth.configure do |config|
   config.confirmation_expire_limit = 1.hour
   config.reset_password_expire_limit = 1.hour
   config.mail_delivery_method = :deliver_now
+  config.use_cookie_auth = false
   config.redirect_path do |urls|
     # config.redirect_path_after_sign_in = -> (client_name) {
     #  if client_name == :admin

data/lib/nyauth/configuration.rb

@@ -14,7 +14,8 @@ module Nyauth
                   :password_minium,
                   :password_digest_stretches,
                   :encryption_secret,
-                  :mail_delivery_method
+                  :mail_delivery_method,
+                  :use_cookie_auth
 
 
     def initialize
@@ -32,6 +33,7 @@ module Nyauth
       @password_digest_stretches = 1000
       @encryption_secret = ENV['NYAUTH_ENCRYPTION_SECRET']
       @mail_delivery_method = :deliver_now
+      @use_cookie_auth = false
       @redirect_path_block = Proc.new {}
     end
 

data/lib/nyauth/middleware.rb

@@ -8,6 +8,7 @@ module Nyauth
 
     def call(env)
       return @app.call(env) if env['nyauth']
+
       env['nyauth'] = Nyauth::Nyan.new(env)
       Nyauth::Nyan.run_callback env['nyauth'] do
         @app.call(env)

data/lib/nyauth/nyan.rb

@@ -16,6 +16,7 @@ module Nyauth
           callback.call(nyan, *options)
         end
       end
+
       @@_on_test_request = []
       yield
     end

data/lib/nyauth/session_serializer.rb

@@ -19,6 +19,7 @@ module Nyauth
 
     def store(client, scope)
       return unless client
+
       session[key_for(scope)] = serialize(client)
     end
 
@@ -35,7 +36,7 @@ module Nyauth
       !!session[key_for(scope)]
     end
 
-    def delete(scope, client=nil)
+    def delete(scope)
       session.delete(key_for(scope))
     end
 

data/lib/nyauth/version.rb

@@ -1,3 +1,3 @@
 module Nyauth
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/spec/dummy/config/initializers/nyauth.rb

@@ -1,3 +1,4 @@
 Nyauth.configure do |config|
   config.encryption_secret = ENV['NYAUTH_ENCRYPTION_SECRET'] || 'rails6dd08eff1c2cf5aecb54cb1a97266817b58cc27f06be9e95918c06607d3950d623a4fd4c0c306d2216cdaf3f99871e21e0e975a5e64ef5cf286b68ed8d7379a4'
+  config.use_cookie_auth = true
 end