nyauth 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87601c468486a44c289a5237814b284c2ddd99a3
-  data.tar.gz: 6a6b8354a185b0e79712b0ead1fb173a7277074c
+  metadata.gz: b179e705b0291eb4ab1cb5ceb28ed1ab60f6c36e
+  data.tar.gz: 789c2faca7c10305ecfdef41985394aeca889a4c
 SHA512:
-  metadata.gz: faa4fe34f07107d34c8eec9afa935522bf28e29f5f78e60a391c4923a02009338b8398ebace396d42314535c21dd275f8aba592a5635d75bc6d9324760358c64
-  data.tar.gz: 35c441c44d9e59689368b606fe49267e68ffb4bd6fab19708901472faaf1d95a60bcb0d8199384c13ba33faa9930ec4532161643d11afe0ab3f7c9731f4abb2d
+  metadata.gz: ae1e764608c2e31037aef15d9e52038f70de3f40b37998c30128078013abdb619a412c52ae63c073ed5fdd9280eb954a1c2bd498666eb251dfc5754e0efb3586
+  data.tar.gz: de4269ccf19ad4fb969f05f3b0ae33ca0fbdd846032f3f688c7fc182b0deb6f70a215ba0c6e74f471659a9dbba26c65c77fcd1db2afe84e500598a42912ba529

data/app/controllers/nyauth/confirmation_requests_controller.rb

@@ -4,27 +4,30 @@ module Nyauth
     allow_everyone
     self.responder = Nyauth::AppResponder
     respond_to :html, :json
-    before_action :set_client, only: [:create]
-    after_action :send_mail, only: [:create], if: -> { @client.confirmation_key.present? }
+    before_action :set_service
+    after_action :send_mail, only: [:create], if: -> { @service.errors.blank? }
 
     def new
     end
 
     def create
-      @client.request_confirmation
-      respond_with(@client, location: Nyauth.configuration.redirect_path_after_create_request_confirmation.call(nyauth_client_name) || main_app.root_path)
+      @service.save(as: nyauth_client_name)
+      respond_with(@service, location: Nyauth.configuration.redirect_path_after_create_request_confirmation.call(nyauth_client_name) || main_app.root_path)
     end
 
     private
 
-    def set_client
-      @client = nyauth_client_class.find_by!(email: params[nyauth_client_name][:email])
-    rescue ActiveRecord::RecordNotFound
-      render :new
+    def set_service
+      @service = Nyauth::ConfirmationRequest.new(confirmation_request_params)
+    end
+
+    def confirmation_request_params
+      params.fetch(:confirmation_request, {})
+            .permit(:email)
     end
 
     def send_mail
-      Nyauth::RequestMailer.request_confirmation(@client).deliver_now
+      Nyauth::RequestMailer.request_confirmation(@service.client).deliver_now
     end
   end
 end

data/app/controllers/nyauth/registrations_controller.rb

@@ -4,24 +4,24 @@ module Nyauth
     allow_everyone
     self.responder = Nyauth::AppResponder
     respond_to :html, :json
-    before_action :set_client
+    before_action :set_service
 
     def new
     end
 
     def create
-      sign_in(@client) if @client.save
-      respond_with(@client, location: Nyauth.configuration.redirect_path_after_registration.call(nyauth_client_name) || main_app.root_path)
+      sign_in(@service.client) if @service.save(as: nyauth_client_name)
+      respond_with @service, location: Nyauth.configuration.redirect_path_after_registration.call(nyauth_client_name) || main_app.root_path
     end
 
     private
 
-    def set_client
-      @client = nyauth_client_class.new(client_params)
+    def set_service
+      @service = Nyauth::Registration.new(registration_params)
     end
 
-    def client_params
-      params.fetch(nyauth_client_name, {})
+    def registration_params
+      params.fetch(:registration, {})
             .permit(:email, :password, :password_confirmation)
     end
   end

data/app/controllers/nyauth/reset_password_requests_controller.rb

@@ -4,27 +4,30 @@ module Nyauth
     allow_everyone
     self.responder = Nyauth::AppResponder
     respond_to :html, :json
-    before_action :set_client, only: [:create]
-    after_action :send_mail, only: [:create], if: -> { @client.reset_password_key.present? }
+    before_action :set_service
+    after_action :send_mail, only: [:create], if: -> { @service.errors.blank? }
 
     def new
     end
 
     def create
-      @client.request_reset_password
-      respond_with(@client, location: Nyauth.configuration.redirect_path_after_reset_password_request.call(nyauth_client_name) || main_app.root_path)
+      @service.save(as: nyauth_client_name)
+      respond_with(@service, location: Nyauth.configuration.redirect_path_after_reset_password_request.call(nyauth_client_name) || main_app.root_path)
     end
 
     private
 
-    def set_client
-      @client = nyauth_client_class.find_by!(email: params[nyauth_client_name][:email])
-    rescue ActiveRecord::RecordNotFound
-      render :new
+    def set_service
+      @service = Nyauth::ResetPasswordRequest.new(reset_password_request_params)
+    end
+
+    def reset_password_request_params
+      params.fetch(:reset_password_request, {})
+            .permit(:email)
     end
 
     def send_mail
-      Nyauth::RequestMailer.request_reset_password(@client).deliver_now
+      Nyauth::RequestMailer.request_reset_password(@service.client).deliver_now
     end
   end
 end

data/app/controllers/nyauth/sessions_controller.rb

@@ -5,15 +5,15 @@ module Nyauth
     allow_everyone only: [:new, :create]
     self.responder = Nyauth::AppResponder
     respond_to :html, :json
-    before_action :set_session_service
+    before_action :set_service
 
     def new
     end
 
     def create
-      sign_in(@session_service.client) if @session_service.save(as: nyauth_client_name)
+      sign_in(@service.client) if @service.save(as: nyauth_client_name)
       redirect_path =  session.delete("#{nyauth_client_name}_return_to")
-      respond_with @session_service,
+      respond_with @service,
                    location: redirect_path || \
                    Nyauth.configuration.redirect_path_after_sign_in.call(nyauth_client_name) || \
                    main_app.root_path
@@ -21,17 +21,17 @@ module Nyauth
 
     def destroy
       sign_out
-      respond_with @session_service, location: Nyauth.configuration.redirect_path_after_sign_out.call(nyauth_client_name) || new_session_path_for(nyauth_client_name)
+      respond_with @service, location: Nyauth.configuration.redirect_path_after_sign_out.call(nyauth_client_name) || new_session_path_for(nyauth_client_name)
     end
 
     private
 
-    def set_session_service
-      @session_service = Nyauth::SessionService.new(session_service_params)
+    def set_service
+      @service = Nyauth::Session.new(session_service_params)
     end
 
     def session_service_params
-      params.fetch(:session_service, {})
+      params.fetch(:session, {})
             .permit(:email, :password)
     end
   end

data/app/services/nyauth/confirmation_request.rb

@@ -0,0 +1,19 @@
+module Nyauth
+  class ConfirmationRequest
+    include ActiveModel::Model
+    attr_reader :email, :client
+
+    def initialize(service_params = {})
+      @email = service_params[:email]
+    end
+
+    def save(options = {})
+      options.reverse_merge!(as: :user)
+      klass = options[:as].to_s.classify.constantize
+      @client = klass.find_by!(email: @email)
+      @client.request_confirmation
+    rescue
+      errors.add(:base, :invalid_email)
+    end
+  end
+end

data/app/services/nyauth/registration.rb

@@ -0,0 +1,22 @@
+module Nyauth
+  class Registration
+    include ActiveModel::Model
+    attr_reader :email, :password, :password_confirmation, :client
+
+    def initialize(service_params = {})
+      @email = service_params[:email]
+      @password = service_params[:password]
+      @password_confirmation = service_params[:password_confirmation]
+    end
+
+    def save(options = {})
+      options.reverse_merge!(as: :user)
+      klass = options[:as].to_s.classify.constantize
+      @client = klass.create(email: @email,
+                             password: @password,
+                             password_confirmation: @password_confirmation)
+      @errors = @client.errors
+      @client.valid?
+    end
+  end
+end

data/app/services/nyauth/reset_password_request.rb

@@ -0,0 +1,19 @@
+module Nyauth
+  class ResetPasswordRequest
+    include ActiveModel::Model
+    attr_reader :email, :client
+
+    def initialize(service_params = {})
+      @email = service_params[:email]
+    end
+
+    def save(options = {})
+      options.reverse_merge!(as: :user)
+      klass = options[:as].to_s.classify.constantize
+      @client = klass.find_by!(email: @email)
+      @client.request_reset_password
+    rescue
+      errors.add(:base, :invalid_email)
+    end
+  end
+end

data/app/services/nyauth/{session_service.rb → session.rb}

@@ -1,11 +1,11 @@
 module Nyauth
-  class SessionService
+  class Session
     include ActiveModel::Model
     attr_reader :email, :password, :client
 
-    def initialize(session_service_params = {})
-      @email = session_service_params[:email]
-      @password = session_service_params[:password]
+    def initialize(service_params = {})
+      @email = service_params[:email]
+      @password = service_params[:password]
     end
 
     def save(options = {})

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

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

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

@@ -1,4 +1,4 @@
-<%= form_for @client, url: registration_path_for(nyauth_client_name) do |f| %>
+<%= form_for @service, 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 nyauth_client_class.new, url: reset_password_requests_path_for(nyauth_client_name) do |f| %>
+<%= form_for @service, url: reset_password_requests_path_for(nyauth_client_name) do |f| %>
   <%= f.text_field :email %>
   <%= f.submit 'reset password' %>
 <% end %>

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

@@ -1,4 +1,4 @@
-<%= form_for @session_service, url: session_path_for(nyauth_client_name) do |f| %>
+<%= form_for @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/config/locales/en.yml

@@ -31,3 +31,4 @@ en:
   errors:
     messages:
       invalid_email_or_password: 'Invalid email or password'
+      invalid_email: 'Invalid email'

data/config/locales/ja.yml

@@ -31,3 +31,4 @@ ja:
   errors:
     messages:
       invalid_email_or_password: 'ログイン情報に誤りがあります'
+      invalid_email: 'メールアドレスに誤りがあります'

data/lib/nyauth/version.rb

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