morpho 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5e58a85aef299825d478036742e688fc13a9ddc8233387bd5e708fdf8fc3c59
-  data.tar.gz: 899df45d8f131d02d9899a9624abd22ff3eb4138a971954cca56d63f0ea919c4
+  metadata.gz: c5c49b67969b1ac0960d6430694b709177b68968887b32906304f5e0f02ee830
+  data.tar.gz: ac874025f16e322d8846dd11ca252cf80719eb0717c98879a813188daecd473b
 SHA512:
-  metadata.gz: ffc548ba4bf67699b99e377e6590dec5afc2e234f7c6bd20ea27d721cc08e489b5482eedc4b74c1404c9f5dcc79319c644cf9396f71e2069d213621116abba09
-  data.tar.gz: 99d6701412b6ccda6cae2c34812d0c67a739b7f70f113163380f2af766f57f1861dfa6facf6776107d010f0f303ffa016dddc2c2673689c4a4c5a9184c45ccef
+  metadata.gz: 835a3ae2e4f2c4f7b5d74af16ea4e560ae6a95fd7929bedff3cccdbff15442b8cdd22d55259985ca7d6f089a17ff70f022023e4613142e9dd6c569c7bf32a973
+  data.tar.gz: 4ec7206954f12b3fe7e78fbf7996776701af1dc7be0dbc79dc1e1be67c7ed379b339871190dac881dd2baf81a24d58874d41083e2806618be43a851d6c4819fc

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

@@ -2,8 +2,9 @@ module Morpho
   module Entities
     module SignIn
       class AuthenticationToken < ::Morpho::Entities::Base
-        expose :token, documentation: { type: 'string', desc: 'User authentication token', required: true }
+        expose :authentication_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 }
+        expose :refresh_token, documentation: { type: 'string', desc: 'User refresh token', required: true }
       end
     end
   end

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

@@ -0,0 +1,10 @@
+module Morpho
+  module Entities
+    module SignIn
+      class Credentials < ::Morpho::Entities::Base
+        expose :email, documentation: { type: 'string', desc: 'User email address' }
+        expose :password, documentation: { type: 'string', desc: 'User password' }
+      end
+    end
+  end
+end

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

@@ -0,0 +1,9 @@
+module Morpho
+  module Entities
+    module SignIn
+      class RefreshToken < ::Morpho::Entities::Base
+        expose :refresh_token, documentation: { type: 'string', desc: 'User refresh token', required: true }
+      end
+    end
+  end
+end

data/app/api/{concerns/morpho/grape → morpho/helpers}/http_responses.rb

@@ -1,8 +1,6 @@
 module Morpho
-  module Grape
+  module Helpers
     module HTTPResponses
-      extend ActiveSupport::Concern
-
       protected
 
       def render_bad_request

data/app/api/{concerns/morpho/grape → morpho/helpers}/user_activation.rb

@@ -1,8 +1,6 @@
 module Morpho
-  module Grape
+  module Helpers
     module UserActivation
-      extend ActiveSupport::Concern
-
       protected
 
       def current_user

data/app/api/{concerns/morpho/grape/jwt_authentication.rb → morpho/helpers/user_login.rb}

@@ -1,8 +1,6 @@
 module Morpho
-  module Grape
-    module JWTAuthentication
-      extend ActiveSupport::Concern
-
+  module Helpers
+    module UserLogin
       protected
 
       def logged_in?
@@ -14,12 +12,13 @@ module Morpho
       end
 
       def login(user_params)
-        user = User.find_by(email: user_params[:email])
+        user = Morpho::User.find_by(email: user_params[:email])
 
         if user
           if user.active?
             if !user.login_locked?
               if user.valid_password?(user_params[:password])
+                user.generate_refresh_token!
                 token = user_payload(user)
 
                 present token, with: Morpho::Entities::SignIn::AuthenticationToken
@@ -70,7 +69,7 @@ module Morpho
         expires_at = Time.now.to_i + Morpho.config.jwt.expiration_time
         issued_at = Time.now.to_i
 
-        { token: jwt_encode({ exp: expires_at, iat: issued_at, email: user.email }), expires_at: expires_at }
+        { authentication_token: jwt_encode({ exp: expires_at, iat: issued_at, email: user.email }), expires_at: expires_at, refresh_token: user.refresh_token }
       end
     end
   end

data/app/api/{concerns/morpho/grape → morpho/helpers}/user_password_reset.rb

@@ -1,8 +1,6 @@
 module Morpho
-  module Grape
+  module Helpers
     module UserPasswordReset
-      extend ActiveSupport::Concern
-
       protected
 
       def current_user

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

@@ -0,0 +1,24 @@
+module Morpho
+  module Helpers
+    module UserRefreshAuthenticationToken
+      protected
+
+      def valid_refresh_token?(refresh_token_params)
+        Morpho::User.exists?(refresh_token: refresh_token_params[:refresh_token])
+      end
+
+      def refresh_token(refresh_token_params)
+        if self.valid_refresh_token?(refresh_token_params)
+          user = Morpho::User.find_by(refresh_token: refresh_token_params[:refresh_token])
+
+          user.generate_refresh_token!
+          token = user_payload(user)
+
+          present token, with: Morpho::Entities::SignIn::AuthenticationToken
+        else
+          render_unprocessable_entity_detailed([I18n.t('morpho.api.messages.refresh_token.invalid')])
+        end
+      end
+    end
+  end
+end

data/app/api/{concerns/morpho/grape → morpho/helpers}/user_registration.rb

@@ -1,8 +1,6 @@
 module Morpho
-  module Grape
+  module Helpers
     module UserRegistration
-      extend ActiveSupport::Concern
-
       protected
 
       def register(user_params)

data/app/api/{concerns/morpho/grape → morpho/helpers}/user_unlock.rb

@@ -1,8 +1,6 @@
 module Morpho
-  module Grape
+  module Helpers
     module UserUnlock
-      extend ActiveSupport::Concern
-
       protected
 
       def current_user

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

@@ -1,7 +1,8 @@
 module Morpho
   module Resources
     class Activations < ::Grape::API
-      helpers Morpho::Grape::HTTPResponses, Morpho::Grape::UserActivation
+      helpers Morpho::Helpers::HTTPResponses,
+        Morpho::Helpers::UserActivation
 
       namespace :activations do
         desc 'Request user activation token' do

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

@@ -1,7 +1,8 @@
 module Morpho
   module Resources
     class Passwords < ::Grape::API
-      helpers Morpho::Grape::HTTPResponses, Morpho::Grape::UserPasswordReset
+      helpers Morpho::Helpers::HTTPResponses,
+        Morpho::Helpers::UserPasswordReset
 
       namespace :passwords do
         desc 'Request user reset password token' do

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

@@ -1,7 +1,9 @@
 module Morpho
   module Resources
     class Tokens < ::Grape::API
-      helpers Morpho::Grape::HTTPResponses, Morpho::Grape::JWTAuthentication
+      helpers Morpho::Helpers::HTTPResponses,
+        Morpho::Helpers::UserLogin,
+        Morpho::Helpers::UserRefreshAuthenticationToken
 
       namespace :tokens do
         desc 'Request user authentication token' do
@@ -11,11 +13,24 @@ module Morpho
           ]
         end
         params do
-          requires :data, type: Morpho::Entities::UserSignIn
+          requires :data, type: Morpho::Entities::SignIn::Credentials
         end
         post do
           login(params[:data])
         end
+
+        desc 'Refresh user authentication token' do
+          success Morpho::Entities::SignIn::Success
+          failure [
+            [ 422, I18n.t('morpho.api.messages.unprocessable_entity'), Morpho::Entities::Error ]
+          ]
+        end
+        params do
+          requires :data, type: Morpho::Entities::SignIn::RefreshToken
+        end
+        post :refresh do
+          refresh_token(params[:data])
+        end
       end
     end
   end

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

@@ -1,7 +1,8 @@
 module Morpho
   module Resources
     class Unlocks < ::Grape::API
-      helpers Morpho::Grape::HTTPResponses, Morpho::Grape::UserUnlock
+      helpers Morpho::Helpers::HTTPResponses,
+        Morpho::Helpers::UserUnlock
 
       namespace :unlocks do
         desc 'Request user unlock token' do

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

@@ -1,7 +1,8 @@
 module Morpho
   module Resources
     class Users < ::Grape::API
-      helpers Morpho::Grape::HTTPResponses, Morpho::Grape::UserRegistration
+      helpers Morpho::Helpers::HTTPResponses,
+        Morpho::Helpers::UserRegistration
 
       namespace :users do
         desc 'User registration' do

data/app/models/concerns/morpho/tokenable.rb

@@ -0,0 +1,23 @@
+module Morpho
+  module Tokenable
+    extend ActiveSupport::Concern
+
+    included do
+      before_create :generate_refresh_token
+    end
+
+    def generate_refresh_token!
+      self.generate_refresh_token
+      self.save
+    end
+
+    protected
+
+    def generate_refresh_token
+      self.refresh_token = loop do
+        random_token = SecureRandom.urlsafe_base64(nil, false)
+        break random_token unless self.class.exists?(refresh_token: random_token)
+      end
+    end
+  end
+end

data/app/models/morpho/user.rb

@@ -5,11 +5,6 @@ module Morpho
     has_many :authentications, dependent: :destroy
     accepts_nested_attributes_for :authentications
 
-    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
-    validates :password, confirmation: true
     validates :email, uniqueness: true
     validates_email_format_of :email
 

data/config/locales/morpho.en.yml

@@ -142,6 +142,8 @@ en:
           bad_credentials: 'User email and/or password is incorrect'
           unconfirmed: 'User account has not been confirmed'
           locked: 'User account has been locked'
+        refresh_token:
+          invalid: 'Invalid token'
   simple_form:
     'yes': 'Yes'
     'no': 'No'

data/config/locales/morpho.es.yml

@@ -142,6 +142,8 @@ es:
           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'
+        refresh_token:
+          invalid: 'El token es inválido'
   simple_form:
     'yes': 'Si'
     'no': 'No'

data/db/migrate/20181019162225_add_refresh_token_to_users_table.rb

@@ -0,0 +1,5 @@
+class AddRefreshTokenToUsersTable < ActiveRecord::Migration[5.2]
+  def change
+    add_column :morpho_users, :refresh_token, :string, index: true
+  end
+end

data/lib/morpho/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: morpho
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Hugo Gilmar Erazo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-18 00:00:00.000000000 Z
+date: 2018-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -244,19 +244,21 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- app/api/concerns/morpho/grape/http_responses.rb
-- app/api/concerns/morpho/grape/jwt_authentication.rb
-- app/api/concerns/morpho/grape/user_activation.rb
-- 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/base.rb
 - app/api/morpho/entities/error.rb
 - app/api/morpho/entities/sign_in/authentication_token.rb
+- app/api/morpho/entities/sign_in/credentials.rb
+- app/api/morpho/entities/sign_in/refresh_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
+- app/api/morpho/helpers/http_responses.rb
+- app/api/morpho/helpers/user_activation.rb
+- app/api/morpho/helpers/user_login.rb
+- app/api/morpho/helpers/user_password_reset.rb
+- app/api/morpho/helpers/user_refresh_authentication_token.rb
+- app/api/morpho/helpers/user_registration.rb
+- app/api/morpho/helpers/user_unlock.rb
 - app/api/morpho/resources/activations.rb
 - app/api/morpho/resources/passwords.rb
 - app/api/morpho/resources/tokens.rb
@@ -278,6 +280,7 @@ files:
 - app/jobs/morpho/application_job.rb
 - app/mailers/morpho/application_mailer.rb
 - app/mailers/morpho/user_mailer.rb
+- app/models/concerns/morpho/tokenable.rb
 - app/models/morpho/application_record.rb
 - app/models/morpho/authentication.rb
 - app/models/morpho/user.rb
@@ -314,6 +317,7 @@ files:
 - db/migrate/20180919162058_sorcery_brute_force_protection.rb
 - db/migrate/20180919162059_sorcery_activity_logging.rb
 - db/migrate/20180919162100_sorcery_external.rb
+- db/migrate/20181019162225_add_refresh_token_to_users_table.rb
 - lib/generators/morpho/install/install_generator.rb
 - lib/generators/morpho/install/templates/app/api/morpho/api.rb
 - lib/generators/morpho/install/templates/config/initializers/morpho.rb

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

@@ -1,8 +0,0 @@
-module Morpho
-  module Entities
-    class UserSignIn < ::Morpho::Entities::Base
-      expose :email, documentation: { type: 'string', desc: 'User email address' }
-      expose :password, documentation: { type: 'string', desc: 'User password' }
-    end
-  end
-end