morpho 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3536e547cc737f7badcac9844606c355f2fd28a60e26cc7c5cbc877e269e4bb8
-  data.tar.gz: 524baa415ee30782dc65cb722683688bf3ee931be52394a1ca80f7c3dd40ae87
+  metadata.gz: c7caf113b827232f529da9eae464def330b46e1f507d0a1e440aedc5325cf690
+  data.tar.gz: 9a8163a9bd725cd0f525ab3bbfe50f084d91e2c98f92a4811641e2a39e08b5c2
 SHA512:
-  metadata.gz: 02431c3b8fa188adbbd2efa4335375fa4754ff829eff1525a8e94a631ccd9f7c6075e11dcfd6aa29fee6e6eb846cdb195595debfe6328e076ad2358e28cfc686
-  data.tar.gz: e01fc5410f8d5e0f291378db7ce32dcc72664e988a77f6368219a9bdc645b367e1366af042f5499a981f955d7faf19c14d002a113a3e06a1153d782531e4c497
+  metadata.gz: 6a446b9690227aa894fe7497a03e0c3d6ba743b2547b275a6c11c56eefe8361a05ccf5f5db1c3e690c4144dfd9d6216a8990c6470ae01637fb148ca31c44b093
+  data.tar.gz: 2066ae49183978f79be5f0ba700657acee923d9e94807609a3a71305532b14f33e02fdeb94886eb413b53a3e53324e2e8ca7b6e6d9f340ebb2572b1ce229c2b6

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

@@ -2,7 +2,7 @@ module Morpho
   module Entities
     class Error < ::Grape::Entity
       expose :message, documentation: { type: 'string', desc: 'Error standard message', required: true }
-      expose :errors, safe: true, documentation: { type: 'string', desc: 'Error message details', is_array: true }
+      expose :errors, safe: true, documentation: { type: 'object', desc: 'Error message details' }
     end
   end
 end

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

@@ -1,9 +1,9 @@
 module Morpho
   module Entities
     class External < ::Morpho::Entities::Base
-      expose :email, documentation: { type: 'string', desc: 'User email address' }
-      expose :provider, documentation: { type: 'string', desc: 'User authentication provider' }
-      expose :uid, documentation: { type: 'string', desc: 'User provider uid' }
+      expose :email, documentation: { type: 'string', desc: 'User email address', required: true }
+      expose :provider, documentation: { type: 'string', desc: 'User authentication provider', required: true }
+      expose :uid, documentation: { type: 'string', desc: 'User provider uid', required: true }
     end
   end
 end

data/app/api/morpho/helpers/http_responses.rb

@@ -3,7 +3,7 @@ module Morpho
     module HTTPResponses
       protected
 
-      def render_bad_request(errors = [])
+      def render_bad_request(errors = {})
         error!({
           message: I18n.t('morpho.api.messages.bad_request'),
           errors: errors,
@@ -11,7 +11,7 @@ module Morpho
         }, 400)
       end
 
-      def render_unauthorized(errors = [])
+      def render_unauthorized(errors = {})
         error!({
           message: I18n.t('morpho.api.messages.unauthorized'),
           errors: errors,
@@ -19,11 +19,11 @@ module Morpho
         }, 401)
       end
 
-      def render_unauthorized_detailed(errors = [])
+      def render_unauthorized_detailed(errors = {})
         render_unauthorized(errors)
       end
 
-      def render_payment_required(errors = [])
+      def render_payment_required(errors = {})
         error!({
           message: I18n.t('morpho.api.messages.payment_required'),
           errors: errors,
@@ -31,7 +31,7 @@ module Morpho
         }, 402)
       end
 
-      def render_forbidden(errors = [])
+      def render_forbidden(errors = {})
         error!({
           message: I18n.t('morpho.api.messages.forbidden'),
           errors: errors,
@@ -39,7 +39,7 @@ module Morpho
         }, 403)
       end
 
-      def render_not_found(errors = [])
+      def render_not_found(errors = {})
         error!({
           message: I18n.t('morpho.api.messages.not_found'),
           errors: errors,
@@ -47,7 +47,7 @@ module Morpho
         }, 404)
       end
 
-      def render_method_not_allowed(errors = [])
+      def render_method_not_allowed(errors = {})
         error!({
           message: I18n.t('morpho.api.messages.method_not_allowed'),
           errors: errors,
@@ -55,7 +55,7 @@ module Morpho
         }, 405)
       end
 
-      def render_unprocessable_entity(errors = [])
+      def render_unprocessable_entity(errors = {})
         error!({
           message: I18n.t('morpho.api.messages.unprocessable_entity'),
           errors: errors,
@@ -63,7 +63,7 @@ module Morpho
         }, 422)
       end
 
-      def render_locked(errors = [])
+      def render_locked(errors = {})
         error!({
           message: I18n.t('morpho.api.messages.locked'),
           errors: errors,
@@ -71,7 +71,7 @@ module Morpho
         }, 423)
       end
 
-      def render_unprocessable_entity_detailed(errors = [])
+      def render_unprocessable_entity_detailed(errors = {})
         render_unprocessable_entity(errors)
       end
 

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

@@ -22,14 +22,12 @@ module Morpho
             present result['model'], with: Morpho::Entities::User
           else
             case result['error']
-            when :not_valid
+            when :unprocessable_entity
               render_unprocessable_entity(result['contract'].errors)
             when :not_found
-              render_not_found
-            when :not_allowed
-              render_method_not_allowed
-            when :not_delivered
-              render_unprocessable_entity
+              render_not_found({ base: I18n.t('morpho.api.messages.activate.not_found') })
+            when :method_not_allowed
+              render_method_not_allowed({ base: I18n.t('morpho.api.messages.activate.method_not_allowed') })
             else
               render_unprocessable_entity
             end

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

@@ -17,7 +17,7 @@ module Morpho
             present result['token'], with: Morpho::Entities::AuthenticationToken
           else
             case result['error']
-            when :not_valid
+            when :unprocessable_entity
               render_unprocessable_entity(result['contract'].errors)
             else
               render_unprocessable_entity

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

@@ -1,8 +1,7 @@
 module Morpho
   module Resources
     class Tokens < ::Grape::API
-      helpers Morpho::Helpers::HTTPResponses,
-        Morpho::Helpers::JWTUtils
+      helpers Morpho::Helpers::HTTPResponses
 
       namespace :tokens do
         desc 'Request user authentication token' do
@@ -25,16 +24,16 @@ module Morpho
             present result['token'], with: Morpho::Entities::AuthenticationToken
           else
             case result['error']
-            when :not_valid
+            when :unprocessable_entity
               render_unprocessable_entity(result['contract'].errors)
             when :not_found
-              render_not_found([I18n.t('morpho.api.messages.sign_in.unexistent')])
-            when :not_active
-              render_forbidden([I18n.t('morpho.api.messages.sign_in.unconfirmed')])
+              render_not_found({ base: I18n.t('morpho.api.messages.sign_in.not_found') })
+            when :forbidden
+              render_forbidden({ base: I18n.t('morpho.api.messages.sign_in.not_active') })
             when :locked
-              render_locked([I18n.t('morpho.api.messages.sign_in.locked')])
-            when :wrong_password
-              render_unauthorized([I18n.t('morpho.api.messages.sign_in.bad_credentials')])
+              render_locked({ base: I18n.t('morpho.api.messages.sign_in.locked') })
+            when :unauthorized
+              render_unauthorized({ base: I18n.t('morpho.api.messages.sign_in.unauthorized') })
             else
               render_unprocessable_entity
             end
@@ -58,10 +57,10 @@ module Morpho
             present result['token'], with: Morpho::Entities::AuthenticationToken
           else
             case result['error']
-            when :not_valid
+            when :unprocessable_entity
               render_unprocessable_entity(result['contract'].errors)
             when :not_found
-              render_not_found([I18n.t('morpho.api.messages.refresh_token.invalid')])
+              render_not_found({ base: I18n.t('morpho.api.messages.refresh_token.not_found') })
             else
               render_unprocessable_entity
             end

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

@@ -22,14 +22,12 @@ module Morpho
             present result['model'], with: Morpho::Entities::User
           else
             case result['error']
-            when :not_valid
+            when :unprocessable_entity
               render_unprocessable_entity(result['contract'].errors)
             when :not_found
-              render_not_found
-            when :not_allowed
-              render_method_not_allowed
-            when :not_delivered
-              render_unprocessable_entity
+              render_not_found({ base: I18n.t('morpho.api.messages.unlock.not_found') })
+            when :method_not_allowed
+              render_method_not_allowed({ base: I18n.t('morpho.api.messages.unlock.method_not_allowed') })
             else
               render_unprocessable_entity
             end

data/app/concepts/morpho/user/contract/external_sign_in.rb

@@ -1,5 +1,3 @@
-require 'reform/form/validation/unique_validator'
-
 module Morpho
   class User::Contract::ExternalSignIn < Reform::Form
     include Reform::Form::ActiveRecord

data/app/concepts/morpho/user/operation/activate.rb

@@ -1,13 +1,12 @@
 module Morpho
   class User::Operation::Activate < Trailblazer::Operation
     step :validate
-    fail :not_valid, fail_fast: true
+    fail :unprocessable_entity, fail_fast: true
     step :find
     fail :not_found, fail_fast: true
     step :check
-    fail :not_allowed, fail_fast: true
-    step :activation_email
-    fail :not_delivered, fail_fast: true
+    fail :method_not_allowed, fail_fast: true
+    pass :activation_email
 
     def validate (options, **)
       options['contract'] = Morpho::User::Contract::Activate.new(OpenStruct.new)
@@ -26,20 +25,16 @@ module Morpho
       options['model'].resend_activation_needed_email!
     end
 
-    def not_valid (options, **)
-      options['error'] = :not_valid
+    def unprocessable_entity (options, **)
+      options['error'] = :unprocessable_entity
     end
 
     def not_found (options, **)
       options['error'] = :not_found
     end
 
-    def not_allowed (options, **)
-      options['error'] = :not_allowed
-    end
-
-    def not_delivered (options, **)
-      options['error'] = :not_delivered
+    def method_not_allowed (options, **)
+      options['error'] = :method_not_allowed
     end
   end
 end

data/app/concepts/morpho/user/operation/external_sign_in.rb

@@ -1,7 +1,7 @@
 module Morpho
   class User::Operation::ExternalSignIn < Trailblazer::Operation
     step :validate
-    fail :not_valid, fail_fast: true
+    fail :unprocessable_entity, fail_fast: true
     pass :find_authentication
     pass :find_user
     pass :sign_in
@@ -59,20 +59,8 @@ module Morpho
       options['user.model'].register_last_login_activity!(options['ip'])
     end
 
-    def not_valid (options, **)
-      options['error'] = :not_valid
-    end
-
-    def not_signed_in (options, **)
-      options['error'] = :not_signed_in
-    end
-
-    def not_registered (options, **)
-      options['error'] = :not_registered
-    end
-
-    def not_signed_up (options, **)
-      options['error'] = :not_signed_up
+    def unprocessable_entity (options, **)
+      options['error'] = :unprocessable_entity
     end
 
     def authentication_token (options, **)

data/app/concepts/morpho/user/operation/refresh_token.rb

@@ -1,7 +1,7 @@
 module Morpho
   class User::Operation::RefreshToken < Trailblazer::Operation
     step :validate
-    fail :not_valid, fail_fast: true
+    fail :unprocessable_entity, fail_fast: true
     step :find
     fail :not_found, fail_fast: true
     step :generate_refresh_token
@@ -20,8 +20,8 @@ module Morpho
       options['model'].generate_refresh_token!
     end
 
-    def not_valid (options, **)
-      options['error'] = :not_valid
+    def unprocessable_entity (options, **)
+      options['error'] = :unprocessable_entity
     end
 
     def not_found (options, **)

data/app/concepts/morpho/user/operation/sign_in.rb

@@ -1,15 +1,15 @@
 module Morpho
   class User::Operation::SignIn < Trailblazer::Operation
     step :validate
-    fail :not_valid, fail_fast: true
+    fail :unprocessable_entity, fail_fast: true
     step :find
     fail :not_found, fail_fast: true
     step :check_active
-    fail :not_active, fail_fast: true
+    fail :forbidden, fail_fast: true
     step :check_unlocked
     fail :locked, fail_fast: true
     step :check_password
-    fail :wrong_password, fail_fast: true
+    fail :unauthorized, fail_fast: true
     step :generate_refresh_token
     step :register_last_login_activity
     step :authentication_token
@@ -43,25 +43,25 @@ module Morpho
       options['model'].register_last_login_activity!(options['ip'])
     end
 
-    def not_valid (options, **)
-      options['error'] = :not_valid
+    def unprocessable_entity (options, **)
+      options['error'] = :unprocessable_entity
     end
 
     def not_found (options, **)
       options['error'] = :not_found
     end
 
-    def not_active (options, **)
-      options['error'] = :not_active
+    def forbidden (options, **)
+      options['error'] = :forbidden
     end
 
     def locked (options, **)
       options['error'] = :locked
     end
 
-    def wrong_password (options, **)
+    def unauthorized (options, **)
       options['model'].register_failed_login!
-      options['error'] = :wrong_password
+      options['error'] = :unauthorized
     end
 
     def authentication_token (options, **)

data/app/concepts/morpho/user/operation/unlock.rb

@@ -1,13 +1,12 @@
 module Morpho
   class User::Operation::Unlock < Trailblazer::Operation
     step :validate
-    fail :not_valid, fail_fast: true
+    fail :unprocessable_entity, fail_fast: true
     step :find
     fail :not_found, fail_fast: true
     step :check
-    fail :not_allowed, fail_fast: true
-    step :unlock_token_email
-    fail :not_delivered, fail_fast: true
+    fail :method_not_allowed, fail_fast: true
+    pass :unlock_token_email
 
     def validate (options, **)
       options['contract'] = Morpho::User::Contract::Unlock.new(OpenStruct.new)
@@ -26,20 +25,16 @@ module Morpho
       options['model'].resend_unlock_token_email!
     end
 
-    def not_valid (options, **)
-      options['error'] = :not_valid
+    def unprocessable_entity (options, **)
+      options['error'] = :unprocessable_entity
     end
 
     def not_found (options, **)
       options['error'] = :not_found
     end
 
-    def not_allowed (options, **)
-      options['error'] = :not_allowed
-    end
-
-    def not_delivered (options, **)
-      options['error'] = :not_delivered
+    def method_not_allowed (options, **)
+      options['error'] = :method_not_allowed
     end
   end
 end

data/config/locales/morpho.en.yml

@@ -138,15 +138,19 @@ en:
         method_not_allowed: 'Method not allowed'
         unprocessable_entity: 'Unprocessable entity'
         locked: 'Locked'
+        activate:
+          not_found: 'Email address does not belongs to a registered account'
+          method_not_allowed: 'User account has already been confirmed'
         sign_in:
-          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'
+          not_found: 'Email address does not belongs to a registered account'
+          forbidden: 'User account has not been confirmed'
+          unauthorized: 'User email and/or password is incorrect'
           locked: 'User account has been locked'
         refresh_token:
-          invalid: 'Invalid token'
-        provider:
-          unregistered: 'Could not register user authentication provider'
+          not_found: 'Invalid token'
+        unlock:
+          not_found: 'Email address does not belongs to a registered account'
+          method_not_allowed: 'User account has not been locked'
   simple_form:
     'yes': 'Yes'
     'no': 'No'
@@ -161,3 +165,26 @@ en:
         password: 'Password'
         password_confirmation: 'Confirm your password'
         remember_me: 'Remember me'
+  activemodel:
+    errors:
+      models:
+        morpho/user/contract/activate:
+          attributes:
+            email:
+              invalid_email_address: 'invalid'
+        morpho/user/contract/external_sign_in:
+          attributes:
+            email:
+              invalid_email_address: 'invalid'
+        morpho/user/contract/sign_in:
+          attributes:
+            email:
+              invalid_email_address: 'invalid'
+        morpho/user/contract/sign_up:
+          attributes:
+            email:
+              invalid_email_address: 'invalid'
+        morpho/user/contract/unlock:
+          attributes:
+            email:
+              invalid_email_address: 'invalid'

data/config/locales/morpho.es.yml

@@ -138,15 +138,19 @@ es:
         method_not_allowed: 'Método no permitido'
         unprocessable_entity: 'Entidad no procesable'
         locked: 'Bloqueado'
+        activate:
+          not_found: 'Correo electrónico no pertenece a un usuario registrado'
+          method_not_allowed: 'Cuenta de usuario ya ha sido confirmada'
         sign_in:
-          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'
+          not_found: 'Correo electrónico no pertenece a un usuario registrado'
+          forbidden: 'Cuenta de usuario no ha sido confirmada'
+          unauthorized: 'Correo electrónico y/o contraseña es incorrecto(a)'
           locked: 'Cuenta de usuario ha sido bloqueada'
         refresh_token:
-          invalid: 'El token es inválido'
-        provider:
-          unregistered: 'No se ha podido registrar a el proveedor'
+          not_found: 'El token es inválido'
+        unlock:
+          not_found: 'Correo electrónico no pertenece a un usuario registrado'
+          method_not_allowed: 'Cuenta de usuario no ha sido bloqueada'
   simple_form:
     'yes': 'Si'
     'no': 'No'
@@ -161,3 +165,26 @@ es:
         password: 'Contraseña'
         password_confirmation: 'Confirmar la contraseña'
         remember_me: 'Recuérdame'
+  activemodel:
+    errors:
+      models:
+        morpho/user/contract/activate:
+          attributes:
+            email:
+              invalid_email_address: 'no es válido'
+        morpho/user/contract/external_sign_in:
+          attributes:
+            email:
+              invalid_email_address: 'no es válido'
+        morpho/user/contract/sign_in:
+          attributes:
+            email:
+              invalid_email_address: 'no es válido'
+        morpho/user/contract/sign_up:
+          attributes:
+            email:
+              invalid_email_address: 'no es válido'
+        morpho/user/contract/unlock:
+          attributes:
+            email:
+              invalid_email_address: 'no es válido'

data/lib/morpho/engine.rb

@@ -16,9 +16,7 @@ module Morpho
     initializer 'morpho.configurations', after: :load_config_initializers do |app|
       mailer = ActionMailer::Base
       mailer.delivery_method = Morpho.config.mailer.delivery_method
-                                     .to_s.to_sym
-      mailer.perform_deliveries = Morpho.config.mailer
-                                        .perform_deliveries
+      mailer.perform_deliveries = Morpho.config.mailer.perform_deliveries
 
       mailer.default_options = {
         from: Morpho.config.mailer.from

data/lib/morpho/version.rb

@@ -1,3 +1,3 @@
 module Morpho
-  VERSION = '1.0.1'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: morpho
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Hugo Gilmar Erazo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-30 00:00:00.000000000 Z
+date: 2018-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -238,42 +238,42 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0'
 description: Skeleton rails engine for modular development.