Released Version 1.1.1

null93 · null93 · commit 11b3288d674c · 2018-03-01T17:50:47.000-06:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -68,4 +68,7 @@
 -   Made failed attempts configurable
 -   Made ban duration configurable
 -   Added a manage 2FA accounts page for super admins
--   Improved email templates
+-   Improved email templates
+
+## Version 1.1.1
+-   Added enterprise compatibility
diff --git a/COMPATIBILITY.md b/COMPATIBILITY.md
@@ -26,4 +26,13 @@
 | 1.9.3.4 | 12/15/2017 | SUCCESS | Rafael Grigorian |
 | 1.9.3.5 | 12/15/2017 | SUCCESS | Rafael Grigorian |
 | 1.9.3.6 | 12/15/2017 | SUCCESS | Rafael Grigorian |
-| 1.9.3.7 | 12/15/2017 | SUCCESS | Rafael Grigorian |
+| 1.9.3.7 | 12/15/2017 | SUCCESS | Rafael Grigorian |
+| 1.9.3.8 | 03/01/2018 | SUCCESS | Rafael Grigorian |
+
+## Magento Commerce 1.x
+
+| Release  |  Test Date |  Status |    Tester Name   |
+|:--------:|:----------:|:-------:|:----------------:|
+| 1.13.1.0 | 03/01/2018 | SUCCESS | Rafael Grigorian |
+| 1.14.3.7 | 03/01/2018 | SUCCESS | Rafael Grigorian |
+| 1.14.3.8 | 03/01/2018 | SUCCESS | Rafael Grigorian |
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 <p align="center" >
 	<img src="https://img.shields.io/badge/Magento-1.x-orange.svg?style=for-the-badge" />
 	<img src="https://img.shields.io/badge/License-MIT-orange.svg?style=for-the-badge" />
-	<img src="https://img.shields.io/badge/Version-1.1.0-orange.svg?style=for-the-badge" />
+	<img src="https://img.shields.io/badge/Version-1.1.1-orange.svg?style=for-the-badge" />
 </p>
 </br>
 
diff --git a/design/User Guide.sketch b/design/User Guide.sketch
diff --git a/dist/JetRails_TwoFactor-1.1.0.tgz b/dist/JetRails_TwoFactor-1.1.0.tgz
diff --git a/dist/JetRails_TwoFactor-1.1.1.tgz b/dist/JetRails_TwoFactor-1.1.1.tgz
diff --git a/doc/User Guide.pdf b/doc/User Guide.pdf
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -43,8 +43,8 @@ services:
         links:
             - database
         environment:
-            - MAGEREPO_EDITION=community
-            - MAGEREPO_RELEASE=1.9.3.7
+            - MAGEREPO_EDITION=enterprise
+            - MAGEREPO_RELEASE=1.14.3.8
     database:
         image: jetrails/magento:1.x-database
         volumes:
@@ -55,4 +55,4 @@ services:
             - MYSQL_ROOT_PASSWORD=magento
             - MYSQL_USER=magento
             - MYSQL_PASSWORD=magento
-            - MYSQL_DATABASE=magento
+            - MYSQL_DATABASE=magento
diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-	"version": "1.1.0",
+	"version": "1.1.1",
 	"name": "magento-twofactor",
 	"description": "Two-factor authorization for 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.0
+	 * @version         1.1.1
 	 * @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.0
+	 * @version         1.1.1
 	 * @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.0
+	 * @version         1.1.1
 	 * @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.0
+	 * @version         1.1.1
 	 * @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.0
+	 * @version         1.1.1
 	 * @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.0
+	 * @version         1.1.1
 	 * @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.0
+	 * @version         1.1.1
 	 * @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.0
+	 * @version         1.1.1
 	 * @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.0
+	 * @version         1.1.1
 	 * @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.0
+	 * @version         1.1.1
 	 * @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.0
+	 * @version         1.1.1
 	 * @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.0
+	 * @version         1.1.1
 	 * @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.0
+	 * @version         1.1.1
 	 * @package         JetRails® TwoFactor
 	 * @category        Helper
 	 * @author          Rafael Grigorian - JetRails®
@@ -61,7 +61,7 @@ public function create ( $time, $pin, $address ) {
 			// Load the data helper instance
 			$data = Mage::helper ("twofactor/data");
 			// Create the content for the cookie
-			$value = Mage::helper ("core")->encrypt ( json_encode ( array (
+			$value = Mage::getSingleton ("core/encryption")->encrypt ( json_encode ( array (
 				"timestamp" => $time,
 				"pin" => $pin,
 				"address" => $address
@@ -100,7 +100,7 @@ public function authenticate ( $uid ) {
 			// Check to see if that the cookie exists
 			if ( $cookie !== false ) {
 				// Decrypt the contents of cookie
-				$cached = json_decode ( Mage::helper ("core")->decrypt ( $cookie ) );
+				$cached = json_decode ( Mage::getSingleton ("core/encryption")->decrypt ( $cookie ) );
 				// Check to see that the IP address still matches
 				if ( Mage::helper ("core/http")->getRemoteAddr () === $cached->address ) {
 					// Calculate the timestamp for x days after creation
@@ -132,4 +132,4 @@ public function authenticate ( $uid ) {
 			return false;
 		}
 
-	}
+	}
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.0
+	 * @version         1.1.1
 	 * @package         JetRails® TwoFactor
 	 * @category        Helper
 	 * @author          Rafael Grigorian - JetRails®
@@ -61,4 +61,4 @@ public function getData () {
 			);
 		}
 
-	}
+	}
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.0
+	 * @version         1.1.1
 	 * @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.0
+	 * @version         1.1.1
 	 * @package         JetRails® TwoFactor
 	 * @category        Model
 	 * @author          Rafael Grigorian - JetRails®
@@ -101,7 +101,7 @@ public function getSecret () {
 			// If the secret is not null
 			if ( $secret !== null ) {
 				// Decrypt and return the secret
-				return Mage::helper ("core")->decrypt ( $secret );
+				return Mage::getSingleton ("core/encryption")->decrypt ( $secret );
 			}
 			// Otherwise, return null
 			return null;
@@ -115,7 +115,7 @@ public function getSecret () {
 		 */
 		public function setSecret ( $secret ) {
 			// Before saving to databases, encrypt the TOTP secret
-			parent::setSecret ( Mage::helper ("core")->encrypt ( $secret ) );
+			parent::setSecret ( Mage::getSingleton ("core/encryption")->encrypt ( $secret ) );
 		}
 
 		/**
@@ -129,7 +129,7 @@ public function getBackupCodes () {
 			// If the value is not null and defined
 			if ( $codes !== null ) {
 				// Decrypt the values and turn into a PHP array
-				$codes = Mage::helper ("core")->decrypt ( $codes );
+				$codes = Mage::getSingleton ("core/encryption")->decrypt ( $codes );
 				return json_decode ( $codes );
 			}
 			// Otherwise, return an empty array
@@ -145,7 +145,7 @@ public function getBackupCodes () {
 		public function setBackupCodes ( $codes ) {
 			// Encode as JSON, encrypt, store into database
 			$codes = json_encode ( $codes );
-			$codes = Mage::helper ("core")->encrypt ( $codes );
+			$codes = Mage::getSingleton ("core/encryption")->encrypt ( $codes );
 			parent::setBackupCodes ( $codes );
 		}
 
@@ -197,4 +197,4 @@ public function isBanned () {
 			return false;
 		}
 
-	}
+	}
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.0
+	 * @version         1.1.1
 	 * @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.0
+	 * @version         1.1.1
 	 * @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.0
+	 * @version         1.1.1
 	 * @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.0
+	 * @version         1.1.1
 	 * @package         JetRails® TwoFactor
 	 * @category        Resource 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.0
+	 * @version         1.1.1
 	 * @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.0
+	 * @version         1.1.1
 	 * @package         JetRails® TwoFactor
 	 * @category        Model
 	 * @author          Rafael Grigorian - JetRails®
diff --git a/src/app/code/community/JetRails/TwoFactor/controllers/ConfigureController.php b/src/app/code/community/JetRails/TwoFactor/controllers/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.0
+	 * @version         1.1.1
 	 * @package         JetRails® TwoFactor
 	 * @category        Controllers
 	 * @author          Rafael Grigorian - JetRails®
diff --git a/src/app/code/community/JetRails/TwoFactor/controllers/LoginController.php b/src/app/code/community/JetRails/TwoFactor/controllers/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.0
+	 * @version         1.1.1
 	 * @package         JetRails® TwoFactor
 	 * @category        Controllers
 	 * @author          Rafael Grigorian - JetRails®
diff --git a/src/app/code/community/JetRails/TwoFactor/controllers/ManageController.php b/src/app/code/community/JetRails/TwoFactor/controllers/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.0
+	 * @version         1.1.1
 	 * @package         JetRails® TwoFactor
 	 * @category        Controllers
 	 * @author          Rafael Grigorian - JetRails®
diff --git a/src/app/code/community/JetRails/TwoFactor/controllers/SetupController.php b/src/app/code/community/JetRails/TwoFactor/controllers/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.0
+	 * @version         1.1.1
 	 * @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.0</version>
+			<version>1.1.1</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.0
+     * @version         1.1.1
      * @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.0
+     * @version         1.1.1
      * @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
diff --git a/src/app/design/adminhtml/base/default/template/twofactor/message.phtml b/src/app/design/adminhtml/base/default/template/twofactor/message.phtml
diff --git a/src/app/design/adminhtml/base/default/template/twofactor/page.phtml b/src/app/design/adminhtml/base/default/template/twofactor/page.phtml
diff --git a/src/app/design/adminhtml/base/default/template/twofactor/scan.phtml b/src/app/design/adminhtml/base/default/template/twofactor/scan.phtml
diff --git a/src/app/design/adminhtml/base/default/template/twofactor/verify.phtml b/src/app/design/adminhtml/base/default/template/twofactor/verify.phtml

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "version": "1.1.0",`
	`2`	`+ "version": "1.1.1",`
`3`	`3`	`"name": "magento-twofactor",`
`4`	`4`	`"description": "Two-factor authorization for Magento 1.x",`
`5`	`5`	`"author": "Rafael Grigorian",`