rails_jwt_auth 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b96c7a63119aa045fa08e184f4ab932fbcaf4b1b
-  data.tar.gz: 0d2823aee7a5f58f4586f03769bcba83e9dd96ef
+  metadata.gz: 3494e45b64c0d552272f8e20af88201294d4bf68
+  data.tar.gz: 3930404dd79c4d8c6807451579289f13085c4199
 SHA512:
-  metadata.gz: b6165a6384a25f04e987da4a7e41dad7336fdeb830934cff72875412846aa43900e5ee3b9c11e0e77987decef9c8505f3b8e72bdd37ad4700a2f4c746a6faad1
-  data.tar.gz: 6b49902ab3d1c3f88409c7ccda8bc3008268d59a5a812961eab9797a010686e6b713eefb80e2f61637b141a519f0e441b54fb4b1b69b5a6f0b1a2ef4ba95f913
+  metadata.gz: 0391f7c10a5819b25b42511b1546566e730e4145082bd8237aa5b6050874a493ca7816a803139c3eba336b53ca1a30d418d493ce341e14b1146fa901dd3ad7be
+  data.tar.gz: afae862ba2e5714b56a76206ee940c7d5f53ccfc77d5f65baea5a1d31d1a372eaf79649abc03a54d2fa4e47fbbeb7b2fb3876e848afd87f1295e22b9b8d40477

data/README.md

@@ -1,6 +1,6 @@
 # RailsJwtAuth
 
-Rails authentication solution based on Warden and JWT and inspired by Devise.
+Rails-API authentication solution based on Warden and JWT and inspired by Devise.
 
 ## Installation
 
@@ -267,7 +267,7 @@ Confirmation api is defined by RailsJwtAuth::ConfirmationsController.
 ```js
 {
   url: host/confirmation,
-  method: GET
+  method: PUT
   data: {
     confirmation_token: "token"
   }

data/app/controllers/rails_jwt_auth/confirmations_controller.rb

@@ -1,23 +1,21 @@
 class RailsJwtAuth::ConfirmationsController < ApplicationController
-  def show
-    return render json: {}, status: 400 unless params[:confirmation_token]
+  def create
+    user = RailsJwtAuth.model.where(email: confirmation_params[:email]).first
+    return render json: create_error_response, status: 422 unless user
+
+    user.send_confirmation_instructions
+    render json: {}, status: 204
+  end
 
-    user = RailsJwtAuth.model.find_by!(confirmation_token: params[:confirmation_token])
+  def update
+    user = RailsJwtAuth.model.where(confirmation_token: params[:confirmation_token]).first
+    return render json: update_error_response(nil), status: 422 unless user
 
     if user.confirm!
       render json: {}, status: 204
     else
-      render json: show_error_response(user), status: 422
-    end
-  end
-
-  def create
-    unless (user = RailsJwtAuth.model.where(email: confirmation_params[:email]).first)
-      return render json: create_error_response, status: 422
+      render json: update_error_response(user), status: 422
     end
-
-    user.send_confirmation_instructions
-    render json: {}, status: 204
   end
 
   private
@@ -26,11 +24,15 @@ class RailsJwtAuth::ConfirmationsController < ApplicationController
     params.require(:confirmation).permit(:email)
   end
 
-  def show_error_response(user)
-    {errors: user.errors}
-  end
-
   def create_error_response
     {errors: {email: [I18n.t('rails_jwt_auth.errors.not_found')]}}
   end
+
+  def update_error_response(user)
+    if user
+      {errors: user.errors}
+    else
+      {errors: {confirmation_token: [I18n.t('rails_jwt_auth.errors.not_found')]}}
+    end
+  end
 end

data/app/controllers/rails_jwt_auth/passwords_controller.rb

@@ -1,15 +1,15 @@
 class RailsJwtAuth::PasswordsController < ApplicationController
   def create
-    unless (user = RailsJwtAuth.model.where(email: create_password_params[:email]).first)
-      return render json: create_error_response, status: 422
-    end
+    user = RailsJwtAuth.model.where(email: create_password_params[:email]).first
+    return render json: create_error_response, status: 422 unless user
 
     user.send_reset_password_instructions
     render json: {}, status: 204
   end
 
   def update
-    user = RailsJwtAuth.model.find_by!(reset_password_token: params[:reset_password_token])
+    user = RailsJwtAuth.model.where(reset_password_token: params[:reset_password_token]).first
+    return render json: update_error_response(nil), status: 422 unless user
 
     if user.update_attributes(update_password_params)
       render json: {}, status: 204
@@ -33,6 +33,10 @@ class RailsJwtAuth::PasswordsController < ApplicationController
   end
 
   def update_error_response(user)
-    {errors: user.errors}
+    if user
+      {errors: user.errors}
+    else
+      {errors: {reset_password_token: [I18n.t('rails_jwt_auth.errors.not_found')]}}
+    end
   end
 end

data/app/controllers/rails_jwt_auth/sessions_controller.rb

@@ -31,20 +31,20 @@ module RailsJwtAuth
       RailsJwtAuth::Jwt::Manager.encode(auth_token: token)
     end
 
-    def unconfirmed_error_response
-      {errors: {session: 'Unconfirmed email'}}
-    end
-
-    def create_success_response(_user, jwt)
-      {session: {jwt: jwt}}
+    def create_params
+      params.require(:session).permit(RailsJwtAuth.auth_field_name, :password)
     end
 
     def create_error_response(_user)
       {errors: {session: "Invalid #{RailsJwtAuth.auth_field_name} / password"}}
     end
 
-    def create_params
-      params.require(:session).permit(RailsJwtAuth.auth_field_name, :password)
+    def unconfirmed_error_response
+      {errors: {session: 'Unconfirmed email'}}
+    end
+
+    def create_success_response(_user, jwt)
+      {session: {jwt: jwt}}
     end
   end
 end

data/lib/generators/rails_jwt_auth/install_generator.rb

@@ -9,7 +9,7 @@ class RailsJwtAuth::InstallGenerator < Rails::Generators::Base
     route "resource :session, controller: 'rails_jwt_auth/sessions', only: [:create, :destroy]"
     route "resource :registration, controller: 'rails_jwt_auth/registrations', only: [:create, :update, :destroy]"
 
-    route "resource :confirmation, controller: 'rails_jwt_auth/confirmations', only: [:show, :create]"
+    route "resource :confirmation, controller: 'rails_jwt_auth/confirmations', only: [:create, :update]"
     route "resource :password, controller: 'rails_jwt_auth/passwords', only: [:create, :update]"
   end
 end

data/lib/rails_jwt_auth/version.rb

@@ -1,3 +1,3 @@
 module RailsJwtAuth
-  VERSION = '0.3.2'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_jwt_auth
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - rjurado