Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Fix: hid gift card codes and download links from other company members
Damian Legawieca5d840919327
diff --git a/packages/sdk/src/types/generated/LineItem.ts b/packages/sdk/src/types/generated/LineItem.tsindex d841a1b71a..ef6274d369 100644--- a/packages/sdk/src/types/generated/LineItem.ts+++ b/packages/sdk/src/types/generated/LineItem.ts@@ -1,4 +1,4 @@-// Typelizer digest 1d51470347a255b4aa911fdc59b3df52+// Typelizer digest 4a3f5b43b6b9595123494ab00b94fad4//// DO NOT MODIFY: This file was automatically generated by Typelizer.import type {Seller, OptionValue, DigitalLink, TaxLine} from '@/types'@@ -35,7 +35,7 @@ interface LineItem {thumbnail_url: string | null;seller?: Seller;option_values: Array<OptionValue>;- digital_links: Array<DigitalLink>;+ digital_links?: Array<DigitalLink>;tax_lines?: Array<TaxLine>;}diff --git a/packages/sdk/src/zod/generated/LineItem.ts b/packages/sdk/src/zod/generated/LineItem.tsindex b973b36fd0..7e97454fe0 100644--- a/packages/sdk/src/zod/generated/LineItem.ts+++ b/packages/sdk/src/zod/generated/LineItem.ts@@ -37,7 +37,7 @@ export const LineItemSchema = z.object({thumbnail_url: z.string().nullable(),seller: SellerSchema.optional(),option_values: z.array(OptionValueSchema),- digital_links: z.array(DigitalLinkSchema),+ digital_links: z.array(DigitalLinkSchema).optional(),tax_lines: z.array(TaxLineSchema).optional(),});diff --git a/spree/api/app/controllers/spree/api/v3/store/companies/orders_controller.rb b/spree/api/app/controllers/spree/api/v3/store/companies/orders_controller.rbindex a0a67c5803..b4a8150d68 100644--- a/spree/api/app/controllers/spree/api/v3/store/companies/orders_controller.rb+++ b/spree/api/app/controllers/spree/api/v3/store/companies/orders_controller.rb@@ -20,6 +20,12 @@ module Spreecurrent_store.orders.complete.where(company_id: @parent.self_and_descendants.select(:id))end++ # These are other members' orders: gift card codes and download+ # links are the buyer's credentials, not the company's.+ def serializer_params+ super.merge(hide_credentials: true)+ endendendenddiff --git a/spree/api/app/serializers/spree/api/v3/gift_card_serializer.rb b/spree/api/app/serializers/spree/api/v3/gift_card_serializer.rbindex 6ab54c9f01..5e9e52983f 100644--- a/spree/api/app/serializers/spree/api/v3/gift_card_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/gift_card_serializer.rb@@ -17,8 +17,10 @@ module Spreeexpired: :boolean,active: :boolean+ # A bearer credential: masked when the order is shown to someone other+ # than its buyer (a company's other members).attribute :code do |gift_card|- gift_card.display_code+ params[:hide_credentials] ? gift_card.masked_code : gift_card.display_codeendattribute :status do |gift_card|diff --git a/spree/api/app/serializers/spree/api/v3/line_item_serializer.rb b/spree/api/app/serializers/spree/api/v3/line_item_serializer.rbindex 38b88b7594..dec83c36f2 100644--- a/spree/api/app/serializers/spree/api/v3/line_item_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/line_item_serializer.rb@@ -71,7 +71,8 @@ module Spreeif: proc { expand?('seller') }many :option_values, resource: proc { Spree.api.option_value_serializer }- many :digital_links, resource: proc { Spree.api.digital_link_serializer }+ # Download links carry a bearer token; only the buyer gets them.+ many :digital_links, resource: proc { Spree.api.digital_link_serializer }, if: proc { !params[:hide_credentials] }# Tax hangs off its adjustable, never off the cart or order: the# exactly-one-adjustable rule makes the nested view complete, and the# owner already carries the tax totals.diff --git a/spree/api/spec/controllers/spree/api/v3/store/companies/orders_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/store/companies/orders_controller_spec.rbindex d7b30812b1..47bc168723 100644--- a/spree/api/spec/controllers/spree/api/v3/store/companies/orders_controller_spec.rb+++ b/spree/api/spec/controllers/spree/api/v3/store/companies/orders_controller_spec.rb@@ -37,6 +37,23 @@ RSpec.describe Spree::Api::V3::Store::Companies::OrdersController, type: :controexpect(json_response['data']).to be_emptyend+ # Other members' orders: the buyer's gift card code and download links+ # are credentials, not company data.+ it "withholds another member's gift card code and download links" do+ order = create(:completed_order_with_totals, store: store)+ order.update_columns(company_id: company.id)+ gift_card = create(:gift_card, store: store, code: 'membercard1234')+ order.update_column(:gift_card_id, gift_card.id)+ create(:digital_link, line_item: order.line_items.first)++ get :index, params: { company_id: company.prefixed_id }, as: :json++ row = json_response['data'].first+ expect(row['gift_card']['code']).to eq('**********1234')+ expect(response.body).not_to include('MEMBERCARD1234')+ expect(row['items'].first).not_to have_key('digital_links')+ end+it '404s a node without standing' doget :index, params: { company_id: create(:company, store: store).prefixed_id }, as: :json