snf_core 0.3.6 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c44ee26535ca2c3687a171ccd8643aca7d5c93b70430801f1f3345b2c2735e34
-  data.tar.gz: 366988a00ed4ee227d3c1c5d5f08f6077da7f13a2d85a3b2ce9fa7884f1d1729
+  metadata.gz: a6089c70b25e81c76d4256e296c173865d35a1719516a5b31f6df20f6da7d603
+  data.tar.gz: 6df324619449910eaea298462ed5c5cf85bf54531681c974b73c8ab126508392
 SHA512:
-  metadata.gz: 3a8babd301598eb87c0efaa128c8f77dc55c6df08b4ea218f01073ab55fd0210182b3ac10fc15d218bde46f5f344a9df03366673c324909970517c1ba95fe714
-  data.tar.gz: 581aea9808a0d4499306ecf90d5881e756cf03fe41982406b4e2330f6386bf43f0575a1b8576cd8de09019a6af61afe1d440b187244a8e339dc166b2286f28f4
+  metadata.gz: 075272f56cad453bd1267d0ed084adf61eb1e04460ecb09051841c0bbed5cbc58c5908d0113faba2eee7b874c08234ac1d18cff5f5490c4f40c5c510400241af
+  data.tar.gz: e6e6c53d4acaa86abd536c056d5ba5909a1332197d690a686fef60b0f857c4c4c9cae00022527bed54372ef4192d2370dd63623e321c70f067c7d3dd51627e61

data/app/controllers/snf_core/auth_controller.rb

@@ -73,10 +73,26 @@ module SnfCore
       user = User.find_by(phone_number: auth_params[:phone_number])
       return render json: { success: false, error: "User doesn't exist" }, status: :unauthorized unless user
       return render json: { success: false, error: "Invalid email or password" }, status: :unauthorized unless user.authenticate(auth_params[:password])
+      user_role = UserRole.find_by(user: user)
+      return render json: { success: false, error: "No role was assigned to your user" }, status: :unauthorized unless user_role
+      address = SnfCore::User.find_by(address_id: user.address_id)
+      return render json: { success: false, error: "No address was assigned to your user" }, status: :unauthorized unless address
+      role = Role.find(user_role.role_id)
+      token = @token_service.encode({ user: user.as_json.except("password_digest", "created_at", "updated_at"), role: role.name, address: address.as_json(except: [ :created_at, :updated_at ]) })
+      render json: { success: true, token: token, user: user.as_json(except: [ :password_digest ]), role: role.name }
+    end
+
+    def admin_login
+      user = User.find_by(phone_number: auth_params[:phone_number])
+      return render json: { success: false, error: "User doesn't exist" }, status: :unauthorized unless user
+      return render json: { success: false, error: "Invalid email or password" }, status: :unauthorized unless user.authenticate(auth_params[:password])
+
       user_role = UserRole.find_by(user: user)
       return render json: { success: false, error: "No role was assigned to your user" }, status: :unauthorized unless user_role
 
       role = Role.find(user_role.role_id)
+      return render json: { success: false, error: "Unauthorized access" }, status: :unauthorized unless role.name == "Admin"
+
       token = @token_service.encode({ user: user.as_json.except("password_digest", "created_at", "updated_at"), role: role.name })
       render json: { success: true, token: token, user: user.as_json(except: [ :password_digest ]), role: role.name }
     end

data/app/models/snf_core/quotation.rb

@@ -1,6 +1,7 @@
 module SnfCore
   class Quotation < ApplicationRecord
     belongs_to :item_request
+    belongs_to :user
 
     validates :price, presence: true, numericality: { greater_than: 0 }
     validates :valid_until, presence: true

data/config/routes.rb

@@ -1,6 +1,6 @@
 SnfCore::Engine.routes.draw do
-  mount SnfCore::Engine => "/snf_core"
   post "auth/login"
+  post "auth/admin/login", to: "auth#admin_login"
   post "auth/signup"
   post "auth/validate_token"
 end

data/db/migrate/20250317135148_add_user_to_quotation.rb

@@ -0,0 +1,5 @@
+class AddUserToQuotation < ActiveRecord::Migration[8.0]
+  def change
+    add_reference :snf_core_quotations, :user, null: false, foreign_key: { to_table: :snf_core_users }
+  end
+end

data/lib/snf_core/version.rb

@@ -1,3 +1,3 @@
 module SnfCore
-  VERSION = "0.3.6"
+  VERSION = "0.3.8"
 end

data/spec/dummy/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[8.0].define(version: 2025_03_13_103149) do
+ActiveRecord::Schema[8.0].define(version: 2025_03_17_135148) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_catalog.plpgsql"
 
@@ -202,7 +202,9 @@ ActiveRecord::Schema[8.0].define(version: 2025_03_13_103149) do
     t.text "notes"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.bigint "user_id", null: false
     t.index ["item_request_id"], name: "index_snf_core_quotations_on_item_request_id"
+    t.index ["user_id"], name: "index_snf_core_quotations_on_user_id"
   end
 
   create_table "snf_core_roles", force: :cascade do |t|
@@ -333,6 +335,7 @@ ActiveRecord::Schema[8.0].define(version: 2025_03_13_103149) do
   add_foreign_key "snf_core_orders", "snf_core_users", column: "user_id"
   add_foreign_key "snf_core_products", "snf_core_categories", column: "category_id"
   add_foreign_key "snf_core_quotations", "snf_core_item_requests", column: "item_request_id"
+  add_foreign_key "snf_core_quotations", "snf_core_users", column: "user_id"
   add_foreign_key "snf_core_store_inventories", "snf_core_products", column: "product_id"
   add_foreign_key "snf_core_store_inventories", "snf_core_stores", column: "store_id"
   add_foreign_key "snf_core_stores", "snf_core_addresses", column: "address_id"