From 1d81f54c12b663be8802383f6c11d3d533dbfa01 Mon Sep 17 00:00:00 2001
From: Chirag Dodia <chirag.dodia@wagento.com>
Date: Fri, 30 Oct 2020 17:09:13 +0530
Subject: [PATCH 01/25] [WAGMODS-99] Removed deprecated methods and make code
 comapatible with latest class

---
 Controller/Index/AjaxPost.php               | 35 ++++++++----
 registration.php                            |  7 ++-
 view/frontend/templates/form/register.phtml | 59 +++++++++++----------
 3 files changed, 60 insertions(+), 41 deletions(-)

diff --git a/Controller/Index/AjaxPost.php b/Controller/Index/AjaxPost.php
index 8b499b5..ad266a2 100644
--- a/Controller/Index/AjaxPost.php
+++ b/Controller/Index/AjaxPost.php
@@ -15,8 +15,8 @@
 namespace Wagento\HIBP\Controller\Index;
 
 use Dragonbe\Hibp\HibpFactory;
-use Magento\Framework\App\Action\Action;
-use Magento\Framework\App\Action\Context;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Exception\NotFoundException;
 
@@ -26,20 +26,35 @@
  * @package Wagento\HIBP\Controller\Index
  * @author Joseph Leedy <joseph@wagento.com>
  */
-class AjaxPost extends Action
+class AjaxPost implements HttpPostActionInterface
 {
     /**
-     * @var \Dragonbe\Hibp\HibpFactory
+     * @var RequestInterface
+     */
+    protected RequestInterface $request;
+    /**
+     * @var ResultFactory
+     */
+    protected ResultFactory $resultFactory;
+    /**
+     * @var HibpFactory
      */
     private $hibpFactory;
 
+    /**
+     * AjaxPost constructor.
+     * @param HibpFactory $hibpFactory
+     * @param RequestInterface $request
+     * @param ResultFactory $resultFactory
+     */
     public function __construct(
-        Context $context,
-        HibpFactory $hibpFactory
+        HibpFactory $hibpFactory,
+        RequestInterface $request,
+        ResultFactory $resultFactory
     ) {
-        parent::__construct($context);
-
         $this->hibpFactory = $hibpFactory;
+        $this->request = $request;
+        $this->resultFactory = $resultFactory;
     }
 
     /**
@@ -47,12 +62,12 @@ public function __construct(
      */
     public function execute()
     {
-        if (!$this->getRequest()->isAjax() || !$this->getRequest()->isPost()) {
+        if (!$this->request->isAjax() || !$this->request->isPost()) {
             throw new NotFoundException(__('Action is not available.'));
         }
 
         $hibp = $this->hibpFactory::create();
-        $password = $this->getRequest()->getPost('password');
+        $password = $this->request->getPost('password');
         $resultJson = $this->resultFactory->create(ResultFactory::TYPE_JSON);
 
         $resultJson->setData([
diff --git a/registration.php b/registration.php
index 69d7b85..ed9e548 100644
--- a/registration.php
+++ b/registration.php
@@ -9,8 +9,11 @@
  * @copyright Copyright (c) Wagento Creative LLC. (https://www.wagento.com/)
  * @license https://opensource.org/licenses/OSL-3.0.php Open Software License 3.0
  */
-\Magento\Framework\Component\ComponentRegistrar::register(
-    \Magento\Framework\Component\ComponentRegistrar::MODULE,
+
+use Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(
+    ComponentRegistrar::MODULE,
     'Wagento_HIBP',
     __DIR__
 );
diff --git a/view/frontend/templates/form/register.phtml b/view/frontend/templates/form/register.phtml
index 39627d2..ddadf7a 100644
--- a/view/frontend/templates/form/register.phtml
+++ b/view/frontend/templates/form/register.phtml
@@ -7,21 +7,22 @@
 // @codingStandardsIgnoreFile
 
 /** @var \Magento\Customer\Block\Form\Register $block */
+/** @var \Magento\Framework\Escaper $escaper */
 ?>
 <?= $block->getChildHtml('form_fields_before') ?>
 <?php /* Extensions placeholder */ ?>
 <?= $block->getChildHtml('customer.form.register.extra') ?>
-<form class="form create account form-create-account" action="<?= $block->escapeUrl($block->getPostActionUrl()) ?>" method="post" id="form-validate" enctype="multipart/form-data" autocomplete="off">
+<form class="form create account form-create-account" action="<?= $escaper->escapeUrl($block->getPostActionUrl()) ?>" method="post" id="form-validate" enctype="multipart/form-data" autocomplete="off">
     <?= /* @noEscape */ $block->getBlockHtml('formkey'); ?>
     <fieldset class="fieldset create info">
-        <legend class="legend"><span><?= $block->escapeHtml(__('Personal Information')) ?></span></legend><br>
-        <input type="hidden" name="success_url" value="<?= $block->escapeUrl($block->getSuccessUrl()) ?>">
-        <input type="hidden" name="error_url" value="<?= $block->escapeUrl($block->getErrorUrl()) ?>">
+        <legend class="legend"><span><?= $escaper->escapeHtml(__('Personal Information')) ?></span></legend><br>
+        <input type="hidden" name="success_url" value="<?= $escaper->escapeUrl($block->getSuccessUrl()) ?>">
+        <input type="hidden" name="error_url" value="<?= $escaper->escapeUrl($block->getErrorUrl()) ?>">
         <?= $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Name')->setObject($block->getFormData())->setForceUseCustomerAttributes(true)->toHtml() ?>
         <?php if ($block->isNewsletterEnabled()): ?>
             <div class="field choice newsletter">
-                <input type="checkbox" name="is_subscribed" title="<?= $block->escapeHtmlAttr(__('Sign Up for Newsletter')) ?>" value="1" id="is_subscribed"<?php if ($block->getFormData()->getIsSubscribed()): ?> checked="checked"<?php endif; ?> class="checkbox">
-                <label for="is_subscribed" class="label"><span><?= $block->escapeHtml(__('Sign Up for Newsletter')) ?></span></label>
+                <input type="checkbox" name="is_subscribed" title="<?= $escaper->escapeHtmlAttr(__('Sign Up for Newsletter')) ?>" value="1" id="is_subscribed"<?php if ($block->getFormData()->getIsSubscribed()): ?> checked="checked"<?php endif; ?> class="checkbox">
+                <label for="is_subscribed" class="label"><span><?= $escaper->escapeHtml(__('Sign Up for Newsletter')) ?></span></label>
             </div>
             <?php /* Extensions placeholder */ ?>
             <?= $block->getChildHtml('customer.form.register.newsletter') ?>
@@ -44,7 +45,7 @@
     </fieldset>
     <?php if ($block->getShowAddressFields()): ?>
         <fieldset class="fieldset address">
-            <legend class="legend"><span><?= $block->escapeHtml(__('Address Information')) ?></span></legend><br>
+            <legend class="legend"><span><?= $escaper->escapeHtml(__('Address Information')) ?></span></legend><br>
             <input type="hidden" name="create_address" value="1" />
 
             <?php $_company = $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Company') ?>
@@ -67,16 +68,16 @@
             <div class="field street required">
                 <label for="street_1" class="label"><span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('street') ?></span></label>
                 <div class="control">
-                    <input type="text" name="street[]" value="<?= $block->escapeHtmlAttr($block->getFormData()->getStreet(0)) ?>" title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('street') ?>" id="street_1" class="input-text <?= $block->escapeHtmlAttr($_streetValidationClass) ?>">
+                    <input type="text" name="street[]" value="<?= $escaper->escapeHtmlAttr($block->getFormData()->getStreet(0)) ?>" title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('street') ?>" id="street_1" class="input-text <?= $escaper->escapeHtmlAttr($_streetValidationClass) ?>">
                     <div class="nested">
                         <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
                         <?php for ($_i = 2, $_n = $this->helper('Magento\Customer\Helper\Address')->getStreetLines(); $_i <= $_n; $_i++): ?>
                             <div class="field additional">
                                 <label class="label" for="street_<?= /* @noEscape */ $_i ?>">
-                                    <span><?= $block->escapeHtml(__('Address')) ?></span>
+                                    <span><?= $escaper->escapeHtml(__('Address')) ?></span>
                                 </label>
                                 <div class="control">
-                                    <input type="text" name="street[]" value="<?= $block->escapeHtml($block->getFormData()->getStreetLine($_i - 1)) ?>" title="<?= $block->escapeHtmlAttr(__('Street Address %1', $_i)) ?>" id="street_<?= /* @noEscape */ $_i ?>" class="input-text <?= $block->escapeHtmlAttr($_streetValidationClass) ?>">
+                                    <input type="text" name="street[]" value="<?= $escaper->escapeHtml($block->getFormData()->getStreetLine($_i - 1)) ?>" title="<?= $escaper->escapeHtmlAttr(__('Street Address %1', $_i)) ?>" id="street_<?= /* @noEscape */ $_i ?>" class="input-text <?= $escaper->escapeHtmlAttr($_streetValidationClass) ?>">
                                 </div>
                             </div>
                         <?php endfor; ?>
@@ -87,7 +88,7 @@
             <div class="field required">
                 <label for="city" class="label"><span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('city') ?></span></label>
                 <div class="control">
-                    <input type="text" name="city" value="<?= $block->escapeHtmlAttr($block->getFormData()->getCity()) ?>" title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('city') ?>" class="input-text <?= $block->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('city')) ?>" id="city">
+                    <input type="text" name="city" value="<?= $escaper->escapeHtmlAttr($block->getFormData()->getCity()) ?>" title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('city') ?>" class="input-text <?= $escaper->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('city')) ?>" id="city">
                 </div>
             </div>
 
@@ -95,16 +96,16 @@
                 <label for="region_id" class="label"><span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('region') ?></span></label>
                 <div class="control">
                     <select id="region_id" name="region_id" title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('region') ?>" class="validate-select" style="display:none;">
-                        <option value=""><?= $block->escapeHtml(__('Please select a region, state or province.')) ?></option>
+                        <option value=""><?= $escaper->escapeHtml(__('Please select a region, state or province.')) ?></option>
                     </select>
-                    <input type="text" id="region" name="region" value="<?= $block->escapeHtml($block->getRegion()) ?>" title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('region') ?>" class="input-text <?= $block->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('region')) ?>" style="display:none;">
+                    <input type="text" id="region" name="region" value="<?= $escaper->escapeHtml($block->getRegion()) ?>" title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('region') ?>" class="input-text <?= $escaper->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('region')) ?>" style="display:none;">
                 </div>
             </div>
 
             <div class="field zip required">
                 <label for="zip" class="label"><span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('postcode') ?></span></label>
                 <div class="control">
-                    <input type="text" name="postcode" value="<?= $block->escapeHtmlAttr($block->getFormData()->getPostcode()) ?>" title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('postcode') ?>" id="zip" class="input-text validate-zip-international <?= $block->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode')) ?>">
+                    <input type="text" name="postcode" value="<?= $escaper->escapeHtmlAttr($block->getFormData()->getPostcode()) ?>" title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('postcode') ?>" id="zip" class="input-text validate-zip-international <?= $escaper->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode')) ?>">
                 </div>
             </div>
 
@@ -126,53 +127,53 @@
         </fieldset>
 
     <?php endif; ?>
-    <fieldset class="fieldset create account" data-hasrequired="<?= $block->escapeHtmlAttr(__('* Required Fields')) ?>">
-        <legend class="legend"><span><?= $block->escapeHtml(__('Sign-in Information')) ?></span></legend><br>
+    <fieldset class="fieldset create account" data-hasrequired="<?= $escaper->escapeHtmlAttr(__('* Required Fields')) ?>">
+        <legend class="legend"><span><?= $escaper->escapeHtml(__('Sign-in Information')) ?></span></legend><br>
         <div class="field required">
-            <label for="email_address" class="label"><span><?= $block->escapeHtml(__('Email')) ?></span></label>
+            <label for="email_address" class="label"><span><?= $escaper->escapeHtml(__('Email')) ?></span></label>
             <div class="control">
-                <input type="email" name="email" autocomplete="email" id="email_address" value="<?= $block->escapeHtmlAttr($block->getFormData()->getEmail()) ?>" title="<?= $block->escapeHtmlAttr(__('Email')) ?>" class="input-text" data-mage-init='{"mage/trim-input":{}}' data-validate="{required:true, 'validate-email':true}">
+                <input type="email" name="email" autocomplete="email" id="email_address" value="<?= $escaper->escapeHtmlAttr($block->getFormData()->getEmail()) ?>" title="<?= $escaper->escapeHtmlAttr(__('Email')) ?>" class="input-text" data-mage-init='{"mage/trim-input":{}}' data-validate="{required:true, 'validate-email':true}">
             </div>
         </div>
         <div class="field password required">
-            <label for="password" class="label"><span><?= $block->escapeHtml(__('Password')) ?></span></label>
+            <label for="password" class="label"><span><?= $escaper->escapeHtml(__('Password')) ?></span></label>
             <div class="control">
                 <input type="password" name="password" id="password"
-                       title="<?= $block->escapeHtmlAttr(__('Password')) ?>"
+                       title="<?= $escaper->escapeHtmlAttr(__('Password')) ?>"
                        class="input-text"
-                       data-password-min-length="<?= $block->escapeHtmlAttr($block->getMinimumPasswordLength()) ?>"
-                       data-password-min-character-sets="<?= $block->escapeHtmlAttr($block->getRequiredCharacterClassesNumber()) ?>"
+                       data-password-min-length="<?= $escaper->escapeHtmlAttr($block->getMinimumPasswordLength()) ?>"
+                       data-password-min-character-sets="<?= $escaper->escapeHtmlAttr($block->getRequiredCharacterClassesNumber()) ?>"
                        data-validate="{required:true, 'validate-customer-password':true}"
                        autocomplete="off">
                 <div id="password-strength-meter-container" data-role="password-strength-meter" aria-live="polite">
                     <div id="password-strength-meter" class="password-strength-meter">
-                        <?= $block->escapeHtml(__('Password Strength')) ?>:
+                        <?= $escaper->escapeHtml(__('Password Strength')) ?>:
                         <span id="password-strength-meter-label" data-role="password-strength-meter-label">
-                            <?= $block->escapeHtml(__('No Password')) ?>
+                            <?= $escaper->escapeHtml(__('No Password')) ?>
                         </span>
                     </div>
                 </div>
                 <div id="hibp-count" class="hibp-count mage-error" data-role="hibp-count" aria-live="polite" style="display: none;" generated="false">
                     <?= __('This password has been used %1 times on other sites.', '<span class="hibp-count-label" data-role="hibp-count-label">0</span>') ?>
-                    (<?= $block->escapeHtml(__('Source:')) ?> <a href="https://haveibeenpwned.com/" target="_blank">HaveIBeenPwned.com</a>)
+                    (<?= $escaper->escapeHtml(__('Source:')) ?> <a href="https://haveibeenpwned.com/" target="_blank">HaveIBeenPwned.com</a>)
                 </div>
             </div>
 
         </div>
         <div class="field confirmation required">
-            <label for="password-confirmation" class="label"><span><?= $block->escapeHtml(__('Confirm Password')) ?></span></label>
+            <label for="password-confirmation" class="label"><span><?= $escaper->escapeHtml(__('Confirm Password')) ?></span></label>
             <div class="control">
-                <input type="password" name="password_confirmation" title="<?= $block->escapeHtmlAttr(__('Confirm Password')) ?>" id="password-confirmation" class="input-text" data-validate="{required:true, equalTo:'#password'}" autocomplete="off">
+                <input type="password" name="password_confirmation" title="<?= $escaper->escapeHtmlAttr(__('Confirm Password')) ?>" id="password-confirmation" class="input-text" data-validate="{required:true, equalTo:'#password'}" autocomplete="off">
             </div>
         </div>
         <?= $block->getChildHtml('form_additional_info') ?>
     </fieldset>
     <div class="actions-toolbar">
         <div class="primary">
-            <button type="submit" class="action submit primary" title="<?= $block->escapeHtmlAttr(__('Create an Account')) ?>"><span><?= $block->escapeHtml(__('Create an Account')) ?></span></button>
+            <button type="submit" class="action submit primary" title="<?= $escaper->escapeHtmlAttr(__('Create an Account')) ?>"><span><?= $escaper->escapeHtml(__('Create an Account')) ?></span></button>
         </div>
         <div class="secondary">
-            <a class="action back" href="<?= $block->escapeUrl($block->getBackUrl()) ?>"><span><?= $block->escapeHtml(__('Back')) ?></span></a>
+            <a class="action back" href="<?= $escaper->escapeUrl($block->getBackUrl()) ?>"><span><?= $escaper->escapeHtml(__('Back')) ?></span></a>
         </div>
     </div>
 </form>

From fe1d89129a22260090e13e8b829b61c7eea5b97e Mon Sep 17 00:00:00 2001
From: Chirag Dodia <chirag.dodia@wagento.com>
Date: Mon, 2 Nov 2020 17:36:03 +0530
Subject: [PATCH 02/25] [WAGMODS-102] removed the extenal library and directly
 call the API in module using guzzlehttp

---
 Controller/Index/AjaxPost.php | 16 +++---
 Model/Hibp.php                | 93 +++++++++++++++++++++++++++++++++++
 composer.json                 |  5 +-
 3 files changed, 103 insertions(+), 11 deletions(-)
 create mode 100644 Model/Hibp.php

diff --git a/Controller/Index/AjaxPost.php b/Controller/Index/AjaxPost.php
index ad266a2..9575e16 100644
--- a/Controller/Index/AjaxPost.php
+++ b/Controller/Index/AjaxPost.php
@@ -14,11 +14,11 @@
 
 namespace Wagento\HIBP\Controller\Index;
 
-use Dragonbe\Hibp\HibpFactory;
 use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Exception\NotFoundException;
+use Wagento\HIBP\Model\Hibp;
 
 /**
  * Ajax POST Controller
@@ -37,22 +37,22 @@ class AjaxPost implements HttpPostActionInterface
      */
     protected ResultFactory $resultFactory;
     /**
-     * @var HibpFactory
+     * @var Hibp
      */
-    private $hibpFactory;
+    protected Hibp $hibp;
 
     /**
      * AjaxPost constructor.
-     * @param HibpFactory $hibpFactory
+     * @param Hibp $hibp
      * @param RequestInterface $request
      * @param ResultFactory $resultFactory
      */
     public function __construct(
-        HibpFactory $hibpFactory,
+        Hibp $hibp,
         RequestInterface $request,
         ResultFactory $resultFactory
     ) {
-        $this->hibpFactory = $hibpFactory;
+        $this->hibp = $hibp;
         $this->request = $request;
         $this->resultFactory = $resultFactory;
     }
@@ -66,13 +66,13 @@ public function execute()
             throw new NotFoundException(__('Action is not available.'));
         }
 
-        $hibp = $this->hibpFactory::create();
+        $hibp = $this->hibp;
         $password = $this->request->getPost('password');
         $resultJson = $this->resultFactory->create(ResultFactory::TYPE_JSON);
 
         $resultJson->setData([
             'pwned' => $hibp->isPwnedPassword($password),
-            'count' => count($hibp)
+            'count' => $hibp->count()
         ]);
 
         return $resultJson;
diff --git a/Model/Hibp.php b/Model/Hibp.php
new file mode 100644
index 0000000..6809cc1
--- /dev/null
+++ b/Model/Hibp.php
@@ -0,0 +1,93 @@
+<?php
+
+namespace Wagento\HIBP\Model;
+
+use GuzzleHttp\ClientFactory;
+use GuzzleHttp\Exception\GuzzleException;
+use GuzzleHttp\Psr7\ResponseFactory;
+use Magento\Framework\Webapi\Rest\Request;
+
+class Hibp
+{
+    /**
+     * API request URL
+     */
+    const API_REQUEST_URI = 'https://api.pwnedpasswords.com/range/';
+
+    /**
+     * @var ClientFactory
+     */
+    protected ClientFactory $clientFactory;
+    /**
+     * @var ResponseFactory
+     */
+    protected ResponseFactory $responseFactory;
+
+    /**
+     * @var int
+     */
+    protected $count = 0;
+    /**
+     * Hibp constructor.
+     * @param ClientFactory $clientFactory
+     * @param ResponseFactory $responseFactory
+     */
+    public function __construct(
+        ClientFactory $clientFactory,
+        ResponseFactory $responseFactory
+    ) {
+        $this->clientFactory = $clientFactory;
+        $this->responseFactory = $responseFactory;
+    }
+
+    /**
+     * @param $password
+     * @param string $requestMethod
+     * @return bool|\GuzzleHttp\Psr7\Response
+     */
+    public function isPwnedPassword($password, $requestMethod = Request::HTTP_METHOD_GET)
+    {
+        $password = sha1($password);
+        $password = strtoupper($password);
+        $range = substr($password, 0, 5);
+        $endpoint = self::API_REQUEST_URI . $range;
+
+        /** @var Client $client */
+        $client = $this->clientFactory->create();
+
+        try {
+            $totalCount = 0;
+            $data = [];
+            $response = $client->request($requestMethod, $endpoint);
+            if ($response->getStatusCode() == 200) {
+                $body = (string) $response->getBody();
+                $data = explode("\r\n", $body);
+                foreach ($data as $value) {
+                    list($hash, $count) = explode(':', $value);
+                    if (strcmp($hash, substr($password, 5)) === 0) {
+                        $totalCount = +(int)$count;
+                    }
+                }
+            }
+            if ($data === []) {
+                return false;
+            }
+            $this->count = $totalCount;
+            return true;
+        } catch (GuzzleException $exception) {
+            $response = $this->responseFactory->create([
+                'status' => $exception->getCode(),
+                'reason' => $exception->getMessage()
+            ]);
+        }
+        return $response;
+    }
+
+    /**
+     * @return int
+     */
+    public function count()
+    {
+        return $this->count;
+    }
+}
diff --git a/composer.json b/composer.json
index 145b277..605121e 100644
--- a/composer.json
+++ b/composer.json
@@ -12,8 +12,7 @@
     "require": {
         "php": "~7.2.0",
         "magento/framework": "102.0.*",
-        "magento/module-customer": "102.0.*",
-        "dragonbe/hibp": "^0.0.5"
+        "magento/module-customer": "102.0.*"
     },
     "autoload": {
         "files": [
@@ -23,4 +22,4 @@
             "Wagento\\HIBP\\": ""
         }
     }
-}
\ No newline at end of file
+}

From f29e33a321ab6a9e081c2b569d1ddfc85693f134 Mon Sep 17 00:00:00 2001
From: Chirag Dodia <chirag.dodia@wagento.com>
Date: Tue, 3 Nov 2020 16:57:36 +0530
Subject: [PATCH 03/25] [WAGMODS-100] Removed overidden file and add the
 required customization using js mixin

---
 view/frontend/requirejs-config.js             |  10 +-
 .../js/password-strength-indicator-mixin.js   |  55 ++++++
 .../web/js/password-strength-indicator.js     | 180 ------------------
 3 files changed, 61 insertions(+), 184 deletions(-)
 create mode 100644 view/frontend/web/js/password-strength-indicator-mixin.js
 delete mode 100644 view/frontend/web/js/password-strength-indicator.js

diff --git a/view/frontend/requirejs-config.js b/view/frontend/requirejs-config.js
index 36b71df..da5c2f6 100644
--- a/view/frontend/requirejs-config.js
+++ b/view/frontend/requirejs-config.js
@@ -10,9 +10,11 @@
  */
 
 var config = {
-    map: {
-        '*': {
-            passwordStrengthIndicator: 'Wagento_HIBP/js/password-strength-indicator'
+    config: {
+        mixins: {
+            'Magento_Customer/js/password-strength-indicator': {
+                'Wagento_HIBP/js/password-strength-indicator-mixin': true
+            }
         }
     }
-};
\ No newline at end of file
+};
diff --git a/view/frontend/web/js/password-strength-indicator-mixin.js b/view/frontend/web/js/password-strength-indicator-mixin.js
new file mode 100644
index 0000000..17c4862
--- /dev/null
+++ b/view/frontend/web/js/password-strength-indicator-mixin.js
@@ -0,0 +1,55 @@
+define([
+    'jquery',
+    'Magento_Customer/js/zxcvbn',
+    'Wagento_HIBP/js/hibp',
+    'mage/translate',
+    'mage/validation'
+], function ($, zxcvbn, hibp, $t) {
+    'use strict';
+
+    var passwordStrengthIndicatorMixin = {
+        options: {
+            passwordFieldSelector: "input[name=password]",
+            hibpCountSelector: '[data-role=hibp-count]',
+            hibpCountLabelSelector: '[data-role=hibp-count-label]',
+        },
+
+        _bind: function () {
+            var self = this;
+            $(self.options.passwordFieldSelector).on('change', function () {
+                self._checkHibp();
+
+            });
+            return this._super();
+        },
+
+        _checkHibp: function () {
+            var self = this;
+            var password = $(self.options.passwordFieldSelector).val();
+            console.log("MIXIN"+password);
+            hibp(password, function (result) {
+                self._displayHibpCount(result.count, self);
+            });
+        },
+
+        /**
+         * Display number of times password has been used
+         * @param {Number} count
+         * @private
+         */
+        _displayHibpCount: function (count, self) {
+            if (count === 0) {
+                $(self.options.hibpCountSelector).hide();
+                return;
+            }
+
+            $(self.options.hibpCountSelector).show();
+            $(self.options.hibpCountLabelSelector).text(count);
+        },
+    };
+
+    return function (targetWidget) {
+        $.widget('mage.passwordStrengthIndicator', targetWidget, passwordStrengthIndicatorMixin);
+        return $.mage.passwordStrengthIndicator;
+    };
+});
diff --git a/view/frontend/web/js/password-strength-indicator.js b/view/frontend/web/js/password-strength-indicator.js
deleted file mode 100644
index d906536..0000000
--- a/view/frontend/web/js/password-strength-indicator.js
+++ /dev/null
@@ -1,180 +0,0 @@
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-define([
-    'jquery',
-    'Magento_Customer/js/zxcvbn',
-    'Wagento_HIBP/js/hibp',
-    'mage/translate',
-    'mage/validation'
-], function ($, zxcvbn, hibp, $t) {
-    'use strict';
-
-    $.widget('mage.passwordStrengthIndicator', {
-        options: {
-            cache: {},
-            passwordSelector: '[type=password]',
-            passwordStrengthMeterSelector: '[data-role=password-strength-meter]',
-            passwordStrengthMeterLabelSelector: '[data-role=password-strength-meter-label]',
-            hibpCountSelector: '[data-role=hibp-count]',
-            hibpCountLabelSelector: '[data-role=hibp-count-label]',
-            formSelector: 'form',
-            emailSelector: 'input[type="email"]'
-        },
-
-        /**
-         * Widget initialization
-         * @private
-         */
-        _create: function () {
-            this.options.cache.input = $(this.options.passwordSelector, this.element);
-            this.options.cache.meter = $(this.options.passwordStrengthMeterSelector, this.element);
-            this.options.cache.label = $(this.options.passwordStrengthMeterLabelSelector, this.element);
-            this.options.cache.hibpCount = $(this.options.hibpCountSelector, this.element);
-            this.options.cache.hibpCountLabel = $(this.options.hibpCountLabelSelector, this.element);
-
-            // We need to look outside the module for backward compatibility, since someone can already use the module.
-            // @todo Narrow this selector in 2.3 so it doesn't accidentally finds the email field from the
-            // newsletter email field or any other "email" field.
-            this.options.cache.email = $(this.options.formSelector).find(this.options.emailSelector);
-            this._bind();
-        },
-
-        /**
-         * Event binding, will monitor change, keyup and paste events.
-         * @private
-         */
-        _bind: function () {
-            this._on(this.options.cache.input, {
-                'change': this._calculateStrength,
-                'keyup': this._calculateStrength,
-                'paste': this._calculateStrength
-            });
-
-            if (this.options.cache.email.length) {
-                this._on(this.options.cache.email, {
-                    'change': this._calculateStrength,
-                    'keyup': this._calculateStrength,
-                    'paste': this._calculateStrength
-                });
-            }
-        },
-
-        /**
-         * Calculate password strength
-         * @private
-         */
-        _calculateStrength: function () {
-            var password = this._getPassword(),
-                isEmpty = password.length === 0,
-                zxcvbnScore,
-                displayScore,
-                isValid,
-                hibpResult;
-
-            // Display score is based on combination of whether password is empty, valid, and zxcvbn strength
-            if (isEmpty) {
-                displayScore = 0;
-            } else {
-                this.options.cache.input.rules('add', {
-                    'password-not-equal-to-user-name': this.options.cache.email.val()
-                });
-
-                // We should only perform this check in case there is an email field on screen
-                if (this.options.cache.email.length &&
-                    password.toLowerCase() === this.options.cache.email.val().toLowerCase()) {
-                    displayScore = 1;
-                } else {
-                    const self = this;
-
-                    hibp(password, function (result) {
-                        if (result.pwned) {
-                            displayScore = 1;
-                        } else {
-                            isValid = $.validator.validateSingleElement(self.options.cache.input);
-                            zxcvbnScore = zxcvbn(password).score;
-                            displayScore = isValid ? zxcvbnScore : 1;
-                        }
-
-                        self._displayHibpCount(result.count);
-                        self._displayStrength(displayScore);
-                    });
-                }
-            }
-
-            // Update label
-            this._displayStrength(displayScore);
-        },
-
-        /**
-         * Display strength
-         * @param {Number} displayScore
-         * @private
-         */
-        _displayStrength: function (displayScore) {
-            var strengthLabel = '',
-                className;
-
-            switch (displayScore) {
-                case 0:
-                    strengthLabel = $t('No Password');
-                    className = 'password-none';
-                    break;
-
-                case 1:
-                    strengthLabel = $t('Weak');
-                    className = 'password-weak';
-                    break;
-
-                case 2:
-                    strengthLabel = $t('Medium');
-                    className = 'password-medium';
-                    break;
-
-                case 3:
-                    strengthLabel = $t('Strong');
-                    className = 'password-strong';
-                    break;
-
-                case 4:
-                    strengthLabel = $t('Very Strong');
-                    className = 'password-very-strong';
-                    break;
-            }
-
-            this.options.cache.meter
-                .removeClass()
-                .addClass(className);
-            this.options.cache.label.text(strengthLabel);
-        },
-
-        /**
-         * Display number of times password has been used
-         * @param {Number} count
-         * @private
-         */
-        _displayHibpCount: function (count) {
-            if (count === 0) {
-                this.options.cache.hibpCount.hide();
-
-                return;
-            }
-
-            this.options.cache.hibpCount.show();
-            this.options.cache.hibpCountLabel.text(count);
-        },
-
-        /**
-         * Get password value
-         * @returns {*}
-         * @private
-         */
-        _getPassword: function () {
-            return this.options.cache.input.val();
-        }
-    });
-
-    return $.mage.passwordStrengthIndicator;
-});

From f72e1a651ab08c96cf2d6b84d0363e7de9cf40f3 Mon Sep 17 00:00:00 2001
From: Chirag Dodia <chirag.dodia@wagento.com>
Date: Wed, 4 Nov 2020 18:43:34 +0530
Subject: [PATCH 04/25] [WAGMODS-104] Added code to implement strict mode

---
 Model/Config/Source/Mode.php                  | 27 +++++++++++++++++++
 etc/acl.xml                                   | 16 +++++++++++
 etc/adminhtml/system.xml                      | 21 +++++++++++++++
 etc/config.xml                                | 10 +++++++
 view/frontend/templates/form/register.phtml   |  4 ++-
 .../js/password-strength-indicator-mixin.js   | 12 ++++++++-
 6 files changed, 88 insertions(+), 2 deletions(-)
 create mode 100644 Model/Config/Source/Mode.php
 create mode 100644 etc/acl.xml
 create mode 100644 etc/adminhtml/system.xml
 create mode 100644 etc/config.xml

diff --git a/Model/Config/Source/Mode.php b/Model/Config/Source/Mode.php
new file mode 100644
index 0000000..43be14a
--- /dev/null
+++ b/Model/Config/Source/Mode.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright ©  All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Wagento\HIBP\Model\Config\Source;
+
+use Magento\Framework\Data\OptionSourceInterface;
+
+class Mode implements OptionSourceInterface
+{
+    public function toOptionArray()
+    {
+        return [
+                [
+                    'value' => 'report',
+                    'label' => __('Report Only')
+                ],
+                [
+                    'value' => 'restrict',
+                    'label' => __('Restrict')
+                ]
+            ];
+    }
+}
diff --git a/etc/acl.xml b/etc/acl.xml
new file mode 100644
index 0000000..6103a19
--- /dev/null
+++ b/etc/acl.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" ?>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Acl/etc/acl.xsd">
+    <acl>
+        <resources>
+            <resource id="Magento_Backend::admin">
+                <resource id="Magento_Backend::stores">
+                    <resource id="Magento_Backend::stores_settings">
+                        <resource id="Magento_Config::config">
+                            <resource id="Wagento_HIBP::config_wagento_hibp" title="hibp"/>
+                        </resource>
+                    </resource>
+                </resource>
+            </resource>
+        </resources>
+    </acl>
+</config>
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
new file mode 100644
index 0000000..a491078
--- /dev/null
+++ b/etc/adminhtml/system.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" ?>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
+    <system>
+        <tab id="wagento" sortOrder="100" translate="label">
+            <label>Wagento Modules</label>
+        </tab>
+        <section id="hibp" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="20" translate="label">
+            <label>HIBP Checker</label>
+            <tab>wagento</tab>
+            <resource>Wagento_HIBP::config_wagento_hibp</resource>
+            <group id="general" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="10" translate="label">
+                <label>General</label>
+                <field id="mode" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="10" translate="label" type="select">
+                    <label>Mode</label>
+                    <comment>In the restrict mode system will restrict users from using pwned password</comment>
+                    <source_model>Wagento\HIBP\Model\Config\Source\Mode</source_model>
+                </field>
+            </group>
+        </section>
+    </system>
+</config>
diff --git a/etc/config.xml b/etc/config.xml
new file mode 100644
index 0000000..f105b06
--- /dev/null
+++ b/etc/config.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" ?>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
+    <default>
+        <hibp>
+            <general>
+                <mode>report</mode>
+            </general>
+        </hibp>
+    </default>
+</config>
diff --git a/view/frontend/templates/form/register.phtml b/view/frontend/templates/form/register.phtml
index ddadf7a..15a02fe 100644
--- a/view/frontend/templates/form/register.phtml
+++ b/view/frontend/templates/form/register.phtml
@@ -156,6 +156,7 @@
                 <div id="hibp-count" class="hibp-count mage-error" data-role="hibp-count" aria-live="polite" style="display: none;" generated="false">
                     <?= __('This password has been used %1 times on other sites.', '<span class="hibp-count-label" data-role="hibp-count-label">0</span>') ?>
                     (<?= $escaper->escapeHtml(__('Source:')) ?> <a href="https://haveibeenpwned.com/" target="_blank">HaveIBeenPwned.com</a>)
+                    <span class="hibp-strict-message" data-role="hibp-strict-message"><?= __('Please choose another password.') ?></span>
                 </div>
             </div>
 
@@ -231,7 +232,8 @@ require([
     {
         ".field.password": {
             "passwordStrengthIndicator": {
-                "formSelector": "form.form-create-account"
+                "formSelector": "form.form-create-account",
+                "hibpMode": "<?php echo $block->getConfig('hibp/general/mode')?>"
             }
         }
     }
diff --git a/view/frontend/web/js/password-strength-indicator-mixin.js b/view/frontend/web/js/password-strength-indicator-mixin.js
index 17c4862..252e5b9 100644
--- a/view/frontend/web/js/password-strength-indicator-mixin.js
+++ b/view/frontend/web/js/password-strength-indicator-mixin.js
@@ -12,6 +12,9 @@ define([
             passwordFieldSelector: "input[name=password]",
             hibpCountSelector: '[data-role=hibp-count]',
             hibpCountLabelSelector: '[data-role=hibp-count-label]',
+            submitButtonSelector: ":input[type=submit]",
+            hibpstrictMessageSelector: '[data-role=hibp-strict-message]',
+            hibpMode: ''
         },
 
         _bind: function () {
@@ -40,11 +43,18 @@ define([
         _displayHibpCount: function (count, self) {
             if (count === 0) {
                 $(self.options.hibpCountSelector).hide();
+                $(self.options.submitButtonSelector).prop('disabled', false);
                 return;
             }
-
             $(self.options.hibpCountSelector).show();
             $(self.options.hibpCountLabelSelector).text(count);
+            if(self.options.hibpMode == 'restrict') {
+                $(self.options.hibpstrictMessageSelector).show();
+                $(self.options.submitButtonSelector).prop('disabled', true);
+            } else {
+                $(self.options.hibpstrictMessageSelector).hide();
+                $(self.options.submitButtonSelector).prop('disabled', false);
+            }
         },
     };
 

From 6c486391a9d71265cf3115ee5aae81242c81563e Mon Sep 17 00:00:00 2001
From: Chirag Dodia <chirag.dodia@wagento.com>
Date: Thu, 5 Nov 2020 14:22:13 +0530
Subject: [PATCH 05/25] [WAGMODS-106] implement hibp in create password page

---
 .../Customer/Block/Account/Resetpassword.php  | 16 +++++
 etc/di.xml                                    |  4 ++
 .../customer_account_createpassword.xml       | 16 +++++
 .../form/resetforgottenpassword.phtml         | 61 +++++++++++++++++++
 .../js/password-strength-indicator-mixin.js   |  1 -
 5 files changed, 97 insertions(+), 1 deletion(-)
 create mode 100644 Rewrite/Magento/Customer/Block/Account/Resetpassword.php
 create mode 100644 etc/di.xml
 create mode 100644 view/frontend/layout/customer_account_createpassword.xml
 create mode 100644 view/frontend/templates/form/resetforgottenpassword.phtml

diff --git a/Rewrite/Magento/Customer/Block/Account/Resetpassword.php b/Rewrite/Magento/Customer/Block/Account/Resetpassword.php
new file mode 100644
index 0000000..6daecfd
--- /dev/null
+++ b/Rewrite/Magento/Customer/Block/Account/Resetpassword.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright ©  All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Wagento\HIBP\Rewrite\Magento\Customer\Block\Account;
+
+class Resetpassword extends \Magento\Customer\Block\Account\Resetpassword
+{
+    public function getConfig($path)
+    {
+        return $this->_scopeConfig->getValue($path, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+    }
+}
diff --git a/etc/di.xml b/etc/di.xml
new file mode 100644
index 0000000..74cad29
--- /dev/null
+++ b/etc/di.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <preference for="Magento\Customer\Block\Account\Resetpassword" type="Wagento\HIBP\Rewrite\Magento\Customer\Block\Account\Resetpassword"/>
+</config>
diff --git a/view/frontend/layout/customer_account_createpassword.xml b/view/frontend/layout/customer_account_createpassword.xml
new file mode 100644
index 0000000..7006ec1
--- /dev/null
+++ b/view/frontend/layout/customer_account_createpassword.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <body>
+        <referenceBlock name="resetPassword">
+            <action method="setTemplate">
+                <argument name="template" xsi:type="string">Wagento_HIBP::form/resetforgottenpassword.phtml</argument>
+            </action>
+        </referenceBlock>
+    </body>
+</page>
diff --git a/view/frontend/templates/form/resetforgottenpassword.phtml b/view/frontend/templates/form/resetforgottenpassword.phtml
new file mode 100644
index 0000000..f52e99d
--- /dev/null
+++ b/view/frontend/templates/form/resetforgottenpassword.phtml
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var \Magento\Customer\Block\Account\Resetpassword $block */
+/** @var \Magento\Framework\Escaper $escaper */
+?>
+<form action="<?= $escaper->escapeUrl($block->getUrl('*/*/resetpasswordpost', ['_query' => ['token' => $block->getResetPasswordLinkToken()]])) ?>"
+      method="post"
+    <?php if ($block->isAutocompleteDisabled()) : ?> autocomplete="off"<?php endif; ?>
+      id="form-validate"
+      class="form password reset"
+      data-mage-init='{"validation":{}}'>
+    <fieldset class="fieldset" data-hasrequired="<?= $escaper->escapeHtmlAttr(__('* Required Fields')) ?>">
+        <div class="field password required" data-mage-init='{"passwordStrengthIndicator": {}}'>
+            <label class="label" for="password"><span><?= $escaper->escapeHtml(__('New Password')) ?></span></label>
+            <div class="control">
+                <input type="password" class="input-text" name="password" id="password"
+                       data-password-min-length="<?= $escaper->escapeHtmlAttr($block->getMinimumPasswordLength()) ?>"
+                       data-password-min-character-sets="<?= $escaper->escapeHtmlAttr($block->getRequiredCharacterClassesNumber()) ?>"
+                       data-validate="{required:true, 'validate-customer-password':true}"
+                       autocomplete="off">
+                <div id="password-strength-meter-container" data-role="password-strength-meter" aria-live="polite">
+                    <div id="password-strength-meter" class="password-strength-meter">
+                        <?= $escaper->escapeHtml(__('Password Strength')) ?>:
+                        <span id="password-strength-meter-label" data-role="password-strength-meter-label">
+                            <?= $escaper->escapeHtml(__('No Password')) ?>
+                        </span>
+                    </div>
+                </div>
+                <div id="hibp-count" class="hibp-count mage-error" data-role="hibp-count" aria-live="polite" style="display: none;" generated="false">
+                    <?= __('This password has been used %1 times on other sites.', '<span class="hibp-count-label" data-role="hibp-count-label">0</span>') ?>
+                    (<?= $escaper->escapeHtml(__('Source:')) ?> <a href="https://haveibeenpwned.com/" target="_blank">HaveIBeenPwned.com</a>)
+                    <span class="hibp-strict-message" data-role="hibp-strict-message"><?= __('Please choose another password.') ?></span>
+                </div>
+            </div>
+        </div>
+        <div class="field confirmation required">
+            <label class="label" for="password-confirmation"><span><?= $escaper->escapeHtml(__('Confirm New Password')) ?></span></label>
+            <div class="control">
+                <input type="password" class="input-text" name="password_confirmation" id="password-confirmation" data-validate="{required:true,equalTo:'#password'}" autocomplete="off">
+            </div>
+        </div>
+    </fieldset>
+    <div class="actions-toolbar">
+        <div class="primary">
+            <button type="submit" class="action submit primary"><span><?= $escaper->escapeHtml(__('Set a New Password')) ?></span></button>
+        </div>
+    </div>
+</form>
+<script type="text/x-magento-init">
+    {
+        ".field.password": {
+            "passwordStrengthIndicator": {
+                "hibpMode": "<?php echo $block->getConfig('hibp/general/mode')?>"
+            }
+        }
+    }
+</script>
diff --git a/view/frontend/web/js/password-strength-indicator-mixin.js b/view/frontend/web/js/password-strength-indicator-mixin.js
index 252e5b9..bb0d114 100644
--- a/view/frontend/web/js/password-strength-indicator-mixin.js
+++ b/view/frontend/web/js/password-strength-indicator-mixin.js
@@ -29,7 +29,6 @@ define([
         _checkHibp: function () {
             var self = this;
             var password = $(self.options.passwordFieldSelector).val();
-            console.log("MIXIN"+password);
             hibp(password, function (result) {
                 self._displayHibpCount(result.count, self);
             });

From 28b5412fed6917684398808d87e24ba6cd67551c Mon Sep 17 00:00:00 2001
From: Chirag Dodia <chirag.dodia@wagento.com>
Date: Fri, 6 Nov 2020 14:23:18 +0530
Subject: [PATCH 06/25] [WAGMODS-105] Added code to make ajax call in admin
 form

---
 Block/Adminhtml/User.php                      | 18 +++++++++
 view/adminhtml/layout/adminhtml_user_edit.xml | 14 +++++++
 view/adminhtml/templates/hibp_js.phtml        | 39 +++++++++++++++++++
 view/adminhtml/web/js/hibp.js                 | 16 ++++++++
 4 files changed, 87 insertions(+)
 create mode 100644 Block/Adminhtml/User.php
 create mode 100644 view/adminhtml/layout/adminhtml_user_edit.xml
 create mode 100644 view/adminhtml/templates/hibp_js.phtml
 create mode 100644 view/adminhtml/web/js/hibp.js

diff --git a/Block/Adminhtml/User.php b/Block/Adminhtml/User.php
new file mode 100644
index 0000000..69cd90c
--- /dev/null
+++ b/Block/Adminhtml/User.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Wagento\HIBP\Block\Adminhtml;
+
+use Magento\Backend\Block\Template;
+
+class User extends Template
+{
+    public function getConfig($path)
+    {
+        return $this->_scopeConfig->getValue($path, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+    }
+
+    public function getBaseUrl()
+    {
+        return parent::getBaseUrl();
+    }
+}
diff --git a/view/adminhtml/layout/adminhtml_user_edit.xml b/view/adminhtml/layout/adminhtml_user_edit.xml
new file mode 100644
index 0000000..4f69b8c
--- /dev/null
+++ b/view/adminhtml/layout/adminhtml_user_edit.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="admin-2columns-left" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <body>
+        <referenceContainer name="js">
+            <block class="Wagento\HIBP\Block\Adminhtml\User" name="adminhtml.user.hibp.js" template="Wagento_HIBP::hibp_js.phtml"/>
+        </referenceContainer>
+    </body>
+</page>
diff --git a/view/adminhtml/templates/hibp_js.phtml b/view/adminhtml/templates/hibp_js.phtml
new file mode 100644
index 0000000..861a7a7
--- /dev/null
+++ b/view/adminhtml/templates/hibp_js.phtml
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+/** @var \Wagento\HIBP\Block\Adminhtml\User $block */
+?>
+<?php $scriptString = <<<script
+
+require([
+    "jquery",
+    "domReady",
+    'Wagento_HIBP/js/hibp'
+], function($, domReady, hibp){
+
+    domReady(function () {
+        $("#user_password").on("change", function(){
+            password = $(this).val();
+             hibp(password, function (result) {
+                alert(result.count);
+            });
+        });
+    });
+
+});
+
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
+
+<script>
+    require([
+        'mage/url'
+    ], function(url) {
+        return url.setBaseUrl('<?php /* @escapeNotVerified */ echo $block->getBaseUrl();?>');
+    })
+</script>
diff --git a/view/adminhtml/web/js/hibp.js b/view/adminhtml/web/js/hibp.js
new file mode 100644
index 0000000..9084942
--- /dev/null
+++ b/view/adminhtml/web/js/hibp.js
@@ -0,0 +1,16 @@
+define([
+    'jquery',
+    'mage/url'
+], function ($, urlBuilder) {
+    'use strict';
+
+    return function hibp(password, doneCallback) {
+        const ajaxPostUrl = urlBuilder.buil('hibp/index/ajaxPost');
+
+        $.ajax({
+            url: ajaxPostUrl,
+            data: {password: password},
+            type: 'POST'
+        }).done(doneCallback);
+    };
+});

From 21ae1f4cd9fce2d7e55ac811d59396389f003220 Mon Sep 17 00:00:00 2001
From: Chirag Dodia <chirag.dodia@wagento.com>
Date: Mon, 9 Nov 2020 10:18:24 +0530
Subject: [PATCH 07/25] [WAGEMODS-105] removed typo error

---
 view/adminhtml/web/js/hibp.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/adminhtml/web/js/hibp.js b/view/adminhtml/web/js/hibp.js
index 9084942..a39a059 100644
--- a/view/adminhtml/web/js/hibp.js
+++ b/view/adminhtml/web/js/hibp.js
@@ -5,7 +5,7 @@ define([
     'use strict';
 
     return function hibp(password, doneCallback) {
-        const ajaxPostUrl = urlBuilder.buil('hibp/index/ajaxPost');
+        const ajaxPostUrl = urlBuilder.build('hibp/index/ajaxPost');
 
         $.ajax({
             url: ajaxPostUrl,

From ddc09239dd2c5e35c1f4dcee74323aed309030f8 Mon Sep 17 00:00:00 2001
From: Bhavin Parmar <bhavin@wagento.com>
Date: Thu, 3 Dec 2020 22:28:08 +0530
Subject: [PATCH 08/25] Implemented code for showing text on creating user from
 admin form(WAGMODS-105)

---
 view/adminhtml/templates/hibp_js.phtml | 38 ++++++++++++++++++--------
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/view/adminhtml/templates/hibp_js.phtml b/view/adminhtml/templates/hibp_js.phtml
index 861a7a7..160ac3e 100644
--- a/view/adminhtml/templates/hibp_js.phtml
+++ b/view/adminhtml/templates/hibp_js.phtml
@@ -7,25 +7,41 @@
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 /** @var \Wagento\HIBP\Block\Adminhtml\User $block */
 ?>
+<?php
+$mode = $block->getConfig('hibp/general/mode');
+?>
 <?php $scriptString = <<<script
 
 require([
-    "jquery",
-    "domReady",
-    'Wagento_HIBP/js/hibp'
-], function($, domReady, hibp){
+        "jquery",
+        "domReady",
+        'Wagento_HIBP/js/hibp'
+    ], function($, domReady, hibp){
 
-    domReady(function () {
-        $("#user_password").on("change", function(){
-            password = $(this).val();
-             hibp(password, function (result) {
-                alert(result.count);
+        domReady(function () {
+            $("#user_password").on("change", function(){
+                var mode = '<?= $mode ?>';
+                var validText = '<label class="mage-error"><div id="hibp-count" class="hibp-count mage-error" data-role="hibp-count" aria-live="polite" generated="false">';
+
+                password = $(this).val();
+                hibp(password, function (result) {
+                    validText += 'This password has been used <span class="hibp-count-label" data-role="hibp-count-label">' + result.count  +'</span> times on other sites.';
+                    validText += '(Source: <a href="https://haveibeenpwned.com/" target="_blank">HaveIBeenPwned.com</a>)';
+                    validText += '</div></label>';
+                    if (result.count > 0) {
+                        if (mode === 'restrict') {
+                            validText +='<span class="hibp-strict-message" data-role="hibp-strict-message">Please choose another password.</span>';
+                            $('#save').prop('disabled', true);
+                        } else {
+                            $('#save').prop('disabled', false);
+                        }
+                        $(validText).insertAfter($("#user_password"));
+                    }
+                });
             });
         });
     });
 
-});
-
 script;
 ?>
 <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>

From 6547520762953f7f6b62fd7bc978766fcee34ed7 Mon Sep 17 00:00:00 2001
From: Chirag Dodia <chirag.dodia@wagento.com>
Date: Tue, 8 Dec 2020 17:49:45 +0530
Subject: [PATCH 09/25] [WAGMODS-108] Added readme template

---
 README.md | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 README.md

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..89b0a2a
--- /dev/null
+++ b/README.md
@@ -0,0 +1,50 @@
+Wagento HIBP Module
+======================
+This Wagento module leverages Have I Been Pwned? to check ensure your password has not been compromised. It will return your email and password and whether it has been used and/or pasted. This is accomplished by utilizing the HIBP database for passwords that exist and are the same. There is no risk since the two are not connected, but it does tell you if your password is out there.
+
+Installation Instructions
+-------------------------
+Download the file, extract
+its contents to the project root directory. The module sources should then be
+available in the following sub-directory:
+
+    app
+    └── code
+        └── Wagento
+            └── HIBP
+### Enable Module ###
+Once the source files are available, make them known to the application:
+
+    ./bin/magento module:enable Wagento_HIBP
+    ./bin/magento setup:upgrade
+
+Last but not least, flush cache and compile.
+
+    ./bin/magento cache:flush
+    ./bin/magento setup:di:compile
+
+Uninstallation
+--------------
+To uninstall the module manually, run the following commands in your project
+root directory:
+
+    ./bin/magento module:disable Wagento_HIBP
+    rm -rf app/code/Wagento/HIBP
+
+Features
+--------------
+ Module will check, whether your password is compromise or not by utilizing the HIBP database in following Magento 2 forms
+ 1. Customer Registration Form
+ 2. Customer Reset Password Form
+ 3. Admin User Creation and edit Form
+ 
+ Module is also providing system configuration under Wagento Modules > HIBP Checker > Mode: Report Only/Restrict
+ 
+ In the Report Only mode, module will only indicate the notice but allow customer to use the compromise password. While in Restrict mode, module will restrict customer to use compromise password.
+ 
+ How to Contribute?
+ --------------
+ To learn about how to make a contribution, <a href="module-hibp/CONTRIBUTING.md">click here.</a>
+    
+ 
+ 

From 1bc1849eb994fe0789e92a35aedece8d6b588143 Mon Sep 17 00:00:00 2001
From: chirag-d-wagento <43737932+chirag-d-wagento@users.noreply.github.com>
Date: Tue, 8 Dec 2020 17:54:22 +0530
Subject: [PATCH 10/25] [WAGMODS-108] added license file

---
 LICENSE.txt | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 LICENSE.txt

diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100644
index 0000000..85b8353
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 Team Wagento
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

From 88794d85452c60675d660c7098264749a4177312 Mon Sep 17 00:00:00 2001
From: Chirag Dodia <chirag.dodia@wagento.com>
Date: Tue, 8 Dec 2020 17:59:54 +0530
Subject: [PATCH 11/25] [WAGMODS-108] Added contribution template

---
 CONTRIBUTING.md | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 CONTRIBUTING.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..8fc5aa0
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1 @@
+contributing text goes here

From 7668dae079f44662b6f3c062456d5186bbbe9524 Mon Sep 17 00:00:00 2001
From: Chirag Dodia <chirag.dodia@wagento.com>
Date: Tue, 8 Dec 2020 18:01:17 +0530
Subject: [PATCH 12/25] [WAGMODS-108] Added readme template

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 89b0a2a..12c95d6 100644
--- a/README.md
+++ b/README.md
@@ -44,7 +44,7 @@ Features
  
  How to Contribute?
  --------------
- To learn about how to make a contribution, <a href="module-hibp/CONTRIBUTING.md">click here.</a>
+ To learn about how to make a contribution, <a href="CONTRIBUTING.md">click here.</a>
     
  
  

From 6a1b089a8e33ddd9cfa85445baa17fda9bcd2896 Mon Sep 17 00:00:00 2001
From: Chirag Dodia <chirag.dodia@wagento.com>
Date: Wed, 9 Dec 2020 15:52:46 +0530
Subject: [PATCH 13/25] [WAGMODS-108] updated license file

---
 LICENSE.txt | 42 ++++++++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/LICENSE.txt b/LICENSE.txt
index 85b8353..eb8baf3 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,21 +1,27 @@
-MIT License
+Open Software License ("OSL") v. 3.0
 
-Copyright (c) 2020 Team Wagento
+This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Licensed under the Open Software License version 3.0
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
+     a. to reproduce the Original Work in copies, either alone or as part of a collective work;
+     b. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
+     c. to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Open Software License;
+     d. to perform the Original Work publicly; and
+     e. to display the Original Work publicly.
+2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
+3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
+4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
+5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
+6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
+7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
+8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
+9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including 'fair use' or 'fair dealing'). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
+10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
+11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
+12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
+13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
+14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
+16. Modification of This License. This License is Copyright (C) 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.

From 466fda0788f1ab81e08500cd67c6166325d8a666 Mon Sep 17 00:00:00 2001
From: Chirag Dodia <chirag.dodia@wagento.com>
Date: Wed, 9 Dec 2020 16:29:20 +0530
Subject: [PATCH 14/25] [WAGMODS-108] updated contributing file

---
 CONTRIBUTING.md | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8fc5aa0..767386b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1 +1,47 @@
-contributing text goes here
+# Contributing to Wagento HIBP Module
+Thank you for your interest in helping Wagento improve this extension. We
+welcome any enhancements or bug fixes that you might wish to contribute.
+
+**Note**: If you have a security concern or an issue that you cannot resolve
+yourself, please send an e-mail to [support@wagento.com] instead of opening a
+GitHub ticket.
+## Things to Know
+
+* At Wagento, we follow the [Git Flow] methodology when adding new features.
+* We follow the [PSR-1], [PSR-2], and [PSR-12] coding standards.
+* Please be civil and do not harass or abuse any members of the Wagento staff
+or other contributors.
+* Wagento reserves the right to decline any contributions which do not fit
+our guidelines or vision for the extension.
+* All code submitted becomes the sole property of Wagento and is subject to our
+copyright with or without attribution.
+
+## Important Steps to Follow
+
+1. [Open a GitHub issue][issue] describing the enhancement or fix that you are
+contributing.
+2. Create a fork of [our GitHub repository][repository] in your GitHub account.
+3. Create a feature branch to contain your contribution.
+4. Develop your contribution and test it thoroughly under the Magento versions
+supported by the extension (see the [README] for a list).
+5. Add unit tests, integration tests, and functional tests to prove that your
+contribution functions properly and does not break anything.
+6. [Submit a Pull Request][pr] referencing the ticket you created in Step 1.
+
+## Follow-up
+
+After you submit your contribution, we will review it when time permits. Once we
+do so, we will add a comment to the Pull Request letting you know what needs to
+be added, corrected, or otherwise changed. When we are satisfied, we will merge
+your changes and add your name to the Credits section of the [README] if
+merited.
+
+[support@wagento.com]: mailto:support@wagento.com?subject=[SMS%20Notifications]%20
+[Git Flow]: http://nvie.com/posts/a-successful-git-branching-model/
+[PSR-1]: https://www.php-fig.org/psr/psr-1/
+[PSR-2]: https://www.php-fig.org/psr/psr-2/
+[PSR-12]: https://github.com/php-fig/fig-standards/blob/master/proposed/extended-coding-style-guide.md
+[repository]: https://github.com/wagento/module-hibp
+[issue]: https://github.com/wagento/module-hibp/issues
+[pr]: https://github.com/wagento/module-hibp/compare
+[README]: ./README.md

From ce782c23ade3f27f9e9fe2c78ac22ecdffc9d491 Mon Sep 17 00:00:00 2001
From: Chirag Dodia <chirag.dodia@wagento.com>
Date: Wed, 9 Dec 2020 16:30:55 +0530
Subject: [PATCH 15/25] [WAGMODS-108] updated contributing file

---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 767386b..b084c71 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -36,7 +36,7 @@ be added, corrected, or otherwise changed. When we are satisfied, we will merge
 your changes and add your name to the Credits section of the [README] if
 merited.
 
-[support@wagento.com]: mailto:support@wagento.com?subject=[SMS%20Notifications]%20
+[support@wagento.com]: mailto:support@wagento.com?subject=[HIBP%20Module]%20
 [Git Flow]: http://nvie.com/posts/a-successful-git-branching-model/
 [PSR-1]: https://www.php-fig.org/psr/psr-1/
 [PSR-2]: https://www.php-fig.org/psr/psr-2/

From b18e734da379602c4e73ab4aff640864a0eec1c5 Mon Sep 17 00:00:00 2001
From: Chirag Dodia <chirag.dodia@wagento.com>
Date: Wed, 9 Dec 2020 17:33:30 +0530
Subject: [PATCH 16/25] [WAGEMODS-99] make module compatible with 7.4 and added
 copyrights in files

---
 Block/Adminhtml/User.php                           | 11 +++++++++++
 Controller/Index/AjaxPost.php                      |  8 ++++----
 Model/Config/Source/Mode.php                       | 12 ++++++++++--
 Model/Hibp.php                                     | 11 +++++++++++
 .../Customer/Block/Account/Resetpassword.php       | 11 +++++++++--
 etc/acl.xml                                        | 12 ++++++++++++
 etc/adminhtml/system.xml                           | 12 ++++++++++++
 etc/config.xml                                     | 12 ++++++++++++
 etc/di.xml                                         | 12 ++++++++++++
 etc/frontend/routes.xml                            |  4 ++--
 etc/module.xml                                     |  6 +++---
 view/adminhtml/layout/adminhtml_user_edit.xml      | 10 ++++++++--
 view/adminhtml/templates/hibp_js.phtml             | 11 +++++++++--
 view/adminhtml/web/js/hibp.js                      | 11 +++++++++++
 view/frontend/layout/customer_account_create.xml   | 14 +++++++++++++-
 .../layout/customer_account_createpassword.xml     | 10 ++++++++--
 view/frontend/requirejs-config.js                  |  2 +-
 view/frontend/web/js/hibp.js                       | 12 +++++++++++-
 .../web/js/password-strength-indicator-mixin.js    | 10 ++++++++++
 19 files changed, 169 insertions(+), 22 deletions(-)

diff --git a/Block/Adminhtml/User.php b/Block/Adminhtml/User.php
index 69cd90c..839f1aa 100644
--- a/Block/Adminhtml/User.php
+++ b/Block/Adminhtml/User.php
@@ -1,4 +1,15 @@
 <?php
+/**
+ * Wagento Have I Been Pwned?
+ *
+ * Adds test to built-in password strength indicator to check if password has
+ * been used on other sites.
+ *
+ * @package Wagento\HIBP\Controller\Index
+ * @author Joseph Leedy <joseph@wagento.com>, Chirag Dodia <chirag.dodia@wagento.com>
+ * @copyright Copyright (c) Wagento Creative LLC. (https://www.wagento.com/)
+ * @license https://opensource.org/licenses/OSL-3.0.php Open Software License 3.0
+ */
 
 namespace Wagento\HIBP\Block\Adminhtml;
 
diff --git a/Controller/Index/AjaxPost.php b/Controller/Index/AjaxPost.php
index 9575e16..6a5532a 100644
--- a/Controller/Index/AjaxPost.php
+++ b/Controller/Index/AjaxPost.php
@@ -6,7 +6,7 @@
  * been used on other sites.
  *
  * @package Wagento\HIBP\Controller\Index
- * @author Joseph Leedy <joseph@wagento.com>
+ * @author Joseph Leedy <joseph@wagento.com>, Chirag Dodia <chirag.dodia@wagento.com>
  * @copyright Copyright (c) Wagento Creative LLC. (https://www.wagento.com/)
  * @license https://opensource.org/licenses/OSL-3.0.php Open Software License 3.0
  */
@@ -31,15 +31,15 @@ class AjaxPost implements HttpPostActionInterface
     /**
      * @var RequestInterface
      */
-    protected RequestInterface $request;
+    protected $request;
     /**
      * @var ResultFactory
      */
-    protected ResultFactory $resultFactory;
+    protected $resultFactory;
     /**
      * @var Hibp
      */
-    protected Hibp $hibp;
+    protected $hibp;
 
     /**
      * AjaxPost constructor.
diff --git a/Model/Config/Source/Mode.php b/Model/Config/Source/Mode.php
index 43be14a..29d0bfb 100644
--- a/Model/Config/Source/Mode.php
+++ b/Model/Config/Source/Mode.php
@@ -1,8 +1,16 @@
 <?php
 /**
- * Copyright ©  All rights reserved.
- * See COPYING.txt for license details.
+ * Wagento Have I Been Pwned?
+ *
+ * Adds test to built-in password strength indicator to check if password has
+ * been used on other sites.
+ *
+ * @package Wagento\HIBP\Controller\Index
+ * @author Joseph Leedy <joseph@wagento.com>, Chirag Dodia <chirag.dodia@wagento.com>
+ * @copyright Copyright (c) Wagento Creative LLC. (https://www.wagento.com/)
+ * @license https://opensource.org/licenses/OSL-3.0.php Open Software License 3.0
  */
+
 declare(strict_types=1);
 
 namespace Wagento\HIBP\Model\Config\Source;
diff --git a/Model/Hibp.php b/Model/Hibp.php
index 6809cc1..12cf5b1 100644
--- a/Model/Hibp.php
+++ b/Model/Hibp.php
@@ -1,4 +1,15 @@
 <?php
+/**
+ * Wagento Have I Been Pwned?
+ *
+ * Adds test to built-in password strength indicator to check if password has
+ * been used on other sites.
+ *
+ * @package Wagento\HIBP\Controller\Index
+ * @author Joseph Leedy <joseph@wagento.com>, Chirag Dodia <chirag.dodia@wagento.com>
+ * @copyright Copyright (c) Wagento Creative LLC. (https://www.wagento.com/)
+ * @license https://opensource.org/licenses/OSL-3.0.php Open Software License 3.0
+ */
 
 namespace Wagento\HIBP\Model;
 
diff --git a/Rewrite/Magento/Customer/Block/Account/Resetpassword.php b/Rewrite/Magento/Customer/Block/Account/Resetpassword.php
index 6daecfd..79b589c 100644
--- a/Rewrite/Magento/Customer/Block/Account/Resetpassword.php
+++ b/Rewrite/Magento/Customer/Block/Account/Resetpassword.php
@@ -1,7 +1,14 @@
 <?php
 /**
- * Copyright ©  All rights reserved.
- * See COPYING.txt for license details.
+ * Wagento Have I Been Pwned?
+ *
+ * Adds test to built-in password strength indicator to check if password has
+ * been used on other sites.
+ *
+ * @package Wagento\HIBP\Controller\Index
+ * @author Joseph Leedy <joseph@wagento.com>, Chirag Dodia <chirag.dodia@wagento.com>
+ * @copyright Copyright (c) Wagento Creative LLC. (https://www.wagento.com/)
+ * @license https://opensource.org/licenses/OSL-3.0.php Open Software License 3.0
  */
 declare(strict_types=1);
 
diff --git a/etc/acl.xml b/etc/acl.xml
index 6103a19..80d3b6c 100644
--- a/etc/acl.xml
+++ b/etc/acl.xml
@@ -1,4 +1,16 @@
 <?xml version="1.0" ?>
+<!--
+/**
+ * Wagento Have I Been Pwned?
+ *
+ * Adds test to built-in password strength indicator to check if password has
+ * been used on other sites.
+ *
+ * @author Joseph Leedy <joseph@wagento.com>, Chirag Dodia <chirag.dodia@wagento.com>
+ * @copyright Copyright (c) Wagento Creative LLC. (https://www.wagento.com/)
+ * @license https://opensource.org/licenses/OSL-3.0.php Open Software License 3.0
+ */
+-->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Acl/etc/acl.xsd">
     <acl>
         <resources>
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index a491078..86d860b 100644
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -1,4 +1,16 @@
 <?xml version="1.0" ?>
+<!--
+/**
+ * Wagento Have I Been Pwned?
+ *
+ * Adds test to built-in password strength indicator to check if password has
+ * been used on other sites.
+ *
+ * @author Joseph Leedy <joseph@wagento.com>, Chirag Dodia <chirag.dodia@wagento.com>
+ * @copyright Copyright (c) Wagento Creative LLC. (https://www.wagento.com/)
+ * @license https://opensource.org/licenses/OSL-3.0.php Open Software License 3.0
+ */
+-->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
     <system>
         <tab id="wagento" sortOrder="100" translate="label">
diff --git a/etc/config.xml b/etc/config.xml
index f105b06..a65106e 100644
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -1,4 +1,16 @@
 <?xml version="1.0" ?>
+<!--
+/**
+ * Wagento Have I Been Pwned?
+ *
+ * Adds test to built-in password strength indicator to check if password has
+ * been used on other sites.
+ *
+ * @author Joseph Leedy <joseph@wagento.com>, Chirag Dodia <chirag.dodia@wagento.com>
+ * @copyright Copyright (c) Wagento Creative LLC. (https://www.wagento.com/)
+ * @license https://opensource.org/licenses/OSL-3.0.php Open Software License 3.0
+ */
+-->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
     <default>
         <hibp>
diff --git a/etc/di.xml b/etc/di.xml
index 74cad29..46aaf28 100644
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -1,4 +1,16 @@
 <?xml version="1.0" ?>
+<!--
+/**
+ * Wagento Have I Been Pwned?
+ *
+ * Adds test to built-in password strength indicator to check if password has
+ * been used on other sites.
+ *
+ * @author Joseph Leedy <joseph@wagento.com>, Chirag Dodia <chirag.dodia@wagento.com>
+ * @copyright Copyright (c) Wagento Creative LLC. (https://www.wagento.com/)
+ * @license https://opensource.org/licenses/OSL-3.0.php Open Software License 3.0
+ */
+-->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <preference for="Magento\Customer\Block\Account\Resetpassword" type="Wagento\HIBP\Rewrite\Magento\Customer\Block\Account\Resetpassword"/>
 </config>
diff --git a/etc/frontend/routes.xml b/etc/frontend/routes.xml
index 85aa453..5de1cd1 100644
--- a/etc/frontend/routes.xml
+++ b/etc/frontend/routes.xml
@@ -6,7 +6,7 @@
  * Adds test to built-in password strength indicator to check if password has
  * been used on other sites.
  *
- * @author Joseph Leedy <joseph@wagento.com>
+ * @author Joseph Leedy <joseph@wagento.com>, Chirag Dodia <chirag.dodia@wagento.com>
  * @copyright Copyright (c) Wagento Creative LLC. (https://www.wagento.com/)
  * @license https://opensource.org/licenses/OSL-3.0.php Open Software License 3.0
  */
@@ -17,4 +17,4 @@
             <module name="Wagento_HIBP"/>
         </route>
     </router>
-</config>
\ No newline at end of file
+</config>
diff --git a/etc/module.xml b/etc/module.xml
index f71f030..85cc78f 100644
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -6,15 +6,15 @@
  * Adds test to built-in password strength indicator to check if password has
  * been used on other sites.
  *
- * @author Joseph Leedy <joseph@wagento.com>
+ * @author Joseph Leedy <joseph@wagento.com>, Chirag Dodia <chirag.dodia@wagento.com>
  * @copyright Copyright (c) Wagento Creative LLC. (https://www.wagento.com/)
  * @license https://opensource.org/licenses/OSL-3.0.php Open Software License 3.0
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Wagento_HIBP" setup_version="0.1.0">
+    <module name="Wagento_HIBP">
         <sequence>
             <module name="Magento_Customer"/>
         </sequence>
     </module>
-</config>
\ No newline at end of file
+</config>
diff --git a/view/adminhtml/layout/adminhtml_user_edit.xml b/view/adminhtml/layout/adminhtml_user_edit.xml
index 4f69b8c..04fe592 100644
--- a/view/adminhtml/layout/adminhtml_user_edit.xml
+++ b/view/adminhtml/layout/adminhtml_user_edit.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Wagento Have I Been Pwned?
+ *
+ * Adds test to built-in password strength indicator to check if password has
+ * been used on other sites.
+ *
+ * @author Joseph Leedy <joseph@wagento.com>, Chirag Dodia <chirag.dodia@wagento.com>
+ * @copyright Copyright (c) Wagento Creative LLC. (https://www.wagento.com/)
+ * @license https://opensource.org/licenses/OSL-3.0.php Open Software License 3.0
  */
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="admin-2columns-left" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
diff --git a/view/adminhtml/templates/hibp_js.phtml b/view/adminhtml/templates/hibp_js.phtml
index 160ac3e..9c700f2 100644
--- a/view/adminhtml/templates/hibp_js.phtml
+++ b/view/adminhtml/templates/hibp_js.phtml
@@ -1,7 +1,14 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Wagento Have I Been Pwned?
+ *
+ * Adds test to built-in password strength indicator to check if password has
+ * been used on other sites.
+ *
+ * @package Wagento\HIBP\Controller\Index
+ * @author Joseph Leedy <joseph@wagento.com>, Chirag Dodia <chirag.dodia@wagento.com>
+ * @copyright Copyright (c) Wagento Creative LLC. (https://www.wagento.com/)
+ * @license https://opensource.org/licenses/OSL-3.0.php Open Software License 3.0
  */
 
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
diff --git a/view/adminhtml/web/js/hibp.js b/view/adminhtml/web/js/hibp.js
index a39a059..550308e 100644
--- a/view/adminhtml/web/js/hibp.js
+++ b/view/adminhtml/web/js/hibp.js
@@ -1,3 +1,14 @@
+/**
+ * Wagento Have I Been Pwned?
+ *
+ * Adds test to built-in password strength indicator to check if password has
+ * been used on other sites.
+ *
+ * @author Joseph Leedy <joseph@wagento.com>, Chirag Dodia <chirag.dodia@wagento.com>
+ * @copyright Copyright (c) Wagento Creative LLC. (https://www.wagento.com/)
+ * @license https://opensource.org/licenses/OSL-3.0.php Open Software License 3.0
+ */
+
 define([
     'jquery',
     'mage/url'
diff --git a/view/frontend/layout/customer_account_create.xml b/view/frontend/layout/customer_account_create.xml
index c178c30..37fa11b 100644
--- a/view/frontend/layout/customer_account_create.xml
+++ b/view/frontend/layout/customer_account_create.xml
@@ -1,4 +1,16 @@
 <?xml version="1.0"?>
+<!--
+/**
+ * Wagento Have I Been Pwned?
+ *
+ * Adds test to built-in password strength indicator to check if password has
+ * been used on other sites.
+ *
+ * @author Joseph Leedy <joseph@wagento.com>, Chirag Dodia <chirag.dodia@wagento.com>
+ * @copyright Copyright (c) Wagento Creative LLC. (https://www.wagento.com/)
+ * @license https://opensource.org/licenses/OSL-3.0.php Open Software License 3.0
+ */
+-->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceBlock name="customer_form_register">
@@ -7,4 +19,4 @@
             </action>
         </referenceBlock>
     </body>
-</page>
\ No newline at end of file
+</page>
diff --git a/view/frontend/layout/customer_account_createpassword.xml b/view/frontend/layout/customer_account_createpassword.xml
index 7006ec1..02e6033 100644
--- a/view/frontend/layout/customer_account_createpassword.xml
+++ b/view/frontend/layout/customer_account_createpassword.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Wagento Have I Been Pwned?
+ *
+ * Adds test to built-in password strength indicator to check if password has
+ * been used on other sites.
+ *
+ * @author Joseph Leedy <joseph@wagento.com>, Chirag Dodia <chirag.dodia@wagento.com>
+ * @copyright Copyright (c) Wagento Creative LLC. (https://www.wagento.com/)
+ * @license https://opensource.org/licenses/OSL-3.0.php Open Software License 3.0
  */
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
diff --git a/view/frontend/requirejs-config.js b/view/frontend/requirejs-config.js
index da5c2f6..6a8ae54 100644
--- a/view/frontend/requirejs-config.js
+++ b/view/frontend/requirejs-config.js
@@ -4,7 +4,7 @@
  * Adds test to built-in password strength indicator to check if password has
  * been used on other sites.
  *
- * @author Joseph Leedy <joseph@wagento.com>
+ * @author Joseph Leedy <joseph@wagento.com>, Chirag Dodia <chirag.dodia@wagento.com>
  * @copyright Copyright (c) Wagento Creative LLC. (https://www.wagento.com/)
  * @license https://opensource.org/licenses/OSL-3.0.php Open Software License 3.0
  */
diff --git a/view/frontend/web/js/hibp.js b/view/frontend/web/js/hibp.js
index 8698e2e..46d0867 100644
--- a/view/frontend/web/js/hibp.js
+++ b/view/frontend/web/js/hibp.js
@@ -1,3 +1,13 @@
+/**
+ * Wagento Have I Been Pwned?
+ *
+ * Adds test to built-in password strength indicator to check if password has
+ * been used on other sites.
+ *
+ * @author Joseph Leedy <joseph@wagento.com>, Chirag Dodia <chirag.dodia@wagento.com>
+ * @copyright Copyright (c) Wagento Creative LLC. (https://www.wagento.com/)
+ * @license https://opensource.org/licenses/OSL-3.0.php Open Software License 3.0
+ */
 define([
     'jquery',
     'mage/url'
@@ -13,4 +23,4 @@ define([
             type: 'POST'
         }).done(doneCallback);
     };
-});
\ No newline at end of file
+});
diff --git a/view/frontend/web/js/password-strength-indicator-mixin.js b/view/frontend/web/js/password-strength-indicator-mixin.js
index bb0d114..797ca9d 100644
--- a/view/frontend/web/js/password-strength-indicator-mixin.js
+++ b/view/frontend/web/js/password-strength-indicator-mixin.js
@@ -1,3 +1,13 @@
+/**
+ * Wagento Have I Been Pwned?
+ *
+ * Adds test to built-in password strength indicator to check if password has
+ * been used on other sites.
+ *
+ * @author Joseph Leedy <joseph@wagento.com>, Chirag Dodia <chirag.dodia@wagento.com>
+ * @copyright Copyright (c) Wagento Creative LLC. (https://www.wagento.com/)
+ * @license https://opensource.org/licenses/OSL-3.0.php Open Software License 3.0
+ */
 define([
     'jquery',
     'Magento_Customer/js/zxcvbn',

From dfdb7cfeb3ebed075d38e21fb62751a72317112d Mon Sep 17 00:00:00 2001
From: Chirag Dodia <chirag.dodia@wagento.com>
Date: Thu, 10 Dec 2020 16:37:02 +0530
Subject: [PATCH 17/25] [WAGMODS-108] updated readme file

---
 README.md | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 12c95d6..1d5b8a6 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,11 @@ Wagento HIBP Module
 ======================
 This Wagento module leverages Have I Been Pwned? to check ensure your password has not been compromised. It will return your email and password and whether it has been used and/or pasted. This is accomplished by utilizing the HIBP database for passwords that exist and are the same. There is no risk since the two are not connected, but it does tell you if your password is out there.
 
+Requirements
+-------------------------
+* PHP 7.3+, 7.4
+* Magento Open Source/Commerce 2.3+ or 2.4
+
 Installation Instructions
 -------------------------
 Download the file, extract
@@ -42,9 +47,32 @@ Features
  
  In the Report Only mode, module will only indicate the notice but allow customer to use the compromise password. While in Restrict mode, module will restrict customer to use compromise password.
  
+ Support
+ ---------
+ If you experience any issues or errors while using the extension, please open a
+ ticket by sending an e-mail to [support@wagento.com][Support]. Be sure to
+ include your domain, PHP version, Magento version, a detailed description of the
+ problem including steps to reproduce it and any other relevant information. We
+ do our best to respond to all legitimate inquires within 48 business hours.
+ 
+ License
+ --------
+ The source code contained in this extension is licensed under [version 3.0 of
+ the Open Software License (OSL-3.0)][OSL]. A full copy of the license can be
+ found in the [LICENSE.txt] file.
+
+ 
  How to Contribute?
  --------------
- To learn about how to make a contribution, <a href="CONTRIBUTING.md">click here.</a>
+We welcome any and all feedback, suggestions and improvements submitted via
+issues and pull requests on [GitHub]. For guidelines, please see the
+[CONTRIBUTING.md] document.
     
- 
+ [support@wagento.com]: mailto:support@wagento.com?subject=[HIBP%20Module]%20
+ [GitHub]: https://github.com/wagento/module-hibp
+ [README]: ./README.md
+ [LICENSE.txt]: ./LICENSE.txt
+ [CONTRIBUTING.md]: ./CONTRIBUTING.md
+ [CHANGELOG.md]: ./CHANGELOG.md
+ [OSL]: https://opensource.org/licenses/OSL-3.0.php
  

From 135f3080a046fede4f2e74b73a1885391e41ee88 Mon Sep 17 00:00:00 2001
From: Chirag Dodia <chirag.dodia@wagento.com>
Date: Thu, 10 Dec 2020 16:39:23 +0530
Subject: [PATCH 18/25] [WAGMODS-108] updated readme file

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1d5b8a6..8abac77 100644
--- a/README.md
+++ b/README.md
@@ -68,7 +68,7 @@ We welcome any and all feedback, suggestions and improvements submitted via
 issues and pull requests on [GitHub]. For guidelines, please see the
 [CONTRIBUTING.md] document.
     
- [support@wagento.com]: mailto:support@wagento.com?subject=[HIBP%20Module]%20
+ [Support]: mailto:support@wagento.com?subject=[SMS%20Notifications]%20
  [GitHub]: https://github.com/wagento/module-hibp
  [README]: ./README.md
  [LICENSE.txt]: ./LICENSE.txt

From 9899828922436edc8b9d2fb3b25756a7e5044fd0 Mon Sep 17 00:00:00 2001
From: Chirag Dodia <chirag.dodia@wagento.com>
Date: Thu, 10 Dec 2020 16:40:06 +0530
Subject: [PATCH 19/25] [WAGMODS-108] updated readme file

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8abac77..fe71512 100644
--- a/README.md
+++ b/README.md
@@ -68,7 +68,7 @@ We welcome any and all feedback, suggestions and improvements submitted via
 issues and pull requests on [GitHub]. For guidelines, please see the
 [CONTRIBUTING.md] document.
     
- [Support]: mailto:support@wagento.com?subject=[SMS%20Notifications]%20
+ [Support]: mailto:support@wagento.com?subject=[HIBP%20Module]%20
  [GitHub]: https://github.com/wagento/module-hibp
  [README]: ./README.md
  [LICENSE.txt]: ./LICENSE.txt

From f17363d4bd24c81f2025df879d13ff762b679f33 Mon Sep 17 00:00:00 2001
From: Chirag Dodia <chirag.dodia@wagento.com>
Date: Thu, 10 Dec 2020 16:56:13 +0530
Subject: [PATCH 20/25] [WAGMODS-108] updated readme file

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index fe71512..a8e5f10 100644
--- a/README.md
+++ b/README.md
@@ -4,8 +4,8 @@ This Wagento module leverages Have I Been Pwned? to check ensure your password h
 
 Requirements
 -------------------------
-* PHP 7.3+, 7.4
-* Magento Open Source/Commerce 2.3+ or 2.4
+* PHP 7.4
+* Magento Open Source/Commerce 2.4
 
 Installation Instructions
 -------------------------

From 0610aaf1b539163f66f1db718d9139dc0e528c39 Mon Sep 17 00:00:00 2001
From: Chirag Dodia <chirag.dodia@wagento.com>
Date: Thu, 10 Dec 2020 17:12:00 +0530
Subject: [PATCH 21/25] [WAGMODS-109] added pull request template

---
 PULL_REQUEST_TEMPLATE.md | 45 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 PULL_REQUEST_TEMPLATE.md

diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000..06db822
--- /dev/null
+++ b/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,45 @@
+<!---
+    Thank you for contributing to Wagento Module.
+    To help us process this pull request we recommend that you add the following information:
+     - Summary of the pull request,
+     - Issue(s) related to the changes made,
+     - Manual testing scenarios
+    Fields marked with (*) are required. Please don't remove the template.
+-->
+
+<!--- Please provide a general summary of the Pull Request in the Title above -->
+
+### Description (*)
+<!---
+    Please provide a description of the changes proposed in the pull request.
+    Letting us know what has changed and why it needed changing will help us validate this pull request.
+-->
+
+### Related Pull Requests
+<!-- related pull request placeholder -->
+
+### Fixed Issues (if relevant)
+<!---
+    If relevant, please provide a list of fixed issues in the format wagento/module-hibp#<issue_number>.
+    There could be 1 or more issues linked here and it will help us find some more information about the reasoning behind this change.
+-->
+
+1. Fixes wagento/module-hibp#<issue_number>
+
+### Manual testing scenarios (*)
+<!---
+    Please provide a set of unambiguous steps to test the proposed code change.
+    Giving us manual testing scenarios will help with the processing and validation process.
+-->
+1. ...
+2. ...
+
+### Questions or comments
+<!---
+	If relevant, here you can ask questions or provide comments on your pull request for the reviewer
+	For example if you need assistance with writing tests or would like some feedback on one of your development ideas
+-->
+
+### Contribution checklist (*)
+ - [ ] Pull request has a meaningful description of its purpose
+ - [ ] All commits are accompanied by meaningful commit messages

From a99c91d9329b3150718e76513d4765ae5e95d396 Mon Sep 17 00:00:00 2001
From: Chirag Dodia <chirag.dodia@wagento.com>
Date: Thu, 10 Dec 2020 17:19:49 +0530
Subject: [PATCH 22/25] [WAGMODS-109] move pull request template to .github
 directory

---
 PULL_REQUEST_TEMPLATE.md => .github/PULL_REQUEST_TEMPLATE.md | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename PULL_REQUEST_TEMPLATE.md => .github/PULL_REQUEST_TEMPLATE.md (100%)

diff --git a/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
similarity index 100%
rename from PULL_REQUEST_TEMPLATE.md
rename to .github/PULL_REQUEST_TEMPLATE.md

From 83d710a8f34afd4b137433c40ac8da8eff4dd3c3 Mon Sep 17 00:00:00 2001
From: Chirag Dodia <chirag.dodia@wagento.com>
Date: Thu, 10 Dec 2020 17:40:28 +0530
Subject: [PATCH 23/25] [WAGMODS-109] added bug report template

---
 .github/ISSUE_TEMPLATE/bug_report.md | 29 ++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..7397668
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,29 @@
+---
+name: Bug report
+about: Technical issue with the Wagento HIBP module.
+
+---
+
+### Preconditions (*)
+<!---
+Provide the exact Magento version (example: 2.4.0) and any important information on the environment where bug is reproducible.
+-->
+1.
+2.
+
+### Steps to reproduce (*)
+<!---
+Important: Provide a set of clear steps to reproduce this bug. We can not provide support without clear instructions on how to reproduce.
+-->
+1.
+2.
+
+### Expected result (*)
+<!--- Tell us what do you expect to happen. -->
+1. [Screenshots, logs or description]
+2.
+
+### Actual result (*)
+<!--- Tell us what happened instead. Include error messages and issues. -->
+1. [Screenshots, logs or description]
+2.

From 696af399b707859aeb70e72bf5b63ec66ea4d510 Mon Sep 17 00:00:00 2001
From: Chirag Dodia <chirag.dodia@wagento.com>
Date: Thu, 10 Dec 2020 17:46:51 +0530
Subject: [PATCH 24/25] [WAGMODS-109] added feature template

---
 .github/ISSUE_TEMPLATE/feature_request.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md

diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..ab5ad85
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Any feature or improvements you would like to see in this module.
+
+---
+
+### Description (*)
+<!--- Describe the feature you would like to add. -->
+
+### Expected behavior (*)
+<!--- What is the expected behavior of this feature? How is it going to work? -->
+
+### Benefits
+<!--- How do you think this feature would improve Module? -->
+
+### Additional information
+<!--- What other information can you provide about the desired feature? -->

From ceb9e07a20fe9752ae173274816367fe20352ac8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nguye=CC=82=CC=83n=20Tha=CC=80nh?= <nd.thanh@outlook.com>
Date: Sun, 10 Jan 2021 21:36:09 +0000
Subject: [PATCH 25/25] WAGMODS-105 implement command line to check password

---
 Console/Command/HIBP.php | 69 ++++++++++++++++++++++++++++++++++++++++
 etc/di.xml               |  7 ++++
 2 files changed, 76 insertions(+)
 create mode 100644 Console/Command/HIBP.php

diff --git a/Console/Command/HIBP.php b/Console/Command/HIBP.php
new file mode 100644
index 0000000..44d763a
--- /dev/null
+++ b/Console/Command/HIBP.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Wagento Have I Been Pwned?
+ *
+ * Adds test to built-in password strength indicator to check if password has
+ * been used on other sites.
+ *
+ * @package Wagento\HIBP\Console\Command
+ * @author Joseph Leedy <joseph@wagento.com>, Chirag Dodia <chirag.dodia@wagento.com>, Thanh Nguyen <leo@wagento.com>
+ * @copyright Copyright (c) Wagento Creative LLC. (https://www.wagento.com/)
+ * @license https://opensource.org/licenses/OSL-3.0.php Open Software License 3.0
+ */
+declare(strict_types=1);
+
+namespace Wagento\HIBP\Console\Command;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Input\InputArgument;
+use Wagento\HIBP\Model\Hibp as HibpModel;
+
+class HIBP extends Command
+{
+    const PASSWORD = 'password';
+
+    /**
+     * Command Line class HIBP constructor.
+     * @param Hibp $hibp
+     */
+    public function __construct(
+        HibpModel $hibp
+    ) {
+        $this->hibp = $hibp;
+        parent::__construct();
+    }
+
+    protected function configure()
+    {
+        $this->setName('hibp:check-password')
+             ->setDescription('Wagento Have I Been Pwned - Check Password')
+             ->addArgument(
+                 self::PASSWORD,
+                 InputArgument::REQUIRED,
+                 'Password To Check'
+             );
+
+        parent::configure();
+    }
+
+    /**
+     * check input password from command line
+     * @param InputInterface
+     * @param OutputInterface
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $password = $input->getArgument(self::PASSWORD);
+
+        $isPwnedPassword = $this->hibp->isPwnedPassword($password);
+        $count = $this->hibp->count();
+        if ($isPwnedPassword && $count) {
+            $output->writeln("Your Password has been Pwned {$count} times !");
+        }
+        else {
+            $output->writeln("Your Password hasn't been Pwned !");
+        }
+    }
+}
diff --git a/etc/di.xml b/etc/di.xml
index 46aaf28..3b8bbc6 100644
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -13,4 +13,11 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <preference for="Magento\Customer\Block\Account\Resetpassword" type="Wagento\HIBP\Rewrite\Magento\Customer\Block\Account\Resetpassword"/>
+    <type name="Magento\Framework\Console\CommandList">
+        <arguments>
+            <argument name="commands" xsi:type="array">
+                <item name="hibp" xsi:type="object">Wagento\HIBP\Console\Command\HIBP</item>
+            </argument>
+        </arguments>
+    </type>
 </config>