Icemax_AESocialLogin - Version 1.0.4

Version Notes

- Hide modal popup which appeared while customer refused to login with specific network

Download this release

Release Info

Developer Maxim Baybakov
Extension Icemax_AESocialLogin
Version 1.0.4
Comparing to
See all releases


Code changes from version 1.0.3 to 1.0.4

Files changed (6) hide show
  1. app/code/community/Icemax/AESocialLogin/Helper/Identifiers.php +7 -1
  2. app/code/community/Icemax/AESocialLogin/controllers/ApiController.php +11 -1
  3. app/code/community/Icemax/AESocialLogin/etc/config.xml +1 -1
  4. app/design/frontend/base/default/layout/icemax/aesociallogin.xml +2 -2
  5. app/design/frontend/base/default/template/icemax/aesociallogin/init.phtml +7 -11
  6. package.xml +4 -4
app/code/community/Icemax/AESocialLogin/Helper/Identifiers.php CHANGED
@@ -102,7 +102,13 @@ class Icemax_AESocialLogin_Helper_Identifiers extends Mage_Core_Helper_Abstract
102
  ->getCollection()
103
  ->addFieldToFilter('email', $email)
104
  ->getFirstItem();
105
- return $customer;
 
 
 
 
 
 
106
  }
107
 
108
  /**
102
  ->getCollection()
103
  ->addFieldToFilter('email', $email)
104
  ->getFirstItem();
105
+
106
+ $customer_id = $customer->getId();
107
+ if ((int) $customer_id > 0) {
108
+ return $customer;
109
+ }
110
+
111
+ return false;
112
  }
113
 
114
  /**
app/code/community/Icemax/AESocialLogin/controllers/ApiController.php CHANGED
@@ -64,7 +64,12 @@ class Icemax_AESocialLogin_ApiController extends Mage_Customer_AccountController
64
  */
65
  public function loginAction() {
66
  $session = $this->_getSession();
67
-
 
 
 
 
 
68
  // Redirect if user is already authenticated
69
  if ($session->isLoggedIn()) {
70
  $this->_redirect('customer/account');
@@ -193,7 +198,12 @@ class Icemax_AESocialLogin_ApiController extends Mage_Customer_AccountController
193
  Mage::getSingleton('aesociallogin/session')->setIdentifier(false);
194
  }
195
  }
 
196
 
 
 
 
 
197
  parent::_loginPostRedirect();
198
  }
199
 
64
  */
65
  public function loginAction() {
66
  $session = $this->_getSession();
67
+
68
+ $redirect_url = $this->_getRefererUrl();
69
+ if (!empty($redirect_url) && $this->_isUrlInternal($redirect_url)) {
70
+ $session->setBeforeAuthUrl($redirect_url);
71
+ }
72
+
73
  // Redirect if user is already authenticated
74
  if ($session->isLoggedIn()) {
75
  $this->_redirect('customer/account');
198
  Mage::getSingleton('aesociallogin/session')->setIdentifier(false);
199
  }
200
  }
201
+ $redirect_url = $session->getBeforeAuthUrl(true);
202
 
203
+ if (!empty($redirect_url)) {
204
+ $this->_redirectUrl($redirect_url);
205
+ return;
206
+ }
207
  parent::_loginPostRedirect();
208
  }
209
 
app/code/community/Icemax/AESocialLogin/etc/config.xml CHANGED
@@ -3,7 +3,7 @@
3
  <modules>
4
  <Icemax_AESocialLogin>
5
  <codePool>community</codePool>
6
- <version>1.0.3</version>
7
  </Icemax_AESocialLogin>
8
  </modules>
9
  <global>
3
  <modules>
4
  <Icemax_AESocialLogin>
5
  <codePool>community</codePool>
6
+ <version>1.0.4</version>
7
  </Icemax_AESocialLogin>
8
  </modules>
9
  <global>
app/design/frontend/base/default/layout/icemax/aesociallogin.xml CHANGED
@@ -1,8 +1,8 @@
1
  <?xml version="1.0"?>
2
  <layout version="0.1.0">
3
- <!-- Initialize AE on every page. -->
4
  <default>
5
- <reference name="head">
6
  <block type="core/template" name="icemax_aesociallogin_init" template="icemax/aesociallogin/init.phtml"/>
7
  </reference>
8
  </default>
1
  <?xml version="1.0"?>
2
  <layout version="0.1.0">
3
+ <!-- Initialize AE on all pages. -->
4
  <default>
5
+ <reference name="before_body_end">
6
  <block type="core/template" name="icemax_aesociallogin_init" template="icemax/aesociallogin/init.phtml"/>
7
  </reference>
8
  </default>
app/design/frontend/base/default/template/icemax/aesociallogin/init.phtml CHANGED
@@ -2,10 +2,11 @@
2
  <script>
3
  function AEJSReady(aeJS) {
4
  // Specify the settings required for your environment (see Settings)
5
- aeJS.settings['extra_fields_screen'] = 'after'; // 'disabled', 'before' or 'after'
6
- aeJS.settings['auth_window'] = <?php echo Mage::getStoreConfig('aesociallogin/options/auth_window')?>;
7
- aeJS.settings['return_url'] = "<?php echo Mage::getUrl('aesociallogin/api/login'); ?>";
8
- aeJS.settings['sso'] = "<?php echo Mage::getStoreConfig('aesociallogin/options/sso'); ?>";
 
9
 
10
  // Attach local handlers to events
11
  aeJS.events.onLogin.addHandler(loginHandler);
@@ -18,12 +19,7 @@
18
  <?php endif; ?>
19
  }
20
  </script>
21
-
22
  <script type="text/javascript" charset="utf-8" src="<?php echo Mage::getStoreConfig('aesociallogin/options/endpoint')?>/framework/js/<?php echo Mage::getStoreConfig('aesociallogin/options/framework_id') ?>"></script>
23
  <?php endif; ?>
24
- <style>
25
- .ow-overlay,.ae-modal-overlay{display:none;}
26
- .ow-closed,.ae-modal-closed,.ae-modal-overlay-closed{display:none;}
27
- .ae-modal{display:none;}
28
- .ae-modal iframe{display:none;}
29
- </style>
2
  <script>
3
  function AEJSReady(aeJS) {
4
  // Specify the settings required for your environment (see Settings)
5
+ aeJS.settings['extra_fields_screen'] = 'after'; // 'disabled', 'before' or 'after'
6
+ aeJS.settings['auth_window'] = <?php echo Mage::getStoreConfig('aesociallogin/options/auth_window')?>;
7
+ aeJS.settings['return_url'] = "<?php echo Mage::getUrl('aesociallogin/api/login'); ?>";
8
+ aeJS.settings['display_error_message'] = false;
9
+ aeJS.settings['sso'] = "<?php echo Mage::getStoreConfig('aesociallogin/options/sso'); ?>";
10
 
11
  // Attach local handlers to events
12
  aeJS.events.onLogin.addHandler(loginHandler);
19
  <?php endif; ?>
20
  }
21
  </script>
22
+ <?php if (Mage::getStoreConfig('aesociallogin/options/endpoint') != '' && Mage::getStoreConfig('aesociallogin/options/framework_id') != ''): ?>
23
  <script type="text/javascript" charset="utf-8" src="<?php echo Mage::getStoreConfig('aesociallogin/options/endpoint')?>/framework/js/<?php echo Mage::getStoreConfig('aesociallogin/options/framework_id') ?>"></script>
24
  <?php endif; ?>
25
+ <?php endif; ?>
 
 
 
 
 
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Icemax_AESocialLogin</name>
4
- <version>1.0.3</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/GPL-3.0">GNU General Public License (GPL) v 3.0</license>
7
  <channel>community</channel>
@@ -10,9 +10,9 @@
10
  <description>Speed up your registration, login and checkout process with The Appreciation Engine Social Login</description>
11
  <notes>- Hide modal popup which appeared while customer refused to login with specific network</notes>
12
  <authors><author><name>Maxim Baybakov</name><user>icemax</user><email>maxim.baibakov@gmail.com</email></author></authors>
13
- <date>2015-07-08</date>
14
- <time>16:24:23</time>
15
- <contents><target name="mageetc"><dir name="modules"><file name="Icemax_AESocialLogin.xml" hash="93d22118787c3a69710686ee59663413"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><dir name="icemax"><file name="aesociallogin.xml" hash="13daa8f1441a46eb2a7943e3ad04af7f"/></dir></dir><dir name="template"><dir name="icemax"><dir><dir name="aesociallogin"><file name="duplicate.phtml" hash="53610155524eaf0c58ec41a1d627990d"/><file name="init.phtml" hash="f5eea3e90095f62ea84d6a46e000583d"/><file name="register.phtml" hash="3350e9cfc3bee975f940c23ed66cc8b2"/></dir></dir></dir></dir></dir></dir></dir></target><target name="magecommunity"><dir name="Icemax"><dir name="AESocialLogin"><dir name="Block"><file name="Accountdata.php" hash="ab6e5a04553c38ef5702ef1e5cac5e7b"/><file name="Info.php" hash="5b9c0751e5a983d5e8ac3812ea3c98ee"/></dir><dir name="Helper"><file name="Apicall.php" hash="0da413ed447bb7a7a691f23fb6bc1bc3"/><file name="Data.php" hash="3e33db60fec5c2269da49afdff9d7601"/><file name="Identifiers.php" hash="79896191c2322cf37c15a3474156cec4"/></dir><dir name="Model"><file name="Identifiers.php" hash="22646d595f3e0a4df314293c862c50c3"/><dir name="Mysql4"><dir name="Identifiers"><file name="Collection.php" hash="614a3f62e8c4ba17c3ce5b98921648ca"/></dir><file name="Identifiers.php" hash="db115c2617ded578dada55a66d50c7fa"/></dir><file name="Observer.php" hash="8c2571315c923aea7719480dc050fd9e"/><dir name="Resource"><dir name="Eav"><dir name="Mysql4"><file name="Setup.php" hash="ab5e8ed13d7553bd85a950fb54c849f9"/></dir></dir></dir><file name="Session.php" hash="cd5812fc1ef49b2748fbc76c813a0080"/><dir name="System"><dir name="Config"><file name="Authwindow.php" hash="2ea4d0e893ccf7242263ddac35d3e5f2"/><file name="Sso.php" hash="3a5a350246ea869ac49c5e6e553a2247"/></dir></dir></dir><dir name="controllers"><dir name="Adminhtml"><file name="RefreshController.php" hash="b36ac4aabeb546c8edf31ac1f2b6ec56"/></dir><file name="ApiController.php" hash="6b745473df3e6bc659851f5d61362e58"/></dir><dir name="etc"><file name="config.xml" hash="cee93cd6f01a73d084d0561ce3b2ce92"/><file name="system.xml" hash="4322d162dce73daa9bc12dd7313b8828"/></dir><dir name="sql"><dir name="AESocialLogin_setup"><file name="mysql4-install-1.0.1.php" hash="9158db6fee443285ce1d54b1b44be0ae"/></dir></dir></dir></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Icemax_AESocialLogin</name>
4
+ <version>1.0.4</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/GPL-3.0">GNU General Public License (GPL) v 3.0</license>
7
  <channel>community</channel>
10
  <description>Speed up your registration, login and checkout process with The Appreciation Engine Social Login</description>
11
  <notes>- Hide modal popup which appeared while customer refused to login with specific network</notes>
12
  <authors><author><name>Maxim Baybakov</name><user>icemax</user><email>maxim.baibakov@gmail.com</email></author></authors>
13
+ <date>2015-07-28</date>
14
+ <time>10:59:47</time>
15
+ <contents><target name="mageetc"><dir name="modules"><file name="Icemax_AESocialLogin.xml" hash="93d22118787c3a69710686ee59663413"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><dir name="icemax"><file name="aesociallogin.xml" hash="692faa538420ec8ad72d37c0636fe069"/></dir></dir><dir name="template"><dir name="icemax"><dir><dir name="aesociallogin"><file name="duplicate.phtml" hash="53610155524eaf0c58ec41a1d627990d"/><file name="init.phtml" hash="dd69a6d782345f64ae4be70bbb6b509a"/><file name="register.phtml" hash="3350e9cfc3bee975f940c23ed66cc8b2"/></dir></dir></dir></dir></dir></dir></dir></target><target name="magecommunity"><dir name="Icemax"><dir name="AESocialLogin"><dir name="Block"><file name="Accountdata.php" hash="ab6e5a04553c38ef5702ef1e5cac5e7b"/><file name="Info.php" hash="5b9c0751e5a983d5e8ac3812ea3c98ee"/></dir><dir name="Helper"><file name="Apicall.php" hash="0da413ed447bb7a7a691f23fb6bc1bc3"/><file name="Data.php" hash="3e33db60fec5c2269da49afdff9d7601"/><file name="Identifiers.php" hash="0a31ffa53d6e8556d95a1870b2787909"/></dir><dir name="Model"><file name="Identifiers.php" hash="22646d595f3e0a4df314293c862c50c3"/><dir name="Mysql4"><dir name="Identifiers"><file name="Collection.php" hash="614a3f62e8c4ba17c3ce5b98921648ca"/></dir><file name="Identifiers.php" hash="db115c2617ded578dada55a66d50c7fa"/></dir><file name="Observer.php" hash="8c2571315c923aea7719480dc050fd9e"/><dir name="Resource"><dir name="Eav"><dir name="Mysql4"><file name="Setup.php" hash="ab5e8ed13d7553bd85a950fb54c849f9"/></dir></dir></dir><file name="Session.php" hash="cd5812fc1ef49b2748fbc76c813a0080"/><dir name="System"><dir name="Config"><file name="Authwindow.php" hash="2ea4d0e893ccf7242263ddac35d3e5f2"/><file name="Sso.php" hash="3a5a350246ea869ac49c5e6e553a2247"/></dir></dir></dir><dir name="controllers"><dir name="Adminhtml"><file name="RefreshController.php" hash="b36ac4aabeb546c8edf31ac1f2b6ec56"/></dir><file name="ApiController.php" hash="bdb51d102e689a8e970cc39001f83bfa"/></dir><dir name="etc"><file name="config.xml" hash="26a955d11b1c9a784a31510fe27dac07"/><file name="system.xml" hash="4322d162dce73daa9bc12dd7313b8828"/></dir><dir name="sql"><dir name="AESocialLogin_setup"><file name="mysql4-install-1.0.1.php" hash="9158db6fee443285ce1d54b1b44be0ae"/></dir></dir></dir></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
18
  </package>