Fixes

Author: ndiezel0

apps/hellgate/src/hg_invoice_payment.erl

@@ -445,35 +445,28 @@ init_(PaymentID, Params, #{timestamp := CreatedAt} = Opts) ->
         customer_id = InheritedCustomerID
     },
     CascadeTokenEvents =
-        case {InheritedCustomerID, PayerParams, VS0} of
-            {CID, {recurrent, #payproc_RecurrentPayerParams{recurrent_parent = ?recurrent_parent(InvID, PmtID)}}, #{
-                    parent_payment := ParentSt
-                }} when CID =/= undefined ->
-                CubastyTokens = hg_customer_client:get_recurrent_tokens(InvID, PmtID),
-                ParentToken = make_parent_recurrent_token(ParentSt),
-                AllTokens = [ParentToken | CubastyTokens],
-                [?cascade_tokens_loaded(AllTokens)];
+        case {InheritedCustomerID, PayerParams} of
+            {CID, {recurrent, #payproc_RecurrentPayerParams{recurrent_parent = ?recurrent_parent(InvID, PmtID)}}} when
+                CID =/= undefined
+            ->
+                case hg_customer_client:get_recurrent_tokens(InvID, PmtID) of
+                    [_ | _] = Tokens -> [?cascade_tokens_loaded(Tokens)];
+                    [] -> []
+                end;
             _ ->
                 []
         end,
     Events = [?payment_started(Payment2)] ++ CascadeTokenEvents,
     {collapse_changes(Events, undefined, #{}), {Events, hg_machine_action:instant()}}.
 
-make_parent_recurrent_token(ParentSt) ->
-    #domain_PaymentRoute{provider = ProviderRef, terminal = TerminalRef} = get_route(ParentSt),
-    RecToken = get_recurrent_token(ParentSt),
-    #domain_InvoicePayment{created_at = CreatedAt} = get_payment(ParentSt),
-    #customer_RecurrentToken{
-        id = <<"parent">>,
-        provider_ref = ProviderRef,
-        terminal_ref = TerminalRef,
-        token = RecToken,
-        created_at = CreatedAt,
-        status = {active, #customer_RecurrentTokenActive{}}
-    }.
-
 maybe_inherit_customer_id(undefined, #{parent_payment := ParentPayment}) ->
     (get_payment(ParentPayment))#domain_InvoicePayment.customer_id;
+maybe_inherit_customer_id(CustomerID, #{parent_payment := ParentPayment}) ->
+    case (get_payment(ParentPayment))#domain_InvoicePayment.customer_id of
+        CustomerID -> CustomerID;
+        undefined -> CustomerID;
+        _Other -> throw(#payproc_InvalidRecurrentParentPayment{details = <<"Customer ID mismatch with parent">>})
+    end;
 maybe_inherit_customer_id(CustomerID, _VS) ->
     CustomerID.
 
@@ -2965,11 +2958,8 @@ construct_payment_resource(
     },
     RecToken =
         case maps:find(Key, Tokens) of
-            {ok, T} ->
-                T;
-            error ->
-                %% Cascade route without pre-existing token — use parent's token
-                get_recurrent_token(get_payment_state(InvoiceID, PaymentID))
+            {ok, T} -> T;
+            error -> get_recurrent_token(get_payment_state(InvoiceID, PaymentID))
         end,
     {recurrent_payment_resource, #proxy_provider_RecurrentPaymentResource{
         payment_tool = PaymentTool,

apps/hellgate/test/hg_direct_recurrent_tests_SUITE.erl

@@ -34,6 +34,7 @@
 -export([customer_id_stored_no_parent_test/1]).
 -export([cascade_tokens_filter_success_test/1]).
 -export([cascade_recurrent_payment_success_test/1]).
+-export([different_customer_id_test/1]).
 
 %% Internal types
 
@@ -91,6 +92,7 @@ groups() ->
         {cascade_tokens, [], [
             customer_id_stored_test,
             customer_id_stored_no_parent_test,
+            different_customer_id_test,
             cascade_tokens_filter_success_test,
             cascade_recurrent_payment_success_test
         ]}
@@ -452,6 +454,27 @@ customer_id_stored_no_parent_test(C) ->
     } = hg_client_invoicing:get_payment(InvoiceID, PaymentID, Client),
     ?assertEqual(CustomerID, StoredCustomerID).
 
+-spec different_customer_id_test(config()) -> test_result().
+different_customer_id_test(C) ->
+    Client = cfg(client, C),
+    PartyConfigRef = cfg(party_config_ref, C),
+    %% Create two different customers
+    #customer_Customer{id = CustomerA} = hg_customer_client:create_customer(PartyConfigRef),
+    #customer_Customer{id = CustomerB} = hg_customer_client:create_customer(PartyConfigRef),
+    %% Parent payment with CustomerA
+    Invoice1ID = start_invoice(<<"rubberduck">>, make_due_date(10), 42000, C),
+    Payment1BaseParams = make_payment_params(?pmt_sys(<<"visa-ref">>)),
+    Payment1Params = Payment1BaseParams#payproc_InvoicePaymentParams{customer_id = CustomerA},
+    {ok, Payment1ID} = start_payment(Invoice1ID, Payment1Params, Client),
+    Payment1ID = await_payment_capture(Invoice1ID, Payment1ID, Client),
+    %% Child recurrent payment with different CustomerB should be rejected
+    Invoice2ID = start_invoice(<<"rubberduck">>, make_due_date(10), 42000, C),
+    RecurrentParent = ?recurrent_parent(Invoice1ID, Payment1ID),
+    BaseParams = make_recurrent_payment_params(true, RecurrentParent, ?pmt_sys(<<"visa-ref">>)),
+    Payment2Params = BaseParams#payproc_InvoicePaymentParams{customer_id = CustomerB},
+    {error, #payproc_InvalidRecurrentParentPayment{details = <<"Customer ID mismatch with parent">>}} =
+        start_payment(Invoice2ID, Payment2Params, Client).
+
 -spec cascade_tokens_filter_success_test(config()) -> test_result().
 cascade_tokens_filter_success_test(C) ->
     Client = cfg(client, C),