Released Version 1.1.5

null93 · null93 · commit f733aa1f72e1 · 2024-10-11T12:44:25.000-05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -86,3 +86,6 @@
 -   Fixed GH-11, Admin Base URL Missing From Admin Email
 -   Fixed GH-12, Email Is Sent To Inactive Admin Users On Ban
 -   Fixed GH-13, Replace 'mt_rand' With 'random_int'
+
+## Version 1.1.5
+-   Merged PR-28, Replacing QR code provider, thanks @marcogruhl!
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 
 ![](https://img.shields.io/badge/Magento-1-orange.svg?style=for-the-badge)
 ![](https://img.shields.io/badge/License-MIT-orange.svg?style=for-the-badge)
-![](https://img.shields.io/badge/Version-1.1.4-orange.svg?style=for-the-badge)
+![](https://img.shields.io/badge/Version-1.1.5-orange.svg?style=for-the-badge)
 ![](https://img.shields.io/badge/Stability-Stable-orange.svg?style=for-the-badge)
 
 <p align="center" >
diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
 	"name": "jetrails/magento-twofactor",
 	"description": "User based 2FA enablement for admin users in Magento 1.x",
 	"type": "magento-module",
-	"version": "1.1.4",
+	"version": "1.1.5",
 	"license": "MIT",
 	"homepage": "https://github.com/jetrails/magento-twofactor",
 	"authors": [
diff --git a/conf/package.xml b/conf/package.xml
@@ -10,7 +10,7 @@
 	<extends/>
 	<summary>The JetRails 2FA plugin adds an extra layer of security to your Magento store.  User-based 2FA enablement ensures that admin users are following best security practices.</summary>
 	<description>https://github.com/jetrails/magento-twofactor</description>
-	<notes>Released Version 1.1.4</notes>
+	<notes>Released Version 1.1.5</notes>
 	<authors>
 		<author>
 			<name>Rafael Grigorian</name>
diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-	"version": "1.1.4",
+	"version": "1.1.5",
 	"name": "magento-twofactor",
 	"description": "User based 2FA enablement for admin users in Magento 1.x",
 	"author": "Rafael Grigorian",
diff --git a/src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Configure/Edit.php b/src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Configure/Edit.php
@@ -4,7 +4,7 @@
 	 * Edit.php - This class exists to simply tell Magento's grid system where to look for the
 	 * proper controller for the configure page.  It also specifies the proper block group within
 	 * the constructor.
-	 * @version         1.1.4
+	 * @version         1.1.5
 	 * @package         JetRails® TwoFactor
 	 * @category        Configure
 	 * @author          Rafael Grigorian - JetRails®
diff --git a/src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Configure/Edit/Form.php b/src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Configure/Edit/Form.php
@@ -3,7 +3,7 @@
 	/**
 	 * Form.php - This class initializes the form, field-set, and form fields that will exist on the
 	 * configure page.  All information is set in the _prepareForm method.
-	 * @version         1.1.4
+	 * @version         1.1.5
 	 * @package         JetRails® TwoFactor
 	 * @category        Edit
 	 * @author          Rafael Grigorian - JetRails®
diff --git a/src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Manage/Container.php b/src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Manage/Container.php
@@ -4,7 +4,7 @@
 	 * Container.php - This class exists to simply tell Magento's grid system where to look for the
 	 * proper controller for the configure page.  It also specifies the proper block group within
 	 * the constructor.
-	 * @version         1.1.4
+	 * @version         1.1.5
 	 * @package         JetRails® TwoFactor
 	 * @category        Manage
 	 * @author          Rafael Grigorian - JetRails®
diff --git a/src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Manage/Container/Grid.php b/src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Manage/Container/Grid.php
@@ -4,7 +4,7 @@
 	 * Grid.php - This class defines what collection to use for the grid collection.  It also
 	 * defines all the columns for the grid widget.  Additionally it defines all the mass-action
 	 * options for the widget grid.
-	 * @version         1.1.4
+	 * @version         1.1.5
 	 * @package         JetRails® TwoFactor
 	 * @category        Container
 	 * @author          Rafael Grigorian - JetRails®
diff --git a/src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Renderer/Manage/Address.php b/src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Renderer/Manage/Address.php
@@ -4,7 +4,7 @@
 	 * Address.php - This class is a renderer class that is used with the grid widget's columns.
 	 * These classes are used to load information from the authentication model using the admin
 	 * user's id.
-	 * @version         1.1.4
+	 * @version         1.1.5
 	 * @package         JetRails® TwoFactor
 	 * @category        Manage
 	 * @author          Rafael Grigorian - JetRails®
diff --git a/src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Renderer/Manage/State.php b/src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Renderer/Manage/State.php
@@ -4,7 +4,7 @@
 	 * State.php - This class is a renderer class that is used with the grid widget's columns.
 	 * These classes are used to load information from the authentication model using the admin
 	 * user's id.
-	 * @version         1.1.4
+	 * @version         1.1.5
 	 * @package         JetRails® TwoFactor
 	 * @category        Manage
 	 * @author          Rafael Grigorian - JetRails®
diff --git a/src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Renderer/Manage/Status.php b/src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Renderer/Manage/Status.php
@@ -4,7 +4,7 @@
 	 * Status.php - This class is a renderer class that is used with the grid widget's columns.
 	 * These classes are used to load information from the authentication model using the admin
 	 * user's id.
-	 * @version         1.1.4
+	 * @version         1.1.5
 	 * @package         JetRails® TwoFactor
 	 * @category        Manage
 	 * @author          Rafael Grigorian - JetRails®
diff --git a/src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Renderer/Manage/Timestamp.php b/src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Renderer/Manage/Timestamp.php
@@ -4,7 +4,7 @@
 	 * Timestamp.php - This class is a renderer class that is used with the grid widget's columns.
 	 * These classes are used to load information from the authentication model using the admin
 	 * user's id.
-	 * @version         1.1.4
+	 * @version         1.1.5
 	 * @package         JetRails® TwoFactor
 	 * @category        Manage
 	 * @author          Rafael Grigorian - JetRails®
diff --git a/src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Template/Backup.php b/src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Template/Backup.php
@@ -3,7 +3,7 @@
 	/**
 	 * Backup.php - This template block is used in hand with the associated template file and it
 	 * is used to prepare information for the template file.
-	 * @version         1.1.4
+	 * @version         1.1.5
 	 * @package         JetRails® TwoFactor
 	 * @category        Template
 	 * @author          Rafael Grigorian - JetRails®
diff --git a/src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Template/Banned.php b/src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Template/Banned.php
@@ -3,7 +3,7 @@
 	/**
 	 * Banned.php - This template block is used in hand with the associated template file and it
 	 * is used to prepare information for the template file.
-	 * @version         1.1.4
+	 * @version         1.1.5
 	 * @package         JetRails® TwoFactor
 	 * @category        Template
 	 * @author          Rafael Grigorian - JetRails®
diff --git a/src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Template/Scan.php b/src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Template/Scan.php
@@ -3,7 +3,7 @@
 	/**
 	 * Scan.php - This template block is used in hand with the associated template file and it
 	 * is used to prepare information for the template file.
-	 * @version         1.1.4
+	 * @version         1.1.5
 	 * @package         JetRails® TwoFactor
 	 * @category        Template
 	 * @author          Rafael Grigorian - JetRails®
diff --git a/src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Template/Verify.php b/src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Template/Verify.php
@@ -3,7 +3,7 @@
 	/**
 	 * Verify.php - This function aids the Verify template.  This block offers helpful function that
 	 * are used within the template, such as suppling the form action and stylesheet URL.
-	 * @version         1.1.4
+	 * @version         1.1.5
 	 * @package         JetRails® TwoFactor
 	 * @category        Template
 	 * @author          Rafael Grigorian - JetRails®
diff --git a/src/app/code/community/JetRails/TwoFactor/Helper/Cookie.php b/src/app/code/community/JetRails/TwoFactor/Helper/Cookie.php
@@ -4,7 +4,7 @@
 	 * Cookie.php - This helper class contains functions that deal with cookie creation, deletion,
 	 * and authentication.  This cookie class is used to aid in the "remember for x days"
 	 * functionality.
-	 * @version         1.1.4
+	 * @version         1.1.5
 	 * @package         JetRails® TwoFactor
 	 * @category        Helper
 	 * @author          Rafael Grigorian - JetRails®
diff --git a/src/app/code/community/JetRails/TwoFactor/Helper/Data.php b/src/app/code/community/JetRails/TwoFactor/Helper/Data.php
@@ -7,7 +7,7 @@
 	 * user. This class also contains methods to get the configuration data which are extracted
 	 * using Magento's getConfig method and supplying the with the XPATH constants which are defined
 	 * internally.
-	 * @version         1.1.4
+	 * @version         1.1.5
 	 * @package         JetRails® TwoFactor
 	 * @category        Helper
 	 * @author          Rafael Grigorian - JetRails®
diff --git a/src/app/code/community/JetRails/TwoFactor/Helper/Totp.php b/src/app/code/community/JetRails/TwoFactor/Helper/Totp.php
@@ -5,7 +5,7 @@
 	 * pins.  It is very flexible and can be initialized to different sized secrets and pins.
 	 * Although the default values conform to the generally accepted configuration for 2FA.  Apps
 	 * such as Authy and Google Authenticator use the default configuration.
-	 * @version         1.1.4
+	 * @version         1.1.5
 	 * @package         JetRails® TwoFactor
 	 * @category        Helper
 	 * @author          Rafael Grigorian - JetRails®
diff --git a/src/app/code/community/JetRails/TwoFactor/Model/Adminhtml/Auth.php b/src/app/code/community/JetRails/TwoFactor/Model/Adminhtml/Auth.php
@@ -7,7 +7,7 @@
 	 * passed TOTP pin, and registers failed authentication attempts.  In addition the constants
 	 * that are defined within this class are used throughout the module and are accessed
 	 * statically.
-	 * @version         1.1.4
+	 * @version         1.1.5
 	 * @package         JetRails® TwoFactor
 	 * @category        Model
 	 * @author          Rafael Grigorian - JetRails®
diff --git a/src/app/code/community/JetRails/TwoFactor/Model/Adminhtml/Notify.php b/src/app/code/community/JetRails/TwoFactor/Model/Adminhtml/Notify.php
@@ -4,7 +4,7 @@
 	 * Notify.php - This class contains methods that help log and communicate messages.  Messages
 	 * can be logged into a custom log file, the logged in admin user can be notified, or all admin
 	 * users in the 'Administrators' role can be notified.
-	 * @version         1.1.4
+	 * @version         1.1.5
 	 * @package         JetRails® TwoFactor
 	 * @category        Model
 	 * @author          Rafael Grigorian - JetRails®
diff --git a/src/app/code/community/JetRails/TwoFactor/Model/Adminhtml/Observer.php b/src/app/code/community/JetRails/TwoFactor/Model/Adminhtml/Observer.php
@@ -5,7 +5,7 @@
 	 * config.xml file.  This observer fires before any adminhtml action gets executed.  This way if
 	 * a user is not authenticated, we can ban access to those actions and redirect to the
 	 * verification page.
-	 * @version         1.1.4
+	 * @version         1.1.5
 	 * @package         JetRails® TwoFactor
 	 * @category        Model
 	 * @author          Rafael Grigorian - JetRails®
diff --git a/src/app/code/community/JetRails/TwoFactor/Model/Adminhtml/Page.php b/src/app/code/community/JetRails/TwoFactor/Model/Adminhtml/Page.php
@@ -3,7 +3,7 @@
 	/**
 	 * Page.php - This class contains the page route constants that are used throughout the module.
 	 * It also contains methods that link the state to the associated route.
-	 * @version         1.1.4
+	 * @version         1.1.5
 	 * @package         JetRails® TwoFactor
 	 * @category        Model
 	 * @author          Rafael Grigorian - JetRails®
diff --git a/src/app/code/community/JetRails/TwoFactor/Model/Adminhtml/Resource/Auth.php b/src/app/code/community/JetRails/TwoFactor/Model/Adminhtml/Resource/Auth.php
@@ -4,7 +4,7 @@
 	 * Auth.php - This class is the resource model for the authentication model.  There is not much
 	 * going on here other than the standard setup.  The database table and primary column is
 	 * defined in the constructor and auto incrementing primary key on data save is disabled.
-	 * @version         1.1.4
+	 * @version         1.1.5
 	 * @package         JetRails® TwoFactor
 	 * @category        Resource Model
 	 * @author          Rafael Grigorian - JetRails®
diff --git a/src/app/code/community/JetRails/TwoFactor/Model/Adminhtml/Rewrite/Observer.php b/src/app/code/community/JetRails/TwoFactor/Model/Adminhtml/Rewrite/Observer.php
@@ -5,7 +5,7 @@
 	 * here in order to ensure 2FA authentication before forcing admin password change. The Pci
 	 * module is only available for EE versions of Magento and therefore this observer will only
 	 * run on enterprise versions of Magento.
-	 * @version         1.1.4
+	 * @version         1.1.5
 	 * @package         JetRails® TwoFactor
 	 * @category        Model
 	 * @author          Rafael Grigorian - JetRails®
diff --git a/src/app/code/community/JetRails/TwoFactor/Model/Adminhtml/State.php b/src/app/code/community/JetRails/TwoFactor/Model/Adminhtml/State.php
@@ -5,7 +5,7 @@
 	 * This basically means that based on the state of authentication, we can redirect user's to the
 	 * proper pages to ensure that their two-factor authentication accounts are setup. The values as
 	 * they relate to the user can be found in the authentication model.
-	 * @version         1.1.4
+	 * @version         1.1.5
 	 * @package         JetRails® TwoFactor
 	 * @category        Model
 	 * @author          Rafael Grigorian - JetRails®
diff --git a/src/app/code/community/JetRails/TwoFactor/Model/Adminhtml/Status.php b/src/app/code/community/JetRails/TwoFactor/Model/Adminhtml/Status.php
@@ -5,7 +5,7 @@
 	 * This basically means if the status is set to enabled for a user, then two-factor
 	 * authentication is enforced for the user.  The values as they relate to the user can be found
 	 * in the authentication model.
-	 * @version         1.1.4
+	 * @version         1.1.5
 	 * @package         JetRails® TwoFactor
 	 * @category        Model
 	 * @author          Rafael Grigorian - JetRails®
diff --git a/src/app/code/community/JetRails/TwoFactor/controllers/Twofactor/ConfigureController.php b/src/app/code/community/JetRails/TwoFactor/controllers/Twofactor/ConfigureController.php
@@ -5,7 +5,7 @@
 	 * be found in the "JetRails/Two-Factor Authentication" menu tab.  It handles the rendering of
 	 * that page as well as all the actions that are submitted with the grid container that the
 	 * index action renders.
-	 * @version         1.1.4
+	 * @version         1.1.5
 	 * @package         JetRails® TwoFactor
 	 * @category        Controllers
 	 * @author          Rafael Grigorian - JetRails®
diff --git a/src/app/code/community/JetRails/TwoFactor/controllers/Twofactor/LoginController.php b/src/app/code/community/JetRails/TwoFactor/controllers/Twofactor/LoginController.php
@@ -5,7 +5,7 @@
 	 * their two-factor authentication account.  Actions that render the verification page as well
 	 * as the banned page that a user will see on failed login are all encapsulated within this
 	 * controller.
-	 * @version         1.1.4
+	 * @version         1.1.5
 	 * @package         JetRails® TwoFactor
 	 * @category        Controllers
 	 * @author          Rafael Grigorian - JetRails®
diff --git a/src/app/code/community/JetRails/TwoFactor/controllers/Twofactor/ManageController.php b/src/app/code/community/JetRails/TwoFactor/controllers/Twofactor/ManageController.php
@@ -5,7 +5,7 @@
 	 * found in the "JetRails/Two-Factor Authentication" menu tab.  It handles the rendering of that
 	 * page as well as all the actions that are submitted with the grid container that the index
 	 * action renders.
-	 * @version         1.1.4
+	 * @version         1.1.5
 	 * @package         JetRails® TwoFactor
 	 * @category        Controllers
 	 * @author          Rafael Grigorian - JetRails®
diff --git a/src/app/code/community/JetRails/TwoFactor/controllers/Twofactor/SetupController.php b/src/app/code/community/JetRails/TwoFactor/controllers/Twofactor/SetupController.php
@@ -4,7 +4,7 @@
 	 * SetupController.php - This controller contains all actions that relate to setting up the two
 	 * factor authentication on an admin user's account.  Actions that render both the scan and
 	 * backup pages for setup, as well as an action that resets the whole process for an admin user.
-	 * @version         1.1.4
+	 * @version         1.1.5
 	 * @package         JetRails® TwoFactor
 	 * @category        Controllers
 	 * @author          Rafael Grigorian - JetRails®
diff --git a/src/app/code/community/JetRails/TwoFactor/etc/config.xml b/src/app/code/community/JetRails/TwoFactor/etc/config.xml
@@ -3,7 +3,7 @@
 <config>
 	<modules>
 		<JetRails_TwoFactor>
-			<version>1.1.4</version>
+			<version>1.1.5</version>
 		</JetRails_TwoFactor>
 	</modules>
 	<admin>
diff --git a/src/app/design/adminhtml/base/default/template/twofactor/backup.phtml b/src/app/design/adminhtml/base/default/template/twofactor/backup.phtml
@@ -3,7 +3,7 @@
     /**
      * backup.phtml - These page templates are rendered with the help of the block classes that are
      * found under the Template folder for this module.
-     * @version         1.1.4
+     * @version         1.1.5
      * @package         JetRails® TwoFactor
      * @category        Template
      * @author          Rafael Grigorian - JetRails®
diff --git a/src/app/design/adminhtml/base/default/template/twofactor/banned.phtml b/src/app/design/adminhtml/base/default/template/twofactor/banned.phtml
@@ -3,7 +3,7 @@
     /**
      * banned.phtml - These page templates are rendered with the help of the block classes that are
      * found under the Template folder for this module.
-     * @version         1.1.4
+     * @version         1.1.5
      * @package         JetRails® TwoFactor
      * @category        Template
      * @author          Rafael Grigorian - JetRails®
diff --git a/src/app/design/adminhtml/base/default/template/twofactor/logout.phtml b/src/app/design/adminhtml/base/default/template/twofactor/logout.phtml
@@ -3,7 +3,7 @@
     /**
      * logout.phtml - These page templates are rendered with the help of the block classes that are
      * found under the Template folder for this module.
-     * @version         1.1.4
+     * @version         1.1.5
      * @package         JetRails® TwoFactor
      * @category        Template
      * @author          Rafael Grigorian - JetRails®
diff --git a/src/app/design/adminhtml/base/default/template/twofactor/message.phtml b/src/app/design/adminhtml/base/default/template/twofactor/message.phtml
@@ -3,7 +3,7 @@
     /**
      * message.phtml - These page templates are rendered with the help of the block classes that are
      * found under the Template folder for this module.
-     * @version         1.1.4
+     * @version         1.1.5
      * @package         JetRails® TwoFactor
      * @category        Template
      * @author          Rafael Grigorian - JetRails®
diff --git a/src/app/design/adminhtml/base/default/template/twofactor/page.phtml b/src/app/design/adminhtml/base/default/template/twofactor/page.phtml
@@ -3,7 +3,7 @@
     /**
      * page.phtml - These page templates are rendered with the help of the block classes that are
      * found under the Template folder for this module.
-     * @version         1.1.4
+     * @version         1.1.5
      * @package         JetRails® TwoFactor
      * @category        Template
      * @author          Rafael Grigorian - JetRails®
diff --git a/src/app/design/adminhtml/base/default/template/twofactor/scan.phtml b/src/app/design/adminhtml/base/default/template/twofactor/scan.phtml
@@ -3,7 +3,7 @@
     /**
      * scan.phtml - These page templates are rendered with the help of the block classes that are
      * found under the Template folder for this module.
-     * @version         1.1.4
+     * @version         1.1.5
      * @package         JetRails® TwoFactor
      * @category        Template
      * @author          Rafael Grigorian - JetRails®
diff --git a/src/app/design/adminhtml/base/default/template/twofactor/verify.phtml b/src/app/design/adminhtml/base/default/template/twofactor/verify.phtml
@@ -3,7 +3,7 @@
     /**
      * verify.phtml - These page templates are rendered with the help of the block classes that are
      * found under the Template folder for this module.
-     * @version         1.1.4
+     * @version         1.1.5
      * @package         JetRails® TwoFactor
      * @category        Template
      * @author          Rafael Grigorian - JetRails®

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "version": "1.1.4",`
	`2`	`+ "version": "1.1.5",`
`3`	`3`	`"name": "magento-twofactor",`
`4`	`4`	`"description": "User based 2FA enablement for admin users in Magento 1.x",`
`5`	`5`	`"author": "Rafael Grigorian",`