Skip to content

Commit

Permalink
Merge pull request #367 from zesu22/feature/es-19
Browse files Browse the repository at this point in the history
  • Loading branch information
@gsasikumar
gsasikumar authored Sep 18, 2023
2 parents 9ae317d + 7da3f07 commit 25c6afd
Show file tree
Hide file tree
Showing 18 changed files with 409 additions and 314 deletions.
13 changes: 8 additions & 5 deletions esignet-service/src/main/resources/application-dev.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,13 +233,16 @@ crypto.PrependThumbprint.enable=true
# 1. linked-transaction-expire-in-secs value should be a sum of mosip.esignet.authentication-expire-in-secs and linked cache expire in seconds under mosip.esignet.cache.expire-in-seconds property
# 2. A new Qrcode will be autogenerated before the expiry of current qr-code, and the time difference in seconds for the same is defined in wallet.qr-code-buffer-in-secs property

mosip.esignet.ui.wallet.config={{'wallet.name': 'Inji 1', 'wallet.logo-url': 'inji_logo.png', 'wallet.download-uri': '#', \
'wallet.deep-link-uri': 'inji1://landing-page-name?linkCode=LINK_CODE&linkExpireDateTime=LINK_EXPIRE_DT' }, \
{'wallet.name': 'Inji 2', 'wallet.logo-url': 'inji_logo.png', 'wallet.download-uri': '#', \
'wallet.deep-link-uri': 'inji2://landing-page-name?linkCode=LINK_CODE&linkExpireDateTime=LINK_EXPIRE_DT' }}

mosip.esignet.ui.config.key-values={'sbi.env': 'Developer', 'sbi.timeout.DISC': 30, \
'sbi.timeout.DINFO': 30, 'sbi.timeout.CAPTURE': 30, 'sbi.capture.count.face': 1, 'sbi.capture.count.finger': 2, \
'sbi.capture.count.iris': 1, 'sbi.capture.score.face': 70, 'sbi.capture.score.finger':70, 'sbi.capture.score.iris':70, 'wallet.logo-url': 'inji_logo.png', \
'sbi.capture.count.iris': 1, 'sbi.capture.score.face': 70, 'sbi.capture.score.finger':70, 'sbi.capture.score.iris':70, \
'send.otp.channels':'email,phone', 'consent.screen.timeout-in-secs':${mosip.esignet.authentication-expire-in-secs}, \
'consent.screen.timeout-buffer-in-secs': 5, 'sbi.port.range': 4501-4600, 'sbi.bio.subtypes.iris': 'UNKNOWN', 'sbi.bio.subtypes.finger': 'UNKNOWN', \
'resend.otp.delay.secs': 120, 'captcha.enable': '', 'captcha.sitekey': '6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI', \
'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': ''}
'linked-transaction-expire-in-secs': 120, 'wallet.qr-code-buffer-in-secs': 10, 'auth.txnid.length': 10, \
'otp.length': 6, 'password.regex': '', 'wallet.config': ${mosip.esignet.ui.wallet.config}}
13 changes: 8 additions & 5 deletions esignet-service/src/main/resources/application-local.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,16 +240,19 @@ crypto.PrependThumbprint.enable=true
# 1. linked-transaction-expire-in-secs value should be a sum of mosip.esignet.authentication-expire-in-secs and linked cache expire in seconds under mosip.esignet.cache.expire-in-seconds property
# 2. A new Qrcode will be autogenerated before the expiry of current qr-code, and the time difference in seconds for the same is defined in wallet.qr-code-buffer-in-secs property

mosip.esignet.ui.wallet.config={{'wallet.name': 'Inji 1', 'wallet.logo-url': 'inji_logo.png', 'wallet.download-uri': '#', \
'wallet.deep-link-uri': 'inji1://landing-page-name?linkCode=LINK_CODE&linkExpireDateTime=LINK_EXPIRE_DT' }, \
{'wallet.name': 'Inji 2', 'wallet.logo-url': 'inji_logo.png', 'wallet.download-uri': '#', \
'wallet.deep-link-uri': 'inji2://landing-page-name?linkCode=LINK_CODE&linkExpireDateTime=LINK_EXPIRE_DT' }}

mosip.esignet.ui.config.key-values={'sbi.env': 'Developer', 'sbi.timeout.DISC': 30, \
'sbi.timeout.DINFO': 30, 'sbi.timeout.CAPTURE': 30, 'sbi.capture.count.face': 1, 'sbi.capture.count.finger': 2, \
'sbi.capture.count.iris': 1, 'sbi.capture.score.face': 70, 'sbi.capture.score.finger':70, 'sbi.capture.score.iris':70, 'wallet.logo-url': 'inji_logo.png', \
'sbi.capture.count.iris': 1, 'sbi.capture.score.face': 70, 'sbi.capture.score.finger':70, 'sbi.capture.score.iris':70, \
'send.otp.channels':'email,phone', 'consent.screen.timeout-in-secs':${mosip.esignet.authentication-expire-in-secs}, \
'consent.screen.timeout-buffer-in-secs': 5, 'sbi.port.range': 4501-4600, 'sbi.bio.subtypes.iris': 'UNKNOWN', 'sbi.bio.subtypes.finger': 'UNKNOWN', \
'resend.otp.delay.secs': 120, 'captcha.enable': '', 'captcha.sitekey': '6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI', \
'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': ''}
'linked-transaction-expire-in-secs': 120, 'wallet.qr-code-buffer-in-secs': 10, 'auth.txnid.length': 10, \
'otp.length': 6, 'password.regex': '', 'wallet.config': ${mosip.esignet.ui.wallet.config}}

## ---------------------------------------------- VCI ------------------------------------------------------------------

Expand Down
11 changes: 11 additions & 0 deletions oidc-ui/public/images/bio_icon.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions oidc-ui/public/images/otp_icon.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 17 additions & 0 deletions oidc-ui/public/images/wallet_icon.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 8 additions & 13 deletions oidc-ui/public/locales/ar.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,13 @@
"password_placeholder": "كلمة المرور"
},
"LoginQRCode": {
"sign_in_with_inji": "تسجيل الدخول باستخدام Inji",
"scan_with_inji": "امسح باستخدام تطبيق Inji لتسجيل الدخول",
"inji_app": "تطبيق إنجي",
"dont_have_inji": "ليس لديك إنجي؟",
"scan_with_wallet": "امسح باستخدام تطبيق {{walletName}} لتسجيل الدخول",
"dont_have_wallet": "؟{{walletName}} ليس لديك",
"download_now": "التحميل الان",
"link_code_status": "حالة رمز الارتباط",
"failed": "باءت بالفشل",
"refresh": "قم بتحديث رمز الاستجابة السريعة"
"refresh": "قم بتحديث رمز الاستجابة السريعة",
"open_wallet_app": "{{walletName}} افتح تطبيق"
},
"otp": {
"sign_in_with_otp": "تسجيل الدخول باستخدام OTP",
Expand All @@ -103,13 +102,13 @@
"login_option_heading": "اختر كيف تريد تسجيل الدخول:",
"login_with": "تسجيل الدخول باستخدام {{option}}",
"PIN": "دبوس",
"Inji": "Inji",
"Biometrics": "القياسات الحيوية",
"BIO": "القياسات الحيوية",
"QRCode": "رمز الاستجابة السريعة",
"WALLET": "إنجي",
"OTP": "OTP",
"PWD": "كلمة المرور"
"PWD": "كلمة المرور",
"preferred_mode_of_login": "حدد الوضع المفضل لتسجيل الدخول",
"more_ways_to_sign_in": "المزيد من الطرق لتسجيل الدخول"
},
"esignetDetails": {
"esignet_details_heading": "واجهات برمجة التطبيقات Esignet معروفة جيدا",
Expand All @@ -121,22 +120,18 @@
"login_linkName": "التسجيل المسبق",
"more_ways_to_sign_in": "المزيد من الطرق لتسجيل الدخول",
"invalid_auth_factor": "عوامل المصادقة غير صالحة. حاول مرة اخرى...",
"here_tab_name": "تسجيل الدخول هنا",
"inji_tab_name": "تسجيل الدخول باستخدام Inji",
"dont_have_inji": "ليس لديك إنجي؟",
"download_now": "التحميل الان",
"logo_alt": "e-Signet",
"backgroud_image_alt": "قم بتسجيل الدخول باستخدام e-Signet",
"language": "لغة"
},
"tabs": {
"pin_tab_name": "قم بتسجيل الدخول باستخدام PIN",
"inji_tab_name": "تسجيل الدخول باستخدام Inji",
"biometric_tab_name": "تسجيل الدخول باستخدام القياسات الحيوية"
},
"loadingMsgs": {
"redirecting_msg": "إعادة توجيه. أرجو الإنتظار...",
"link_auth_waiting": "يرجى المصادقة عبر INJI. لا تحديث هذه الصفحة",
"link_auth_waiting": "يرجى المصادقة عبر {{walletName}}. لا تقم بتحديث هذه الصفحة.",
"authenticating_msg": "المصادقة. أرجو الإنتظار...",
"scanning_devices_msg": "أجهزة المسح. أرجو الإنتظار...",
"capture_initiated_msg": "تم بدء الالتقاط {{modality}} في {{deviceModel}}",
Expand Down
21 changes: 8 additions & 13 deletions oidc-ui/public/locales/en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,13 @@
"password_placeholder": "Password"
},
"LoginQRCode": {
"sign_in_with_inji": "Login with Inji",
"scan_with_inji": "Scan with Inji App to Log In",
"inji_app": "Inji App",
"dont_have_inji": "Don't Have Inji?",
"scan_with_wallet": "Scan with {{walletName}} App to Log In",
"dont_have_wallet": "Don't Have {{walletName}}?",
"download_now": "Download Now",
"link_code_status": "Link Code Status",
"failed": "Failed",
"refresh": "Refresh QR Code"
"refresh": "Refresh QR Code",
"open_wallet_app": "Open {{walletName}} App"
},
"otp": {
"sign_in_with_otp": "Login with OTP",
Expand All @@ -103,13 +102,13 @@
"login_option_heading": "Choose How You Want to Login:",
"login_with": "Login with {{option}}",
"PIN": "PIN",
"Inji": "Inji",
"Biometrics": "Biometrics",
"BIO": "Biometrics",
"QRCode": "QR Code",
"WALLET": "Inji",
"OTP": "OTP",
"PWD": "Password"
"PWD": "Password",
"preferred_mode_of_login": "Select a preferred mode of login",
"more_ways_to_sign_in": "More ways to sign in"
},
"esignetDetails": {
"esignet_details_heading": "Esignet wellknown APIs",
Expand All @@ -121,22 +120,18 @@
"login_linkName": "Preregister",
"more_ways_to_sign_in": "More Ways to Login",
"invalid_auth_factor": "Invalid Auth Factors. Please Try Again...",
"here_tab_name": "Log In Here",
"inji_tab_name": "Log In with Inji",
"dont_have_inji": "Don't Have Inji?",
"download_now": "Download Now",
"logo_alt": "e-Signet",
"backgroud_image_alt": "Sign in with e-Signet",
"language": "Language"
},
"tabs": {
"pin_tab_name": "Login with PIN",
"inji_tab_name": "Login with Inji",
"biometric_tab_name": "Login with Biometrics"
},
"loadingMsgs": {
"redirecting_msg": "Redirecting. Please Wait...",
"link_auth_waiting": "Please Authenticate via Inji. Don't Refresh This Page.",
"link_auth_waiting": "Please Authenticate via {{walletName}}. Don't Refresh This Page.",
"authenticating_msg": "Authenticating. Please Wait...",
"scanning_devices_msg": "Scanning Devices. Please Wait...",
"capture_initiated_msg": "{{modality}} capture initiated on {{deviceModel}}",
Expand Down
8 changes: 2 additions & 6 deletions oidc-ui/src/common/LoadingIndicator.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,12 @@ const LoadingIndicator = ({
<>
<div
role="status"
style={{
display: "flex",
alignItems: "center",
justifyContent: "center",
}}
className="flex justify-center items-center"
>
<svg
style={dynamicSize[size]}
aria-hidden="true"
className="mr-2 w-8 h-8 text-gray-200 animate-spin dark:text-gray-600 fill-blue-600"
className="mr-2 rtl:ml-2 w-8 h-8 text-gray-200 animate-spin dark:text-gray-600 fill-blue-600"
viewBox="0 0 100 101"
fill="none"
xmlns="http://www.w3.org/2000/svg"
Expand Down
Loading

0 comments on commit 25c6afd

Please sign in to comment.