morpho 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0338ac8728b7b68d4573d522582176ef24120d8ee32b166a4b47a4cc2c31a80
-  data.tar.gz: f1b00da0632ea3ec3f63c60cbdb01b378b404fdbb6c24696c10cfea8291a29d4
+  metadata.gz: a5e58a85aef299825d478036742e688fc13a9ddc8233387bd5e708fdf8fc3c59
+  data.tar.gz: 899df45d8f131d02d9899a9624abd22ff3eb4138a971954cca56d63f0ea919c4
 SHA512:
-  metadata.gz: 11778c465a75f168c1a1a8db55ca70d3b9d70b8f61d0dd69743fcfccfc3e7c3951d9d29c287587ad7ee2e1cadb1d3059f990a0dd51f709e63c060feb9813abd4
-  data.tar.gz: 1674597483b4ea9c1098dd92936796a394c790a2403e9702ae3225949862109cf8d54411540411fb3a0753940ace36a724dd1ce30a02080506f3a797705661ce
+  metadata.gz: ffc548ba4bf67699b99e377e6590dec5afc2e234f7c6bd20ea27d721cc08e489b5482eedc4b74c1404c9f5dcc79319c644cf9396f71e2069d213621116abba09
+  data.tar.gz: 99d6701412b6ccda6cae2c34812d0c67a739b7f70f113163380f2af766f57f1861dfa6facf6776107d010f0f303ffa016dddc2c2673689c4a4c5a9184c45ccef

data/app/api/concerns/morpho/grape/http_responses.rb

@@ -6,31 +6,39 @@ module Morpho
       protected
 
       def render_bad_request
-        error!({ message: I18n.t('morpho.api.messages.bad_request') }, 400)
+        error!({ message: I18n.t('morpho.api.messages.bad_request'), with: Morpho::Entities::Error }, 400)
       end
 
       def render_unauthorized
-        error!({ message: I18n.t('morpho.api.messages.unauthorized') }, 401)
+        error!({ message: I18n.t('morpho.api.messages.unauthorized'), with: Morpho::Entities::Error }, 401)
+      end
+
+      def render_unauthorized_detailed(errors)
+        error!({ message: I18n.t('morpho.api.messages.unauthorized'), errors: errors, with: Morpho::Entities::Error }, 401)
       end
 
       def render_payment_required
-        error!({ message: I18n.t('morpho.api.messages.payment_required') }, 402)
+        error!({ message: I18n.t('morpho.api.messages.payment_required'), with: Morpho::Entities::Error }, 402)
       end
 
       def render_forbidden
-        error!({ message: I18n.t('morpho.api.messages.forbidden') }, 403)
+        error!({ message: I18n.t('morpho.api.messages.forbidden'), with: Morpho::Entities::Error }, 403)
       end
 
       def render_not_found
-        error!({ message: I18n.t('morpho.api.messages.not_found') }, 404)
+        error!({ message: I18n.t('morpho.api.messages.not_found'), with: Morpho::Entities::Error }, 404)
       end
 
       def render_method_not_allowed
-        error!({ message: I18n.t('morpho.api.messages.method_not_allowed') }, 405)
+        error!({ message: I18n.t('morpho.api.messages.method_not_allowed'), with: Morpho::Entities::Error }, 405)
+      end
+
+      def render_unprocessable_entity
+        error!({ message: I18n.t('morpho.api.messages.unprocessable_entity'), with: Morpho::Entities::Error }, 422)
       end
 
-      def render_unprocessable_entity(errors)
-        error!({ message: I18n.t('morpho.api.messages.unprocessable_entity'), errors: errors }, 422)
+      def render_unprocessable_entity_detailed(errors)
+        error!({ message: I18n.t('morpho.api.messages.unprocessable_entity'), errors: errors, with: Morpho::Entities::Error }, 422)
       end
 
       def render_no_content

data/app/api/concerns/morpho/grape/jwt_authentication.rb

@@ -22,19 +22,19 @@ module Morpho
               if user.valid_password?(user_params[:password])
                 token = user_payload(user)
 
-                present token, with: Morpho::Entities::AuthenticationToken
+                present token, with: Morpho::Entities::SignIn::AuthenticationToken
               else
                 user.register_failed_login!
-                render_unauthorized
+                render_unauthorized_detailed([I18n.t('morpho.api.messages.unauthorized_detailed.bad_credentials')])
               end
             else
-              render_unauthorized
+              render_unauthorized_detailed([I18n.t('morpho.api.messages.unauthorized_detailed.locked')])
             end
           else
-            render_unauthorized
+            render_unauthorized_detailed([I18n.t('morpho.api.messages.unauthorized_detailed.unconfirmed')])
           end
         else
-          render_unauthorized
+          render_unauthorized_detailed([I18n.t('morpho.api.messages.unauthorized_detailed.unexistent')])
         end
       end
 

data/app/api/concerns/morpho/grape/user_registration.rb

@@ -11,7 +11,7 @@ module Morpho
         if user.save
           present user, with: Morpho::Entities::User
         else
-          render_unprocessable_entity(user.errors)
+          render_unprocessable_entity_detailed(user.errors)
         end
       end
     end

data/app/api/morpho/entities/sign_in/authentication_token.rb

@@ -0,0 +1,10 @@
+module Morpho
+  module Entities
+    module SignIn
+      class AuthenticationToken < ::Morpho::Entities::Base
+        expose :token, documentation: { type: 'string', desc: 'User authentication token', required: true }
+        expose :expires_at, documentation: { type: 'string', desc: 'Authentication token expiration date in millis', required: true }
+      end
+    end
+  end
+end

data/app/api/morpho/entities/sign_in/success.rb

@@ -0,0 +1,9 @@
+module Morpho
+  module Entities
+    module SignIn
+      class Success < ::Morpho::Entities::Base
+        expose :data, using: ::Morpho::Entities::SignIn::AuthenticationToken
+      end
+    end
+  end
+end

data/app/api/morpho/resources/tokens.rb

@@ -5,13 +5,16 @@ module Morpho
 
       namespace :tokens do
         desc 'Request user authentication token' do
-          success Morpho::Entities::AuthenticationToken
+          success Morpho::Entities::SignIn::Success
+          failure [
+            [ 401, I18n.t('morpho.api.messages.unauthorized'), Morpho::Entities::Error ]
+          ]
         end
         params do
-          requires :user, type: Morpho::Entities::UserSignIn
+          requires :data, type: Morpho::Entities::UserSignIn
         end
         post do
-          login(params[:user])
+          login(params[:data])
         end
       end
     end

data/config/locales/morpho.en.yml

@@ -137,6 +137,11 @@ en:
         not_found: 'Not found'
         method_not_allowed: 'Method not allowed'
         unprocessable_entity: 'Unprocessable entity'
+        unauthorized_detailed:
+          unexistent: 'Email address does not belongs to a registered account'
+          bad_credentials: 'User email and/or password is incorrect'
+          unconfirmed: 'User account has not been confirmed'
+          locked: 'User account has been locked'
   simple_form:
     'yes': 'Yes'
     'no': 'No'

data/config/locales/morpho.es.yml

@@ -137,6 +137,11 @@ es:
         not_found: 'No encontrado'
         method_not_allowed: 'Método no permitido'
         unprocessable_entity: 'Entidad no procesable'
+        unauthorized_detailed:
+          unexistent: 'Correo electrónico no pertenece a un usuario registrado'
+          bad_credentials: 'Correo electrónico y/o contraseña es incorrecto(a)'
+          unconfirmed: 'Cuenta de usuario no ha sido confirmada'
+          locked: 'Cuenta de usuario ha sido bloqueada'
   simple_form:
     'yes': 'Si'
     'no': 'No'
@@ -150,4 +155,4 @@ es:
         email: 'Correo electrónico'
         password: 'Contraseña'
         password_confirmation: 'Confirmar la contraseña'
-        remember_me: 'Recuérdame'
+        remember_me: 'Recuérdame'

data/lib/morpho/version.rb

@@ -1,3 +1,3 @@
 module Morpho
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpho
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Hugo Gilmar Erazo
@@ -250,9 +250,10 @@ files:
 - app/api/concerns/morpho/grape/user_password_reset.rb
 - app/api/concerns/morpho/grape/user_registration.rb
 - app/api/concerns/morpho/grape/user_unlock.rb
-- app/api/morpho/entities/authentication_token.rb
 - app/api/morpho/entities/base.rb
 - app/api/morpho/entities/error.rb
+- app/api/morpho/entities/sign_in/authentication_token.rb
+- app/api/morpho/entities/sign_in/success.rb
 - app/api/morpho/entities/user.rb
 - app/api/morpho/entities/user_sign_in.rb
 - app/api/morpho/entities/user_sign_up.rb

data/app/api/morpho/entities/authentication_token.rb

@@ -1,8 +0,0 @@
-module Morpho
-  module Entities
-    class AuthenticationToken < ::Morpho::Entities::Base
-      expose :token, documentation: { type: 'string', desc: 'User authentication token', required: true }
-      expose :expires_at, documentation: { type: 'string', desc: 'Authentication token expiration date in millis', required: true }
-    end
-  end
-end