morpho 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1b8f7ef0ece2c917cec0876be3320c0116dbc38805527ace6eb9c1ce8e38236
-  data.tar.gz: 1d90f41b51f124122cb6c592c65646d25bad6279d936188b2fada30adbef4a21
+  metadata.gz: 1e6a96107096cf61bdcd55849c2bbad3d5c27c085bac23afd061fab4fb508b86
+  data.tar.gz: 7c061fe271965fc176adde62d3856f343b9e9605ab1e0a7cb096d78d8d78409c
 SHA512:
-  metadata.gz: 3c1b55ef40e0c560cbf4a53b9f389be420f54749ebdd21390b359e22e318709cf20e1c3e45e0abfec6c40f06f7516269de4c16264a939ac6d09c37fe7ad438c0
-  data.tar.gz: 021b8958298735fec744065e88e095a404205c6959d3edd2badb68d996a34dbcf245494012b051c664b218eee642206e58e01238120f71bc0336ec92770c6537
+  metadata.gz: f6f6c509deaafd28182fd49d91fc8255aa9d52675753150d0e028e1efb698956131884f2b609c5aac80770eb74996aa47b538c2edc0ee46b52b0d415002047e3
+  data.tar.gz: 45d6a0a2a2aaf7551453373c40ef750c90a3f5f3caf7fa32c6124fdb45baaa5b38249e8c382be7511fa6f03d39c25922b4b4733dd77d8c6bb8b39d0f38b3a8aa

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

@@ -3,10 +3,10 @@ module Morpho
     include Reform::Form::ActiveRecord
 
     property :email
-    validates :email, presence: true, email_format: true
-    property :uid
-    validates :uid, presence: true
     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/sign_in.rb

@@ -3,8 +3,8 @@ module Morpho
     include Reform::Form::ActiveRecord
 
     property :email
-    validates :email, presence: true, email_format: true
     property :password
+    validates :email, presence: true, email_format: true
     validates :password, presence: true
   end
 end

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

@@ -5,10 +5,18 @@ module Morpho
     include Reform::Form::ActiveRecord
 
     property :email
-    validates :email, presence: true, unique: true, email_format: true
     property :password
-    validates :password, presence: true, confirmation: true
     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/services/morpho/jwt/authentication_token.rb

@@ -1,10 +1,12 @@
 module Morpho
-  class JWT::AuthenticationToken
-    def self.new(request)
-      if request.headers[Morpho.config.jwt.header].present?
-        request.headers[Morpho.config.jwt.header].split(' ').last
-      else
-        nil
+  module JWT
+    class AuthenticationToken
+      def self.new(request)
+        if request.headers[Morpho.config.jwt.header].present?
+          request.headers[Morpho.config.jwt.header].split(' ').last
+        else
+          nil
+        end
       end
     end
   end

data/app/services/morpho/jwt/decode.rb

@@ -1,10 +1,12 @@
 module Morpho
-  class JWT::Decode
-    def self.new(token)
-      begin
-        Morpho::Cipher.jwt_decode(token)
-      rescue
-        nil
+  module JWT
+    class Decode
+      def self.new(token)
+        begin
+          Morpho::Cipher.jwt_decode(token)
+        rescue
+          nil
+        end
       end
     end
   end

data/app/services/morpho/jwt/encode.rb

@@ -1,10 +1,12 @@
 module Morpho
-  class JWT::Encode
-    def self.new(payload)
-      begin
-        Morpho::Cipher.jwt_encode(payload)
-      rescue
-        nil
+  module JWT
+    class Encode
+      def self.new(payload)
+        begin
+          Morpho::Cipher.jwt_encode(payload)
+        rescue
+          nil
+        end
       end
     end
   end

data/app/services/morpho/jwt/payload.rb

@@ -1,11 +1,13 @@
 module Morpho
-  class JWT::Payload
-    def self.new(user)
-      expires_at = Time.now.to_i + Morpho.config.jwt.expiration_time
-      issued_at = Time.now.to_i
-      token = ::Morpho::JWT::Encode.new({ exp: expires_at, iat: issued_at, email: user.email })
+  module JWT
+    class Payload
+      def self.new(user)
+        expires_at = Time.now.to_i + Morpho.config.jwt.expiration_time
+        issued_at = Time.now.to_i
+        token = ::Morpho::JWT::Encode.new({ exp: expires_at, iat: issued_at, email: user.email })
 
-      { authentication_token: token, expires_at: expires_at, refresh_token: user.refresh_token }
+        { authentication_token: token, expires_at: expires_at, refresh_token: user.refresh_token }
+      end
     end
   end
 end

data/app/services/morpho/jwt/token.rb

@@ -1,12 +1,14 @@
 module Morpho
-  class JWT::Token
-    def self.new(authentication_token)
-      begin
-        token = ::Morpho::JWT::Decode.new(authentication_token)
+  module JWT
+    class Token
+      def self.new(authentication_token)
+        begin
+          token = ::Morpho::JWT::Decode.new(authentication_token)
 
-        HashWithIndifferentAccess.new(token.first)
-      rescue
-        HashWithIndifferentAccess.new
+          HashWithIndifferentAccess.new(token.first)
+        rescue
+          HashWithIndifferentAccess.new
+        end
       end
     end
   end

data/lib/morpho/version.rb

@@ -1,3 +1,3 @@
 module Morpho
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: morpho
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Hugo Gilmar Erazo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-31 00:00:00.000000000 Z
+date: 2018-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails