morpho 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7fca5e64b05dd61217178c941e7f0dece7ad1f5088184e9463b80cd11c16414
-  data.tar.gz: e89d1a456a7b76f24f18bcdde9f5a71a3268258fe2b86f1e868b12cff77a106d
+  metadata.gz: c0338ac8728b7b68d4573d522582176ef24120d8ee32b166a4b47a4cc2c31a80
+  data.tar.gz: f1b00da0632ea3ec3f63c60cbdb01b378b404fdbb6c24696c10cfea8291a29d4
 SHA512:
-  metadata.gz: b36cf4a0152b861d01e3e4fe75c0f7c40f31ddfca3209ce07dfcc0f7fed4596d7cf3fc640b3ca188bfdb44de0a0523158b648e7dd074b49b77aa8bb5622cac03
-  data.tar.gz: 91a25b1c00d433111234446830d59eb26a538288519f0f7930434a26e9331178bd579793712683c75d7e94d2aa72320b7d0a961d5c75ff62a698f810503652f5
+  metadata.gz: 11778c465a75f168c1a1a8db55ca70d3b9d70b8f61d0dd69743fcfccfc3e7c3951d9d29c287587ad7ee2e1cadb1d3059f990a0dd51f709e63c060feb9813abd4
+  data.tar.gz: 1674597483b4ea9c1098dd92936796a394c790a2403e9702ae3225949862109cf8d54411540411fb3a0753940ace36a724dd1ce30a02080506f3a797705661ce

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

@@ -55,12 +55,12 @@ module Morpho
       end
 
       def jwt_encode(payload)
-        JWT.encode(payload, Morpho.config.jwt.secret, Morpho.config.jwt.algorithm)
+        Morpho::Cipher.jwt_encode(payload)
       end
 
       def jwt_decode(token)
         begin
-          return JWT.decode(token, Morpho.config.jwt.secret, true, { algorithm: Morpho.config.jwt.algorithm })
+          return Morpho::Cipher.jwt_decode(token)
         rescue
           nil
         end

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

@@ -0,0 +1,8 @@
+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 }
+    end
+  end
+end

data/app/assets/stylesheets/morpho/application.css

@@ -12,77 +12,4 @@
  *
  *= require_self
  */
- @import 'https://fonts.googleapis.com/css?family=Raleway:400,300,600';
- @import 'https://cdn.jsdelivr.net/npm/skeleton-css@2.0.4/css/normalize.css';
- @import 'https://cdn.jsdelivr.net/npm/skeleton-css@2.0.4/css/skeleton.css';
-
-body {
-  padding: 2em 1em;
-}
-
-.alert {
-  display: block;
-  padding: 1em;
-  border-left: 5px solid;
-  margin-bottom: 1em;
-}
-
-.alert-success {
-  background-color: #D5F5E3;
-  border-left-color: #2ECC71;
-  color: #2ECC71;
-}
-
-.alert-info {
-  background-color: #D6EAF8;
-  border-left-color: #3498DB;
-  color: #3498DB;
-}
-
-.alert-warning {
-  background-color: #FCF3CF;
-  border-left-color: #F1C40F;
-  color: #F1C40F;
-}
-
-.alert-error {
-  background-color: #F2D7D5;
-  border-left-color: #C0392B;
-  color: #C0392B;
-}
-
-.field_with_errors {
-  padding-bottom: 1em;
-}
-
-.field_with_errors input, .field_with_errors textarea, .field_with_errors select {
-  margin-bottom: 0.5em;
-}
-
-.field_with_errors span.error {
-  color: #C0392B;
-  text-transform: lowercase;
-}
-
-.input label.boolean {
-  display: inline;
-  font-weight: normal;
-  margin-left: 0.5em;
-}
-
-ul.unstyled {
-  list-style: none;
-}
-
-.sign-in-form, .sign-up-form, .activation-form, .reset-password-form, .unlock-form {
-  position: relative;
-  height: 50vh;
-}
-
-.sign-in-form form, .sign-up-form form, .activation-form form, .reset-password-form form, .unlock-form form {
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-  width: 50vh;
-}
+ @import 'https://fonts.googleapis.com/css?family=Raleway:400,300,600';

data/app/controllers/morpho/activations_controller.rb

@@ -17,9 +17,9 @@ module Morpho
     def show
       if user && !user.active?
         user.activate!
-        redirect_to sign_in_path, success: I18n.t('morpho.messages.activations.activate.success')
+        render "morpho/activations/success"
       else
-        redirect_to sign_in_path, error: I18n.t('morpho.messages.activations.activate.failure')
+        render "morpho/activations/failure"
       end
     end
 

data/app/models/morpho/user.rb

@@ -5,7 +5,7 @@ module Morpho
     has_many :authentications, dependent: :destroy
     accepts_nested_attributes_for :authentications
 
-    validates :password, length: { minimum: 12 },
+    validates :password, length: { minimum: Morpho.config.auth.password_minimum_length },
               :'morpho/validators/contain_number' => true,
               :'morpho/validators/contain_uppercase' => true,
               :'morpho/validators/contain_symbol' => true

data/app/views/morpho/activations/failure.html.erb

@@ -0,0 +1,17 @@
+<div class="tw-flex tw-flex-wrap tw-h-screen tw-items-center tw-content-center tw-text-grey-dark tw-text-4xl">
+  <div class="tw-w-full lg:tw-w-3/4 tw-mx-auto tw-text-center">
+      <h3 class="tw-text-5xl tw-pb-16 tw-text-grey-dark">
+        Token inválido
+      </h3>
+     <div class="">
+      
+     </div>
+
+     <div class="tw-pt-24 tw-px-32  ">
+        <p>
+        Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor.
+        </p>
+     </div>
+    
+  </div>
+</div>

data/app/views/morpho/activations/new.html.erb

@@ -1,10 +1,10 @@
-<div class="activation-form">
+<div class="">
   <%= simple_form_for :user, url: send_activation_path do |f| %>
-    <%= f.input :email, required: true, placeholder: 'johndoe@example.com', input_html: { class: 'u-full-width' } %>
+    <%= f.input :email, required: true, placeholder: 'johndoe@example.com', input_html: { class: '' } %>
 
-    <%= f.submit t('morpho.labels.activations.send_instructions'), class: 'button-primary u-full-width' %>
+    <%= f.submit t('morpho.labels.activations.send_instructions'), class: '' %>
 
-    <ul class="unstyled">
+    <ul class="">
       <li>
         <%= link_to t('morpho.labels.activations.sign_in'), sign_in_path %>
       </li>

data/app/views/morpho/activations/success.html.erb

@@ -0,0 +1,17 @@
+<div class="">
+  <div class="">
+      <h3 class="">
+        Cuenta activada
+      </h3>
+     <div class="">
+      <%= link_to 'Iniciar sesión', sign_in_path , class: "" %>
+     </div>
+
+     <div class="">
+        <p>
+          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor.
+        </p>
+     </div>
+    
+  </div>
+</div>

data/app/views/morpho/passwords/edit.html.erb

@@ -1,12 +1,12 @@
-<div class="sign-up-form">
+<div class="">
   <%= simple_form_for user, url: change_password_path(token: params[:token]), method: :put do |f| %>
-    <%= f.input :password, required: true, placeholder: '************', input_html: { class: 'u-full-width' } %>
+    <%= f.input :password, required: true, placeholder: '************', input_html: { class: '' } %>
 
-    <%= f.input :password_confirmation, required: true, placeholder: '************', input_html: { class: 'u-full-width' } %>
+    <%= f.input :password_confirmation, required: true, placeholder: '************', input_html: { class: '' } %>
 
-    <%= f.submit t('morpho.labels.passwords.change_password'), class: 'button-primary u-full-width' %>
+    <%= f.submit t('morpho.labels.passwords.change_password'), class: '' %>
 
-    <ul class="unstyled">
+    <ul class="">
       <li>
         <%= link_to t('morpho.labels.passwords.sign_in'), sign_in_path %>
       </li>

data/app/views/morpho/passwords/new.html.erb

@@ -1,10 +1,10 @@
-<div class="reset-password-form">
+<div class="">
   <%= simple_form_for :user, url: send_reset_password_path do |f| %>
-    <%= f.input :email, required: true, placeholder: 'johndoe@example.com', input_html: { class: 'u-full-width' } %>
+    <%= f.input :email, required: true, placeholder: 'johndoe@example.com', input_html: { class: '' } %>
 
-    <%= f.submit t('morpho.labels.passwords.send_instructions'), class: 'button-primary u-full-width' %>
+    <%= f.submit t('morpho.labels.passwords.send_instructions'), class: 'button-primary ' %>
 
-    <ul class="unstyled">
+    <ul class="">
       <li>
         <%= link_to t('morpho.labels.passwords.sign_in'), sign_in_path %>
       </li>

data/app/views/morpho/sessions/new.html.erb

@@ -1,14 +1,14 @@
-<div class="sign-in-form">
+<div class="">
   <%= simple_form_for :session, url: sign_in_path do |f| %>
-    <%= f.input :email, required: true, placeholder: 'johndoe@example.com', input_html: { class: 'u-full-width' } %>
+    <%= f.input :email, required: true, placeholder: 'johndoe@example.com', input_html: { class: '' } %>
 
-    <%= f.input :password, required: true, placeholder: '************', input_html: { class: 'u-full-width' } %>
+    <%= f.input :password, required: true, placeholder: '************', input_html: { class: '' } %>
 
     <%= f.input :remember_me, as: :boolean %>
 
-    <%= f.submit t('morpho.labels.sessions.sign_in'), class: 'button-primary u-full-width' %>
+    <%= f.submit t('morpho.labels.sessions.sign_in'), class: '' %>
 
-    <ul class="unstyled">
+    <ul class="">
       <li>
         <%= link_to t('morpho.labels.sessions.sign_up'), sign_up_path %>
       </li>

data/app/views/morpho/unlocks/new.html.erb

@@ -1,10 +1,10 @@
-<div class="unlock-form">
+<div class="">
   <%= simple_form_for :user, url: send_unlock_path do |f| %>
-    <%= f.input :email, required: true, placeholder: 'johndoe@example.com', input_html: { class: 'u-full-width' } %>
+    <%= f.input :email, required: true, placeholder: 'johndoe@example.com', input_html: { class: '' } %>
 
-    <%= f.submit t('morpho.labels.unlocks.send_instructions'), class: 'button-primary u-full-width' %>
+    <%= f.submit t('morpho.labels.unlocks.send_instructions'), class: '' %>
 
-    <ul class="unstyled">
+    <ul class="">
       <li>
         <%= link_to t('morpho.labels.unlocks.sign_in'), sign_in_path %>
       </li>

data/app/views/morpho/users/new.html.erb

@@ -1,14 +1,14 @@
-<div class="sign-up-form">
+<div class="">
   <%= simple_form_for user, url: sign_up_path do |f| %>
-    <%= f.input :email, required: true, placeholder: 'johndoe@example.com', input_html: { class: 'u-full-width' } %>
+    <%= f.input :email, required: true, placeholder: 'johndoe@example.com', input_html: { class: '' } %>
 
-    <%= f.input :password, required: true, placeholder: '************', input_html: { class: 'u-full-width' } %>
+    <%= f.input :password, required: true, placeholder: '************', input_html: { class: '' } %>
 
-    <%= f.input :password_confirmation, required: true, placeholder: '************', input_html: { class: 'u-full-width' } %>
+    <%= f.input :password_confirmation, required: true, placeholder: '************', input_html: { class: '' } %>
 
-    <%= f.submit t('morpho.labels.users.sign_up'), class: 'button-primary u-full-width' %>
+    <%= f.submit t('morpho.labels.users.sign_up'), class: '' %>
 
-    <ul class="unstyled">
+    <ul class="">
       <li>
         <%= link_to t('morpho.labels.users.sign_in'), sign_in_path %>
       </li>

data/config/locales/morpho.es.yml

@@ -1,5 +1,68 @@
 es:
   morpho:
+    labels:
+      validators:
+        contain_symbol: 'debe de contener un caracter especial'
+        contain_number: 'debe de contener un número'
+        contain_uppercase: 'debe de contener al menos una letra en mayúscula'
+      sessions:
+        sign_in: 'Iniciar sesión'
+        sign_up: 'Regístrate con una nueva cuenta de usuario'
+        password_reset: 'Restablecer la contraseña de mi cuenta'
+        unlock: 'Desbloquear mi cuenta'
+      users:
+        sign_up: 'Regístrate'
+        sign_in: 'Inicia sesión con una cuenta de usuario existente'
+        activation: 'Activar mi cuenta'
+      passwords:
+        send_instructions: 'Enviar instrucciones de restablecer contraseña'
+        sign_in: 'Inicia sesión con una cuenta de usuario existente'
+        sign_up: 'Regístrate con una nueva cuenta de usuario'
+        change_password: 'Cambiar mi contraseña'
+      activations:
+        send_instructions: 'Enviar instrucciones de activación'
+        sign_in: 'Inicia sesión con una cuenta de usuario existente'
+        sign_up: 'Regístrate con una nueva cuenta de usuario'
+      unlocks:
+        send_instructions: 'Enviar instrucciones de desbloqueo'
+        sign_in: 'Inicia sesión con una cuenta de usuario existente'
+        sign_up: 'Regístrate con una nueva cuenta de usuario'
+    messages:
+      unauthenticated: 'Necesitas iniciar sesión primero'
+      sessions:
+        create:
+          success: 'Inicia sesión exitosamente'
+          failure: 'Error de inicio de sesión, por favor verifique la información proporcionada'
+        destroy:
+          success: 'Usted cierra la sesión con éxito'
+      users:
+        create:
+          success: 'Regístrese con éxito, recibirá un correo electrónico con instrucciones de activación de cuenta.'
+          failure: 'Registro fallido, por favor revise los errores a continuación'
+      passwords:
+        create:
+          success: 'Recibirá instrucciones para restablecer su contraseña en su buzón de correo electrónico.'
+          failure: 'No se ha encontrado ninguna cuenta de usuario con ese correo electrónico.'
+        edit:
+          success: 'Ingrese su nueva contraseña en los campos de abajo'
+          failure: 'Error al restablecer la contraseña, solicitar un nuevo token de activación'
+        update:
+          success: 'Contraseña modificada correctamente, inicie sesión para continuar'
+          failure: 'Error de cambio de contraseña, por favor revise los errores a continuación'
+      activations:
+        create:
+          success: 'Recibirá instrucciones de activación de cuenta de usuario en su buzón de correo electrónico.'
+          failure: 'Ninguna cuenta de usuario encontrada con ese correo electrónico o cuenta de usuario ya está activa'
+        activate:
+          success: 'Activación exitosa, inicie sesión para continuar'
+          failure: 'La activación falló, solicita un nuevo token de activación'
+      unlocks:
+        create:
+          success: 'Recibirás instrucciones de desbloqueo de cuenta de usuario en tu buzón de correo electrónico.'
+          failure: 'Ninguna cuenta de usuario encontrada con ese correo electrónico o cuenta de usuario ya está desbloqueada'
+        unlock:
+          success: 'Desbloqueo exitoso, inicia sesión para continuar'
+          failure: 'Falló el desbloqueo, solicita un nuevo token de desbloqueo'
     mailer:
       activation_needed:
         subject: 'Te has registrado correctamente'
@@ -63,4 +126,28 @@ es:
 
           Para desbloquear tu cuenta ahora, solo sigue este enlace: %{url}. De todos modos se desbloqueará automáticamente en una hora.
 
-          ¡Que tengas un gran día!
+          ¡Que tengas un gran día!
+
+    api:
+      messages:
+        bad_request: 'Solicitud incorrecta'
+        unauthorized: 'No autorizado'
+        payment_required: 'Pago requerido'
+        forbidden: 'Prohibido'
+        not_found: 'No encontrado'
+        method_not_allowed: 'Método no permitido'
+        unprocessable_entity: 'Entidad no procesable'
+  simple_form:
+    'yes': 'Si'
+    'no': 'No'
+    required:
+      text: 'requerido'
+      mark: '*'
+    error_notification:
+      default_message: 'Por favor revise los problemas a continuación:'
+    labels:
+      defaults:
+        email: 'Correo electrónico'
+        password: 'Contraseña'
+        password_confirmation: 'Confirmar la contraseña'
+        remember_me: 'Recuérdame'

data/lib/morpho.rb

@@ -1,5 +1,6 @@
 require 'morpho/loader'
 require 'morpho/engine'
+require 'morpho/cipher'
 require 'morpho/version'
 require 'morpho/configuration'
 require 'morpho/validators/contain_number_validator'

data/lib/morpho/cipher.rb

@@ -0,0 +1,13 @@
+module Morpho
+  module Cipher
+    module_function
+
+    def jwt_encode(payload, algorithm = Morpho.config.jwt.algorithm)
+      JWT.encode(payload, Morpho.config.jwt.secret, algorithm)
+    end
+
+    def jwt_decode(token, algorithm = Morpho.config.jwt.algorithm)
+      JWT.decode(token, Morpho.config.jwt.secret, true, algorithm: algorithm)
+    end
+  end
+end

data/lib/morpho/configurations/auth.rb

@@ -2,9 +2,10 @@ module Morpho
   module Configurations
     class Auth
       attr_accessor :failed_login_attempts_limit
-
+      attr_accessor :password_minimum_length
       def initialize
         self.failed_login_attempts_limit = 0
+        self.password_minimum_length = 8
       end
     end
   end

data/lib/morpho/loader.rb

@@ -9,3 +9,4 @@ require 'grape-entity'
 require 'grape-swagger'
 require 'grape-swagger/entity'
 require 'grape-swagger/representable'
+require 'rails-i18n'

data/lib/morpho/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: morpho
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Hugo Gilmar Erazo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-17 00:00:00.000000000 Z
+date: 2018-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -178,6 +178,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.2
+- !ruby/object:Gem::Dependency
+  name: rails-i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -238,6 +252,7 @@ files:
 - 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/user.rb
 - app/api/morpho/entities/user_sign_in.rb
 - app/api/morpho/entities/user_sign_up.rb
@@ -268,7 +283,9 @@ files:
 - app/views/layouts/morpho/application.html.erb
 - app/views/layouts/morpho/mailer.html.erb
 - app/views/layouts/morpho/mailer.text.erb
+- app/views/morpho/activations/failure.html.erb
 - app/views/morpho/activations/new.html.erb
+- app/views/morpho/activations/success.html.erb
 - app/views/morpho/home/index.html.erb
 - app/views/morpho/passwords/edit.html.erb
 - app/views/morpho/passwords/new.html.erb
@@ -303,6 +320,7 @@ files:
 - lib/generators/morpho/install/templates/public/favicon-32x32.png
 - lib/generators/morpho/install/templates/public/favicon.ico
 - lib/morpho.rb
+- lib/morpho/cipher.rb
 - lib/morpho/configuration.rb
 - lib/morpho/configurations/api.rb
 - lib/morpho/configurations/auth.rb