spree_cm_commissioner 1.8.10 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77e091c59843dfdbf104e3428b722dc6473c35378ff68ee8dffb6e2bdd64f38f
-  data.tar.gz: 26f93d1d95b6a88148bff4af7e2002da525c10fec0ec8a3d6bcbd066fd44390e
+  metadata.gz: 6aa3cfdf9976b9d40fa5c53533193d93ea1503b79b288c926e5efe8f371db0b5
+  data.tar.gz: f77a64037130b4d871c346534131a3fa664f5fb7cb344834b730e9a1c02e2177
 SHA512:
-  metadata.gz: e011a57a947400dadb38391e3f030a4a9247ea7227172e477b1d5de26039e362b5294b3e6863a75edd7040140ff3cea22e6f0ceea16642a565284de231732af9
-  data.tar.gz: d6ecf636a49e10b089db0a68175492f8e3f35c0bdc033aa290a832ef129afa0dcb93d756f413beaadce8f6ff60a3a84d625ce8c295c5aae1163d1f7e5b486683
+  metadata.gz: 7296a57cfe2b468ff16941f59f8fe744157721df84d05532ee618a4736b5db2c7802975145a607d825b42ea009d460b114479a81e8009c2c5b1a359a7d576902
+  data.tar.gz: 6c8a2a04159368014afdbd2203281f647f2b054281ef1044817967d0e108517e9ddccc0fa04f42aec25ba6af9e24eef7b00f4c253a5d301cb53f145307ebd8fa

data/.env.example

@@ -20,3 +20,7 @@ WAITING_ROOM_SESSION_SIGNATURE="e6b2********************26e3"
 WAITING_ROOM_SESSION_EXPIRE_DURATION_IN_SECOND=
 WAITING_ROOM_MIN_SESSIONS_COUNT=5
 WAITING_ROOM_DISABLED=no
+
+# Vattanac Bank
+VATTANAC_AES_SECRET_KEY= ""
+VATTANAC_PUBLIC_KEY=""

data/Gemfile.lock

@@ -34,7 +34,7 @@ GIT
 PATH
   remote: .
   specs:
-    spree_cm_commissioner (1.8.10)
+    spree_cm_commissioner (1.9.0)
       activerecord-multi-tenant
       activerecord_json_validator (~> 2.1, >= 2.1.3)
       aws-sdk-cloudfront
@@ -46,6 +46,7 @@ PATH
       dry-validation (~> 1.10)
       elasticsearch (~> 8.5)
       exception_notification
+      firebase-admin-sdk (~> 0.3.1)
       font-awesome-sass (~> 6.4.0)
       google-cloud-firestore
       google-cloud-recaptcha_enterprise
@@ -269,6 +270,7 @@ GEM
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
     date (3.3.3)
+    declarative (0.0.20)
     deface (1.9.0)
       actionview (>= 5.2)
       nokogiri (>= 1.6)
@@ -370,6 +372,11 @@ GEM
       rake
     fiber-annotation (0.2.0)
     fiber-local (1.0.0)
+    firebase-admin-sdk (0.3.1)
+      faraday (> 1, < 3)
+      google-apis-fcm_v1 (>= 0.19.0, < 1.0)
+      googleauth (> 0.16, < 2.0)
+      jwt (>= 1.5, < 3.0)
     flag-icons-rails (3.4.6.1)
       sass-rails
     flatpickr (4.6.13.0)
@@ -398,6 +405,16 @@ GEM
     globalid (1.2.1)
       activesupport (>= 6.1)
     glyphicons (1.0.2)
+    google-apis-core (0.11.3)
+      addressable (~> 2.5, >= 2.5.1)
+      googleauth (>= 0.16.2, < 2.a)
+      httpclient (>= 2.8.1, < 3.a)
+      mini_mime (~> 1.0)
+      representable (~> 3.0)
+      retriable (>= 2.0, < 4.a)
+      rexml
+    google-apis-fcm_v1 (0.23.0)
+      google-apis-core (>= 0.11.0, < 2.a)
     google-cloud-core (1.6.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
@@ -646,9 +663,14 @@ GEM
     redis-client (0.17.0)
       connection_pool
     regexp_parser (2.8.2)
+    representable (3.2.0)
+      declarative (< 0.1.0)
+      trailblazer-option (>= 0.1.1, < 0.2.0)
+      uber (< 0.2.0)
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
+    retriable (3.1.2)
     rexml (3.2.6)
     rqrcode (2.2.0)
       chunky_png (~> 1.0)
@@ -858,6 +880,7 @@ GEM
     tinymce-rails (5.10.7.1)
       railties (>= 3.1.1)
     traces (0.11.1)
+    trailblazer-option (0.1.2)
     turbo-rails (1.5.0)
       actionpack (>= 6.0.0)
       activejob (>= 6.0.0)
@@ -868,6 +891,7 @@ GEM
       nokogiri (>= 1.6, < 2.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
+    uber (0.1.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8.2)

data/app/controllers/spree/admin/user_events_controller.rb

@@ -2,22 +2,20 @@ module Spree
   module Admin
     class UserEventsController < Spree::Admin::ResourceController
       before_action :load_parents, if: -> { params[:taxon_id].present? }
+      before_action :load_user, if: -> { params[:user_id].present? }
 
       # override
       def index
         if params[:taxon_id].present?
           @user_events = @taxon.user_events
-        else
-          @user = Spree::User.find(params[:user_id])
+        elsif params[:user_id].present?
           @user_events = @user.user_events
+        else
+          flash[:error] = 'Invalid taxon or user' # rubocop:disable Rails/I18nLocaleTexts
+          redirect_back(fallback_location: collection_url)
         end
       end
 
-      # override
-      def new
-        @user = spree_current_user
-      end
-
       # override
       def create
         user_event = SpreeCmCommissioner::UserEvent.new(permitted_resource_params)
@@ -32,6 +30,10 @@ module Spree
 
       private
 
+      def load_user
+        @user = Spree::User.find(params[:user_id])
+      end
+
       def load_parents
         @taxon = Spree::Taxon.find(params[:taxon_id])
         @taxonomy = @taxon.taxonomy

data/app/controllers/spree/api/v2/storefront/vattanac_banks_controller.rb

@@ -0,0 +1,25 @@
+module Spree
+  module Api
+    module V2
+      module Storefront
+        class VattanacBanksController < Spree::Api::V2::BaseController
+          def create
+            result = SpreeCmCommissioner::VattanacBankInitiator.call(params: params)
+
+            if result.success?
+              render json: {
+                message: 'SUCCESS',
+                data: result.data
+              }
+            else
+              render json: {
+                message: 'FAILED',
+                error: result.error
+              }, status: result.status || :unprocessable_entity
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree/api/v2/tenant/change_passwords_controller.rb

@@ -0,0 +1,32 @@
+module Spree
+  module Api
+    module V2
+      module Tenant
+        class ChangePasswordsController < BaseController
+          before_action :require_spree_current_user
+
+          def update
+            context = SpreeCmCommissioner::PasswordChanger.call(change_password_params)
+
+            if context.success?
+              render_serialized_payload { serialize_resource(context.user) }
+            else
+              render_error_payload(context.message)
+            end
+          end
+
+          def resource_serializer
+            Spree::V2::Tenant::UserSerializer
+          end
+
+          def change_password_params
+            result = params.permit(:current_password, :password, :password_confirmation)
+            result[:user] = spree_current_user
+
+            result.to_h
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree/api/v2/tenant/id_cards_controller.rb

@@ -0,0 +1,63 @@
+module Spree
+  module Api
+    module V2
+      module Tenant
+        class IdCardsController < BaseController
+          def create
+            context = SpreeCmCommissioner::GuestIdCardManager.call(
+              card_type: id_card_params[:card_type],
+              front_image_url: id_card_params[:front_image_url],
+              back_image_url: id_card_params[:back_image_url],
+              guest_id: id_card_params[:guest_id]
+            )
+
+            if context.success?
+              render_serialized_payload { serialize_resource(context.result) }
+            else
+              render_error_payload(context.message)
+            end
+          end
+
+          def update
+            context = SpreeCmCommissioner::GuestIdCardManager.call(
+              card_type: id_card_params[:card_type],
+              front_image_url: id_card_params[:front_image_url],
+              back_image_url: id_card_params[:back_image_url],
+              guest_id: id_card_params[:guest_id]
+            )
+
+            if context.success?
+              render_serialized_payload { serialize_resource(context.result) }
+            else
+              render_error_payload(context.message)
+            end
+          end
+
+          def destroy
+            id_card = SpreeCmCommissioner::IdCard.find(params[:id])
+
+            if id_card.destroy
+              head :no_content
+            else
+              render_error_payload('Failed to destroy ID card', 400)
+            end
+          end
+
+          private
+
+          def id_card_params
+            params.permit(:card_type, :front_image_url, :back_image_url, :guest_id)
+          end
+
+          def model_class
+            SpreeCmCommissioner::IdCard
+          end
+
+          def resource_serializer
+            Spree::V2::Tenant::IdCardSerializer
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree/api/v2/tenant/reset_passwords_controller.rb

@@ -0,0 +1,35 @@
+module Spree
+  module Api
+    module V2
+      module Tenant
+        class ResetPasswordsController < BaseController
+          def update
+            context = SpreeCmCommissioner::UserForgottenPasswordUpdater.call(update_params)
+
+            if context.success?
+              render_serialized_payload { serialize_resource(context.user) }
+            else
+              render_error_payload(context.message)
+            end
+          end
+
+          def resource_serializer
+            Spree::V2::Tenant::ResetPasswordSerializer
+          end
+
+          def update_params
+            params.permit(
+              :email,
+              :phone_number,
+              :country_code,
+              :pin_code,
+              :pin_code_token,
+              :password,
+              :password_confirmation
+            )
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree/api/v2/tenant/tickets_controller.rb

@@ -0,0 +1,25 @@
+module Spree
+  module Api
+    module V2
+      module Tenant
+        class TicketsController < BaseController
+          def index
+            render_serialized_payload do
+              serialize_collection(paginated_collection)
+            end
+          end
+
+          def collection
+            SpreeCmCommissioner::TicketsSearcherQuery.new(params, MultiTenant.current_tenant_id).call
+          end
+
+          private
+
+          def collection_serializer
+            Spree::V2::Tenant::TicketSerializer
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree/api/v2/tenant/user_contacts_controller.rb

@@ -0,0 +1,33 @@
+module Spree
+  module Api
+    module V2
+      module Tenant
+        class UserContactsController < BaseController
+          def update
+            options = user_with_pin_code_params
+
+            generator_context = ::SpreeCmCommissioner::UserContactUpdater.call(options)
+
+            if generator_context.success?
+              render_serialized_payload { serialize_resource(generator_context.user) }
+            else
+              render_error_payload(generator_context.message)
+            end
+          end
+
+          private
+
+          def user_with_pin_code_params
+            results = params.permit(:pin_code, :pin_code_token, :email, :phone_number)
+            results[:user] = spree_current_user
+            results.to_h
+          end
+
+          def resource_serializer
+            Spree::V2::Tenant::UserContactSerializer
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree_cm_commissioner/admin/roles_controller_decorator.rb

@@ -0,0 +1,13 @@
+module SpreeCmCommissioner
+  module Admin
+    module RolesControllerDecorator
+      def index
+        @roles = Spree::Role.non_vendor.page(params[:page])
+      end
+    end
+  end
+end
+
+unless Spree::Admin::RolesController.ancestors.include?(SpreeCmCommissioner::Admin::RolesControllerDecorator)
+  Spree::Admin::RolesController.prepend(SpreeCmCommissioner::Admin::RolesControllerDecorator)
+end

data/app/interactors/spree_cm_commissioner/firebase_email_fetcher.rb

@@ -0,0 +1,25 @@
+require 'firebase-admin-sdk'
+
+module SpreeCmCommissioner
+  class FirebaseEmailFetcher < BaseInteractor
+    delegate :user_id, to: :context
+
+    def call
+      manager = initialize_firebase_manager
+      user = manager.get_user_by(uid: context.user_id)
+
+      context.email = user.provider_data.first&.email
+    end
+
+    private
+
+    def service_account
+      @service_account ||= Rails.application.credentials.cloud_firestore_service_account
+    end
+
+    def initialize_firebase_manager
+      @credentials ||= Firebase::Admin::Credentials.from_json(service_account.to_json)
+      @manager ||= Firebase::Admin::Auth::UserManager.new(service_account[:project_id], @credentials)
+    end
+  end
+end

data/app/interactors/spree_cm_commissioner/firebase_id_token_provider.rb

@@ -85,8 +85,9 @@ module SpreeCmCommissioner
       return nil if claim.nil?
 
       provider_name = claim['firebase']['sign_in_provider']
+      user_id = claim['user_id']
       sub = claim['firebase']['identities'][provider_name].first
-      email = claim['email']
+      email = claim['email'] || get_user_email(user_id)
       name = claim['name']
 
       {
@@ -97,6 +98,16 @@ module SpreeCmCommissioner
       }
     end
 
+    def get_user_email(user_id)
+      return nil if user_id.blank?
+
+      firebase_context = FirebaseEmailFetcher.call(user_id: user_id)
+
+      return unless firebase_context.success?
+
+      firebase_context.email
+    end
+
     delegate :id_token, to: :context
   end
 end

data/app/interactors/spree_cm_commissioner/user_id_token_authenticator.rb

@@ -7,6 +7,9 @@ module SpreeCmCommissioner
                      else
                        checker.user
                      end
+
+      update_user_email if context.user.email.blank?
+
       context.fail!(message: 'account_temporarily_deleted') if context.user.soft_deleted?
     end
 
@@ -15,6 +18,14 @@ module SpreeCmCommissioner
       register_context.user
     end
 
+    def update_user_email
+      firebase_context = FirebaseIdTokenProvider.call(id_token: context.id_token)
+      return unless firebase_context.success?
+
+      email = firebase_context.provider[:email]
+      context.user.update(email: email) if email.present?
+    end
+
     def checker
       @checker ||= SpreeCmCommissioner::UserIdTokenChecker.call(id_token: context.id_token)
       @checker

data/app/interactors/spree_cm_commissioner/user_registration_with_id_token.rb

@@ -6,7 +6,7 @@ module SpreeCmCommissioner
 
       if firebase_context.success?
         ActiveRecord::Base.transaction do
-          register_user!(firebase_context.provider[:name])
+          register_user!(firebase_context.provider[:name], firebase_context.provider[:email])
           link_user_account!(firebase_context.provider)
         end
       else
@@ -14,8 +14,8 @@ module SpreeCmCommissioner
       end
     end
 
-    def register_user!(name)
-      user = Spree.user_class.new(password: SecureRandom.base64(16), **name_attributes(name))
+    def register_user!(name, email)
+      user = Spree.user_class.new(password: SecureRandom.base64(16), email: email, **name_attributes(name))
       if user.save(validate: false)
         context.user = user
       else

data/app/interactors/spree_cm_commissioner/user_vattanac_bank_web_app_authenticator.rb

@@ -0,0 +1,30 @@
+module SpreeCmCommissioner
+  class UserVattanacBankWebAppAuthenticator < BaseInteractor
+    delegate :session_id, to: :context
+
+    def call
+      return context.fail!(message: 'Invalid token') unless payload
+      return context.fail!(message: 'User not found') unless user
+
+      verify_token!
+
+      context.user = user
+    rescue JWT::DecodeError => e
+      context.fail!(message: "Decode error: #{e.message}")
+    end
+
+    private
+
+    def payload
+      @payload ||= SpreeCmCommissioner::UserSessionJwtToken.decode(session_id)
+    end
+
+    def user
+      @user ||= Spree::User.find_by(id: payload['user_id']) if payload
+    end
+
+    def verify_token!
+      SpreeCmCommissioner::UserSessionJwtToken.decode(session_id, user.secure_token)
+    end
+  end
+end

data/app/interactors/spree_cm_commissioner/vattanac_bank_initiator.rb

@@ -0,0 +1,116 @@
+module SpreeCmCommissioner
+  class VattanacBankInitiator
+    include Interactor
+
+    def call
+      extract_encrypted_data_and_signature
+      verify_signature
+      decrypt_payload
+      find_or_create_user
+      construct_data
+    end
+
+    private
+
+    def extract_encrypted_data_and_signature
+      data_param = context.params[:data]
+      context.fail!(message: 'Invalid payload format', status: :bad_request) if data_param.blank?
+
+      parts = data_param.to_s.split('.', 2)
+      context.fail!(message: 'Invalid payload format', status: :bad_request) unless parts.size == 2
+
+      encrypted_data, signature = parts
+      context.encrypted_data = encrypted_data
+      context.signature = signature
+    end
+
+    def verify_signature
+      public_key = ENV['VATTANAC_PUBLIC_KEY'].presence || Rails.application.credentials.vattanac.public_key
+
+      rsa_service = SpreeCmCommissioner::RsaService.new(
+        public_key: public_key
+      )
+
+      return if rsa_service.verify(context.encrypted_data, context.signature)
+
+      context.fail!(message: 'Invalid signature', status: :unauthorized)
+    end
+
+    def decrypt_payload
+      aes_key = ENV['VATTANAC_AES_SECRET_KEY'].presence || Rails.application.credentials.vattanac.aes_secret_key
+
+      context.fail!(message: 'Invalid AES key length', status: :unprocessable_entity) unless aes_key
+
+      begin
+        decrypted_json = SpreeCmCommissioner::AesEncryptionService.decrypt(context.encrypted_data, aes_key)
+        context.user_data = JSON.parse(decrypted_json)
+      rescue StandardError => e
+        context.fail!(message: 'Decryption failed', error: e.message, status: :unprocessable_entity)
+      end
+    end
+
+    def find_or_create_user
+      find_user_by_identity || find_existing_user || create_new_user
+    end
+
+    def find_user_by_identity
+      user_data = context.user_data
+
+      identity = SpreeCmCommissioner::UserIdentityProvider.vattanac_bank
+                                                          .find_or_initialize_by(sub: user_data['id'])
+
+      if identity.persisted?
+        context.user = identity.user
+      else
+        context.identity = identity
+      end
+
+      context.user
+    end
+
+    def find_existing_user
+      user_data = context.user_data
+
+      context.user = Spree::User.find_by(
+        'email = ? OR phone_number = ?', user_data['email'], user_data['phoneNum']
+      )
+    end
+
+    def create_new_user
+      user_data = context.user_data
+      full_name = "#{user_data['firstName']} #{user_data['lastName']}"
+      identity = context.identity
+
+      identity.name = full_name
+
+      context.user = Spree::User.new(
+        first_name: user_data['firstName'],
+        last_name: user_data['lastName'],
+        email: user_data['email'],
+        phone_number: user_data['phoneNum'],
+        password: SecureRandom.base64(16),
+        user_identity_providers: [identity]
+      )
+
+      return if context.user.save
+
+      context.fail!(message: "User creation failed: #{context.user.errors.full_messages.join(', ')}")
+    end
+
+    def construct_data
+      user = context.user
+      context.data = {
+        sessionId: session_id,
+        name: user.full_name,
+        phone: user.phone_number,
+        email: user.email,
+        webUrl: "#{Spree::Store.default.formatted_url}/vattanac_bank_web_app?session_id=#{session_id}"
+      }
+    end
+
+    def session_id
+      payload = { user_id: context.user.id }
+      SpreeCmCommissioner::UserSessionJwtToken.encode(payload, context.user.reload.secure_token)
+    end
+  end
+end

data/app/models/spree_cm_commissioner/order_decorator.rb

@@ -46,7 +46,7 @@ module SpreeCmCommissioner
 
       base.delegate :customer, to: :user, allow_nil: true
 
-      base.whitelisted_ransackable_associations |= %w[customer taxon payments invoice]
+      base.whitelisted_ransackable_associations |= %w[customer taxon payments guests invoice]
       base.whitelisted_ransackable_attributes |= %w[intel_phone_number phone_number email number state]
 
       def base.search_by_qr_data!(data)

data/app/models/spree_cm_commissioner/role_decorator.rb

@@ -10,10 +10,16 @@ module SpreeCmCommissioner
 
       base.accepts_nested_attributes_for :role_permissions, allow_destroy: true
 
-      base._validators.reject! { |key, _| key == :name }
-      base._validate_callbacks.each { |c| c.filter.attributes.delete(:name) if c.filter.respond_to?(:attributes) }
+      base.before_validation :generate_unique_name, if: -> { vendor_id.present? }
 
-      base.validates :name, uniqueness: { scope: :vendor_id, allow_blank: true }
+      base.validates :presentation, uniqueness: { scope: :vendor_id }, presence: true, if: -> { vendor_id.present? }
+    end
+
+    def generate_unique_name
+      return if name.present?
+      return if presentation.blank?
+
+      self.name = "#{vendor.slug}-#{presentation.downcase.parameterize(separator: '-')}"
     end
   end
 end

data/app/models/spree_cm_commissioner/taxon_decorator.rb

@@ -7,7 +7,6 @@ module SpreeCmCommissioner
 
       base.preference :background_color, :string
       base.preference :foreground_color, :string
-      base.preference :reports, :array, default: []
 
       base.has_many :taxon_vendors, class_name: 'SpreeCmCommissioner::TaxonVendor'
       base.has_many :vendors, through: :taxon_vendors

data/app/models/spree_cm_commissioner/trip.rb

@@ -4,6 +4,7 @@ module SpreeCmCommissioner
     attr_accessor :hours, :minutes, :seconds
 
     before_validation :convert_duration_to_seconds
+    belongs_to :variant, class_name: 'Spree::Variant'
 
     belongs_to :route, class_name: 'Spree::Product'
     belongs_to :vehicle, class_name: 'SpreeCmCommissioner::Vehicle'
@@ -39,6 +40,12 @@ module SpreeCmCommissioner
       { hours: hours, minutes: minutes, seconds: seconds }
     end
 
+    def arrival_time
+      return nil if departure_time.nil? || duration.nil?
+
+      departure_time + duration.seconds
+    end
+
     private
 
     def origin_and_destination_cannot_be_the_same