morpho 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e50fc5ced39f47d23b63fe334fe5432b29de7efc47ace7ca7c53a56b212c4f1
-  data.tar.gz: 11a1f4c10a95b6254aa1994a866dc63361cfd367cdea90aca34147486c4877b1
+  metadata.gz: 897ee2fc194496e055864aec5475926004ab7a5665b00c0a4979f4fb686b4c48
+  data.tar.gz: 0e5a7348610783970b1243db39ed40405a47eab4a339f4d88aba4fdaa70e1a0d
 SHA512:
-  metadata.gz: e3cae4da2ad117543d24a5d3b793529a8c569295f1fb04aeec2bc4274702773b3353991a9b76402bf8bc167548e643b69d7fdbccad23f6e7b810460e502905eb
-  data.tar.gz: 4b87721c70d9478d7d39afcd8a90b516c7ee2711cc17a8c4845c60fdb5de1fa166b908e47b66dfc58a1f007edaa2c1bda4123766740a7714340c2539c68e1584
+  metadata.gz: c4debc02baf4abf21d34c2ed9c83f9e8ce12e364e46dccf6a8529a74963ec7765af47e49265585af2cbdd7d7b47dd65162ffe06ec0acfa9ecb918f6da2c82fe8
+  data.tar.gz: 571c6a523befd73e153e09ec8d91addb35f8d95654c64e797744702c0066b95bb71a152994c792f9ce60a0adfc1ee5d6bffcca8dcc69af1afb3b8e5fbffa85bb

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

@@ -0,0 +1,12 @@
+module Morpho
+  module Entities
+    module SignIn
+      class External < ::Morpho::Entities::Base
+        expose :email, documentation: { type: 'string', desc: 'User email address' }
+        expose :name, documentation: { type: 'string', desc: 'User name' }
+        expose :provider, documentation: { type: 'string', desc: 'User authentication provider' }
+        expose :uid, documentation: { type: 'string', desc: 'User provider uid' }
+      end
+    end
+  end
+end

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

@@ -0,0 +1,42 @@
+module Morpho
+  module Helpers
+    module JWTUtils
+      protected
+
+      def current_user
+        @current_user ||= Morpho::User.find_by(email: jwt_token[:email])
+      rescue
+        nil
+      end
+
+      def http_token
+        @http_token ||= if request.headers[Morpho.config.jwt.header].present?
+          request.headers[Morpho.config.jwt.header].split(' ').last
+        end
+      end
+
+      def jwt_token
+        @jwt_token ||= HashWithIndifferentAccess.new(jwt_decode(http_token).first)
+      end
+
+      def jwt_encode(payload)
+        Morpho::Cipher.jwt_encode(payload)
+      end
+
+      def jwt_decode(token)
+        begin
+          return Morpho::Cipher.jwt_decode(token)
+        rescue
+          nil
+        end
+      end
+
+      def user_payload(user)
+        expires_at = Time.now.to_i + Morpho.config.jwt.expiration_time
+        issued_at = Time.now.to_i
+
+        { 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
+end

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

@@ -0,0 +1,53 @@
+module Morpho
+  module Helpers
+    module UserExternalLogin
+      protected
+
+      def login(user_params)
+        provider = user_params[:provider].downcase
+
+        if Morpho::Authentication.exists?(provider: provider, uid: user_params[:uid])
+          authentication = Morpho::Authentication.find_by(provider: provider, uid: user_params[:uid])
+
+          user = authentication.user
+
+          user.activate! unless user.active?
+          user.register_last_login_activity!(request.ip)
+          user.generate_refresh_token!
+          token = user_payload(user)
+
+          present token, with: Morpho::Entities::SignIn::AuthenticationToken
+        elsif Morpho::User.exists?(email: user_params[:email])
+          user = Morpho::User.find_by(email: user_params[:email])
+
+          if user.add_provider_to_user(provider, user_params[:uid])
+            user.activate! unless user.active?
+            user.register_last_login_activity!(request.ip)
+            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.provider.unregistered')])
+          end
+        else
+          user = Morpho::User.create_from_provider(provider, user_params[:uid], {
+            email: user_params[:email],
+            name: user_params[:name]
+          })
+
+          if user.persisted?
+            user.activate!
+            user.register_last_login_activity!(request.ip)
+            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.provider.unregistered')])
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -18,6 +18,7 @@ module Morpho
           if user.active?
             if !user.login_locked?
               if user.valid_password?(user_params[:password])
+                user.register_last_login_activity!(request.ip)
                 user.generate_refresh_token!
                 token = user_payload(user)
 
@@ -36,41 +37,6 @@ module Morpho
           render_unauthorized_detailed([I18n.t('morpho.api.messages.unauthorized_detailed.unexistent')])
         end
       end
-
-      def current_user
-        @current_user ||= Morpho::User.find_by(email: jwt_token[:email])
-      rescue
-        nil
-      end
-
-      def http_token
-        @http_token ||= if request.headers[Morpho.config.jwt.header].present?
-          request.headers[Morpho.config.jwt.header].split(' ').last
-        end
-      end
-
-      def jwt_token
-        @jwt_token ||= HashWithIndifferentAccess.new(jwt_decode(http_token).first)
-      end
-
-      def jwt_encode(payload)
-        Morpho::Cipher.jwt_encode(payload)
-      end
-
-      def jwt_decode(token)
-        begin
-          return Morpho::Cipher.jwt_decode(token)
-        rescue
-          nil
-        end
-      end
-
-      def user_payload(user)
-        expires_at = Time.now.to_i + Morpho.config.jwt.expiration_time
-        issued_at = Time.now.to_i
-
-        { 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
 end

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

@@ -0,0 +1,21 @@
+module Morpho
+  module Resources
+    class Externals < ::Grape::API
+      helpers Morpho::Helpers::HTTPResponses,
+        Morpho::Helpers::JWTUtils,
+        Morpho::Helpers::UserExternalLogin
+
+      namespace :externals do
+        desc 'Request user authentication from external provider' do
+          success Morpho::Entities::User
+        end
+        params do
+          requires :data, type: Morpho::Entities::SignIn::External
+        end
+        post do
+          login(params[:data])
+        end
+      end
+    end
+  end
+end

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

@@ -2,6 +2,7 @@ module Morpho
   module Resources
     class Tokens < ::Grape::API
       helpers Morpho::Helpers::HTTPResponses,
+        Morpho::Helpers::JWTUtils,
         Morpho::Helpers::UserLogin,
         Morpho::Helpers::UserRefreshAuthenticationToken
 

data/app/models/morpho/user.rb

@@ -12,6 +12,15 @@ module Morpho
       self.activation_state == 'active'
     end
 
+    def register_last_login_activity!(ip_address)
+      self.set_last_login_at(Time.now)
+      self.set_last_ip_address(ip_address)
+    end
+
+    def register_last_activity_time!
+      self.set_last_activity_at(Time.now)
+    end
+
     def resend_activation_needed_email!
       self.setup_activation
       self.reload

data/config/locales/morpho.en.yml

@@ -144,6 +144,8 @@ en:
           locked: 'User account has been locked'
         refresh_token:
           invalid: 'Invalid token'
+        provider:
+          unregistered: 'Could not register user authentication provider'
   simple_form:
     'yes': 'Yes'
     'no': 'No'

data/config/locales/morpho.es.yml

@@ -144,6 +144,8 @@ es:
           locked: 'Cuenta de usuario ha sido bloqueada'
         refresh_token:
           invalid: 'El token es inválido'
+        provider:
+          unregistered: 'No se ha podido registrar a el proveedor'
   simple_form:
     'yes': 'Si'
     'no': 'No'

data/lib/morpho/version.rb

@@ -1,3 +1,3 @@
 module Morpho
-  VERSION = '0.3.3'
+  VERSION = '0.3.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpho
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Hugo Gilmar Erazo
@@ -248,18 +248,22 @@ files:
 - 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/external.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_up.rb
 - app/api/morpho/helpers/http_responses.rb
+- app/api/morpho/helpers/jwt_utils.rb
 - app/api/morpho/helpers/user_activation.rb
+- app/api/morpho/helpers/user_external_login.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/externals.rb
 - app/api/morpho/resources/passwords.rb
 - app/api/morpho/resources/tokens.rb
 - app/api/morpho/resources/unlocks.rb