nyauth 0.2.8 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52716de1c677f6ce21afc860a01e77f344044698
-  data.tar.gz: 356ea1bc8a34c7d72f0792794dcc01242fe9ecbd
+  metadata.gz: 87601c468486a44c289a5237814b284c2ddd99a3
+  data.tar.gz: 6a6b8354a185b0e79712b0ead1fb173a7277074c
 SHA512:
-  metadata.gz: 579895bb751bcc14a30e191567d7a6c43ddad922dd89d7bc10c441841cbb6ad4364b192ee20b9c32f98742d4a82d3501731ac0e862d171db553209788324843d
-  data.tar.gz: d421b721c37802b4a4299b835cc3888117ebcb0ec9d203066bf90fd2a4f62472eef5f6699c6dc4b73148227d6ae65ef68026e837f96c60472bdfe71d66547eb9
+  metadata.gz: faa4fe34f07107d34c8eec9afa935522bf28e29f5f78e60a391c4923a02009338b8398ebace396d42314535c21dd275f8aba592a5635d75bc6d9324760358c64
+  data.tar.gz: 35c441c44d9e59689368b606fe49267e68ffb4bd6fab19708901472faaf1d95a60bcb0d8199384c13ba33faa9930ec4532161643d11afe0ab3f7c9731f4abb2d

data/README.md

@@ -8,8 +8,7 @@ Simple & modulable authentication gem
 
 ```ruby
 class ApplicationController < ActionController::Base
-  include Nyauth::SessionConcern
-  include Nyauth::ClientConcern
+  include Nyauth::ControllerConcern
   before_action -> { require_authentication! as: client_name }
 end
 ```
@@ -199,11 +198,16 @@ ja:
 spec/rails_helper.rb
 
 ```ruby
-require 'nyauth/test/controller_macros'
-require 'nyauth/test/feature_macros'
+require 'nyauth/test/macros'
 
 RSpec.configure do |config|
   config.include Nyauth::Test::ControllerMacros, type: :controller
   config.include Nyauth::Test::FeatureMacros, type: :feature
 end
 ```
+
+use macro
+
+```
+background { sign_in(user) }
+```

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

@@ -2,30 +2,42 @@ module Nyauth
   module ClientConcern
     extend ActiveSupport::Concern
     included do |base|
-      helper_method :client_class
-      helper_method :client_name
+      helper_method :nyauth_client_class
+      helper_method :nyauth_client_name
+      helper_method :client_class # deprecated
+      helper_method :client_name # deprecated
     end
 
     def initialize
-      @client_classes = {}
+      @nyauth_client_classes = {}
       super
     end
 
     private
 
-    def mounted_path
+    def nyauth_mounted_path
       request.script_name.presence || "/#{request.path.split('/').try(:second)}"
     end
 
-    # specify client class from mounted_path
-    def client_class
-      @client_classes[mounted_path] ||= mounted_path[1..-1].classify.constantize
+    # specify client class from nyauth_mounted_path
+    def nyauth_client_class
+      @nyauth_client_classes[nyauth_mounted_path] ||= nyauth_mounted_path[1..-1].classify.constantize
     rescue
-      @client_classes[mounted_path] = User
+      @nyauth_client_classes[nyauth_mounted_path] = User
+    end
+
+    def nyauth_client_name
+      nyauth_client_class.name.underscore.to_sym
+    end
+
+    def client_class
+      warn 'DEPRECATION WARNING: client_class is deprecated. Please use nyauth_client_class'
+      nyauth_client_class
     end
 
     def client_name
-      client_class.name.underscore.to_sym
+      warn 'DEPRECATION WARNING: client_name is deprecated. Please use nyauth_client_name'
+      nyauth_client_name
     end
   end
 end

data/app/controllers/concerns/nyauth/{application_concern.rb → controller_concern.rb}

@@ -1,7 +1,9 @@
 module Nyauth
-  module ApplicationConcern
+  module ControllerConcern
     extend ActiveSupport::Concern
     include Nyauth::ApplicationHelper
+    include Nyauth::SessionConcern
+    include Nyauth::ClientConcern
 
     included do
       helper Nyauth::ApplicationHelper

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

@@ -36,7 +36,8 @@ 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)
-      head :unauthorized unless signed_in?(options)
+      session["#{options[:as]}_return_to"] = request.url if request.get?
+      redirect_to new_session_path_for(options[:as]) unless signed_in?(options)
     end
 
     def current_authenticated(options = {})

data/app/controllers/nyauth/confirmation_requests_controller.rb

@@ -1,7 +1,6 @@
 module Nyauth
   class ConfirmationRequestsController < ApplicationController
-    include Nyauth::ApplicationConcern
-    include Nyauth::ClientConcern
+    include Nyauth::ControllerConcern
     allow_everyone
     self.responder = Nyauth::AppResponder
     respond_to :html, :json
@@ -13,13 +12,13 @@ module Nyauth
 
     def create
       @client.request_confirmation
-      respond_with(@client, location: Nyauth.configuration.redirect_path_after_create_request_confirmation.call(client_name) || main_app.root_path)
+      respond_with(@client, location: Nyauth.configuration.redirect_path_after_create_request_confirmation.call(nyauth_client_name) || main_app.root_path)
     end
 
     private
 
     def set_client
-      @client = client_class.find_by!(email: params[client_name][:email])
+      @client = nyauth_client_class.find_by!(email: params[nyauth_client_name][:email])
     rescue ActiveRecord::RecordNotFound
       render :new
     end

data/app/controllers/nyauth/confirmations_controller.rb

@@ -1,7 +1,6 @@
 module Nyauth
   class ConfirmationsController < ApplicationController
-    include Nyauth::ApplicationConcern
-    include Nyauth::ClientConcern
+    include Nyauth::ControllerConcern
     allow_everyone
     self.responder = ConfirmationResponder
     respond_to :html, :json
@@ -9,13 +8,13 @@ module Nyauth
 
     def update
       @client.confirm
-      respond_with(@client, location: Nyauth.configuration.redirect_path_after_update_confirmation.call(client_name) || main_app.root_path)
+      respond_with(@client, location: Nyauth.configuration.redirect_path_after_update_confirmation.call(nyauth_client_name) || main_app.root_path)
     end
 
     private
 
     def set_client
-      @client = client_class.find_by!(confirmation_key: params[:confirmation_key])
+      @client = nyauth_client_class.find_by!(confirmation_key: params[:confirmation_key])
     end
   end
 end

data/app/controllers/nyauth/passwords_controller.rb

@@ -1,9 +1,7 @@
 module Nyauth
   class PasswordsController < ApplicationController
-    include Nyauth::ApplicationConcern
-    include Nyauth::ClientConcern
-    include Nyauth::SessionConcern
-    before_action -> { require_authentication! as: client_name }
+    include Nyauth::ControllerConcern
+    before_action -> { require_authentication! as: nyauth_client_name }
 
     self.responder = Nyauth::AppResponder
     respond_to :html, :json
@@ -15,17 +13,17 @@ module Nyauth
     def update
       @client.attributes = client_params
       @client.save(context: :update_password)
-      respond_with(@client, location: Nyauth.configuration.redirect_path_after_update_password.call(client_name) || main_app.root_path)
+      respond_with(@client, location: Nyauth.configuration.redirect_path_after_update_password.call(nyauth_client_name) || main_app.root_path)
     end
 
     private
 
     def set_client
-      @client = client_class.find(current_authenticated.id)
+      @client = nyauth_client_class.find(current_authenticated.id)
     end
 
     def client_params
-      params.fetch(client_name, {})
+      params.fetch(nyauth_client_name, {})
             .permit(:password, :password_confirmation)
     end
   end

data/app/controllers/nyauth/registrations_controller.rb

@@ -1,7 +1,6 @@
 module Nyauth
   class RegistrationsController < ApplicationController
-    include Nyauth::ApplicationConcern
-    include Nyauth::ClientConcern
+    include Nyauth::ControllerConcern
     allow_everyone
     self.responder = Nyauth::AppResponder
     respond_to :html, :json
@@ -12,17 +11,17 @@ module Nyauth
 
     def create
       sign_in(@client) if @client.save
-      respond_with(@client, location: Nyauth.configuration.redirect_path_after_registration.call(client_name) || main_app.root_path)
+      respond_with(@client, location: Nyauth.configuration.redirect_path_after_registration.call(nyauth_client_name) || main_app.root_path)
     end
 
     private
 
     def set_client
-      @client = client_class.new(client_params)
+      @client = nyauth_client_class.new(client_params)
     end
 
     def client_params
-      params.fetch(client_name, {})
+      params.fetch(nyauth_client_name, {})
             .permit(:email, :password, :password_confirmation)
     end
   end

data/app/controllers/nyauth/reset_password_requests_controller.rb

@@ -1,7 +1,6 @@
 module Nyauth
   class ResetPasswordRequestsController < ApplicationController
-    include Nyauth::ApplicationConcern
-    include Nyauth::ClientConcern
+    include Nyauth::ControllerConcern
     allow_everyone
     self.responder = Nyauth::AppResponder
     respond_to :html, :json
@@ -13,13 +12,13 @@ module Nyauth
 
     def create
       @client.request_reset_password
-      respond_with(@client, location: Nyauth.configuration.redirect_path_after_reset_password_request.call(client_name) || main_app.root_path)
+      respond_with(@client, location: Nyauth.configuration.redirect_path_after_reset_password_request.call(nyauth_client_name) || main_app.root_path)
     end
 
     private
 
     def set_client
-      @client = client_class.find_by!(email: params[client_name][:email])
+      @client = nyauth_client_class.find_by!(email: params[nyauth_client_name][:email])
     rescue ActiveRecord::RecordNotFound
       render :new
     end

data/app/controllers/nyauth/reset_passwords_controller.rb

@@ -1,7 +1,6 @@
 module Nyauth
   class ResetPasswordsController < ApplicationController
-    include Nyauth::ApplicationConcern
-    include Nyauth::ClientConcern
+    include Nyauth::ControllerConcern
     allow_everyone
     self.responder = Nyauth::AppResponder
     respond_to :html, :json
@@ -9,23 +8,23 @@ module Nyauth
 
     def edit
       unless @client.valid?(:edit_reset_password)
-        redirect_to new_session_path_for(client_name), alert: @client.errors[:reset_password_key].last
+        redirect_to new_session_path_for(nyauth_client_name), alert: @client.errors[:reset_password_key].last
       end
     end
 
     def update
       @client.reset_password(client_params)
-      respond_with(@client, location: Nyauth.configuration.redirect_path_after_reset_password.call(client_name) || new_session_path_for(client_name))
+      respond_with(@client, location: Nyauth.configuration.redirect_path_after_reset_password.call(nyauth_client_name) || new_session_path_for(nyauth_client_name))
     end
 
     private
 
     def set_client
-      @client = client_class.find_by!(reset_password_key: params[:reset_password_key])
+      @client = nyauth_client_class.find_by!(reset_password_key: params[:reset_password_key])
     end
 
     def client_params
-      params.fetch(client_name, {})
+      params.fetch(nyauth_client_name, {})
             .permit(:password, :password_confirmation)
     end
   end

data/app/controllers/nyauth/sessions_controller.rb

@@ -1,9 +1,7 @@
 module Nyauth
   class SessionsController < ApplicationController
-    include Nyauth::ApplicationConcern
-    include Nyauth::ClientConcern
-    include Nyauth::SessionConcern
-    before_action -> { require_authentication! as: client_name }
+    include Nyauth::ControllerConcern
+    before_action -> { require_authentication! as: nyauth_client_name }
     allow_everyone only: [:new, :create]
     self.responder = Nyauth::AppResponder
     respond_to :html, :json
@@ -13,13 +11,17 @@ module Nyauth
     end
 
     def create
-      sign_in(@session_service.client) if @session_service.save(as: client_name)
-      respond_with @session_service, location: Nyauth.configuration.redirect_path_after_sign_in.call(client_name) || main_app.root_path
+      sign_in(@session_service.client) if @session_service.save(as: nyauth_client_name)
+      redirect_path =  session.delete("#{nyauth_client_name}_return_to")
+      respond_with @session_service,
+                   location: redirect_path || \
+                   Nyauth.configuration.redirect_path_after_sign_in.call(nyauth_client_name) || \
+                   main_app.root_path
     end
 
     def destroy
       sign_out
-      respond_with @session_service, location: Nyauth.configuration.redirect_path_after_sign_out.call(client_name) || new_session_path_for(client_name)
+      respond_with @session_service, location: Nyauth.configuration.redirect_path_after_sign_out.call(nyauth_client_name) || new_session_path_for(nyauth_client_name)
     end
 
     private

data/app/helpers/nyauth/application_helper.rb

@@ -11,14 +11,14 @@ module Nyauth
     end
 
     # OPTIMEZE: :(
-    def detect_url_helper(feature, client_name, *args)
+    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) && client_name.to_sym == :user
+      if respond_to?(:nyauth) && nyauth_client_name.to_sym == :user
         # mounted as nyauth
         detect_url_helper_for_nyauth(feature, *args)
       else
-        detect_url_helper_for_app(feature, client_name, *args)
+        detect_url_helper_for_app(feature, nyauth_client_name, *args)
       end
     end
 
@@ -28,11 +28,11 @@ module Nyauth
       nyauth.__send__(path, *args)
     end
 
-    def detect_url_helper_for_app(feature, client_name, *args)
+    def detect_url_helper_for_app(feature, nyauth_client_name, *args)
       if feature =~ /new_(.+)/
-        path = @__candidates.grep(/\Anew_#{client_name}_#{$1}_path\z/).first
+        path = @__candidates.grep(/\Anew_#{nyauth_client_name}_#{$1}_path\z/).first
       else
-        path = @__candidates.grep(/\A#{client_name}_#{feature}_path\z/).first
+        path = @__candidates.grep(/\A#{nyauth_client_name}_#{feature}_path\z/).first
       end
       return nil unless path
       main_app.__send__(path, *args)

data/app/views/nyauth/confirmation_requests/new.html.erb

@@ -1,4 +1,4 @@
-<%= form_for client_class.new, url: confirmation_requests_path_for(client_name) do |f| %>
+<%= form_for nyauth_client_class.new, url: confirmation_requests_path_for(nyauth_client_name) do |f| %>
   <%= f.email_field :email %>
   <%= f.submit 'request confirmation' %>
 <% end %>

data/app/views/nyauth/passwords/edit.html.erb

@@ -1,4 +1,4 @@
-<%= form_for @client, url: password_path_for(client_name) do |f| %>
+<%= form_for @client, url: password_path_for(nyauth_client_name) do |f| %>
   <%= f.object.errors.full_messages %>
   <%= f.password_field :password %>
   <%= f.password_field :password_confirmation %>

data/app/views/nyauth/registrations/new.html.erb

@@ -1,4 +1,4 @@
-<%= form_for @client, url: registration_path_for(client_name) do |f| %>
+<%= form_for @client, url: registration_path_for(nyauth_client_name) do |f| %>
   <%= f.object.errors.full_messages.join ',' %>
   <%= f.email_field :email %>
   <%= f.password_field :password %>

data/app/views/nyauth/reset_password_requests/new.html.erb

@@ -1,4 +1,4 @@
-<%= form_for client_class.new, url: reset_password_requests_path_for(client_name) do |f| %>
+<%= form_for nyauth_client_class.new, url: reset_password_requests_path_for(nyauth_client_name) do |f| %>
   <%= f.text_field :email %>
   <%= f.submit 'reset password' %>
 <% end %>

data/app/views/nyauth/reset_passwords/edit.html.erb

@@ -1,4 +1,4 @@
-<%= form_for @client, url: reset_password_path_for(client_name, params[:reset_password_key]) do |f| %>
+<%= form_for @client, url: reset_password_path_for(nyauth_client_name, params[:reset_password_key]) do |f| %>
   <%= f.object.errors.full_messages %>
   <%= f.password_field :password %>
   <%= f.password_field :password_confirmation %>

data/app/views/nyauth/sessions/new.html.erb

@@ -1,4 +1,4 @@
-<%= form_for @session_service, url: session_path_for(client_name) do |f| %>
+<%= form_for @session_service, url: session_path_for(nyauth_client_name) do |f| %>
   <%= f.object.errors.full_messages.join ',' %>
   <%= f.email_field :email %>
   <%= f.password_field :password %>

data/lib/nyauth/test/macros.rb

@@ -0,0 +1,2 @@
+require 'nyauth/test/controller_macros'
+require 'nyauth/test/feature_macros'

data/lib/nyauth/version.rb

@@ -1,3 +1,3 @@
 module Nyauth
-  VERSION = "0.2.8"
+  VERSION = "0.3.0"
 end

data/spec/dummy/app/controllers/application_controller.rb

@@ -1,8 +1,4 @@
 class ApplicationController < ActionController::Base
-  include Nyauth::ApplicationConcern
-  include Nyauth::SessionConcern
-  self.responder = Nyauth::AppResponder
-  # Prevent CSRF attacks by raising an exception.
-  # For APIs, you may want to use :null_session instead.
+  include Nyauth::ControllerConcern
   protect_from_forgery with: :exception
 end

data/spec/dummy/app/controllers/posts_controller.rb

@@ -1,5 +1,6 @@
 class PostsController < ApplicationController
+  before_action -> { require_authentication! as: :user }
+
   def index
-    head :ok
   end
 end