Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace login/logout buttons on SFRA #65

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Replace login/logout buttons on SFRA #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 52 additions & 0 deletions cartridges/int_bolt_custom/cartridge/templates/default/account/components/navTabs.isml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
<ul class="nav nav-tabs nav-fill" role="tablist">
<li class="nav-item" role="presentation">
<iscomment>Bolt SSO change. Replace login button</iscomment>
<isif condition="${pdict.config.boltEnableSSO}">
<a
<isif condition="${pdict.navTabValue === 'login'}">
class="nav-link active bolt-sso-custom"
<iselse>
class="nav-link bolt-sso-custom"
</isif>
data-logged-in="false"
href="#login" data-toggle="tab" role="tab" aria-controls="login" aria-selected="true" id="login-tab">
${Resource.msg('link.header.login.module', 'login', null)}
</a>
<iselse>
<a
<isif condition="${pdict.navTabValue === 'login'}">
class="nav-link active"
<iselse>
class="nav-link"
</isif>
href="#login" data-toggle="tab" role="tab" aria-controls="login" aria-selected="true" id="login-tab">
${Resource.msg('link.header.login.module', 'login', null)}
</a>
</isif>
</li>
<li class="nav-item" role="presentation">
<iscomment>Bolt SSO change. Replace register button</iscomment>
<isif condition="${pdict.config.boltEnableSSO}">
<a
<isif condition="${pdict.navTabValue === 'register'}">
class="nav-link active bolt-sso-custom"
<iselse>
class="nav-link bolt-sso-custom"
</isif>
href="#register" data-toggle="tab" role="tab" aria-controls="register" aria-selected="false" id="register-tab">
${Resource.msg('link.header.register.module', 'login', null)}
</a>
<iselse>
<a
<isif condition="${pdict.navTabValue === 'register'}">
class="nav-link active"
<iselse>
class="nav-link"
</isif>
data-logged-in="false"
href="#register" data-toggle="tab" role="tab" aria-controls="register" aria-selected="false" id="register-tab">
${Resource.msg('link.header.register.module', 'login', null)}
</a>
</isif>
</li>
</ul>
33 changes: 33 additions & 0 deletions cartridges/int_bolt_custom/cartridge/templates/default/account/header.isml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<isif condition="${pdict.name === null}">
<iscomment>Bolt SSO change. Replace login button</iscomment>
<div class="user hidden-md-down">
<isif condition="${pdict.config.boltEnableSSO}">
<a class="bolt-sso-custom" data-logged-in="false" href="${URLUtils.https('Login-Show')}" role="button" aria-label="${Resource.msg('label.header.loginbutton', 'account', null)}">
<iselse>
<a href="${URLUtils.https('Login-Show')}" role="button" aria-label="${Resource.msg('label.header.loginbutton', 'account', null)}">
</isif>
<i class="fa fa-sign-in" aria-hidden="true"></i>
<span class="user-message">${Resource.msg('link.header.login', 'account', null)}</span>
</a>
</div>
<iselse/>
<div class="user hidden-md-down nav-item">
<a href="${'#'}" id="myaccount" aria-haspopup="true" aria-label="${Resource.msg('link.header.myaccount', 'account', null)}" role="button">
<i class="fa fa-sign-in" aria-hidden="true"></i><span class="user-message btn dropdown-toggle">${pdict.name}</span>
</a>
<div class="popover popover-bottom">
<ul class="nav" role="menu" aria-label="${Resource.msg('label.profile.myaccountlink', 'account', null)}" aria-hidden="true">
<li class="nav-item" role="presentation"><a href="${URLUtils.https('Account-Show')}" role="menuitem" tabindex="0">${Resource.msg('link.header.myaccount', 'account', null)}</a></li>
<li class="nav-item" role="presentation"><a href="${URLUtils.url('Order-History')}" role="menuitem" tabindex="0">${Resource.msg('label.myorders', 'account', null)}</a></li>
<li class="nav-item" role="presentation">
<iscomment>Bolt SSO change. Replace logout button</iscomment>
<isif condition="${pdict.config.boltEnableSSO}">
<a class="bolt-sso-custom" data-logged-in="true" href="${URLUtils.url('Login-Logout')}" role="menuitem" tabindex="0">${Resource.msg('link.header.logout', 'account', null)}</a>
<iselse>
<a href="${URLUtils.url('Login-Logout')}" role="menuitem" tabindex="0">${Resource.msg('link.header.logout', 'account', null)}</a>
</isif>
</li>
</ul>
</div>
</div>
</isif>
44 changes: 44 additions & 0 deletions cartridges/int_bolt_custom/cartridge/templates/default/account/login.isml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<isdecorate template="common/layout/page">
<isscript>
var assets = require('*/cartridge/scripts/assets.js');
assets.addCss('/css/login.css');
assets.addJs('/js/login.js');
</isscript>

<div class="hero slant-down login-banner">
<h1 class="page-title">${Resource.msg('header.hero.image.login', 'login', null)}</h1>
</div>
<div class="container login-page">
<!---Breadcrumbs--->
<isinclude template="components/breadcrumbs/pageBreadcrumbs"/>
<div class="row justify-content-center equal-height">
<div class="col-sm-8 col-md-6">
<div class="card">
<div class="card-body">
<div class="login-form-nav">
<isinclude template="account/components/navTabs" />
<iscomment>Bolt SSO change. Hide login and register form if SSO is enabled</iscomment>
<isif condition="${!pdict.config.boltEnableSSO}">
<div class="tab-content">
<div class="tab-pane ${pdict.navTabValue === 'login' ? 'active' : ''}" id="login" role="tabpanel" aria-labelledby="login-tab">
<isinclude template="account/components/loginForm" />
<isinclude template="account/password/requestPasswordResetModal"/>
<isinclude template="account/components/oauth" />
</div>
<div class="tab-pane ${pdict.navTabValue === "register" ? 'active' : ''}" id="register" role="tabpanel" aria-labelledby="register-tab">
<isinclude template="account/components/registerForm" />
</div>
</div>
</isif>
</div>
</div>
</div>
</div>
<div class="col-sm-8 col-md-6">
<div class="card">
<isinclude template="account/components/trackOrderForm" />
</div>
</div>
</div>
</div>
</isdecorate>
36 changes: 36 additions & 0 deletions cartridges/int_bolt_custom/cartridge/templates/default/account/mobileHeader.isml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<isif condition="${pdict.name === null}">
<li class="nav-item d-lg-none" role="menuitem">
<iscomment>Bolt SSO change. Replace login button</iscomment>
<isif condition="${pdict.config.boltEnableSSO}">
<a href="${URLUtils.https('Login-Show')}" class="nav-link bolt-sso-custom" data-logged-in="false">
<iselse>
<a href="${URLUtils.https('Login-Show')}" class="nav-link">
</isif>
<i class="fa fa-sign-in" aria-hidden="true"></i>
<span class="user-message">${Resource.msg('link.header.login', 'account', null)}</span>
</a>
</li>
<iselse/>
<li class="nav-item d-lg-none dropdown" role="menuitem">
<span class="nav-link dropdown-toggle" role="button" data-toggle="dropdown">
<i class="fa fa-sign-in" aria-hidden="true"></i>
<span class="user-message">${pdict.name}</span>
</span>
<ul class="dropdown-menu" role="menu" aria-hidden="true">
<li class="dropdown-item" role="menuitem">
<a href="${URLUtils.https('Account-Show')}" class="dropdown-link" role="button">${Resource.msg('link.header.myaccount', 'account', null)}</a>
</li>
<li class="dropdown-item" role="menuitem">
<a href="${URLUtils.url('Order-History')}" class="dropdown-link" role="button">${Resource.msg('label.myorders', 'account', null)}</a>
</li>
<li class="dropdown-item" role="menuitem">
<iscomment>Bolt SSO change. Replace logout button</iscomment>
<isif condition="${pdict.config.boltEnableSSO}">
<a href="${URLUtils.url('Login-Logout')}" class="dropdown-link bolt-sso-custom" data-logged-in="true" role="button">${Resource.msg('link.header.logout', 'account', null)}</a>
<iselse>
<a href="${URLUtils.url('Login-Logout')}" class="dropdown-link" role="button">${Resource.msg('link.header.logout', 'account', null)}</a>
</isif>
</li>
</ul>
</li>
</isif>
1 change: 1 addition & 0 deletions cartridges/int_bolt_sfra/cartridge/client/default/js/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ $(document).ready(function () {
processInclude(require('base/components/clientSideValidation'));
processInclude(require('base/components/countrySelector'));
processInclude(require('base/components/toolTip'));
processInclude(require('./sso'));
});

require('base/thirdParty/bootstrap');
Expand Down
7 changes: 7 additions & 0 deletions cartridges/int_bolt_sfra/cartridge/client/default/js/sso.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
'use strict';

$(document).ready(function () {
$('.bolt-sso-custom').on('click', function (e) {
e.preventDefault(); // prevent URL redirection
});
});
10 changes: 10 additions & 0 deletions cartridges/int_bolt_sfra/cartridge/controllers/Account.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ var BoltHttpUtils = require('int_bolt_core/cartridge/scripts/services/utils/http
var LogUtils = require('int_bolt_core/cartridge/scripts/utils/boltLogUtils');
var log = LogUtils.getLogger('Login');

var BoltPreferences = require('int_bolt_core/cartridge/scripts/services/utils/preferences');
var configuration = BoltPreferences.getSitePreferences();

// for SSO login during checkout, update dwsid in Bolt db.
server.prepend('Show', function (req, res, next) {
var boltOrderId = req.session.privacyCache.store.boltOrderId;
Expand Down Expand Up @@ -46,4 +49,11 @@ function putSFCCObject(boltOrderId) {
}
}

server.append('Header', function (req, res, next) {
res.setViewData({
config: configuration
});
next();
});

module.exports = server.exports();
10 changes: 10 additions & 0 deletions cartridges/int_bolt_sfra/cartridge/controllers/Login.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ var LogUtils = require('int_bolt_core/cartridge/scripts/utils/boltLogUtils');
var OAuthUtils = require('int_bolt_core/cartridge/scripts/utils/oauthUtils');
var log = LogUtils.getLogger('Login');

var BoltPreferences = require('int_bolt_core/cartridge/scripts/services/utils/preferences');
var configuration = BoltPreferences.getSitePreferences();

server.get('OAuthRedirectBolt', function (req, res, next) {
if (!Site.getCurrent().getCustomPreferenceValue('boltEnableSSO')) {
log.error('Bolt SSO feature is not enabled');
Expand Down Expand Up @@ -76,4 +79,11 @@ function renderError(res, next) {
return next();
}

server.append('Show', function (req, res, next) {
res.setViewData({
config: configuration
});
next();
});

module.exports = server.exports();
11 changes: 1 addition & 10 deletions cartridges/int_bolt_sfra/cartridge/templates/default/common/boltScripts.isml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,5 @@
<isif condition="${boltConfig.boltEnable}">
<script id="bolt-track" src="${boltConfig.boltCdnUrl}/track.js" data-publishable-key="${boltConfig.boltMultiPublishableKey}"></script>
<script id="bolt-connect" src="${boltConfig.boltCdnUrl}/connect.js" data-publishable-key="${boltConfig.boltMultiPublishableKey}"></script>
</isif>

<iscomment> SSO login and logout button </iscomment>
<isif condition="${boltConfig.boltEnableSSO}">
<div class="bolt-account-sso" data-logged-in="false" />
<div class="bolt-account-sso" data-logged-in="true" />
<script id="bolt-account"
src="${boltConfig.boltAccountURL}/account.js"
data-publishable-key="${boltConfig.boltMultiPublishableKey}">
</script>
<script id="bolt-account" src="${boltConfig.boltAccountURL}/account.js" data-publishable-key="${boltConfig.boltMultiPublishableKey}"></script>
</isif>