Skip to content

Commit f733aa1

Browse files
committed
Released Version 1.1.5
1 parent 7d05f43 commit f733aa1

40 files changed

+42
-39
lines changed

CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -86,3 +86,6 @@
8686
- Fixed GH-11, Admin Base URL Missing From Admin Email
8787
- Fixed GH-12, Email Is Sent To Inactive Admin Users On Ban
8888
- Fixed GH-13, Replace 'mt_rand' With 'random_int'
89+
90+
## Version 1.1.5
91+
- Merged PR-28, Replacing QR code provider, thanks @marcogruhl!

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
44
![](https://img.shields.io/badge/Magento-1-orange.svg?style=for-the-badge)
55
![](https://img.shields.io/badge/License-MIT-orange.svg?style=for-the-badge)
6-
![](https://img.shields.io/badge/Version-1.1.4-orange.svg?style=for-the-badge)
6+
![](https://img.shields.io/badge/Version-1.1.5-orange.svg?style=for-the-badge)
77
![](https://img.shields.io/badge/Stability-Stable-orange.svg?style=for-the-badge)
88

99
<p align="center" >

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "jetrails/magento-twofactor",
33
"description": "User based 2FA enablement for admin users in Magento 1.x",
44
"type": "magento-module",
5-
"version": "1.1.4",
5+
"version": "1.1.5",
66
"license": "MIT",
77
"homepage": "https://github.com/jetrails/magento-twofactor",
88
"authors": [

conf/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<extends/>
1111
<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>
1212
<description>https://github.com/jetrails/magento-twofactor</description>
13-
<notes>Released Version 1.1.4</notes>
13+
<notes>Released Version 1.1.5</notes>
1414
<authors>
1515
<author>
1616
<name>Rafael Grigorian</name>

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "1.1.4",
2+
"version": "1.1.5",
33
"name": "magento-twofactor",
44
"description": "User based 2FA enablement for admin users in Magento 1.x",
55
"author": "Rafael Grigorian",

src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Configure/Edit.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Edit.php - This class exists to simply tell Magento's grid system where to look for the
55
* proper controller for the configure page. It also specifies the proper block group within
66
* the constructor.
7-
* @version 1.1.4
7+
* @version 1.1.5
88
* @package JetRails® TwoFactor
99
* @category Configure
1010
* @author Rafael Grigorian - JetRails®

src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Configure/Edit/Form.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* Form.php - This class initializes the form, field-set, and form fields that will exist on the
55
* configure page. All information is set in the _prepareForm method.
6-
* @version 1.1.4
6+
* @version 1.1.5
77
* @package JetRails® TwoFactor
88
* @category Edit
99
* @author Rafael Grigorian - JetRails®

src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Manage/Container.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Container.php - This class exists to simply tell Magento's grid system where to look for the
55
* proper controller for the configure page. It also specifies the proper block group within
66
* the constructor.
7-
* @version 1.1.4
7+
* @version 1.1.5
88
* @package JetRails® TwoFactor
99
* @category Manage
1010
* @author Rafael Grigorian - JetRails®

src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Manage/Container/Grid.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Grid.php - This class defines what collection to use for the grid collection. It also
55
* defines all the columns for the grid widget. Additionally it defines all the mass-action
66
* options for the widget grid.
7-
* @version 1.1.4
7+
* @version 1.1.5
88
* @package JetRails® TwoFactor
99
* @category Container
1010
* @author Rafael Grigorian - JetRails®

src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Renderer/Manage/Address.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Address.php - This class is a renderer class that is used with the grid widget's columns.
55
* These classes are used to load information from the authentication model using the admin
66
* user's id.
7-
* @version 1.1.4
7+
* @version 1.1.5
88
* @package JetRails® TwoFactor
99
* @category Manage
1010
* @author Rafael Grigorian - JetRails®

src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Renderer/Manage/State.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* State.php - This class is a renderer class that is used with the grid widget's columns.
55
* These classes are used to load information from the authentication model using the admin
66
* user's id.
7-
* @version 1.1.4
7+
* @version 1.1.5
88
* @package JetRails® TwoFactor
99
* @category Manage
1010
* @author Rafael Grigorian - JetRails®

src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Renderer/Manage/Status.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Status.php - This class is a renderer class that is used with the grid widget's columns.
55
* These classes are used to load information from the authentication model using the admin
66
* user's id.
7-
* @version 1.1.4
7+
* @version 1.1.5
88
* @package JetRails® TwoFactor
99
* @category Manage
1010
* @author Rafael Grigorian - JetRails®

src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Renderer/Manage/Timestamp.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Timestamp.php - This class is a renderer class that is used with the grid widget's columns.
55
* These classes are used to load information from the authentication model using the admin
66
* user's id.
7-
* @version 1.1.4
7+
* @version 1.1.5
88
* @package JetRails® TwoFactor
99
* @category Manage
1010
* @author Rafael Grigorian - JetRails®

src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Template/Backup.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* Backup.php - This template block is used in hand with the associated template file and it
55
* is used to prepare information for the template file.
6-
* @version 1.1.4
6+
* @version 1.1.5
77
* @package JetRails® TwoFactor
88
* @category Template
99
* @author Rafael Grigorian - JetRails®

src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Template/Banned.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* Banned.php - This template block is used in hand with the associated template file and it
55
* is used to prepare information for the template file.
6-
* @version 1.1.4
6+
* @version 1.1.5
77
* @package JetRails® TwoFactor
88
* @category Template
99
* @author Rafael Grigorian - JetRails®

src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Template/Scan.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* Scan.php - This template block is used in hand with the associated template file and it
55
* is used to prepare information for the template file.
6-
* @version 1.1.4
6+
* @version 1.1.5
77
* @package JetRails® TwoFactor
88
* @category Template
99
* @author Rafael Grigorian - JetRails®

src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Template/Verify.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* Verify.php - This function aids the Verify template. This block offers helpful function that
55
* are used within the template, such as suppling the form action and stylesheet URL.
6-
* @version 1.1.4
6+
* @version 1.1.5
77
* @package JetRails® TwoFactor
88
* @category Template
99
* @author Rafael Grigorian - JetRails®

src/app/code/community/JetRails/TwoFactor/Helper/Cookie.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Cookie.php - This helper class contains functions that deal with cookie creation, deletion,
55
* and authentication. This cookie class is used to aid in the "remember for x days"
66
* functionality.
7-
* @version 1.1.4
7+
* @version 1.1.5
88
* @package JetRails® TwoFactor
99
* @category Helper
1010
* @author Rafael Grigorian - JetRails®

src/app/code/community/JetRails/TwoFactor/Helper/Data.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* user. This class also contains methods to get the configuration data which are extracted
88
* using Magento's getConfig method and supplying the with the XPATH constants which are defined
99
* internally.
10-
* @version 1.1.4
10+
* @version 1.1.5
1111
* @package JetRails® TwoFactor
1212
* @category Helper
1313
* @author Rafael Grigorian - JetRails®

src/app/code/community/JetRails/TwoFactor/Helper/Totp.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* pins. It is very flexible and can be initialized to different sized secrets and pins.
66
* Although the default values conform to the generally accepted configuration for 2FA. Apps
77
* such as Authy and Google Authenticator use the default configuration.
8-
* @version 1.1.4
8+
* @version 1.1.5
99
* @package JetRails® TwoFactor
1010
* @category Helper
1111
* @author Rafael Grigorian - JetRails®

src/app/code/community/JetRails/TwoFactor/Model/Adminhtml/Auth.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* passed TOTP pin, and registers failed authentication attempts. In addition the constants
88
* that are defined within this class are used throughout the module and are accessed
99
* statically.
10-
* @version 1.1.4
10+
* @version 1.1.5
1111
* @package JetRails® TwoFactor
1212
* @category Model
1313
* @author Rafael Grigorian - JetRails®

src/app/code/community/JetRails/TwoFactor/Model/Adminhtml/Notify.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Notify.php - This class contains methods that help log and communicate messages. Messages
55
* can be logged into a custom log file, the logged in admin user can be notified, or all admin
66
* users in the 'Administrators' role can be notified.
7-
* @version 1.1.4
7+
* @version 1.1.5
88
* @package JetRails® TwoFactor
99
* @category Model
1010
* @author Rafael Grigorian - JetRails®

src/app/code/community/JetRails/TwoFactor/Model/Adminhtml/Observer.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* config.xml file. This observer fires before any adminhtml action gets executed. This way if
66
* a user is not authenticated, we can ban access to those actions and redirect to the
77
* verification page.
8-
* @version 1.1.4
8+
* @version 1.1.5
99
* @package JetRails® TwoFactor
1010
* @category Model
1111
* @author Rafael Grigorian - JetRails®

src/app/code/community/JetRails/TwoFactor/Model/Adminhtml/Page.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* Page.php - This class contains the page route constants that are used throughout the module.
55
* It also contains methods that link the state to the associated route.
6-
* @version 1.1.4
6+
* @version 1.1.5
77
* @package JetRails® TwoFactor
88
* @category Model
99
* @author Rafael Grigorian - JetRails®

src/app/code/community/JetRails/TwoFactor/Model/Adminhtml/Resource/Auth.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Auth.php - This class is the resource model for the authentication model. There is not much
55
* going on here other than the standard setup. The database table and primary column is
66
* defined in the constructor and auto incrementing primary key on data save is disabled.
7-
* @version 1.1.4
7+
* @version 1.1.5
88
* @package JetRails® TwoFactor
99
* @category Resource Model
1010
* @author Rafael Grigorian - JetRails®

src/app/code/community/JetRails/TwoFactor/Model/Adminhtml/Rewrite/Observer.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* here in order to ensure 2FA authentication before forcing admin password change. The Pci
66
* module is only available for EE versions of Magento and therefore this observer will only
77
* run on enterprise versions of Magento.
8-
* @version 1.1.4
8+
* @version 1.1.5
99
* @package JetRails® TwoFactor
1010
* @category Model
1111
* @author Rafael Grigorian - JetRails®

src/app/code/community/JetRails/TwoFactor/Model/Adminhtml/State.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* This basically means that based on the state of authentication, we can redirect user's to the
66
* proper pages to ensure that their two-factor authentication accounts are setup. The values as
77
* they relate to the user can be found in the authentication model.
8-
* @version 1.1.4
8+
* @version 1.1.5
99
* @package JetRails® TwoFactor
1010
* @category Model
1111
* @author Rafael Grigorian - JetRails®

src/app/code/community/JetRails/TwoFactor/Model/Adminhtml/Status.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* This basically means if the status is set to enabled for a user, then two-factor
66
* authentication is enforced for the user. The values as they relate to the user can be found
77
* in the authentication model.
8-
* @version 1.1.4
8+
* @version 1.1.5
99
* @package JetRails® TwoFactor
1010
* @category Model
1111
* @author Rafael Grigorian - JetRails®

src/app/code/community/JetRails/TwoFactor/controllers/Twofactor/ConfigureController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* be found in the "JetRails/Two-Factor Authentication" menu tab. It handles the rendering of
66
* that page as well as all the actions that are submitted with the grid container that the
77
* index action renders.
8-
* @version 1.1.4
8+
* @version 1.1.5
99
* @package JetRails® TwoFactor
1010
* @category Controllers
1111
* @author Rafael Grigorian - JetRails®

src/app/code/community/JetRails/TwoFactor/controllers/Twofactor/LoginController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* their two-factor authentication account. Actions that render the verification page as well
66
* as the banned page that a user will see on failed login are all encapsulated within this
77
* controller.
8-
* @version 1.1.4
8+
* @version 1.1.5
99
* @package JetRails® TwoFactor
1010
* @category Controllers
1111
* @author Rafael Grigorian - JetRails®

src/app/code/community/JetRails/TwoFactor/controllers/Twofactor/ManageController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* found in the "JetRails/Two-Factor Authentication" menu tab. It handles the rendering of that
66
* page as well as all the actions that are submitted with the grid container that the index
77
* action renders.
8-
* @version 1.1.4
8+
* @version 1.1.5
99
* @package JetRails® TwoFactor
1010
* @category Controllers
1111
* @author Rafael Grigorian - JetRails®

src/app/code/community/JetRails/TwoFactor/controllers/Twofactor/SetupController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* SetupController.php - This controller contains all actions that relate to setting up the two
55
* factor authentication on an admin user's account. Actions that render both the scan and
66
* backup pages for setup, as well as an action that resets the whole process for an admin user.
7-
* @version 1.1.4
7+
* @version 1.1.5
88
* @package JetRails® TwoFactor
99
* @category Controllers
1010
* @author Rafael Grigorian - JetRails®

src/app/code/community/JetRails/TwoFactor/etc/config.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<config>
44
<modules>
55
<JetRails_TwoFactor>
6-
<version>1.1.4</version>
6+
<version>1.1.5</version>
77
</JetRails_TwoFactor>
88
</modules>
99
<admin>

src/app/design/adminhtml/base/default/template/twofactor/backup.phtml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* backup.phtml - These page templates are rendered with the help of the block classes that are
55
* found under the Template folder for this module.
6-
* @version 1.1.4
6+
* @version 1.1.5
77
* @package JetRails® TwoFactor
88
* @category Template
99
* @author Rafael Grigorian - JetRails®

src/app/design/adminhtml/base/default/template/twofactor/banned.phtml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* banned.phtml - These page templates are rendered with the help of the block classes that are
55
* found under the Template folder for this module.
6-
* @version 1.1.4
6+
* @version 1.1.5
77
* @package JetRails® TwoFactor
88
* @category Template
99
* @author Rafael Grigorian - JetRails®

src/app/design/adminhtml/base/default/template/twofactor/logout.phtml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* logout.phtml - These page templates are rendered with the help of the block classes that are
55
* found under the Template folder for this module.
6-
* @version 1.1.4
6+
* @version 1.1.5
77
* @package JetRails® TwoFactor
88
* @category Template
99
* @author Rafael Grigorian - JetRails®

src/app/design/adminhtml/base/default/template/twofactor/message.phtml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* message.phtml - These page templates are rendered with the help of the block classes that are
55
* found under the Template folder for this module.
6-
* @version 1.1.4
6+
* @version 1.1.5
77
* @package JetRails® TwoFactor
88
* @category Template
99
* @author Rafael Grigorian - JetRails®

src/app/design/adminhtml/base/default/template/twofactor/page.phtml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* page.phtml - These page templates are rendered with the help of the block classes that are
55
* found under the Template folder for this module.
6-
* @version 1.1.4
6+
* @version 1.1.5
77
* @package JetRails® TwoFactor
88
* @category Template
99
* @author Rafael Grigorian - JetRails®

src/app/design/adminhtml/base/default/template/twofactor/scan.phtml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* scan.phtml - These page templates are rendered with the help of the block classes that are
55
* found under the Template folder for this module.
6-
* @version 1.1.4
6+
* @version 1.1.5
77
* @package JetRails® TwoFactor
88
* @category Template
99
* @author Rafael Grigorian - JetRails®

src/app/design/adminhtml/base/default/template/twofactor/verify.phtml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* verify.phtml - These page templates are rendered with the help of the block classes that are
55
* found under the Template folder for this module.
6-
* @version 1.1.4
6+
* @version 1.1.5
77
* @package JetRails® TwoFactor
88
* @category Template
99
* @author Rafael Grigorian - JetRails®

0 commit comments

Comments
 (0)