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

token encoded to base64 #1636

Open
wants to merge 22 commits into
base: main
Choose a base branch
from
+380 −361
Open

token encoded to base64 #1636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
ea9ee19
tersor tool for minify
dev-rajneeshkumar Feb 6, 2025
ad73c10
token encoded to base64
bluedeepart Feb 7, 2025
29723bb
test: encode token
bluedeepart Feb 10, 2025
702f9ea
updated source of coveo
bluedeepart Feb 10, 2025
4157b92
Merge branch 'decode-token' of https://github.com/hlxsites/moleculard…
dev-rajneeshkumar Feb 10, 2025
2940da4
updated source of coveo
bluedeepart Feb 10, 2025
775b11c
Merge branch 'decode-token' of https://github.com/hlxsites/moleculard…
dev-rajneeshkumar Feb 12, 2025
9af0842
json chanegs
dev-rajneeshkumar Feb 12, 2025
1d2988d
json chanegs
dev-rajneeshkumar Feb 12, 2025
2797b77
json chanegs
dev-rajneeshkumar Feb 12, 2025
ad0f5bb
new public key
dev-rajneeshkumar Feb 13, 2025
ecf4807
new public key
dev-rajneeshkumar Feb 13, 2025
2fe19b0
no token
dev-rajneeshkumar Feb 13, 2025
41e3462
no token
dev-rajneeshkumar Feb 13, 2025
361f7a4
no token
dev-rajneeshkumar Feb 13, 2025
6f9e032
no token
dev-rajneeshkumar Feb 13, 2025
3d0845f
new kwy
dev-rajneeshkumar Feb 13, 2025
261a212
test public token
bluedeepart Feb 13, 2025
163de07
source chanhes
dev-rajneeshkumar Feb 13, 2025
6e92fa6
reverted search form header
bluedeepart Feb 13, 2025
6fdddb3
test for resource tab
bluedeepart Feb 13, 2025
2c91ed9
new xml
dev-rajneeshkumar Feb 13, 2025
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
43 changes: 14 additions & 29 deletions blocks/coveo-search/coveo-search.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { getCookie, loadScript } from '../../scripts/scripts.js';

const coveoAdminId = '[email protected]';
const organizationId = 'moleculardevicesproductionca45f5xc';
const coveoToken = 'xx46ddf302-8f31-4286-bab7-c06aec617186';
const coveoToken = 'xxd4878081-5099-4f8c-98a1-6ed5c5399e12';

function getCategoriesBasedOnProfile(userProfile) {
const CUSTOMER_ACCESS_LEVEL_CATEGORY = '"Customer"';
Expand All @@ -29,29 +29,21 @@ function getCategoriesBasedOnProfile(userProfile) {
case 'TECH':
categoryAccessLevel = `${CUSTOMER_ACCESS_LEVEL_CATEGORY},${DISTRIBUTOR_ACCESS_LEVEL_CATEGORY},${SYSTEM_INTEGRATOR_ACCESS_LEVEL_CATEGORY},${MOLDEV_SALES_ACCESS_LEVEL_CATEGORY},${MOLDEV_TECH_ACCESS_LEVEL_CATEGORY}`;
break;

default:
categoryAccessLevel = CUSTOMER_ACCESS_LEVEL_CATEGORY;
}
return categoryAccessLevel;
}

function getUserProfile() {
return (getCookie('STYXKEY_PortalUserRole')) ? getCookie('STYXKEY_PortalUserRole') : '';
return (getCookie('STYXKEY_PortalUserRole')) || '';
}

function getFilter() {
const userProfile = getUserProfile();
const accessLevel = getCategoriesBasedOnProfile(userProfile);

let filter;

if (userProfile === 'ADMIN') {
filter = '';
} else {
filter = `NOT @sfkbid OR ( @sfdatacategoryaccess_level == (${accessLevel}) OR @sfisvisibleinpkb=true )`;
}
return filter;
return userProfile === 'ADMIN' ? '' : `NOT @sfkbid OR ( @sfdatacategoryaccess_level == (${accessLevel}) OR @sfisvisibleinpkb=true )`;
}

function searchFormHeader() {
Expand Down Expand Up @@ -80,14 +72,14 @@ export function searchMainSection() {
return `
<div class="section coveo-tab-section-wrapper sticky-element sticky-desktop">
<div class="coveo-tab-section">
<a class="CoveoTab coveo-tab" data-id="All" data-caption="All Content" data-expression="@source==&quot;Molecular Devices Franklin&quot; OR @source==&quot;Molecular Devices Support Portal&quot;"></a>
<div class="CoveoTab coveo-tab" data-id="Resources" data-caption="Resources" data-expression="@source==&quot;Molecular Devices Franklin&quot; AND @md_pagetype==Resource AND NOT @md_contenttype==CoA AND NOT @md_contenttype==SDS AND NOT @md_contenttype==SDS">
<a class="CoveoTab coveo-tab" data-id="All" data-caption="All Content" data-expression="@source==&quot;Coveo Test Key&quot; OR @source==&quot;Molecular Devices Support Portal&quot;"></a>
<div class="CoveoTab coveo-tab" data-id="Resources" data-caption="Resources" data-expression="@source==&quot;Coveo Test Key&quot; AND @md_pagetype==Resource AND NOT @md_contenttype==CoA AND NOT @md_contenttype==SDS AND NOT @md_contenttype==SDS">
</div>
<div class="CoveoTab coveo-tab" data-id="Videos" data-caption="Videos" data-expression="@source==&quot;Molecular Devices Franklin&quot; AND @md_contenttype==&quot;Videos &amp; Webinars&quot;">
<div class="CoveoTab coveo-tab" data-id="Videos" data-caption="Videos" data-expression="@source==&quot;Coveo Test Key&quot; AND @md_contenttype==&quot;Videos &amp; Webinars&quot;">
</div>
<div class="CoveoTab coveo-tab" data-id="KBArticles" data-caption="Knowledge Base" data-expression="@source==&quot;Molecular Devices Support Portal&quot;"></div>
<div class="CoveoTab coveo-tab" data-id="CoA" data-caption="CoA" data-expression="@source==&quot;Molecular Devices Franklin&quot; AND @md_contenttype==CoA"></div>
<div class="CoveoTab coveo-tab" data-id="SDS" data-caption="SDS" data-expression="@source==&quot;Molecular Devices Franklin&quot; AND @md_contenttype==SDS"></div>
<div class="CoveoTab coveo-tab" data-id="CoA" data-caption="CoA" data-expression="@source==&quot;Coveo Test Key&quot; AND @md_contenttype==CoA"></div>
<div class="CoveoTab coveo-tab" data-id="SDS" data-caption="SDS" data-expression="@source==&quot;Coveo Test Key&quot; AND @md_contenttype==SDS"></div>
</div>
</div>
<div class="section coveo-main-section-wrapper">
Expand Down Expand Up @@ -212,17 +204,11 @@ export function searchMainSection() {
`;
}

async function coveoSearchInitiation(organizationID, accessToken) {
const pCookie = (!getUserProfile()) ? 'Logged-in' : 'public';
function coveoSearchInitiation(organizationID) {
if (typeof Coveo !== 'undefined') {
/* global Coveo */
Coveo.SearchEndpoint.configureCloudV2Endpoint(organizationID, accessToken);
Coveo.init(document.getElementById('search'), {
ExcerptConditionalRendering: {
values: ['public'],
compareValue: pCookie,
},
});
Coveo.SearchEndpoint.configureCloudV2Endpoint(organizationID, coveoToken);
Coveo.init(document.getElementById('search'), { analytics: { enabled: false } });
} else {
// eslint-disable-next-line no-console
console.error('Coveo library is not available.');
Expand Down Expand Up @@ -266,9 +252,8 @@ export async function getCoveoToken() {
export function addCoveoFiles() {
loadCSS('https://static.cloud.coveo.com/searchui/v2.10114/css/CoveoFullSearch.min.css');
loadScript('https://static.cloud.coveo.com/searchui/v2.10104/js/CoveoJsSearch.Lazy.min.js', () => {
loadScript('https://static.cloud.coveo.com/searchui/v2.10104/js/templates/templates.js', async () => {
// setTimeout(getCoveoToken, 300);
await getCoveoToken();
loadScript('https://static.cloud.coveo.com/searchui/v2.10104/js/templates/templates.js', () => {
coveoSearchInitiation(organizationId);
});
});
}
Expand All @@ -279,5 +264,5 @@ export default async function decorate(block) {
block.children[0].querySelector('.cover-banner-wrapper').prepend(backgroundImage);
const cRange = document.createRange();
block.children[0].children[0].appendChild(cRange.createContextualFragment(searchMainSection()));
addCoveoFiles(block);
addCoveoFiles();
}
12 changes: 6 additions & 6 deletions blocks/resources/resources.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,14 +247,14 @@ function searchMainSection() {
return `
<div class="section coveo-tab-section-wrapper sticky-element sticky-desktop">
<div class="coveo-tab-section">
<a class="CoveoTab coveo-tab" data-id="All" data-caption="All Content" data-expression="@source==&quot;Molecular Devices Franklin&quot; OR @source==&quot;Molecular Devices Support Portal&quot;"></a>
<div class="CoveoTab coveo-tab" data-id="Resources" data-caption="Resources" data-expression="@source==&quot;Molecular Devices Franklin&quot; AND @md_pagetype==Resource AND NOT @md_contenttype==CoA AND NOT @md_contenttype==SDS AND NOT @md_source==KB ">
<a class="CoveoTab coveo-tab" data-id="All" data-caption="All Content" data-expression="@source==&quot;Coveo Test Key&quot; OR @source==&quot;Molecular Devices Support Portal&quot;"></a>
<div class="CoveoTab coveo-tab" data-id="Resources" data-caption="Resources" data-expression="@source==&quot;Coveo Test Key&quot; AND @md_pagetype==Resource AND NOT @md_contenttype==CoA AND NOT @md_contenttype==SDS AND NOT @md_source==KB ">
</div>
<div class="CoveoTab coveo-tab" data-id="Videos" data-caption="Videos" data-expression="@source==&quot;Molecular Devices Franklin&quot; AND @md_contenttype==&quot;Videos &amp; Webinars&quot;">
<div class="CoveoTab coveo-tab" data-id="Videos" data-caption="Videos" data-expression="@source==&quot;Coveo Test Key&quot; AND @md_contenttype==&quot;Videos &amp; Webinars&quot;">
</div>
<div class="CoveoTab coveo-tab" data-id="KBArticles" data-caption="Knowledge Base" data-expression="@source==&quot;Molecular Devices Support Portal&quot;"></div>
<div class="CoveoTab coveo-tab" data-id="CoA" data-caption="CoA" data-expression="@source==&quot;Molecular Devices Franklin&quot; AND @md_contenttype==CoA"></div>
<div class="CoveoTab coveo-tab" data-id="SDS" data-caption="SDS" data-expression="@source==&quot;Molecular Devices Franklin&quot; AND @md_contenttype==SDS"></div>
<div class="CoveoTab coveo-tab" data-id="CoA" data-caption="CoA" data-expression="@source==&quot;Coveo Test Key&quot; AND @md_contenttype==CoA"></div>
<div class="CoveoTab coveo-tab" data-id="SDS" data-caption="SDS" data-expression="@source==&quot;Coveo Test Key&quot; AND @md_contenttype==SDS"></div>
</div>
</div>
<div class="section coveo-main-section-wrapper">
Expand Down Expand Up @@ -389,7 +389,7 @@ export async function initializeCoveo(block) {
cRange.createContextualFragment(searchMainSection()),
);
loadCSS('/blocks/coveo-search/coveo-search.css');
addCoveoFiles(block);
addCoveoFiles();
}
}

Expand Down
Loading