dscf-core 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e552d33a71bdfc1034def80db7ca6cac7610b4a9537f7e410f95761ccb53633e
-  data.tar.gz: 7c5cee1aecb5ba5aefd0ebf8bdb8c74cc83023777daf3ca98e5cf3292424c6f1
+  metadata.gz: 99924a8190ed67a7540dd59d895d83d1925acb7ace7b16f8928d22e96a95e3cf
+  data.tar.gz: 704c08cb732f2fc1a6212bf4270afea4bbeed5e637ee0fb5950f63852c7eb893
 SHA512:
-  metadata.gz: 977e77f3e781be16541593a2b6a4b1fc86425dfb7312ca4a5814e85783f5c8e2dcc9c3808943bd7b6d8c16c5e16ccb72dd25529f4a37386ce96f3a3f1e703402
-  data.tar.gz: 1e80d64bb5981d30502d610345e2505a8fbba4e85e195ca1c94314c0c40728c0971cd38140bb0087e3589d655fba4a3aef9a97062e58e749526b8a18a67c49d2
+  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)
@@ -119,11 +124,11 @@ module Dscf
       end
 
       def assign_default_role(user)
-        role = Role.find_or_create_by!(name: "user") do |r|
-          r.code = "USER"
+        role = Role.find_or_create_by!(code: "USER") do |r|
+          r.name = "User"
         end
 
-        UserRole.create!(user: user, role: role)
+        UserRole.find_or_create_by!(user: user, role: role)
       end
     end
   end

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.0".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.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Asrat