ecom_core 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4c2a4729011d5781ac6064808128d8893dbc513dfabb329aa4c4f3211f019d6
-  data.tar.gz: 6412967987102831a1177ff8f0226347683544e12d47d6907b99d653c705f29a
+  metadata.gz: 2a0c28baf17d2c00ff282fba227a6cf7c10d4c6f11507e773214d3d82df2477e
+  data.tar.gz: 00e5b91dd8f598b92353923d80750deb193f627cec91e5563a85de6c770e25a5
 SHA512:
-  metadata.gz: b9c39e336428e7b8ef6d723f6cc818dc07340d9b1f6a34427ce29b22589d394605dc53efb103aeefec54c95b033afdea960ca0575dd30956435ab6db5ceb022c
-  data.tar.gz: 5b0f801e7f59fecde99b3e59818f35bc0967f3336154dcd8b35649b3bacbbf4b6b69c84ccff0bc42da20ea89cd497b60d8368348a0d2f1d30f9660956de05e12
+  metadata.gz: e7ea275f8bc129cc1490ca5f2b6a4f90d7e631dabb4d6fb0e9af31f625f1e8fa4538caa6362dac463cd86db86ee3e2304b29a0959e4471cc73578b207bf6f003
+  data.tar.gz: 39d5157a5bb77483d59124289439d52ac94f2a0d37f53c486727727da1f14b83380bdd0afbffa69fa640150fff80dadf805404fef87583c48a7ca39cb3f3a8f1

data/app/controllers/ecom/core/access_controller.rb

@@ -4,13 +4,20 @@ module Ecom
       skip_before_action :authenticate, only: [:login]
 
       def login
+        app_code = Rails.configuration.app_code
         user = User.find_by(email: auth_params[:email])
+
         if user
           if user.authenticate(auth_params[:password])
-            roles = user.user_roles.each_with_object([]) do |role, result|
+            roles = user.roles_for_module(app_code).each_with_object([]) do |role, result|
               result << role.name
             end
 
+            if roles.count <= 0
+              render json: { error: 'User has no roles in this application.' }, status: :unprocessable_entity
+              return
+            end
+
             payload = { id: user.id, email: user.email, name: user.full_name, roles: roles }
             jwt = TokenAuthService.issue(payload)
             render json: { token: jwt, user: payload, error: nil }

data/app/models/ecom/core/user.rb

@@ -15,6 +15,10 @@ module Ecom
       def full_name
         "#{first_name} #{last_name}"
       end
+
+      def roles_for_module(code)
+        user_roles.joins(:application_module).where('ecom_core_application_modules.code = ?', code)
+      end
     end
   end
 end

data/lib/ecom/core/version.rb

@@ -1,5 +1,5 @@
 module Ecom
   module Core
-    VERSION = '1.1.0'.freeze
+    VERSION = '1.1.1'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ecom_core
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Henock L.