Add browser and device info into ClientInfo

apps/capi/src/capi_handler_decoder.erl

@@ -115,11 +115,99 @@ decode_client_info_ext(ClientInfo) ->
         <<"ip">> => ClientInfo#domain_ClientInfo.ip_address,
         <<"peer_ip">> => ClientInfo#domain_ClientInfo.peer_ip_address,
         <<"user_ip">> => ClientInfo#domain_ClientInfo.user_ip_address,
-        <<"url">> => ClientInfo#domain_ClientInfo.url
+        <<"url">> => ClientInfo#domain_ClientInfo.url,
+        <<"browser_info">> => decode_browser_info(ClientInfo#domain_ClientInfo.browser_info),
+        <<"device_info">> => decode_device_info(ClientInfo#domain_ClientInfo.device_info),
+        <<"peer_user_agent">> => ClientInfo#domain_ClientInfo.peer_user_agent,
+        <<"peer_accept_header">> => ClientInfo#domain_ClientInfo.peer_accept_header
     }).
 
 %%
 
+decode_browser_info(undefined) ->
+    undefined;
+decode_browser_info(
+    #domain_BrowserInfo{
+        accept_header = AcceptHeader,
+        user_agent = UserAgent,
+        language = Language,
+        color_depth = ColorDepth,
+        screen_width = ScreenWidth,
+        screen_height = ScreenHeight,
+        tz_offset = TzOffset
+    }
+) ->
+    genlib_map:compact(#{
+        <<"browserAcceptHeader">> => AcceptHeader,
+        <<"browserUserAgent">> => UserAgent,
+        <<"browserLanguage">> => Language,
+        <<"browserColorDepth">> => ColorDepth,
+        <<"browserScreenWidth">> => ScreenWidth,
+        <<"browserScreenHeight">> => ScreenHeight,
+        <<"browserTZ">> => TzOffset
+    }).
+
+decode_device_info(undefined) ->
+    undefined;
+decode_device_info(
+    #domain_DeviceInfo{
+        device_type = DeviceType,
+        os_name = OsName,
+        os_version = OsVersion,
+        device_model = DeviceModel,
+        browser_name = BrowserName,
+        browser_version = BrowserVersion,
+        time_zone = TimeZone,
+        languages = Languages,
+        screen_pixel_ratio = ScreenPixelRatio,
+        web_view = WebView,
+        user_agent_brands = UserAgentBrands
+    }
+) ->
+    genlib_map:compact(#{
+        <<"deviceType">> => decode_device_type(DeviceType),
+        <<"osName">> => OsName,
+        <<"osVersion">> => OsVersion,
+        <<"deviceModel">> => DeviceModel,
+        <<"browserName">> => BrowserName,
+        <<"browserVersion">> => BrowserVersion,
+        <<"timeZone">> => TimeZone,
+        <<"languages">> => Languages,
+        <<"screenPixelRatio">> => ScreenPixelRatio,
+        <<"webView">> => WebView,
+        <<"userAgentBrands">> => decode_brands(UserAgentBrands)
+    }).
+
+decode_device_type(undefined) ->
+    undefined;
+decode_device_type({desktop, #domain_DeviceTypeDesktop{}}) ->
+    <<"desktop">>;
+decode_device_type({mobile, #domain_DeviceTypeMobile{}}) ->
+    <<"mobile">>;
+decode_device_type({tablet, #domain_DeviceTypeTablet{}}) ->
+    <<"tablet">>;
+decode_device_type({unknown, #domain_DeviceTypeUnknown{}}) ->
+    <<"unknown">>.
+
+decode_brands(undefined) ->
+    undefined;
+decode_brands(UserAgentBrands) ->
+    lists:map(
+        fun(Brand) -> decode_brand(Brand) end,
+        UserAgentBrands
+    ).
+
+decode_brand(
+    #domain_UserAgentBrand{
+        brand = Brand,
+        version = Version
+    }
+) ->
+    genlib_map:compact(#{
+        <<"brand">> => Brand,
+        <<"version">> => Version
+    }).
+
 -define(PAN_LENGTH, 16).
 
 -spec decode_masked_pan(binary() | undefined, binary()) -> binary().

apps/capi/src/capi_handler_encoder.erl

@@ -19,7 +19,11 @@ encode_client_info(ClientInfo) ->
         ip_address = maps:get(<<"ip">>, ClientInfo),
         peer_ip_address = maps:get(<<"peer_ip">>, ClientInfo),
         user_ip_address = maps:get(<<"user_ip">>, ClientInfo),
-        url = maps:get(<<"url">>, ClientInfo, undefined)
+        url = maps:get(<<"url">>, ClientInfo, undefined),
+        browser_info = encode_browser_info(maps:get(<<"browserInfo">>, ClientInfo, undefined)),
+        device_info = encode_device_info(maps:get(<<"deviceInfo">>, ClientInfo, undefined)),
+        peer_user_agent = maps:get(<<"peer_user_agent">>, ClientInfo, undefined),
+        peer_accept_header = maps:get(<<"peer_accept_header">>, ClientInfo, undefined)
     }.
 
 -spec encode_content(json, term()) -> encode_data().
@@ -32,3 +36,60 @@ encode_content(json, Data) ->
 -spec encode_crypto_currency(binary()) -> encode_data().
 encode_crypto_currency(CryptoCurrency) ->
     #domain_CryptoCurrencyRef{id = CryptoCurrency}.
+
+%% Internals
+
+encode_browser_info(undefined) ->
+    undefined;
+encode_browser_info(BrowserInfo) ->
+    #domain_BrowserInfo{
+        accept_header = maps:get(<<"browserAcceptHeader">>, BrowserInfo, undefined),
+        user_agent = maps:get(<<"browserUserAgent">>, BrowserInfo, undefined),
+        language = maps:get(<<"browserLanguage">>, BrowserInfo, undefined),
+        color_depth = maps:get(<<"browserColorDepth">>, BrowserInfo, undefined),
+        screen_width = maps:get(<<"browserScreenWidth">>, BrowserInfo, undefined),
+        screen_height = maps:get(<<"browserScreenHeight">>, BrowserInfo, undefined),
+        tz_offset = maps:get(<<"browserTZ">>, BrowserInfo, undefined)
+    }.
+
+encode_device_info(undefined) ->
+    undefined;
+encode_device_info(DeviceInfo) ->
+    #domain_DeviceInfo{
+        device_type = encode_device_type(maps:get(<<"deviceType">>, DeviceInfo, undefined)),
+        os_name = maps:get(<<"osName">>, DeviceInfo, undefined),
+        os_version = maps:get(<<"osVersion">>, DeviceInfo, undefined),
+        device_model = maps:get(<<"deviceModel">>, DeviceInfo, undefined),
+        browser_name = maps:get(<<"browserName">>, DeviceInfo, undefined),
+        browser_version = maps:get(<<"browserVersion">>, DeviceInfo, undefined),
+        time_zone = maps:get(<<"timeZone">>, DeviceInfo, undefined),
+        languages = maps:get(<<"languages">>, DeviceInfo, undefined),
+        screen_pixel_ratio = maps:get(<<"screenPixelRatio">>, DeviceInfo, undefined),
+        web_view = maps:get(<<"webView">>, DeviceInfo, undefined),
+        user_agent_brands = encode_brands(maps:get(<<"userAgentBrands">>, DeviceInfo, undefined))
+    }.
+
+encode_device_type(undefined) ->
+    undefined;
+encode_device_type(<<"desktop">>) ->
+    {desktop, #domain_DeviceTypeDesktop{}};
+encode_device_type(<<"mobile">>) ->
+    {mobile, #domain_DeviceTypeMobile{}};
+encode_device_type(<<"tablet">>) ->
+    {tablet, #domain_DeviceTypeTablet{}};
+encode_device_type(<<"unknown">>) ->
+    {unknown, #domain_DeviceTypeUnknown{}}.
+
+encode_brands(undefined) ->
+    undefined;
+encode_brands(UserAgentBrands) ->
+    lists:map(
+        fun(Brand) -> encode_brand(Brand) end,
+        UserAgentBrands
+    ).
+
+encode_brand(Brand) ->
+    #domain_UserAgentBrand{
+        brand = maps:get(<<"brand">>, Brand, undefined),
+        version = maps:get(<<"version">>, Brand, undefined)
+    }.

apps/capi/src/capi_handler_tokens.erl

@@ -8,6 +8,7 @@
 -include_lib("cds_proto/include/cds_proto_storage_thrift.hrl").
 -include_lib("tds_proto/include/tds_storage_thrift.hrl").
 -include_lib("damsel/include/dmsl_paytool_provider_thrift.hrl").
+-include_lib("damsel/include/dmsl_domain_conf_v2_thrift.hrl").
 -include_lib("moneypenny/include/mnp_thrift.hrl").
 
 -include_lib("bouncer_proto/include/bouncer_rstn_thrift.hrl").
@@ -89,10 +90,13 @@ process_request('CreatePaymentResource', Req, Context, Resolution) ->
                 end
         end,
 
+    Headers = capi_handler_utils:request_headers(Context),
     ClientInfo1 = ClientInfo0#{
         <<"ip">> => ClientIP,
         <<"peer_ip">> => PeerIP,
-        <<"user_ip">> => UserIP
+        <<"user_ip">> => UserIP,
+        <<"peer_user_agent">> => maps:get(<<"user-agent">>, Headers, undefined),
+        <<"peer_accept_header">> => maps:get(<<"accept">>, Headers, undefined)
     },
 
     try
@@ -748,4 +752,10 @@ encode_payment_service_ref(Provider) ->
     #domain_PaymentServiceRef{id = Provider}.
 
 validate_payment_service_ref(#domain_PaymentServiceRef{} = Ref) ->
-    dmt_client:try_checkout_data({payment_service, Ref}).
+    try dmt_client:checkout_object({payment_service, Ref}) of
+        Object ->
+            {ok, Object}
+    catch
+        throw:#domain_conf_v2_ObjectNotFound{} ->
+            {error, object_not_found}
+    end.

apps/capi/src/capi_handler_utils.erl

@@ -8,6 +8,8 @@
 
 -export([get_auth_context/1]).
 
+-export([request_headers/1]).
+
 -export([get_party_id/1]).
 
 -export([merge_and_compact/2]).
@@ -82,6 +84,12 @@ service_call({ServiceName, Function, Args}, #{woody_context := WoodyContext}) ->
 get_auth_context(#{swagger_context := #{auth_context := AuthContext}}) ->
     AuthContext.
 
+-spec request_headers(processing_context()) -> cowboy:http_headers().
+request_headers(#{swagger_context := #{cowboy_req := Req}}) ->
+    cowboy_req:headers(Req);
+request_headers(_) ->
+    #{}.
+
 %% Utils
 
 -spec merge_and_compact(map(), map()) -> map().

apps/capi/src/capi_merchant_id.erl

@@ -1,9 +1,10 @@
 -module(capi_merchant_id).
 
 -include_lib("damsel/include/dmsl_paytool_provider_thrift.hrl").
+-include_lib("damsel/include/dmsl_domain_thrift.hrl").
 
--type party_id() :: dmsl_domain_thrift:'PartyID'().
--type shop_id() :: dmsl_domain_thrift:'ShopID'().
+-type party_id() :: dmsl_base_thrift:'ID'().
+-type shop_id() :: dmsl_base_thrift:'ID'().
 -type realm() :: dmsl_domain_thrift:'PaymentInstitutionRealm'().
 -type merchant_data() :: dmsl_paytool_provider_thrift:'MerchantID'().
 -type merchant_id() :: binary().
@@ -18,11 +19,11 @@
 -define(THRIFT_TYPE, {struct, struct, {dmsl_paytool_provider_thrift, 'MerchantID'}}).
 
 -spec party_id(merchant_data()) -> party_id().
-party_id(#paytool_provider_MerchantID{party_id = PartyID}) ->
+party_id(#paytool_provider_MerchantID{party_ref = #domain_PartyConfigRef{id = PartyID}}) ->
     PartyID.
 
 -spec shop_id(merchant_data()) -> shop_id().
-shop_id(#paytool_provider_MerchantID{shop_id = ShopID}) ->
+shop_id(#paytool_provider_MerchantID{shop_ref = #domain_ShopConfigRef{id = ShopID}}) ->
     ShopID.
 
 -spec realm(merchant_data()) -> realm() | undefined.
@@ -32,8 +33,8 @@ realm(#paytool_provider_MerchantID{realm = Realm}) ->
 -spec encode(realm(), party_id(), shop_id()) -> merchant_id().
 encode(Realm, PartyID, ShopID) ->
     encode(#paytool_provider_MerchantID{
-        party_id = PartyID,
-        shop_id = ShopID,
+        party_ref = #domain_PartyConfigRef{id = PartyID},
+        shop_ref = #domain_ShopConfigRef{id = ShopID},
         realm = Realm
     }).
 

apps/capi/test/capi_ct_helper.erl

@@ -4,7 +4,7 @@
 -include_lib("capi_dummy_data.hrl").
 -include_lib("capi_token_keeper_data.hrl").
 -include_lib("damsel/include/dmsl_domain_thrift.hrl").
--include_lib("damsel/include/dmsl_domain_conf_thrift.hrl").
+-include_lib("damsel/include/dmsl_domain_conf_v2_thrift.hrl").
 
 -export([init_suite/2]).
 -export([init_suite/3]).
@@ -70,33 +70,41 @@ init_suite(Module, Config, CapiEnv) ->
     ServiceURLs = mock_services_(
         [
             {
-                'Repository',
-                {dmsl_domain_conf_thrift, 'Repository'},
-                fun('Checkout', _) ->
-                    {ok, #domain_conf_Snapshot{
-                        version = 1,
-                        domain = #{
-                            ?PAYMENT_SYSTEM_REF(<<"VISA">>) =>
-                                ?PAYMENT_SYSTEM_OBJ(
-                                    <<"VISA">>,
-                                    bankcard_validator_legacy:get_payment_system_ruleset(<<"VISA">>)
-                                ),
-                            ?PAYMENT_SYSTEM_REF(<<"MASTERCARD">>) =>
-                                ?PAYMENT_SYSTEM_OBJ(
-                                    <<"MASTERCARD">>,
-                                    bankcard_validator_legacy:get_payment_system_ruleset(<<"MASTERCARD">>)
-                                ),
-                            ?PAYMENT_SERVICE_REF(<<"qiwi">>) =>
-                                ?PAYMENT_SERVICE_OBJ(
-                                    <<"qiwi">>
-                                ),
-                            ?PAYMENT_SERVICE_REF(<<"euroset">>) =>
-                                ?PAYMENT_SERVICE_OBJ(
-                                    <<"euroset">>
-                                )
-                        }
-                    }}
+                'RepositoryClient',
+                {dmsl_domain_conf_v2_thrift, 'RepositoryClient'},
+                fun
+                    ('CheckoutObject', {{version, V}, ?PAYMENT_SYSTEM_REF(<<"VISA">>)}) ->
+                        PaymentSystemObject = ?PAYMENT_SYSTEM_OBJ(
+                            <<"VISA">>,
+                            bankcard_validator_legacy:get_payment_system_ruleset(<<"VISA">>)
+                        ),
+                        {ok, mk_versioned_object(PaymentSystemObject, V)};
+                    ('CheckoutObject', {{version, V}, ?PAYMENT_SYSTEM_REF(<<"MASTERCARD">>)}) ->
+                        PaymentSystemObject = ?PAYMENT_SYSTEM_OBJ(
+                            <<"VISA">>,
+                            bankcard_validator_legacy:get_payment_system_ruleset(<<"MASTERCARD">>)
+                        ),
+                        {ok, mk_versioned_object(PaymentSystemObject, V)};
+                    ('CheckoutObject', {{version, V}, ?PAYMENT_SYSTEM_REF(<<"NSPK MIR">>)}) ->
+                        PaymentSystemObject = ?PAYMENT_SYSTEM_OBJ(
+                            <<"NSPK MIR">>,
+                            bankcard_validator_legacy:get_payment_system_ruleset(<<"NSPK MIR">>)
+                        ),
+                        {ok, mk_versioned_object(PaymentSystemObject, V)};
+                    ('CheckoutObject', {{version, V}, ?PAYMENT_SERVICE_REF(<<"qiwi">>)}) ->
+                        PaymentServiceObject = ?PAYMENT_SERVICE_OBJ(<<"qiwi">>),
+                        {ok, mk_versioned_object(PaymentServiceObject, V)};
+                    ('CheckoutObject', {{version, V}, ?PAYMENT_SERVICE_REF(<<"euroset">>)}) ->
+                        PaymentServiceObject = ?PAYMENT_SERVICE_OBJ(<<"euroset">>),
+                        {ok, mk_versioned_object(PaymentServiceObject, V)};
+                    ('CheckoutObject', {{version, _V}, _ObjectRef}) ->
+                        erlang:throw(#domain_conf_v2_ObjectNotFound{})
                 end
+            },
+            {
+                'Repository',
+                {dmsl_domain_conf_v2_thrift, 'Repository'},
+                fun('GetLatestVersion', _) -> {ok, ?INTEGER} end
             }
         ],
         SupPid
@@ -282,3 +290,17 @@ get_lifetime(YY, MM, DD) ->
         <<"months">> => MM,
         <<"days">> => DD
     }.
+
+mk_versioned_object(Object, Version) ->
+    #domain_conf_v2_VersionedObject{
+        info = #domain_conf_v2_VersionedObjectInfo{
+            version = Version,
+            changed_at = genlib_rfc3339:format(genlib_time:unow(), second),
+            changed_by = #domain_conf_v2_Author{
+                id = ?STRING,
+                name = ?STRING,
+                email = ?STRING
+            }
+        },
+        object = Object
+    }.

apps/capi/test/capi_dummy_data.hrl

@@ -98,3 +98,31 @@
         message_expiration = ?TIMESTAMP
     }}
 ).
+
+-define(BROWSER_INFO, #{
+    <<"browserAcceptHeader">> => <<"application/json">>,
+    <<"browserUserAgent">> => <<"chromium">>,
+    <<"browserLanguage">> => <<"ru-RU">>,
+    <<"browserColorDepth">> => <<"24">>,
+    <<"browserScreenWidth">> => <<"1080">>,
+    <<"browserScreenHeight">> => <<"1080">>,
+    <<"browserTZ">> => <<"-480">>
+}).
+
+-define(DEVICE_INFO, #{
+    <<"deviceType">> => <<"desktop">>,
+    <<"osName">> => <<"iOS">>,
+    <<"osVersion">> => <<"17.5.1">>,
+    <<"deviceModel">> => <<"iPhone">>,
+    <<"browserName">> => <<"Safari">>,
+    <<"browserVersion">> => <<"126">>,
+    <<"timeZone">> => <<"Asia/Dubai">>,
+    <<"languages">> => [<<"ru">>, <<"en">>],
+    <<"screenPixelRatio">> => 2,
+    <<"webView">> => true,
+    <<"userAgentBrands">> => [?USER_AGENT_BRAND(<<"Chrome">>), ?USER_AGENT_BRAND(<<"Firefox">>)]
+}).
+
+-define(USER_AGENT_BRAND(Name), #{
+    <<"brand">> => Name
+}).