Merge branch 'master' into deriv_auth_user_tracking

deriv-com · Jun 25, 2024 · 4235550 · 4235550
2 parents 1693f06 + b0b66da
commit 4235550
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/packages/deriv_web_view/lib/deriv_web_view.dart b/packages/deriv_web_view/lib/deriv_web_view.dart
@@ -154,6 +154,7 @@ Future<void> openLoggedInWebPage({
   required String appToken,
   required String userAgent,
   required String platform,
+  String? languageCode,
   HttpClientPredicate? getHttpClient,
   String destinationAppId = '16929',
   String? action,
@@ -179,6 +180,7 @@ Future<void> openLoggedInWebPage({
     action: action,
     code: code,
     platform: platform,
+    languageCode: languageCode
   );
 
   if (oneTimeToken == null) {
@@ -219,6 +221,7 @@ Future<void> openLoggedInWebPage({
             action: action,
             code: code,
             platform: platform,
+            languageCode: languageCode,
           );
         }
 
@@ -252,6 +255,7 @@ Future<String?> _fetchOneTimeToken({
   HttpClientPredicate? getHttpClient,
   String? action,
   String? code,
+  String? languageCode,
 }) async {
   loadingDialog(context);
 
@@ -267,6 +271,7 @@ Future<String?> _fetchOneTimeToken({
     code: code,
     getHttpClient: getHttpClient,
     platform: platform,
+    languageCode: languageCode,
   );
 
   Navigator.of(context, rootNavigator: rootNavigator).pop();
@@ -287,6 +292,7 @@ Future<String?> _getOneTimeToken({
   HttpClientPredicate? getHttpClient,
   String? action,
   String? code,
+  String? languageCode,
 }) async {
   try {
     final String? token = await performPassThroughAuthentication(
@@ -301,6 +307,7 @@ Future<String?> _getOneTimeToken({
       code: code,
       getHttpClient: getHttpClient,
       platform: platform,
+      languageCode: languageCode,
     );
 
     return token;
@@ -327,6 +334,7 @@ Future<String?> _validateCredentials({
   HttpClientPredicate? getHttpClient,
   String? action,
   String? code,
+  String? languageCode,
 }) async {
   final String? oneTimeToken = await _fetchOneTimeToken(
     context: context,
@@ -343,6 +351,7 @@ Future<String?> _validateCredentials({
     action: action,
     code: code,
     platform: platform,
+    languageCode: languageCode,
   );
 
   if (oneTimeToken == null) {

diff --git a/packages/deriv_web_view/lib/helper.dart b/packages/deriv_web_view/lib/helper.dart
@@ -26,6 +26,7 @@ Future<String?> performPassThroughAuthentication({
   HttpClientPredicate? getHttpClient,
   String? action,
   String? code,
+  String? languageCode,
 }) async {
   final url = getPtaLoginUrl(host: endpoint);
 
@@ -47,6 +48,7 @@ Future<String?> performPassThroughAuthentication({
       platform: platform,
       action: action,
       code: code,
+      languageCode: languageCode,
     ),
   ).toJson();
 

diff --git a/packages/deriv_web_view/lib/models/pta_login_request_model.dart b/packages/deriv_web_view/lib/models/pta_login_request_model.dart
@@ -33,6 +33,7 @@ class UrlParamsModel {
     required this.platform,
     this.action,
     this.code,
+    this.languageCode,
   });
 
   /// URL that user should be redirected to for example `/cashier`.
@@ -50,12 +51,16 @@ class UrlParamsModel {
   /// Code.
   final String? code;
 
+  /// language code
+  final String? languageCode;
+
   /// Converts a instance of this class to json.
   Map<String, dynamic> toJson() => <String, dynamic>{
         'redirect_url': redirectUrl,
         'selected_acct': selectedAccount,
         if (action != null) 'action': action,
         if (code != null) 'code': code,
         'platform': platform,
+        if (languageCode != null) 'lang': languageCode,
       };
 }