devise_token_auth 0.1.34 → 0.1.35

data/app/controllers/devise_token_auth/passwords_controller.rb

@@ -7,41 +7,31 @@ module DeviseTokenAuth
     # sending emails
     def create
       unless resource_params[:email]
-        return render json: {
-          success: false,
-          errors: [I18n.t("devise_token_auth.passwords.missing_email")]
-        }, status: 401
+        return render_create_error_missing_email
       end
 
       # give redirect value from params priority
-      redirect_url = params[:redirect_url]
+      @redirect_url = params[:redirect_url]
 
       # fall back to default value if provided
-      redirect_url ||= DeviseTokenAuth.default_password_reset_url
+      @redirect_url ||= DeviseTokenAuth.default_password_reset_url
 
-      unless redirect_url
-        return render json: {
-          success: false,
-          errors: [I18n.t("devise_token_auth.passwords.missing_redirect_url")]
-        }, status: 401
+      unless @redirect_url
+        return render_create_error_missing_redirect_url
       end
 
       # if whitelist is set, validate redirect_url against whitelist
       if DeviseTokenAuth.redirect_whitelist
-        unless DeviseTokenAuth.redirect_whitelist.include?(redirect_url)
-          return render json: {
-            status: 'error',
-            data:   @resource.as_json,
-            errors: [I18n.t("devise_token_auth.passwords.not_allowed_redirect_url", redirect_url: redirect_url)]
-          }, status: 403
+        unless DeviseTokenAuth.redirect_whitelist.include?(@redirect_url)
+          return render_create_error_not_allowed_redirect_url
         end
       end
 
       # honor devise configuration for case_insensitive_keys
       if resource_class.case_insensitive_keys.include?(:email)
-        email = resource_params[:email].downcase
+        @email = resource_params[:email].downcase
       else
-        email = resource_params[:email]
+        @email = resource_params[:email]
       end
 
       q = "uid = ? AND provider='email'"
@@ -51,42 +41,35 @@ module DeviseTokenAuth
         q = "BINARY uid = ? AND provider='email'"
       end
 
-      @resource = resource_class.where(q, email).first
+      @resource = resource_class.where(q, @email).first
 
-      errors = nil
-      error_status = 400
+      @errors = nil
+      @error_status = 400
 
       if @resource
         yield if block_given?
         @resource.send_reset_password_instructions({
-          email: email,
+          email: @email,
           provider: 'email',
-          redirect_url: redirect_url,
+          redirect_url: @redirect_url,
           client_config: params[:config_name]
         })
 
         if @resource.errors.empty?
-          render json: {
-            success: true,
-            message: I18n.t("devise_token_auth.passwords.sended", email: email)
-          }
+          return render_create_success
         else
-          errors = @resource.errors
+          @errors = @resource.errors
         end
       else
-        errors = [I18n.t("devise_token_auth.passwords.user_not_found", email: email)]
-        error_status = 404
+        @errors = [I18n.t("devise_token_auth.passwords.user_not_found", email: @email)]
+        @error_status = 404
       end
 
-      if errors
-        render json: {
-          success: false,
-          errors: errors,
-        }, status: error_status
+      if @errors
+        return render_create_error
       end
     end
 
-
     # this is where users arrive after visiting the password reset confirmation link
     def edit
       @resource = resource_class.reset_password_by_token({
@@ -117,54 +100,36 @@ module DeviseTokenAuth
           config:         params[:config]
         }))
       else
-        render json: {
-          success: false
-        }, status: 404
+        render_edit_error
       end
     end
 
     def update
       # make sure user is authorized
       unless @resource
-        return render json: {
-          success: false,
-          errors: ['Unauthorized']
-        }, status: 401
+        return render_update_error_unauthorized
       end
 
       # make sure account doesn't use oauth2 provider
       unless @resource.provider == 'email'
-        return render json: {
-          success: false,
-          errors: [I18n.t("devise_token_auth.passwords.password_not_required", provider: @resource.provider.humanize)]
-        }, status: 422
+        return render_update_error_password_not_required
       end
 
       # ensure that password params were sent
       unless password_resource_params[:password] and password_resource_params[:password_confirmation]
-        return render json: {
-          success: false,
-          errors: [I18n.t("devise_token_auth.passwords.missing_passwords")]
-        }, status: 422
+        return render_update_error_missing_password
       end
 
       if @resource.send(resource_update_method, password_resource_params)
         yield if block_given?
-        return render json: {
-          success: true,
-          data: {
-            user: @resource,
-            message: I18n.t("devise_token_auth.passwords.successfully_updated")
-          }
-        }
+        return render_update_success
       else
-        return render json: {
-          success: false,
-          errors: @resource.errors.to_hash.merge(full_messages: @resource.errors.full_messages)
-        }, status: 422
+        return render_update_error
       end
     end
 
+    protected
+
     def resource_update_method
       if DeviseTokenAuth.check_current_password_before_update != false
         "update_with_password"
@@ -173,13 +138,95 @@ module DeviseTokenAuth
       end
     end
 
-    def password_resource_params
-      params.permit(devise_parameter_sanitizer.for(:account_update))
+    def render_create_error_missing_email
+      render json: {
+        success: false,
+        errors: [I18n.t("devise_token_auth.passwords.missing_email")]
+      }, status: 401
+    end
+
+    def render_create_error_missing_redirect_url
+      render json: {
+        success: false,
+        errors: [I18n.t("devise_token_auth.passwords.missing_redirect_url")]
+      }, status: 401
+    end
+
+    def render_create_error_not_allowed_redirect_url
+      render json: {
+        status: 'error',
+        data:   @resource.as_json,
+        errors: [I18n.t("devise_token_auth.passwords.not_allowed_redirect_url", redirect_url: @redirect_url)]
+      }, status: 403
+    end
+
+    def render_create_success
+      render json: {
+        success: true,
+        message: I18n.t("devise_token_auth.passwords.sended", email: @email)
+      }
+    end
+
+    def render_create_error
+      render json: {
+        success: false,
+        errors: @errors,
+      }, status: @error_status
+    end
+
+    def render_edit_error
+      render json: {
+        success: false
+      }, status: 404
     end
 
+    def render_update_error_unauthorized
+      render json: {
+        success: false,
+        errors: ['Unauthorized']
+      }, status: 401
+    end
+
+    def render_update_error_password_not_required
+      render json: {
+        success: false,
+        errors: [I18n.t("devise_token_auth.passwords.password_not_required", provider: @resource.provider.humanize)]
+      }, status: 422
+    end
+
+    def render_update_error_missing_password
+      render json: {
+        success: false,
+        errors: [I18n.t("devise_token_auth.passwords.missing_passwords")]
+      }, status: 422
+    end
+
+    def render_update_success
+      render json: {
+        success: true,
+        data: {
+          user: @resource,
+          message: I18n.t("devise_token_auth.passwords.successfully_updated")
+        }
+      }
+    end
+
+    def render_update_error
+      return render json: {
+        success: false,
+        errors: @resource.errors.to_hash.merge(full_messages: @resource.errors.full_messages)
+      }, status: 422
+    end
+
+    private
+
     def resource_params
       params.permit(:email, :password, :password_confirmation, :current_password, :reset_password_token)
     end
 
+    def password_resource_params
+      params.permit(devise_parameter_sanitizer.for(:account_update))
+    end
+
   end
 end

data/app/controllers/devise_token_auth/registrations_controller.rb

@@ -17,28 +17,20 @@ module DeviseTokenAuth
       end
 
       # give redirect value from params priority
-      redirect_url = params[:confirm_success_url]
+      @redirect_url = params[:confirm_success_url]
 
       # fall back to default value if provided
-      redirect_url ||= DeviseTokenAuth.default_confirm_success_url
+      @redirect_url ||= DeviseTokenAuth.default_confirm_success_url
 
       # success redirect url is required
-      if resource_class.devise_modules.include?(:confirmable) && !redirect_url
-        return render json: {
-          status: 'error',
-          data:   @resource.as_json,
-          errors: [I18n.t("devise_token_auth.registrations.missing_confirm_success_url")]
-        }, status: 403
+      if resource_class.devise_modules.include?(:confirmable) && !@redirect_url
+        return render_create_error_missing_confirm_success_url
       end
 
       # if whitelist is set, validate redirect_url against whitelist
       if DeviseTokenAuth.redirect_whitelist
-        unless DeviseTokenAuth.redirect_whitelist.include?(redirect_url)
-          return render json: {
-            status: 'error',
-            data:   @resource.as_json,
-            errors: [I18n.t("devise_token_auth.registrations.redirect_url_not_allowed", redirect_url: redirect_url)]
-          }, status: 403
+        unless DeviseTokenAuth.redirect_whitelist.include?(@redirect_url)
+          return render_create_error_redirect_url_not_allowed
         end
       end
 
@@ -52,7 +44,7 @@ module DeviseTokenAuth
             # user will require email authentication
             @resource.send_confirmation_instructions({
               client_config: params[:config_name],
-              redirect_url: redirect_url
+              redirect_url: @redirect_url
             })
 
           else
@@ -69,26 +61,14 @@ module DeviseTokenAuth
 
             update_auth_header
           end
-
-          render json: {
-            status: 'success',
-            data:   @resource.as_json
-          }
+          render_create_success
         else
           clean_up_passwords @resource
-          render json: {
-            status: 'error',
-            data:   @resource.as_json,
-            errors: @resource.errors.to_hash.merge(full_messages: @resource.errors.full_messages)
-          }, status: 403
+          render_create_error
         end
       rescue ActiveRecord::RecordNotUnique
         clean_up_passwords @resource
-        render json: {
-          status: 'error',
-          data:   @resource.as_json,
-          errors: [I18n.t("devise_token_auth.registrations.email_already_exists", email: @resource.email)]
-        }, status: 403
+        render_create_error_email_already_exists
       end
     end
 
@@ -96,21 +76,12 @@ module DeviseTokenAuth
       if @resource
         if @resource.send(resource_update_method, account_update_params)
           yield @resource if block_given?
-          render json: {
-            status: 'success',
-            data:   @resource.as_json
-          }
+          render_update_success
         else
-          render json: {
-            status: 'error',
-            errors: @resource.errors.to_hash.merge(full_messages: @resource.errors.full_messages)
-          }, status: 403
+          render_update_error
         end
       else
-        render json: {
-          status: 'error',
-          errors: [I18n.t("devise_token_auth.registrations.user_not_found")]
-        }, status: 404
+        render_update_error_user_not_found
       end
     end
 
@@ -119,15 +90,9 @@ module DeviseTokenAuth
         @resource.destroy
         yield @resource if block_given?
 
-        render json: {
-          status: 'success',
-          message: I18n.t("devise_token_auth.registrations.account_with_uid_destroyed", uid: @resource.uid)
-        }
+        render_destroy_success
       else
-        render json: {
-          status: 'error',
-          errors: [I18n.t("devise_token_auth.registrations.account_to_destroy_not_found")]
-        }, status: 404
+        render_destroy_error
       end
     end
 
@@ -139,6 +104,82 @@ module DeviseTokenAuth
       params.permit(devise_parameter_sanitizer.for(:account_update))
     end
 
+    protected
+
+    def render_create_error_missing_confirm_success_url
+      render json: {
+        status: 'error',
+        data:   @resource.as_json,
+        errors: [I18n.t("devise_token_auth.registrations.missing_confirm_success_url")]
+      }, status: 403
+    end
+
+    def render_create_error_redirect_url_not_allowed
+      render json: {
+        status: 'error',
+        data:   @resource.as_json,
+        errors: [I18n.t("devise_token_auth.registrations.redirect_url_not_allowed", redirect_url: @redirect_url)]
+      }, status: 403
+    end
+
+    def render_create_success
+      render json: {
+        status: 'success',
+        data:   @resource.as_json
+      }
+    end
+
+    def render_create_error
+      render json: {
+        status: 'error',
+        data:   @resource.as_json,
+        errors: @resource.errors.to_hash.merge(full_messages: @resource.errors.full_messages)
+      }, status: 403
+    end
+
+    def render_create_error_email_already_exists
+      render json: {
+        status: 'error',
+        data:   @resource.as_json,
+        errors: [I18n.t("devise_token_auth.registrations.email_already_exists", email: @resource.email)]
+      }, status: 403
+    end
+
+    def render_update_success
+      render json: {
+        status: 'success',
+        data:   @resource.as_json
+      }
+    end
+
+    def render_update_error
+      render json: {
+        status: 'error',
+        errors: @resource.errors.to_hash.merge(full_messages: @resource.errors.full_messages)
+      }, status: 403
+    end
+
+    def render_update_error_user_not_found
+      render json: {
+        status: 'error',
+        errors: [I18n.t("devise_token_auth.registrations.user_not_found")]
+      }, status: 404
+    end
+
+    def render_destroy_success
+      render json: {
+        status: 'success',
+        message: I18n.t("devise_token_auth.registrations.account_with_uid_destroyed", uid: @resource.uid)
+      }
+    end
+
+    def render_destroy_error
+      render json: {
+        status: 'error',
+        errors: [I18n.t("devise_token_auth.registrations.account_to_destroy_not_found")]
+      }, status: 404
+    end
+
     private
 
     def resource_update_method