Fixed customer data sometimes not being cleared when logging in as customer

Block/Adminhtml/Customer/Edit/Login.php

@@ -63,5 +63,4 @@ public function getInvalidateTokenUrl()
     {
         return $this->getUrl('loginascustomer/login/login', ['customer_id' => $this->getCustomerId()]);
     }
-
 }

Block/Adminhtml/System/Config/Form/Info.php

@@ -48,5 +48,4 @@ public function render(\Magento\Framework\Data\Form\Element\AbstractElement $ele
 
         return $html;
     }
-
 }

Controller/Login/Index.php

@@ -62,5 +62,4 @@ protected function _initLogin()
             return false;
         }
     }
-
 }

Controller/Login/Proceed.php

@@ -22,5 +22,4 @@ public function execute()
         $this->_view->loadLayout();
         $this->_view->renderLayout();
     }
-
 }

Model/AdminNotificationFeed.php

@@ -166,5 +166,4 @@ public function setLastUpdate()
         $this->_cacheManager->save(time(), 'magefan_admin_notifications_lastcheck');
         return $this;
     }
-
 }

Model/Login.php

@@ -220,5 +220,4 @@ public function generate($adminId)
             'created_at' => $this->_dateTime->gmtTimestamp(),
         ])->save();
     }
-
 }

Model/ResourceModel/Login.php

@@ -23,5 +23,4 @@ protected function _construct()
     {
         $this->_init('magefan_login_as_customer', 'login_id');
     }
-
 }

Model/ResourceModel/Login/Collection.php

@@ -24,5 +24,4 @@ protected function _construct()
         parent::_construct();
         $this->_init('Magefan\LoginAsCustomer\Model\Login', 'Magefan\LoginAsCustomer\Model\ResourceModel\Login');
     }
-
 }

Model/ResourceModel/Login/Grid/Collection.php

@@ -45,5 +45,4 @@ protected function _initSelect()
             );
         return $this;
     }
-
 }

Ui/Component/Listing/Column/Actions.php

@@ -74,5 +74,4 @@ public function prepareDataSource(array $dataSource)
 
         return $dataSource;
     }
-
 }

etc/adminhtml/routes.xml

@@ -13,4 +13,4 @@
             <module name="Magefan_LoginAsCustomer" />
         </route>
     </router>
-</config>
+</config>

etc/frontend/events.xml

@@ -11,4 +11,4 @@
     <event name="websiterestriction_frontend">
         <observer name="magefan_las_websiterestriction_frontend" instance="Magefan\LoginAsCustomer\Observer\WbsiterestrictionFrontendObserver" />
     </event>
-</config>
+</config>

etc/frontend/routes.xml

@@ -13,4 +13,4 @@
             <module name="Magefan_LoginAsCustomer" />
         </route>
     </router>
-</config>
+</config>

etc/webrestrictions.xml

@@ -9,6 +9,5 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_WebsiteRestriction:etc/webrestrictions.xsd">
     <action path="loginascustomer_login_index" type="generic" />
-    <action path="loginascustomer_login_post" type="generic" />
     <action path="loginascustomer_login_proceed" type="generic" />
 </config>

view/adminhtml/ui_component/customer_listing.xml

@@ -18,4 +18,4 @@
             </argument>
         </actionsColumn>
     </columns>
-</listing>
+</listing>

view/frontend/layout/loginascustomer_login_proceed.xml

@@ -18,4 +18,4 @@
             <block class="Magento\Framework\View\Element\Template" name="loginascustomer_login" template="Magefan_LoginAsCustomer::login.phtml"/>
         </referenceContainer>
     </body>
-</page>
+</page>

view/frontend/templates/login.phtml

@@ -5,18 +5,15 @@
  *
  * Glory to Ukraine! Glory to the heroes!
  */
+/** @var \Magento\Framework\View\Element\Template $block */
 ?>
-<p><?php /* @escapeNotVerified */ echo __('You have logged in and will go to customer account in 5 seconds.') ?></p>
-<form id="loginascustomer" method="post" action="<?php echo $block->getUrl('*/*/post') ?>">
-    <button style="display: none;" id="loginascustomer-button" type="submit" class="action save primary" title=""><span> >> </span></button>
-</form>
-<script>
-require([
-	"jquery",
-	"domReady!"
-], function($){
-	setTimeout(function(){
-		$('#loginascustomer-button').click();
-	}, 5000);
-});
+
+<script type="text/x-magento-init">
+{
+    "*": {
+        "Magefan_LoginAsCustomer/js/login": {
+            "redirectUrl": "<?php echo $block->getUrl('customer/account/index') ?>"
+        }
+    }
+}
 </script>

view/frontend/web/js/login.js

@@ -0,0 +1,12 @@
+define([
+    'Magento_Customer/js/customer-data'
+], function (customerData) {
+
+    'use strict';
+
+    return function (config) {
+        customerData.reload('customer').done(function () {
+            window.location.href = config.redirectUrl;
+        });
+    };
+});