Fixed GH-9

Author: Rafael Grigorian

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

@@ -0,0 +1,32 @@
+<?php
+
+	/**
+	 * Observer.php - This observer rewrites the observer found in the Enterprise_Pci module. It is
+	 * 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.2
+	 * @package         JetRails® TwoFactor
+	 * @category        Model
+	 * @author          Rafael Grigorian - JetRails®
+	 * @copyright       JetRails®, all rights reserved
+	 */
+	class JetRails_TwoFactor_Model_Adminhtml_Rewrite_Observer extends Enterprise_Pci_Model_Observer {
+
+		/**
+		 * This method overrides the parent method. Before it executes the desired module behavior, it
+		 * makes sure that we are authenticated. If we are not authenticated, then we do not run the
+		 * forceAdminPasswordChange method from the parent.
+		 * @param       Varien_Event_Observer   observer    Passed event observer
+		 * @return      void
+		 */
+		public function forceAdminPasswordChange ( $observer ) {
+			Mage::getSingleton ("twofactor/observer")->preAdminHtml ( $observer );
+			$admin = Mage::getSingleton ("admin/session");
+			if ( $admin->getTwoFactorAllow () === true ) {
+				parent::forceAdminPasswordChange ( $observer );
+			}
+			return $observer;
+		}
+
+	}

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

@@ -41,6 +41,11 @@
 					</auth>
 				</entities>
 			</twofactor_resource>
+			<enterprise_pci>
+				<rewrite>
+					<observer>JetRails_TwoFactor_Model_Adminhtml_Rewrite_Observer</observer>
+				</rewrite>
+			</enterprise_pci>
 		</models>
 		<resources>
 			<jetrails_twofactor_setup>
@@ -78,6 +83,15 @@
 					</twofactor_redirect>
 				</observers>
 			</controller_action_predispatch>
+			<admin_user_authenticate_after>
+				<observers>
+					<twofactor_redirect_after_auth>
+						<type>singleton</type>
+						<class>twofactor/observer</class>
+						<method>preAdminHtml</method>
+					</twofactor_redirect_after_auth>
+				</observers>
+			</admin_user_authenticate_after>
 		</events>
 		<layout>
 			<updates>