stay_commerce 0.1.8 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7a8e266c09ca64768879d945a254f0533878a25c396eaf46c8a9d78c616164c
-  data.tar.gz: 53f67f0b9861c7bda024af282607b755342259c327f9d73ca346923f2d2909dc
+  metadata.gz: b24ed7bc626048ec0567a639f138b6177756960fb6b4206ec03e85802e016c67
+  data.tar.gz: ee0e76e20df358f79a4199b27678cb47d931adec21fabcb6c52c031737bcf820
 SHA512:
-  metadata.gz: fa45bce8985f0d0f37e5067a8be2d87530b22f5f8513b77cb73a01cebd05a80832d3859ef367f78680a1eed7b0dd56e686af752a3a3f3dcc8d2d5e455aa6e1bb
-  data.tar.gz: f7ab0491f34a0276ad586379522a07a9fa45977ad05bad518686981545c8e11cbbcb5045d3114667fedbda44fc73950e8dd9568dd4879c3373874dd80b29f4cb
+  metadata.gz: 82f905a9fac7c37250665077ced813b2a1e1563250835c0e757df0a506a370a73bf4b4444e0e47d733d0510bcbf6a90cb511e61721b6b6d701b7f3e016862135
+  data.tar.gz: 94e34f1b56d89639347113ea1bd3180fa70d9039446aaef09974d2f2e1d11f1279e18a63f4590f34d75e73b80ce70cae1a13235fcfccd77aec4cfb23b376d576

data/app/assets/javascripts/stay/admin/property.js

@@ -25,13 +25,13 @@ $(document).ready(function() {
   const roomTypeField = document.getElementById('room_type_field');
   const propertyCategoryData = document.getElementById('property-category-data');
 
-  const roomTypesByCategory = JSON.parse(propertyCategoryData.getAttribute('data-room-types'));
+  // const roomTypesByCategory = JSON.parse(propertyCategoryData.getAttribute('data-room-types'));
 
-  window.updateRoomType = function(selectedCategoryId) {
-    if (roomTypesByCategory[selectedCategoryId]) {
-      roomTypeField.value = roomTypesByCategory[selectedCategoryId];
-    } else {
-      roomTypeField.value = '';
-    }
-  };
+  // window.updateRoomType = function(selectedCategoryId) {
+  //   if (roomTypesByCategory[selectedCategoryId]) {
+  //     roomTypeField.value = roomTypesByCategory[selectedCategoryId];
+  //   } else {
+  //     roomTypeField.value = '';
+  //   }
+  // };
 });

data/app/controllers/devise/api/tokens_controller.rb

@@ -0,0 +1,185 @@
+# frozen_string_literal: true
+
+# rubocop:disable Metrics/ClassLength
+module Devise
+  module Api
+    class TokensController < Devise.api.config.base_controller.constantize
+      wrap_parameters false
+      skip_before_action :verify_authenticity_token, raise: false
+      before_action :authenticate_devise_api_token!, only: %i[info]
+
+      respond_to :json
+
+      # rubocop:disable Metrics/AbcSize
+      def sign_up
+        unless Devise.api.config.sign_up.enabled
+          error_response = Devise::Api::Responses::ErrorResponse.new(request, error: :sign_up_disabled,
+                                                                              resource_class: resource_class)
+
+          return render json: error_response.body, status: error_response.status
+        end
+
+        Devise.api.config.before_sign_up.call(sign_up_params, request, resource_class)
+
+        service = Devise::Api::ResourceOwnerService::SignUp.new(params: sign_up_params,
+                                                                resource_class: resource_class).call
+        if service.success?
+          token = service.success
+
+          call_devise_trackable!(token.resource_owner)
+
+          token_response = Devise::Api::Responses::TokenResponse.new(request, token: token, action: __method__)
+          Devise.api.config.after_successful_sign_up.call(token.resource_owner, token, request)
+          assign_role(token.resource_owner) if token.resource_owner
+          data = ActiveModelSerializers::SerializableResource.new(token.resource_owner, serializer: UserSerializer).as_json
+          UserMailer.welcome_email(token.resource_owner).deliver_later if token.resource_owner
+          return render json: { access_token: token_response&.token.access_token, success: true }, status: token_response.status
+        end
+
+        error_response = Devise::Api::Responses::ErrorResponse.new(request,
+                                                                   resource_class: resource_class,
+                                                                   **service.failure)
+
+        error_message = error_response.body[:error_description].is_a?(Array) ? error_response.body[:error_description].join : error_response.body[:error_description].to_s
+        render json: { error: error_message, success: false }, status: error_response.status
+      end
+      # rubocop:enable Metrics/AbcSize
+
+      # rubocop:disable Metrics/AbcSize
+      def sign_in
+        Devise.api.config.before_sign_in.call(sign_in_params, request, resource_class)
+        service = Devise::Api::ResourceOwnerService::SignIn.new(params: sign_in_params,
+                                                                resource_class: resource_class).call
+
+        if service.success?
+          token = service.success
+
+          call_devise_trackable!(token.resource_owner)
+
+          token_response = Devise::Api::Responses::TokenResponse.new(request, token: service.success,
+                                                                              action: __method__)
+          Devise.api.config.after_successful_sign_in.call(token.resource_owner, token, request)
+          data = ActiveModelSerializers::SerializableResource.new(token.resource_owner, serializer: UserSerializer).as_json
+          return render json: { access_token: token_response&.token.access_token, success: true }, status: token_response.status
+        end
+
+        error_response = Devise::Api::Responses::ErrorResponse.new(request,
+                                                                   resource_class: resource_class,
+                                                                   **service.failure)
+        error_message = error_response.body[:error_description].is_a?(Array) ? error_response.body[:error_description].join : error_response.body[:error_description].to_s
+
+        render json: { error: error_message, success: false }, status: :unprocessable_entity
+      end
+      # rubocop:enable Metrics/AbcSize
+
+      def info
+        token_response = Devise::Api::Responses::TokenResponse.new(request, token: current_devise_api_token,
+                                                                            action: __method__)
+        data = ActiveModelSerializers::SerializableResource.new(token_response.resource_owner, serializer: UserSerializer).as_json
+        render json: { data: data, success: true }, status: token_response.status
+      end
+
+      # rubocop:disable Metrics/AbcSize
+      def revoke
+        Devise.api.config.before_revoke.call(current_devise_api_token, request)
+
+        service = Devise::Api::TokensService::Revoke.new(devise_api_token: current_devise_api_token).call
+
+        if service.success?
+          token_response = Devise::Api::Responses::TokenResponse.new(request, token: service.success,
+                                                                              action: __method__)
+
+          Devise.api.config.after_successful_revoke.call(service.success&.resource_owner, service.success, request)
+
+          return render json: token_response.body, status: token_response.status
+        end
+
+        error_response = Devise::Api::Responses::ErrorResponse.new(request,
+                                                                   resource_class: resource_class,
+                                                                   **service.failure)
+
+        render json: error_response.body, status: error_response.status
+      end
+      # rubocop:enable Metrics/AbcSize
+
+      # rubocop:disable Metrics/AbcSize
+      def refresh
+        unless Devise.api.config.refresh_token.enabled
+          error_response = Devise::Api::Responses::ErrorResponse.new(request,
+                                                                     resource_class: resource_class,
+                                                                     error: :refresh_token_disabled)
+
+          return render json: error_response.body, status: error_response.status
+        end
+
+        if current_devise_api_refresh_token.blank?
+          error_response = Devise::Api::Responses::ErrorResponse.new(request, error: :invalid_token,
+                                                                              resource_class: resource_class)
+
+          return render json: error_response.body, status: error_response.status
+        end
+
+        if current_devise_api_refresh_token.revoked?
+          error_response = Devise::Api::Responses::ErrorResponse.new(request, error: :revoked_token,
+                                                                              resource_class: resource_class)
+
+          return render json: error_response.body, status: error_response.status
+        end
+
+        Devise.api.config.before_refresh.call(current_devise_api_refresh_token, request)
+
+        service = Devise::Api::TokensService::Refresh.new(devise_api_token: current_devise_api_refresh_token).call
+
+        if service.success?
+          token_response = Devise::Api::Responses::TokenResponse.new(request, token: service.success,
+                                                                              action: __method__)
+
+          Devise.api.config.after_successful_refresh.call(service.success.resource_owner, service.success, request)
+
+          return render json: token_response.body, status: token_response.status
+        end
+
+        error_response = Devise::Api::Responses::ErrorResponse.new(request,
+                                                                   resource_class: resource_class,
+                                                                   **service.failure)
+
+        render json: error_response.body, status: error_response.status
+      end
+      # rubocop:enable Metrics/AbcSize
+
+      private
+
+      def sign_up_params
+        params.permit(*Devise.api.config.sign_up.extra_fields, *resource_class.authentication_keys,
+                      *::Devise::ParameterSanitizer::DEFAULT_PERMITTED_ATTRIBUTES[:sign_up]).to_h
+      end
+
+      def assign_role(user)
+        role  = Stay::Role.find_by(name: params[:type])
+        user.role_users.create(role_id: role&.id) if role.present?
+        token = Random.hex(16)
+        user.update(confirmation_token: token)
+      end
+
+      def sign_in_params
+        params.permit(*resource_class.authentication_keys,
+                      *::Devise::ParameterSanitizer::DEFAULT_PERMITTED_ATTRIBUTES[:sign_in]).to_h
+      end
+
+      def call_devise_trackable!(resource_owner)
+        return unless resource_class.supported_devise_modules.trackable?
+
+        resource_owner.update_tracked_fields!(request)
+      end
+
+      def current_devise_api_refresh_token
+        return @current_devise_api_refresh_token if @current_devise_api_refresh_token
+
+        token = find_devise_api_token
+        devise_api_token_model = Devise.api.config.base_token_model.constantize
+        @current_devise_api_refresh_token = devise_api_token_model.find_by(refresh_token: token)
+      end
+    end
+  end
+end
+# rubocop:enable Metrics/ClassLength

data/app/controllers/stay/api/v1/profiles_controller.rb

@@ -6,18 +6,22 @@ class Stay::Api::V1::ProfilesController < Stay::BaseApiController
     end
 
     def update 
-      @profile.update(profile_params)
-      render json: { profile: @profile }, status: :ok
+      if @profile.update(profile_params)
+        data = ActiveModelSerializers::SerializableResource.new(@profile, serializer: UserSerializer)
+        render json: { profile: data, success: true }, status: :ok
+      else
+        render json: { errors: @profile.errors.full_messages, success:false }, status: :unprocessable_entity
+      end
     end
-
+    
     private
 
     def set_user
-      @profile = current_devise_api_user || Stay::Profile.find(params[:id])
+      @profile = current_devise_api_user || Stay::User.find(params[:id])
     end
 
     def profile_params
-      params.require(:profile).permit(:first_name, :last_name, :phone, :date_of_birth, :gender )
+      params.require(:profile).permit(:first_name, :last_name, :phone, :date_of_birth, :gender, :profile_image )
     end
     
 end

data/app/controllers/stay/api/v1/property_categories_controller.rb

@@ -3,12 +3,12 @@ class Stay::Api::V1::PropertyCategoriesController < Stay::BaseApiController
 
   def index
     @type = Stay::PropertyCategory.all
+    return render json: { error: "no data found", success: false }, status: :not_found unless @type.any?
     render json: { data: ActiveModelSerializers::SerializableResource.new(@type, each_serializer: PropertyCategorySerializer), message: "data found", success: true }, status: :ok
   end
 
   def show
     @type = Stay::PropertyCategory.find_by(id: params[:id])
-    return render json: { error: "no data found", success: false }, status: :unprocessable_entity if @type.nil?
     render json: { data:  PropertyCategorySerializer.new(@type), message: "data found", success: true },  status: :ok
   end
 end

data/app/controllers/stay/api/v1/property_types_controller.rb

@@ -2,9 +2,25 @@ class Stay::Api::V1::PropertyTypesController < Stay::BaseApiController
   before_action :authenticate_devise_api_token!
 
   def index
-    @type = Stay::PropertyType.all
-    render json: { data: ActiveModelSerializers::SerializableResource.new(@type, each_serializer: PropertyTypeSerializer), message: "data found", success: true }, status: :ok
+    property_types = Stay::PropertyType.all
+  
+    if property_types.any?
+      serialized_data = ActiveModelSerializers::SerializableResource.new(property_types, each_serializer: PropertyTypeSerializer)
+  
+      render json: {
+        data: serialized_data,
+        message: "Data found",
+        success: true
+      }, status: :ok
+    else
+      render json: {
+        data: [],
+        message: "No property types found",
+        success: false
+      }, status: :ok
+    end
   end
+  
 
   def show
     @type = Stay::PropertyType.find_by(id: params[:id])

data/app/models/stay/user.rb

@@ -5,7 +5,6 @@ module Stay
     devise :database_authenticatable, :registerable,
            :recoverable, :rememberable, :validatable, :api
 
-    validates :first_name, :last_name, presence: true
     has_many :role_users, class_name: "Stay::RoleUser", dependent: :destroy
     has_many :stay_roles, through: :role_users, class_name: "Stay::Role", source: :role
     has_many :bookings

data/app/serializers/user_serializer.rb

@@ -31,10 +31,6 @@ class UserSerializer < ActiveModel::Serializer
     object&.preferences.present? ? object&.preferences["sms_notification"]: false
   end
 
-  def payment_method_preference
-    object.payment_method_name
-  end
-
   def image_file_name
     object.profile_image&.filename&.to_s || nil
   end

data/app/services/devise/api/resource_owner_service/authenticate.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Devise
+  module Api
+    module ResourceOwnerService
+      class Authenticate < Devise::Api::BaseService
+        option :params, type: Types::Hash
+        option :resource_class, type: Types::Class
+
+        def call
+          resource = resource_class.find_for_authentication(email: params[:email])
+          return Failure(error: :invalid_email, record: nil) if resource.blank?
+          return Failure(error: :invalid_authentication, record: resource) unless authenticate!(resource)
+
+          Success(resource)
+        end
+
+        private
+
+        def authenticate!(resource)
+          resource.valid_for_authentication? do
+            resource.valid_password?(params[:password])
+          end && resource.active_for_authentication?
+        end
+      end
+    end
+  end
+end

data/app/services/devise/api/resource_owner_service/sign_in.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Devise
+  module Api
+    module ResourceOwnerService
+      class SignIn < Devise::Api::BaseService
+        option :params, type: Types::Hash
+        option :resource_class, type: Types::Class
+
+        def call
+          resource_owner = yield call_authenticate_service
+          devise_api_token = yield call_create_devise_api_token_service(resource_owner)
+          resource_owner.reset_failed_attempts! if resource_owner.class.supported_devise_modules.lockable?
+
+          Success(devise_api_token)
+        end
+
+        private
+
+        def call_authenticate_service
+          Devise::Api::ResourceOwnerService::Authenticate.new(params: params,
+                                                              resource_class: resource_class).call
+        end
+
+        def call_create_devise_api_token_service(resource_owner)
+          Devise::Api::TokensService::Create.new(resource_owner: resource_owner).call
+        end
+      end
+    end
+  end
+end

data/app/services/devise/api/resource_owner_service/social_authenticate.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Devise
+  module Api
+    module ResourceOwnerService
+      class SocialAuthenticate < Devise::Api::BaseService
+        option :params, type: Types::Hash
+        option :resource_class, type: Types::Class
+
+        def call
+          resource = resource_class.find_for_authentication(email: params["email"])
+          return Failure(error: :invalid_email, record: nil) if resource.blank?
+          Success(resource)
+        end
+
+        private
+
+        def authenticate!(resource)
+          resource.valid_for_authentication? do
+            resource.valid_password?(params[:password])
+          end && resource.active_for_authentication?
+        end
+      end
+    end
+  end
+end

data/app/services/devise/api/resource_owner_service/social_sign_in.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Devise
+  module Api
+    module ResourceOwnerService
+      class SocialSignIn < Devise::Api::BaseService
+        option :params, type: Types::Hash
+        option :resource_class, type: Types::Class
+
+        def call
+          resource_owner = yield call_authenticate_service
+          devise_api_token = yield call_create_devise_api_token_service(resource_owner)
+          resource_owner.reset_failed_attempts! if resource_owner.class.supported_devise_modules.lockable?
+
+          Success(devise_api_token)
+        end
+
+        private
+
+        def call_authenticate_service
+          Devise::Api::ResourceOwnerService::SocialAuthenticate.new(params: params, resource_class: resource_class).call
+        end
+
+        def call_create_devise_api_token_service(resource_owner)
+          Devise::Api::TokensService::Create.new(resource_owner: resource_owner).call
+        end
+      end
+    end
+  end
+end

data/app/services/devise/api/tokens_service/create.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Devise
+  module Api
+    module TokensService
+      class Create < Devise::Api::BaseService
+        option :resource_owner
+        option :previous_refresh_token, type: Types::String | Types::Nil, default: proc { nil }
+
+        def call
+          return Failure(error: :invalid_resource_owner) unless resource_owner.respond_to?(:access_tokens)
+
+          devise_api_token = yield create_devise_api_token
+
+          Success(devise_api_token)
+        end
+
+        private
+
+        def authenticate_service
+          Devise::Api::ResourceOwnerService::Authenticate.new(params: params,
+                                                              resource_class: resource_class).call
+        end
+
+        def create_devise_api_token
+          devise_api_token = resource_owner.access_tokens.new(params)
+
+          return Success(devise_api_token) if devise_api_token.save
+
+          Failure(error: :devise_api_token_create_error, record: devise_api_token)
+        end
+
+        def params
+          {
+            access_token: Devise.api.config.base_token_model.constantize.generate_uniq_access_token(resource_owner),
+            refresh_token: Devise.api.config.base_token_model.constantize.generate_uniq_refresh_token(resource_owner),
+            expires_in: Devise.api.config.access_token.expires_in,
+            revoked_at: nil,
+            previous_refresh_token: previous_refresh_token
+          }
+        end
+      end
+    end
+  end
+end

data/app/views/stay/admin/shared/_store_switcher.html.erb

@@ -1,30 +0,0 @@
-<% if current_store %>
-  <a class="px-0 py-1 btn text-light" id="storeSelectorDropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-   <span class="d-sm-none"><%= svg_icon name: "store.svg", width: '18', height: '18' %></span>
-   <span class="d-none d-sm-inline"><%= current_store.name %></span> (<%= current_store.code %>) <%= svg_icon name: "chevron-down.svg", width: '12', height: '12', classes: 'ml-1 mb-0' %>
-  </a>
-
-  <div class="dropdown-menu dropdown-menu-left overflow-hidden ml-2" aria-labelledby="storeSelectorDropdown">
-    <% @stores.each do |store| %>
-      <%= store_switcher_link(store) %>
-    <% end %>
-
-    <div class="dropdown-divider m-0"></div>
-    <%= link_to new_admin_store_path, class: 'py-2 px-4 mt-1 mb-0 dropdown-item', id: 'addNewStoreLink' do %>
-      <%= svg_icon name: "plus-circle", width: '18', height: '18' %> Add New Store
-    <% end %>
-  </div>
-<% end %>
-
-<script type="text/javascript">
- $('#storeSelectorDropdown').click(function () {
-    event.preventDefault();
-      $(this).next('.dropdown-menu').toggle();
-  });
-
-  $(document).click(function (e) {
-    if (!$(e.target).closest('#storeSelectorDropdown').length) {
-      $('.dropdown-menu').hide();
-    }
-  });
-</script>

data/lib/stay/version.rb

@@ -1,3 +1,3 @@
 module Stay
-  VERSION = "0.1.8"
+  VERSION = "0.1.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stay_commerce
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.10
 platform: ruby
 authors:
 - w3villa-vikaspal
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-22 00:00:00.000000000 Z
+date: 2025-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -480,6 +480,7 @@ files:
 - app/channels/chat_channel.rb
 - app/controllers/concerns/stay/booking_validations.rb
 - app/controllers/concerns/stay/stripe_concern.rb
+- app/controllers/devise/api/tokens_controller.rb
 - app/controllers/stay/admin/addresses_controller.rb
 - app/controllers/stay/admin/amenities_controller.rb
 - app/controllers/stay/admin/amenity_categories_controller.rb
@@ -623,6 +624,11 @@ files:
 - app/serializers/room_type_serializer.rb
 - app/serializers/user_listing_serializer.rb
 - app/serializers/user_serializer.rb
+- app/services/devise/api/resource_owner_service/authenticate.rb
+- app/services/devise/api/resource_owner_service/sign_in.rb
+- app/services/devise/api/resource_owner_service/social_authenticate.rb
+- app/services/devise/api/resource_owner_service/social_sign_in.rb
+- app/services/devise/api/tokens_service/create.rb
 - app/services/stay/bookings/create_booking_service.rb
 - app/services/stay/bookings/create_line_item_service.rb
 - app/services/stay/bookings/existing_booking_service.rb
@@ -947,7 +953,7 @@ metadata:
   homepage_uri: https://github.com/w3villa/StayCommerce
   source_code_uri: https://github.com/w3villa/StayCommerce
   changelog_uri: https://github.com/w3villa/StayCommerce
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -962,8 +968,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key: 
+rubygems_version: 3.5.9
+signing_key:
 specification_version: 4
 summary: Summary of Stay.
 test_files: []