dscf-core 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '049d90d63eb4196e4b7d15ae1208485d7d09fe4a29a29ed920010b8ebcc6a312'
-  data.tar.gz: 768e5835fd1172552db3548fd675b2a2a3a8b332c6e3bda211ec253f1e0c27e1
+  metadata.gz: 99924a8190ed67a7540dd59d895d83d1925acb7ace7b16f8928d22e96a95e3cf
+  data.tar.gz: 704c08cb732f2fc1a6212bf4270afea4bbeed5e637ee0fb5950f63852c7eb893
 SHA512:
-  metadata.gz: 3ed7b66f6f68b8d51dec4bf2d74561b7c8f2f793e7724bd9aa578c91b6f4f870fb6818afed28d2f1b3b4c84a23b2309f00a254c96896555c57763018624a9daf
-  data.tar.gz: 26f208c4e989045dc55ad983034742a4768b4659602ef7b646f2e6c192ab26ce09ddb78a734884d7becb75eeb16d30ebe6e282a9396ae27e06c47fd2869c1c24
+  metadata.gz: f54ec142983b8d836d20f2342b2d858abcf8c4cbc3588329a164e5363eb96ef6b5a5c474582b9ca19e7eabfdcc9cab999606b19e78159662c18d8099d16dc0ce
+  data.tar.gz: 4ece59364b2199d9d99511b412306d9b177c6ba412975be439e5a6b0cb62e63fb0596f4842951eaea7809f42fe5a6b84676c7028fe5414706d4be148be7e5439

data/app/controllers/dscf/core/auth_controller.rb

@@ -8,7 +8,12 @@ module Dscf
 
       def login
         skip_authorization
-        user = AuthService.authenticate_user(params[:email_or_phone], params[:password])
+        email_or_phone = params[:email_or_phone].presence || params.dig(:auth, :email_or_phone).presence
+        password = params[:password].presence || params.dig(:auth, :password).presence
+
+        return render_error("auth.errors.missing_credentials", status: :bad_request) unless email_or_phone && password
+
+        user = AuthService.authenticate_user(email_or_phone, password)
 
         if user&.valid_for_authentication?
           tokens = sign_in(user, request)

data/app/serializers/dscf/core/document_serializer.rb

@@ -2,15 +2,12 @@ module Dscf
   module Core
     class DocumentSerializer < ActiveModel::Serializer
       attributes :id, :document_type, :file_urls, :is_verified, :verified_at, :created_at, :updated_at
-      include Rails.application.routes.url_helpers
 
       belongs_to :documentable, polymorphic: true
       belongs_to :verified_by, polymorphic: true, optional: true
 
       def file_urls
-        return [] unless object.files.attached?
-
-        object.files.map { |file| url_for(file) }
+        object.file_urls
       end
     end
   end

data/app/services/dscf/core/auth_service.rb

@@ -52,6 +52,8 @@ module Dscf
         private
 
         def find_user_by_email_or_phone(email_or_phone)
+          return nil if email_or_phone.blank?
+
           if email_or_phone.include?("@")
             User.find_by(email: email_or_phone)
           else

data/lib/dscf/core/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Core
-    VERSION = "0.3.1".freeze
+    VERSION = "0.3.2".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dscf-core
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Asrat