From f5c90757907c84e7793abc5f5cb35d7bd6b6481e Mon Sep 17 00:00:00 2001
From: fraudlabspro <support@fraudlabspro.com>
Date: Thu, 3 Sep 2020 08:57:51 +0800
Subject: [PATCH] Implement SMS OTP timeout

---
 Block/Fraudlabsprosmsverificationsend.php | 2 ++
 CHANGELOG                                 | 5 ++++-
 composer.json                             | 2 +-
 etc/adminhtml/system.xml                  | 8 ++++++--
 etc/config.xml                            | 1 +
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/Block/Fraudlabsprosmsverificationsend.php b/Block/Fraudlabsprosmsverificationsend.php
index adf827f..8ba4986 100644
--- a/Block/Fraudlabsprosmsverificationsend.php
+++ b/Block/Fraudlabsprosmsverificationsend.php
@@ -26,6 +26,7 @@ public function getOrder($id)
     public function methodBlock()
     {
         $apiKey = ($this->getConfig()->getValue('fraudlabsprosmsverification/active_display/api_key')) ? $this->getConfig()->getValue('fraudlabsprosmsverification/active_display/api_key') : 'API Key cannot be empty.';
+        $otpTimeout = ($this->getConfig()->getValue('fraudlabsprosmsverification/active_display/otp_timeout')) ? $this->getConfig()->getValue('fraudlabsprosmsverification/active_display/otp_timeout') : 3600;
         if ($apiKey == 'Phone number cannot be empty.') return 'API Key cannot be empty.';
         $tel = (filter_input(INPUT_POST, 'tel')) ? (filter_input(INPUT_POST, 'tel')) : 'Phone number cannot be empty.';
         if ($tel == 'Phone number cannot be empty.') return 'Phone number cannot be empty.';
@@ -38,6 +39,7 @@ public function methodBlock()
             $params['tel'] = '+' . $params['tel'];
         $params['mesg'] = ($this->getConfig()->getValue('fraudlabsprosmsverification/active_display/sms_template')) ? $this->getConfig()->getValue('fraudlabsprosmsverification/active_display/sms_template') : 'Hi, your OTP for Magento is {otp}.';
         $params['mesg'] = str_replace(['{', '}'], ['<', '>'], $params['mesg']);
+        $params['otp_timeout'] = $otpTimeout;
         $url = 'https://api.fraudlabspro.com/v1/verification/send';
 
         $query = '';
diff --git a/CHANGELOG b/CHANGELOG
index 2107a75..c084c03 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,4 +6,7 @@ Revision History for FraudLabs Pro Magento 2
         Minor fixes.
 
 1.0.2 2019-12-26
-        Bug fixes.
\ No newline at end of file
+        Bug fixes.
+
+1.1.0 2020-09-02
+        Implement SMS OTP timeout.
\ No newline at end of file
diff --git a/composer.json b/composer.json
index d43859e..93fe0a9 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "hexasoft/module-fraudlabsprosmsverification",
     "description": "FraudLabs Pro SMS Verification extension for Magento 2 that help merchants to authenticate the client's identity by sending them a SMS for verification.",
-    "version": "1.0.2",
+    "version": "1.1.0",
     "type": "magento2-module",
     "require": {
         "php": "~5.5.0|~5.6.0|~7.0"
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index d9ba0e7..3c36c31 100644
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -27,11 +27,15 @@
                     <label>SMS Template</label>
                     <comment><![CDATA[Template for SMS. Use <strong>{otp}</strong> for the generated OTP. The maximum length for SMS template must be <strong>less than 140 characters</strong>.]]></comment>
                 </field>
-                <field id="email_subject" translate="label" type="text" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="otp_timeout" translate="label" type="text" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>SMS OTP Timeout</label>
+                    <comment><![CDATA[Timeout feature for OTP value in seconds. Default is 3600 seconds(1 hour). Max timeout is 86400 seconds(24 hours).]]></comment>
+                </field>
+                <field id="email_subject" translate="label" type="text" sortOrder="6" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Email Subject</label>
                     <comment><![CDATA[Subject or title of the mail.]]></comment>
                 </field>
-                <field id="email_body" translate="label" type="textarea" sortOrder="6" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="email_body" translate="label" type="textarea" sortOrder="7" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Email Body</label>
                     <comment><![CDATA[Content of the mail. The <strong>{email_verification_link}</strong> tag will be automatically replaced with the page URL for SMS verification, and must not be removed from the email body.]]></comment>
                 </field>
diff --git a/etc/config.xml b/etc/config.xml
index 7ef73eb..2624c78 100644
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -8,6 +8,7 @@
                 <api_key></api_key>
                 <sms_instruction>You are required to verify your phone number using SMS verification. Please make sure you enter the complete phone number (including the country code) and click on the below button to request for an OTP (One Time Password) SMS.</sms_instruction>
                 <sms_template>Hi, your OTP for Magento is {otp}.</sms_template>
+                <otp_timeout>3600</otp_timeout>
                 <email_subject>Action Required: SMS Verification is required to process the order.</email_subject>
                 <email_body>Dear Customer, Thanks for your business. Before we can continue processing your order, you may require you to click on the link to complete the SMS verification: {email_verification_link} Thank you.</email_body>
             </general>