morpho 1.2.0 → 1.2.1

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

@@ -0,0 +1,8 @@
+module Morpho
+  module Operations
+    module User
+      class SignUp < Morpho::Operations::Base::Create
+      end
+    end
+  end
+end

data/app/models/morpho/user.rb

@@ -18,6 +18,11 @@ module Morpho
       !self.login_locked?
     end
 
+    def setup_activation!
+      self.setup_activation
+      self.save
+    end
+
     def register_last_login_activity!(ip_address)
       self.set_last_login_at(Time.now)
       self.set_last_ip_address(ip_address)
@@ -28,8 +33,7 @@ module Morpho
     end
 
     def resend_activation_needed_email!
-      self.setup_activation
-      self.reload
+      self.setup_activation!
       self.send_activation_needed_email!
     end
 

data/config/locales/morpho.en.yml

@@ -149,6 +149,8 @@ en:
           bad_credentials: 'User email and/or password is incorrect'
         refresh_token:
           invalid: 'Invalid token'
+          account_not_confirmed: 'User account has not been confirmed'
+          account_locked: 'User account has been locked'
         unlock:
           email_not_exists: 'Email address does not belongs to a registered account'
           account_not_locked: 'User account has not been locked'

data/config/locales/morpho.es.yml

@@ -149,6 +149,8 @@ es:
           bad_credentials: 'Correo electrónico y/o contraseña es incorrecto(a)'
         refresh_token:
           invalid: 'El token es inválido'
+          account_not_confirmed: 'Cuenta de usuario no ha sido confirmada'
+          account_locked: 'Cuenta de usuario ha sido bloqueada'
         unlock:
           email_not_exists: 'Correo electrónico no pertenece a un usuario registrado'
           account_not_locked: 'Cuenta de usuario no ha sido bloqueada'

data/lib/generators/morpho/install/templates/app/api/morpho/api.rb

@@ -1,7 +1,13 @@
 module Morpho
   class API < ::Grape::API
     format :json
-    rescue_from :all
+
+    error_formatter :json, Morpho::Formatters::StandardError
+
+    rescue_from Morpho::Exceptions::StandardError do |e|
+      message = Morpho::Entities::Error.represent(e)
+      error!(message, e.status)
+    end
 
     mount Morpho::Resources::Users
     mount Morpho::Resources::Externals
@@ -10,6 +16,8 @@ module Morpho
     mount Morpho::Resources::Unlocks
     mount Morpho::Resources::Activations
 
+    mount Morpho::Resources::Hello
+
     add_swagger_documentation({
       info: {
         title: Morpho.config.api.title,
@@ -19,7 +27,9 @@ module Morpho
     })
 
     route :any, '*path' do
-      error!({ message: I18n.t('morpho.api.messages.not_found') }, 404)
+      raise Morpho::Exceptions::StandardError.new(
+        status: 404
+      )
     end
   end
 end

data/lib/generators/morpho/install/templates/config/initializers/morpho.rb

@@ -1,5 +1,6 @@
 Morpho.configure do |config|
-  config.host = ENV.fetch('HOST', 'localhost:3000')
+  config.host = ENV.fetch('HOST', 'localhost')
+  config.port = ENV.fetch('PORT', 3000)
   config.protocol = ENV.fetch('PROTOCOL', 'http')
   config.mailer.from = ENV.fetch('MAILER_FROM', 'no-reply@example.com')
   config.mailer.address = ENV.fetch('MAILER_ADDRESS', 'smtp.mailtrap.io')

data/lib/morpho/configuration.rb

@@ -6,6 +6,7 @@ require 'morpho/configurations/auth'
 module Morpho
   class Configuration
     attr_accessor :host
+    attr_accessor :port
     attr_accessor :protocol
 
     attr_accessor :mailer
@@ -15,6 +16,7 @@ module Morpho
 
     def initialize
       self.host = ''
+      self.port = ''
       self.protocol = ''
 
       self.mailer = Morpho::Configurations::Mailer.new

data/lib/morpho/engine.rb

@@ -7,12 +7,6 @@ module Morpho
       config.autoload_paths << File.expand_path('app/api', __dir__)
     end
 
-    initializer 'morpho.migrations', before: :load_config_initializers do |app|
-      config.paths['db/migrate'].expanded.each do |expanded_path|
-        app.config.paths['db/migrate'] << expanded_path
-      end
-    end
-
     initializer 'morpho.configurations', after: :load_config_initializers do |app|
       mailer = ActionMailer::Base
       mailer.delivery_method = Morpho.config.mailer.delivery_method
@@ -24,6 +18,7 @@ module Morpho
 
       mailer.default_url_options = {
         host: Morpho.config.host,
+        port: Morpho.config.port,
         protocol: Morpho.config.protocol
       }
 

data/lib/morpho/version.rb

@@ -1,3 +1,3 @@
 module Morpho
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: morpho
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Hugo Gilmar Erazo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-13 00:00:00.000000000 Z
+date: 2019-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -312,20 +312,29 @@ files:
 - app/assets/images/morpho/morpho.svg
 - app/assets/javascripts/morpho/application.js
 - app/assets/stylesheets/morpho/application.css
-- app/concepts/morpho/user/contract/activate.rb
-- app/concepts/morpho/user/contract/external_sign_in.rb
-- app/concepts/morpho/user/contract/refresh_token.rb
-- app/concepts/morpho/user/contract/reset_password.rb
-- app/concepts/morpho/user/contract/sign_in.rb
-- app/concepts/morpho/user/contract/sign_up.rb
-- app/concepts/morpho/user/contract/unlock.rb
-- app/concepts/morpho/user/operation/activate.rb
-- app/concepts/morpho/user/operation/external_sign_in.rb
-- app/concepts/morpho/user/operation/refresh_token.rb
-- app/concepts/morpho/user/operation/reset_password.rb
-- app/concepts/morpho/user/operation/sign_in.rb
-- app/concepts/morpho/user/operation/sign_up.rb
-- app/concepts/morpho/user/operation/unlock.rb
+- app/concepts/morpho/contracts/user/deliver_email.rb
+- app/concepts/morpho/contracts/user/external_sign_in.rb
+- app/concepts/morpho/contracts/user/refresh_token.rb
+- app/concepts/morpho/contracts/user/resend_activation_email.rb
+- app/concepts/morpho/contracts/user/resend_unlock_email.rb
+- app/concepts/morpho/contracts/user/send_reset_password_email.rb
+- app/concepts/morpho/contracts/user/sign_in.rb
+- app/concepts/morpho/contracts/user/sign_up.rb
+- app/concepts/morpho/operations/base/create.rb
+- app/concepts/morpho/operations/base/delete.rb
+- app/concepts/morpho/operations/base/fetch.rb
+- app/concepts/morpho/operations/base/find.rb
+- app/concepts/morpho/operations/base/form.rb
+- app/concepts/morpho/operations/base/update.rb
+- app/concepts/morpho/operations/user/deliver_email.rb
+- app/concepts/morpho/operations/user/external_sign_in.rb
+- app/concepts/morpho/operations/user/generate_token.rb
+- app/concepts/morpho/operations/user/refresh_token.rb
+- app/concepts/morpho/operations/user/resend_activation_email.rb
+- app/concepts/morpho/operations/user/resend_unlock_email.rb
+- app/concepts/morpho/operations/user/send_reset_password_email.rb
+- app/concepts/morpho/operations/user/sign_in.rb
+- app/concepts/morpho/operations/user/sign_up.rb
 - app/controllers/morpho/activations_controller.rb
 - app/controllers/morpho/application_controller.rb
 - app/controllers/morpho/home_controller.rb
@@ -424,7 +433,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Morpho Core.

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

@@ -1,8 +0,0 @@
-module Morpho
-  class User::Contract::Activate < Reform::Form
-    include Reform::Form::ActiveRecord
-
-    property :email
-    validates :email, presence: true, email_format: true
-  end
-end

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

@@ -1,12 +0,0 @@
-module Morpho
-  class User::Contract::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

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

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

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

@@ -1,8 +0,0 @@
-module Morpho
-  class User::Contract::ResetPassword < Reform::Form
-    include Reform::Form::ActiveRecord
-
-    property :email
-    validates :email, presence: true, email_format: true
-  end
-end

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

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

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

@@ -1,22 +0,0 @@
-require 'reform/form/validation/unique_validator'
-
-module Morpho
-  class User::Contract::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 },
-              # rubocop:disable Style/HashSyntax
-              :'morpho/validators/contain_number' => true,
-              :'morpho/validators/contain_uppercase' => true,
-              :'morpho/validators/contain_symbol' => true
-    # rubocop:enable Style/HashSyntax
-    validates :password_confirmation, presence: true
-  end
-end

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

@@ -1,8 +0,0 @@
-module Morpho
-  class User::Contract::Unlock < Reform::Form
-    include Reform::Form::ActiveRecord
-
-    property :email
-    validates :email, presence: true, email_format: true
-  end
-end

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

@@ -1,42 +0,0 @@
-module Morpho
-  class User::Operation::Activate < Trailblazer::Operation
-    pass :validate!
-    pass :find!
-    pass :check!
-    pass :activation_email!
-
-    def validate!(options, **)
-      options['contract'] = Morpho::User::Contract::Activate.new(OpenStruct.new)
-
-      unless options['contract'].validate(options['data'])
-        raise Morpho::Exceptions::StandardError.new(
-          errors: options['contract'].errors
-        )
-      end
-    end
-
-    def find!(options, **)
-      options['model'] = Morpho::User.find_by(email: options['data']['email'])
-
-      if options['model'].nil?
-        raise Morpho::Exceptions::StandardError.new(
-          message: I18n.t('morpho.api.messages.activate.email_not_exists'),
-          status: 404
-        )
-      end
-    end
-
-    def check!(options, **)
-      if options['model'].active?
-        raise Morpho::Exceptions::StandardError.new(
-          message: I18n.t('morpho.api.messages.activate.account_already_confirmed'),
-          status: 405
-        )
-      end
-    end
-
-    def activation_email!(options, **)
-      options['model'].resend_activation_needed_email!
-    end
-  end
-end

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

@@ -1,70 +0,0 @@
-module Morpho
-  class User::Operation::ExternalSignIn < Trailblazer::Operation
-    pass :validate!
-    pass :find_authentication!
-    pass :find_user!
-    pass :sign_in!
-    pass :register!
-    pass :sign_up!
-    pass :generate_refresh_token!
-    pass :register_last_login_activity!
-    pass :authentication_token!
-
-    def validate!(options, **)
-      options['contract'] = Morpho::User::Contract::ExternalSignIn.new(OpenStruct.new)
-
-      unless options['contract'].validate(options['data'])
-        raise Morpho::Exceptions::StandardError.new(
-          errors: options['contract'].errors
-        )
-      end
-    end
-
-    def find_authentication!(options, **)
-      options['authentication.model'] = Morpho::Authentication.find_by(
-        uid: options['data']['uid'],
-        provider: options['data']['provider']
-      )
-    end
-
-    def find_user!(options, **)
-      options['user.model'] = Morpho::User.find_by(email: options['data']['email'])
-    end
-
-    def sign_in!(options, **)
-      if options['authentication.model']
-        options['user.model'] = options['authentication.model'].user
-      end
-    end
-
-    def register!(options, **)
-      if options['user.model'] && options['authentication.model'].nil?
-        provider = options['data']['provider'].downcase
-
-        options['user.model'].add_provider_to_user(provider, options['data']['uid'])
-      end
-    end
-
-    def sign_up!(options, **)
-      if options['user.model'].nil? && options['authentication.model'].nil?
-        provider = options['data']['provider'].downcase
-
-        options['user.model'] = Morpho::User.create_from_provider(provider, options['data']['uid'], {
-          email: options['data']['email']
-        })
-      end
-    end
-
-    def generate_refresh_token!(options, **)
-      options['user.model'].generate_refresh_token!
-    end
-
-    def register_last_login_activity!(options, **)
-      options['user.model'].register_last_login_activity!(options['ip'])
-    end
-
-    def authentication_token!(options, **)
-      options['token'] = ::Morpho::JWT::Payload.new(options['user.model'])
-    end
-  end
-end

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

@@ -1,37 +0,0 @@
-module Morpho
-  class User::Operation::RefreshToken < Trailblazer::Operation
-    pass :validate!
-    pass :find!
-    pass :generate_refresh_token!
-    pass :authentication_token!
-
-    def validate!(options, **)
-      options['contract'] = Morpho::User::Contract::RefreshToken.new(OpenStruct.new)
-
-      unless options['contract'].validate(options['data'])
-        raise Morpho::Exceptions::StandardError.new(
-          errors: options['contract'].errors
-        )
-      end
-    end
-
-    def find!(options, **)
-      options['model'] = Morpho::User.find_by(refresh_token: options['data']['refresh_token'])
-
-      if options['model'].nil?
-        raise Morpho::Exceptions::StandardError.new(
-          message: I18n.t('morpho.api.messages.refresh_token.invalid'),
-          status: 404
-        )
-      end
-    end
-
-    def generate_refresh_token!(options, **)
-      options['model'].generate_refresh_token!
-    end
-
-    def authentication_token!(options, **)
-      options['token'] = ::Morpho::JWT::Payload.new(options['model'])
-    end
-  end
-end