morpho 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82024952461a4e2bd7809b6490d89a95ea14ffbdb09bf0eb48f38293195a77d3
-  data.tar.gz: 3f7ddb7bdb31f77544040cc6b6b7576fd6ec2536f88cc66bcbe9e2c4b8ca0065
+  metadata.gz: 031b5db81031a0b5580c14f0d5d2090d52232d4a2bef373f3b96252b02649701
+  data.tar.gz: 98beadb9189542547bf913eec75540898ebffafaeb4a14e8cf8a9cf34259fec4
 SHA512:
-  metadata.gz: 9accfa9064d5a4d9cfcc2110c107007a8fe511c6847bdb368206d2f57caf5e8549c08e1fbed88b47ed61661ee3eb2deae199196a14955db7f0f829382e469202
-  data.tar.gz: 60ed2c1e0f7fed8363d114ff1d98801455b02ad5f9c627e2b6f098b0443dfdbd6352c9001f565257924a7cd91992a6637bc542b7d325f4bede7533daf4ad7254
+  metadata.gz: a7635d8bc511ae7ecc7924604de502506e442a949cfa787ce317b62c1d040d9ffb6ccc5aac5a5854abaef0de0b028ca5e343e3eb5ffadd4f7aa65e8d0d0847ca
+  data.tar.gz: fbf30803bf591c3029b79e53d57b0102409874e43d0b3075e516c1c29db2c71619c6c722800f50c42816ccd71f2868cfca75453f56ba6cb3955db124f6262f4d

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

@@ -1,7 +1,6 @@
 module Morpho
   module Entities
     class User < ::Morpho::Entities::Base
-      root 'data', 'data'
       expose :email, documentation: { type: 'string', desc: 'User email address' }
     end
   end

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

@@ -4,7 +4,7 @@ module Morpho
       helpers Morpho::Helpers::HTTPResponses
 
       namespace :activations do
-        desc 'Request user activation token' do
+        desc 'Resend activation instructions email' do
           detail ''
           success Morpho::Grape::DataWrapper.new(Morpho::Entities::User)
           failure [
@@ -16,11 +16,16 @@ module Morpho
         params do
           requires :data, type: Morpho::Entities::UserEmail
         end
-        post do
-          result = Morpho::User::Operation::Activate.call(params)
+        post :resend_activation_email do
+          result = Morpho::Operations::User::ResendActivationEmail.call(
+            'params' => params,
+            'model.class' => Morpho::User,
+            'contract.class' => Morpho::Contracts::User::ResendActivationEmail,
+            'presenter.class' => Morpho::Entities::User
+          )
 
           if result.success?
-            present result['model'], with: Morpho::Entities::User
+            present result['response']
           end
         end
       end

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

@@ -15,10 +15,16 @@ module Morpho
           requires :data, type: Morpho::Entities::External
         end
         post do
-          result = Morpho::User::Operation::ExternalSignIn.call(params, ip: request.ip)
+          result = Morpho::Operations::User::ExternalSignIn.call(
+            'params' => params,
+            'model.class' => Morpho::User,
+            'contract.class' => Morpho::Contracts::User::ExternalSignIn,
+            'presenter.class' => Morpho::Entities::AuthenticationToken,
+            'ip_address' => request.ip
+          )
 
           if result.success?
-            present result['token'], with: Morpho::Entities::AuthenticationToken
+            present result['response']
           end
         end
       end

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

@@ -4,7 +4,7 @@ module Morpho
       helpers Morpho::Helpers::HTTPResponses
 
       namespace :passwords do
-        desc 'Request user reset password token' do
+        desc 'Send reset password instructions email' do
           detail ''
           success Morpho::Grape::DataWrapper.new(Morpho::Entities::User)
           failure [
@@ -16,11 +16,16 @@ module Morpho
         params do
           requires :data, type: Morpho::Entities::UserEmail
         end
-        post do
-          result = Morpho::User::Operation::ResetPassword.call(params)
+        post :send_reset_password_email do
+          result = Morpho::Operations::User::SendResetPasswordEmail.call(
+            'params' => params,
+            'model.class' => Morpho::User,
+            'contract.class' => Morpho::Contracts::User::SendResetPasswordEmail,
+            'presenter.class' => Morpho::Entities::User
+          )
 
           if result.success?
-            present result['model'], with: Morpho::Entities::User
+            present result['response']
           end
         end
       end

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

@@ -19,10 +19,16 @@ module Morpho
           requires :data, type: Morpho::Entities::Credentials
         end
         post do
-          result = Morpho::User::Operation::SignIn.call(params, ip: request.ip)
+          result = Morpho::Operations::User::SignIn.call(
+            'params' => params,
+            'model.class' => Morpho::User,
+            'contract.class' => Morpho::Contracts::User::SignIn,
+            'presenter.class' => Morpho::Entities::AuthenticationToken,
+            'ip_address' => request.ip
+          )
 
           if result.success?
-            present result['token'], with: Morpho::Entities::AuthenticationToken
+            present result['response']
           end
         end
 
@@ -30,18 +36,26 @@ module Morpho
           detail ''
           success Morpho::Grape::DataWrapper.new(Morpho::Entities::AuthenticationToken)
           failure [
+            [ 403, I18n.t('morpho.api.messages.general.403'), Morpho::Entities::Error ],
             [ 404, I18n.t('morpho.api.messages.general.404'), Morpho::Entities::Error ],
-            [ 422, I18n.t('morpho.api.messages.general.422'), Morpho::Entities::Error ]
+            [ 422, I18n.t('morpho.api.messages.general.422'), Morpho::Entities::Error ],
+            [ 423, I18n.t('morpho.api.messages.general.423'), Morpho::Entities::Error ]
           ]
         end
         params do
           requires :data, type: Morpho::Entities::RefreshToken
         end
         post :refresh do
-          result = Morpho::User::Operation::RefreshToken.call(params)
+          result = Morpho::Operations::User::RefreshToken.call(
+            'params' => params,
+            'model.class' => Morpho::User,
+            'contract.class' => Morpho::Contracts::User::RefreshToken,
+            'presenter.class' => Morpho::Entities::AuthenticationToken,
+            'ip_address' => request.ip
+          )
 
           if result.success?
-            present result['token'], with: Morpho::Entities::AuthenticationToken
+            present result['response']
           end
         end
       end

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

@@ -4,9 +4,9 @@ module Morpho
       helpers Morpho::Helpers::HTTPResponses
 
       namespace :unlocks do
-        desc 'Request user unlock token' do
+        desc 'Resend unlock instructions email' do
           detail ''
-          success Morpho::Grape::DataWrapper.new(Morpho::Entities::UserEmail)
+          success Morpho::Grape::DataWrapper.new(Morpho::Entities::User)
           failure [
             [ 404, I18n.t('morpho.api.messages.general.404'), Morpho::Entities::Error ],
             [ 405, I18n.t('morpho.api.messages.general.405'), Morpho::Entities::Error ],
@@ -16,11 +16,16 @@ module Morpho
         params do
           requires :data, type: Morpho::Entities::UserEmail
         end
-        post do
-          result = Morpho::User::Operation::Unlock.call(params)
+        post :resend_unlock_email do
+          result = Morpho::Operations::User::ResendUnlockEmail.call(
+            'params' => params,
+            'model.class' => Morpho::User,
+            'contract.class' => Morpho::Contracts::User::ResendActivationEmail,
+            'presenter.class' => Morpho::Entities::User
+          )
 
           if result.success?
-            present result['model'], with: Morpho::Entities::User
+            present result['response']
           end
         end
       end

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

@@ -4,7 +4,7 @@ module Morpho
       helpers Morpho::Helpers::HTTPResponses
 
       namespace :users do
-        desc 'User registration' do
+        desc 'User sign up' do
           detail ''
           success Morpho::Grape::DataWrapper.new(Morpho::Entities::User)
           failure [
@@ -15,10 +15,15 @@ module Morpho
           requires :data, type: Morpho::Entities::UserSignUp
         end
         post do
-          result = Morpho::User::Operation::SignUp.call(params)
+          result = Morpho::Operations::User::SignUp.call(
+            'params' => params,
+            'model.class' => Morpho::User,
+            'contract.class' => Morpho::Contracts::User::SignUp,
+            'presenter.class' => Morpho::Entities::User
+          )
 
           if result.success?
-            present result['model'], with: Morpho::Entities::User
+            present result['response']
           end
         end
       end

data/app/concepts/morpho/contracts/user/deliver_email.rb

@@ -0,0 +1,13 @@
+module Morpho
+  module Contracts
+    module User
+      class DeliverEmail < Reform::Form
+        include Reform::Form::ActiveRecord
+
+        property :email
+
+        validates :email, presence: true, email_format: true
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+module Morpho
+  module Contracts
+    module User
+      class ExternalSignIn < Reform::Form
+        include Reform::Form::ActiveRecord
+
+        property :email
+        property :provider
+        property :uid
+
+        validates :email, presence: true, email_format: true
+        validates :provider, presence: true
+        validates :uid, presence: true
+      end
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+module Morpho
+  module Contracts
+    module User
+      class RefreshToken < Reform::Form
+        include Reform::Form::ActiveRecord
+
+        property :refresh_token
+
+        validates :refresh_token, presence: true
+      end
+    end
+  end
+end

data/app/concepts/morpho/contracts/user/resend_activation_email.rb

@@ -0,0 +1,8 @@
+module Morpho
+  module Contracts
+    module User
+      class ResendActivationEmail < Morpho::Contracts::User::DeliverEmail
+      end
+    end
+  end
+end

data/app/concepts/morpho/contracts/user/resend_unlock_email.rb

@@ -0,0 +1,8 @@
+module Morpho
+  module Contracts
+    module User
+      class ResendUnlockEmail < Morpho::Contracts::User::DeliverEmail
+      end
+    end
+  end
+end

data/app/concepts/morpho/contracts/user/send_reset_password_email.rb

@@ -0,0 +1,8 @@
+module Morpho
+  module Contracts
+    module User
+      class SendResetPasswordEmail < Morpho::Contracts::User::DeliverEmail
+      end
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+module Morpho
+  module Contracts
+    module User
+      class SignIn < Reform::Form
+        include Reform::Form::ActiveRecord
+
+        property :email
+        property :password
+
+        validates :email, presence: true, email_format: true
+        validates :password, presence: true
+      end
+    end
+  end
+end

data/app/concepts/morpho/contracts/user/sign_up.rb

@@ -0,0 +1,25 @@
+require 'reform/form/validation/unique_validator'
+
+module Morpho
+  module Contracts
+    module User
+      class SignUp < Reform::Form
+        include Reform::Form::ActiveRecord
+
+        property :email
+        property :password
+        property :password_confirmation, virtual: true
+
+        validates :email, presence: true, unique: true, email_format: true
+        validates :password,
+                  presence: true,
+                  confirmation: true,
+                  length: { minimum: Morpho.config.auth.password_minimum_length },
+                  :'morpho/validators/contain_number' => true,
+                  :'morpho/validators/contain_uppercase' => true,
+                  :'morpho/validators/contain_symbol' => true
+        validates :password_confirmation, presence: true
+      end
+    end
+  end
+end

data/app/concepts/morpho/operations/base/create.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Morpho
+  module Operations
+    module Base
+      # Base create operation
+      class Create < Morpho::Operations::Base::Form
+        def build_model!(options, **)
+          options['model'] = options['model.class'].new
+        end
+      end
+    end
+  end
+end

data/app/concepts/morpho/operations/base/delete.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Morpho
+  module Operations
+    module Base
+      # Base delete operation
+      class Delete < Morpho::Operations::Base::Find
+        pass :destroy!, after: :present!
+
+        def destroy!(options, model:, **)
+          model.destroy
+        end
+      end
+    end
+  end
+end

data/app/concepts/morpho/operations/base/fetch.rb

@@ -0,0 +1,106 @@
+# frozen_string_literal: true
+
+module Morpho
+  module Operations
+    module Base
+      # Base fetch operation
+      class Fetch < Trailblazer::Operation
+        pass :init!
+        pass :params!
+        pass :meta!
+        pass :model_class!
+        pass :build_build_models!
+        pass :filter!
+        pass :page!
+        pass :paginate!
+        pass :search!
+        pass :update_meta!
+        pass :present!
+
+        def init!(options, **)
+          options['default.page.size'] ||= 25
+        end
+
+        def params!(options, **)
+          options['params'] ||= {}
+        end
+
+        def meta!(options, params:, **)
+          options['meta'] = params.fetch('meta', {})
+        end
+
+        def update_meta!(options, **)
+          if options['models'].try(:current_page)
+            options['meta'].merge!(
+              'current_page' => options['models'].current_page,
+              'from' => options['models'].prev_page,
+              'last_page' => options['models'].total_pages,
+              'per_page' => options['models'].limit_value,
+              'to' => options['models'].next_page,
+              'total' => options['models'].total_count
+            )
+          end
+          options
+        end
+
+        def model_class!(options, **)
+          model_class = options['model.class']
+          unless model_class.is_a?(Class) && model_class.ancestors
+                                                        .include?(
+                                                          ::ActiveRecord::Base
+                                                        )
+            raise ArgumentError,
+                  'Supply a valid model.class option'
+          end
+        end
+
+        def build_models!(options, **)
+          options['models'] = options['model.class'].all
+        end
+
+        def filter!(options, params:, **)
+          options['filter'] = params.fetch('filter', {})
+        end
+
+        def page!(options, params:, **)
+          options['page'] = params.fetch(
+            'page',
+            'number' => 1,
+            'size' => options['default.page.size']
+          )
+        end
+
+        def paginate!(options, page:, **)
+          page_size = page.fetch('size', 25)
+          page_number = page.fetch('number', 1)
+          if  page &&
+              page_size.to_i.positive?
+            options['models'] = options['models']
+                                .page(page_number)
+                                .per(page_size)
+          end
+          options
+        end
+
+        def search!(options, **)
+          options['models'] = options['models']
+                              .ransack(options['filter'])
+                              .result(distinct: options['ransack.distinct'])
+        end
+
+        def present!(options, meta:, models:, **)
+          data =
+            if options['presenter.class']
+              options['presenter.class'].represent(models)['data']
+            else
+              models
+            end
+          options['response'] = {
+            data: data,
+            meta: meta
+          }
+        end
+      end
+    end
+  end
+end