feat: Show Wrong pin code message #1902

TalaoDAO · Sep 14, 2023 · 58cdfde · 58cdfde
1 parent 586f649
commit 58cdfde
Show file tree

Hide file tree

Showing 8 changed files with 63 additions and 26 deletions.
diff --git a/lib/app/shared/enum/message/response_string/response_string.dart b/lib/app/shared/enum/message/response_string/response_string.dart
@@ -154,4 +154,5 @@ enum ResponseString {
   RESPONSE_STRING_theCredentialIsNotReady,
   RESPONSE_STRING_theCredentialIsNoMoreReady,
   RESPONSE_STRING_theRequestIsRejected,
+  RESPONSE_STRING_userPinIsIncorrect,
 }
diff --git a/lib/app/shared/enum/message/response_string/response_string_extension.dart b/lib/app/shared/enum/message/response_string/response_string_extension.dart
@@ -486,6 +486,9 @@ extension ResponseStringX on ResponseString {
 
       case ResponseString.RESPONSE_STRING_theRequestIsRejected:
         return globalMessage.RESPONSE_STRING_theRequestIsRejected;
+
+      case ResponseString.RESPONSE_STRING_userPinIsIncorrect:
+        return globalMessage.RESPONSE_STRING_userPinIsIncorrect;
     }
   }
 }
diff --git a/lib/app/shared/message_handler/global_message.dart b/lib/app/shared/message_handler/global_message.dart
@@ -386,4 +386,5 @@ class GlobalMessage {
   String get RESPONSE_STRING_theCredentialIsNoMoreReady =>
       l10n.theCredentialIsNoMoreReady;
   String get RESPONSE_STRING_theRequestIsRejected => l10n.theRequestIsRejected;
+  String get RESPONSE_STRING_userPinIsIncorrect => l10n.userPinIsIncorrect;
 }
diff --git a/lib/app/shared/message_handler/response_message.dart b/lib/app/shared/message_handler/response_message.dart
@@ -723,6 +723,11 @@ class ResponseMessage with MessageHandler {
           return ResponseString.RESPONSE_STRING_theRequestIsRejected.localise(
             context,
           );
+
+        case ResponseString.RESPONSE_STRING_userPinIsIncorrect:
+          return ResponseString.RESPONSE_STRING_userPinIsIncorrect.localise(
+            context,
+          );
       }
     }
     return '';

diff --git a/lib/dashboard/qr_code/qr_code_scan/cubit/qr_code_scan_cubit.dart b/lib/dashboard/qr_code/qr_code_scan/cubit/qr_code_scan_cubit.dart
@@ -1015,17 +1015,43 @@ class QRCodeScanCubit extends Cubit<QRCodeScanState> {
       oidc4vc.resetNonceAndAccessTokenAndAuthorizationDetails();
       goBack();
     } catch (e) {
-      if (e is MessageHandler) {
-        emit(state.copyWith(message: StateMessage.error(messageHandler: e)));
-      } else {
-        emit(
-          state.copyWith(
-            message: StateMessage.error(
-              messageHandler: ResponseMessage(
+      if (e is DioException) {
+        final error = NetworkException.getDioException(error: e);
+
+        if (error.message == NetworkError.NETWORK_ERROR_BAD_REQUEST) {
+          final data = error.data;
+
+          if (data != null &&
+              data is Map &&
+              data.containsKey('error') &&
+              data['error'] == 'invalid_grant') {
+            emitError(
+              ResponseMessage(
+                ResponseString.RESPONSE_STRING_userPinIsIncorrect,
+              ),
+            );
+          } else {
+            emitError(
+              ResponseMessage(
                 ResponseString
                     .RESPONSE_STRING_SOMETHING_WENT_WRONG_TRY_AGAIN_LATER,
               ),
+            );
+          }
+        } else {
+          emitError(
+            ResponseMessage(
+              ResponseString
+                  .RESPONSE_STRING_SOMETHING_WENT_WRONG_TRY_AGAIN_LATER,
             ),
+          );
+        }
+      } else if (e is MessageHandler) {
+        emit(state.copyWith(message: StateMessage.error(messageHandler: e)));
+      } else {
+        emitError(
+          ResponseMessage(
+            ResponseString.RESPONSE_STRING_SOMETHING_WENT_WRONG_TRY_AGAIN_LATER,
           ),
         );
       }

diff --git a/lib/l10n/arb/app_en.arb b/lib/l10n/arb/app_en.arb
@@ -947,5 +947,6 @@
   "theCredentialIsNoMoreReady": "The ceredential is no more available.",
   "lowSecurity": "Low Security",
   "highSecurity": "High Security",
-  "theRequestIsRejected": "The request is rejected."
+  "theRequestIsRejected": "The request is rejected.",
+  "userPinIsIncorrect": "User pin is incorrect"
 }
diff --git a/lib/l10n/untranslated.json b/lib/l10n/untranslated.json
@@ -853,7 +853,8 @@
     "theCredentialIsNoMoreReady",
     "lowSecurity",
     "highSecurity",
-    "theRequestIsRejected"
+    "theRequestIsRejected",
+    "userPinIsIncorrect"
   ],
 
   "es": [
@@ -1710,7 +1711,8 @@
     "theCredentialIsNoMoreReady",
     "lowSecurity",
     "highSecurity",
-    "theRequestIsRejected"
+    "theRequestIsRejected",
+    "userPinIsIncorrect"
   ],
 
   "fr": [
@@ -1870,7 +1872,8 @@
     "theCredentialIsNoMoreReady",
     "lowSecurity",
     "highSecurity",
-    "theRequestIsRejected"
+    "theRequestIsRejected",
+    "userPinIsIncorrect"
   ],
 
   "it": [
@@ -2727,6 +2730,7 @@
     "theCredentialIsNoMoreReady",
     "lowSecurity",
     "highSecurity",
-    "theRequestIsRejected"
+    "theRequestIsRejected",
+    "userPinIsIncorrect"
   ]
 }
diff --git a/packages/oidc4vc/lib/src/oidc4vc.dart b/packages/oidc4vc/lib/src/oidc4vc.dart
@@ -709,21 +709,17 @@ class OIDC4VC {
     String tokenEndPoint,
     Map<String, dynamic> tokenData,
   ) async {
-    try {
-      /// getting token
-      final tokenHeaders = <String, dynamic>{
-        'Content-Type': 'application/x-www-form-urlencoded',
-      };
+    /// getting token
+    final tokenHeaders = <String, dynamic>{
+      'Content-Type': 'application/x-www-form-urlencoded',
+    };
 
-      final dynamic tokenResponse = await client.post<Map<String, dynamic>>(
-        tokenEndPoint,
-        options: Options(headers: tokenHeaders),
-        data: tokenData,
-      );
-      return tokenResponse.data;
-    } catch (e) {
-      throw Exception(e);
-    }
+    final dynamic tokenResponse = await client.post<Map<String, dynamic>>(
+      tokenEndPoint,
+      options: Options(headers: tokenHeaders),
+      data: tokenData,
+    );
+    return tokenResponse.data;
   }
 
   Future<void> sendPresentation({