Merge pull request #299 from YaswanthNagarjuna/ES-206

[ES-206] Added configuration for the number of qrCode auto refresh before showing retry option.
mosip · Aug 9, 2023 · ace7e61 · ace7e61
2 parents 3de6439 + 84726c3
commit ace7e61
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 6 deletions.
diff --git a/esignet-service/src/main/resources/application-local.properties b/esignet-service/src/main/resources/application-local.properties
@@ -237,4 +237,4 @@ mosip.esignet.ui.config.key-values={'sbi.env': 'Developer', 'sbi.timeout.DISC':
   'linked-transaction-expire-in-secs': 120, 'wallet.qr-code-buffer-in-secs': 10, \
   'mosip.esignet.qr-code.deep-link-uri': 'inji://landing-page-name?linkCode=LINK_CODE&linkExpireDateTime=LINK_EXPIRE_DT', \
   'mosip.esignet.qr-code.download-uri': '#', 'mosip.esignet.qr-code.enable': 'true', 'auth.txnid.length': 10, \
-  'otp.length': 6, 'password.regex': ''}
+  'otp.length': 6, 'password.regex': '', 'wallet.qr-code.auto-refresh-limit': 3}
diff --git a/oidc-ui/.env b/oidc-ui/.env
@@ -43,4 +43,6 @@ REACT_APP_PASSWORD_REGEX=""
 
 REACT_APP_WALLET_LOGO_URL=""
 
-REACT_APP_CONSENT_SCREEN_TIME_OUT_BUFFER_IN_SEC=5
+REACT_APP_CONSENT_SCREEN_TIME_OUT_BUFFER_IN_SEC=5
+
+REACT_WALLET_QR_CODE_AUTO_REFRESH_LIMIT=3
diff --git a/oidc-ui/src/common/ErrorIndicator.js b/oidc-ui/src/common/ErrorIndicator.js
@@ -24,7 +24,7 @@ const ErrorIndicator = ({
   const { t } = useTranslation("translation", { keyPrefix: i18nKeyPrefix });
 
   //Redirecting if transaction invalid
-  if (errorCode === "invalid_transaction") {
+  if (errorCode === "invalid_transaction" || errorCode === "link_code_limit_reached") {
     let response = location.hash;
 
     if (!response) {
@@ -48,12 +48,12 @@ const ErrorIndicator = ({
     if (nonce) {
       params = params + "nonce=" + nonce + "&";
     }
-    params = params + "error_description=" + t(errorCode, defaultMsg) + "&";
+    params = params + "error_description=" + t("invalid_transaction", defaultMsg) + "&";
 
     //REQUIRED
     params = params + "state=" + state + "&";
     //REQUIRED
-    params = params + "error=" + errorCode;
+    params = params + "error=" + "invalid_transaction";
 
     window.location.replace(redirect_uri + params);
     return;

diff --git a/oidc-ui/src/components/LoginQRCode.js b/oidc-ui/src/components/LoginQRCode.js
@@ -49,6 +49,10 @@ export default function LoginQRCode({
       configurationKeys.walletLogoURL
     ) ?? process.env.REACT_APP_WALLET_LOGO_URL;
 
+  const walletQrCodeAutoRefreshLimit = openIDConnectService.getEsignetConfiguration(
+    configurationKeys.walletQrCodeAutoRefreshLimit
+  ) ?? process.env.REACT_WALLET_QR_CODE_AUTO_REFRESH_LIMIT;
+
   const GenerateQRCode = (response, logoUrl) => {
     let text =
       openIDConnectService.getEsignetConfiguration(
@@ -123,7 +127,17 @@ export default function LoginQRCode({
     };
   }, []);
 
+  let qrCodeRefreshCount = 0;
+
   const fetchQRCode = async () => {
+    // If successfulFetchQrCount is 3, stop QR code generation and show QR code expired with a refresh button.
+    if (qrCodeRefreshCount >= walletQrCodeAutoRefreshLimit) {
+      setError({
+        errorCode: "qr_code_expired",
+        defaultMsg: "QR Code Expired",
+      });
+      return;
+    }
     setQr("");
     setError(null);
     try {
@@ -177,6 +191,7 @@ export default function LoginQRCode({
           fetchQRCode();
         }, timeLeftWithBuffer * 1000);
         setQrCodeTimeout(_timer);
+        qrCodeRefreshCount++;
       }
     } catch (error) {
       setError({

diff --git a/oidc-ui/src/constants/clientConstants.js b/oidc-ui/src/constants/clientConstants.js
@@ -74,7 +74,8 @@ const configurationKeys = {
   passwordRegex : "password.regex",
   walletLogoURL: "wallet.logo-url",
   consentScreenExpireInSec: "consent.screen.timeout-in-secs",
-  consentScreenTimeOutBufferInSec: "consent.screen.timeout-buffer-in-secs"
+  consentScreenTimeOutBufferInSec: "consent.screen.timeout-buffer-in-secs",
+  walletQrCodeAutoRefreshLimit: "wallet.qr-code.auto-refresh-limit"
 };
 
 export {