Commit b368ce73 authored by Devesh's avatar Devesh
Browse files

Issue #SB-0000 fix:syncing of keyclaock migration from local to sessionstorage

parent 362db8f1
master login-changes loginRegisterBtn prasath-release-5.1.0 release-5.1.0 release-5.1.0-api release-5.1.0-apiuat release-5.1.0-bulk-enrol-unenrol release-5.1.0-uat release-5.1.0-uatLatest release-5.1.0-uatapi release-5.1.0-upsmf-prod release-uat-nginx revert-5-login-changes upstream/release-5.1.0-vdn 3nodeinstall 3node-prior-rebase-2-5 3node-2.6.0 3node 3node_bak_new temp-ratelimit_RC1 service-rename-player-2.5.0_RC9 revert-incorrect revert-942-release-2.6.0 revert-872-SC-1392-ftl-fix release-dock-0.0.3_RC2 release-dock-0.0.3_RC1 release-5.2.0-inquiry_RC1 release-5.1.0_RC3 release-5.1.0_RC2 release-5.1.0_RC1 release-5.0.2 release-5.0.2_RC1 release-5.0.1 release-5.0.1_RC1 release-5.0.0 release-5.0.0_RC5 release-5.0.0_RC4 release-5.0.0_RC3 release-5.0.0_RC2 release-5.0.0_RC1 release-5.0.0-vdn_RC1 release-4.10.2_RC1 release-4.10.1 release-4.10.1_RC2 release-4.10.1_RC1 release-4.10.0 release-4.10.0_RC1 release-4.10.0-vdn_RC1 release-4.9.0 release-4.9.0_RC4 release-4.9.0_RC3 release-4.9.0_RC2 release-4.9.0_RC1 release-4.9.0-vdn_RC2 release-4.9.0-vdn_RC1 release-4.8.0 release-4.8.0_RC8 release-4.8.0_RC7 release-4.8.0_RC6 release-4.8.0_RC5 release-4.8.0_RC4 release-4.8.0_RC3 release-4.8.0_RC2 release-4.8.0_RC1 release-4.8.0-vdn_RC1 release-4.7.0 release-4.7.0_RC3 release-4.7.0_RC2 release-4.7.0_RC1 release-4.7.0-vdn_RC1 release-4.6.0 release-4.6.0_RC4 release-4.6.0_RC3 release-4.6.0_RC2 release-4.6.0_RC1 release-4.5.0 release-4.5.0_RC6 release-4.5.0_RC5 release-4.5.0_RC4 release-4.5.0_RC3 release-4.5.0_RC2 release-4.5.0_RC1 release-4.4.1_RC2 release-4.4.1_RC1 release-4.4.1-vdn_RC2 release-4.4.1-vdn_RC1 release-4.4.0 release-4.4.0_RC10 release-4.4.0_RC9 release-4.4.0_RC8 release-4.4.0_RC7 release-4.4.0_RC6 release-4.4.0_RC5 release-4.4.0_RC4 release-4.4.0_RC3 release-4.4.0_RC2 release-4.4.0_RC1 release-4.3.0 release-4.3.0_RC7 release-4.3.0_RC6 release-4.3.0_RC5 release-4.3.0_RC4 release-4.3.0_RC3 release-4.3.0_RC2 release-4.3.0_RC1 release-4.2.0 release-4.2.0_RC6 release-4.2.0_RC5 release-4.2.0_RC4 release-4.2.0_RC3 release-4.2.0_RC2 release-4.2.0_RC1 release-4.1.0 release-4.1.0_RC20 release-4.1.0_RC19 release-4.1.0_RC18 release-4.1.0_RC17 release-4.1.0_RC16 release-4.1.0_RC15 release-4.1.0_RC14 release-4.1.0_RC13 release-4.1.0_RC12 release-4.1.0_RC11 release-4.1.0_RC10 release-4.1.0_RC9 release-4.1.0_RC8 release-4.1.0_RC7 release-4.1.0_RC6 release-4.1.0_RC5 release-4.1.0_RC4 release-4.1.0_RC3 release-4.1.0_RC2 release-4.1.0_RC1 release-4.0.0 release-4.0.0_RC6 release-4.0.0_RC5 release-4.0.0_RC4 release-4.0.0_RC3 release-4.0.0_RC2 release-4.0.0_RC1 release-3.9.0 release-3.9.0_RC18 release-3.9.0_RC17 release-3.9.0_RC16 release-3.9.0_RC15 release-3.9.0_RC14 release-3.9.0_RC13 release-3.9.0_RC12 release-3.9.0_RC11 release-3.9.0_RC10 release-3.9.0_RC9 release-3.9.0_RC8 release-3.9.0_RC7 release-3.9.0_RC6 release-3.9.0_RC5 release-3.9.0_RC4 release-3.9.0_RC3 release-3.9.0_RC2 release-3.9.0_RC1 release-3.8.0 release-3.8.0_RC14 release-3.8.0_RC13 release-3.8.0_RC12 release-3.8.0_RC11 release-3.8.0_RC10 release-3.8.0_RC9 release-3.8.0_RC8 release-3.8.0_RC7 release-3.8.0_RC6 release-3.8.0_RC5 release-3.8.0_RC4 release-3.8.0_RC3 release-3.8.0_RC2 release-3.8.0_RC1 release-3.7.0_RC16 release-3.7.0_RC15 release-3.7.0_RC14 release-3.7.0_RC13 release-3.7.0_RC12 release-3.7.0_RC11 release-3.7.0_RC10 release-3.7.0_RC9 release-3.7.0_RC8 release-3.7.0_RC7 release-3.7.0_RC6 release-3.7.0_RC5 release-3.7.0_RC4 release-3.7.0_RC3 release-3.7.0_RC2 release-3.7.0_RC1 release-3.6.5_RC1 release-3.6.0_RC8 release-3.6.0_RC7 release-3.6.0_RC6 release-3.6.0_RC5 release-3.6.0_RC4 release-3.6.0_RC3 release-3.6.0_RC2 release-3.6.0_RC1 release-3.5.0 release-3.5.0_RC8 release-3.5.0_RC7 release-3.5.0_RC6 release-3.5.0_RC5 release-3.5.0_RC4 release-3.5.0_RC3 release-3.5.0_RC2 release-3.5.0_RC1 release-3.4.0 release-3.4.0_RC21 release-3.4.0_RC20 release-3.4.0_RC19 release-3.4.0_RC18 release-3.4.0_RC17 release-3.4.0_RC16 release-3.4.0_RC15 release-3.4.0_RC14 release-3.4.0_RC13 release-3.4.0_RC12 release-3.4.0_RC11 release-3.4.0_RC10 release-3.4.0_RC9 release-3.4.0_RC8 release-3.4.0_RC7 release-3.4.0_RC6 release-3.4.0_RC5 release-3.4.0_RC4 release-3.4.0_RC3 release-3.4.0_RC2 release-3.4.0_RC1 release-3.3.0_RC24 release-3.3.0_RC23 release-3.3.0_RC22 release-3.3.0_RC21 release-3.3.0_RC20 release-3.3.0_RC19 release-3.3.0_RC18 release-3.3.0_RC17 release-3.3.0_RC16 release-3.3.0_RC15 release-3.3.0_RC14 release-3.3.0_RC13 release-3.3.0_RC12 release-3.3.0_RC11 release-3.3.0_RC10 release-3.3.0_RC9 release-3.3.0_RC8 release-3.3.0_RC7 release-3.3.0_RC6 release-3.3.0_RC5 release-3.3.0_RC4 release-3.3.0_RC3 release-3.3.0_RC2 release-3.3.0_RC1 release-3.2.7 release-3.2.7_RC14 release-3.2.7_RC13 release-3.2.7_RC12 release-3.2.7_RC11 release-3.2.7_RC10 release-3.2.7_RC9 release-3.2.7_RC8 release-3.2.7_RC7 release-3.2.7_RC6 release-3.2.7_RC5 release-3.2.7_RC4 release-3.2.7_RC3 release-3.2.7_RC2 release-3.2.7_RC1 release-3.2.0_RC21 release-3.2.0_RC20 release-3.2.0_RC19 release-3.2.0_RC18 release-3.2.0_RC17 release-3.2.0_RC16 release-3.2.0_RC15 release-3.2.0_RC14 release-3.2.0_RC13 release-3.2.0_RC12 release-3.2.0_RC11 release-3.2.0_RC10 release-3.2.0_RC9 release-3.2.0_RC8 release-3.2.0_RC7 release-3.2.0_RC6 release-3.2.0_RC5 release-3.2.0_RC4 release-3.2.0_RC3 release-3.2.0_RC2 release-3.2.0_RC1 release-3.1.0 release-3.1.0_RC10 release-3.1.0_RC9 release-3.1.0_RC8 release-3.1.0_RC7 release-3.1.0_RC6 release-3.1.0_RC5 release-3.1.0_RC4 release-3.1.0_RC3 release-3.1.0_RC2 release-3.1.0_RC1 release-3.0.1_RC7 release-3.0.1_RC6 release-3.0.1_RC5 release-3.0.1_RC4 release-3.0.1_RC3 release-3.0.1_RC2 release-3.0.1_RC1 release-3.0.0 release-3.0.0_RC42 release-3.0.0_RC41 release-3.0.0_RC40 release-3.0.0_RC39 release-3.0.0_RC38 release-3.0.0_RC37 release-3.0.0_RC36 release-3.0.0_RC35 release-3.0.0_RC34 release-3.0.0_RC33 release-3.0.0_RC32 release-3.0.0_RC31 release-3.0.0_RC30 release-3.0.0_RC29 release-3.0.0_RC28 release-3.0.0_RC27 release-3.0.0_RC26 release-3.0.0_RC25 release-3.0.0_RC24 release-3.0.0_RC23 release-3.0.0_RC22 release-3.0.0_RC21 release-3.0.0_RC20 release-3.0.0_RC19 release-3.0.0_RC18 release-3.0.0_RC17 release-3.0.0_RC16 release-3.0.0_RC15 release-3.0.0_RC14 release-3.0.0_RC13 release-3.0.0_RC12 release-3.0.0_RC11 release-3.0.0_RC10 release-3.0.0_RC9 release-3.0.0_RC8 release-3.0.0_RC7 release-3.0.0_RC6 release-3.0.0_RC5 release-3.0.0_RC4 release-3.0.0_RC3 release-3.0.0_RC2 release-3.0.0_RC1 release-2.10.0 release-2.10.0_RC24 release-2.10.0_RC23 release-2.10.0_RC22 release-2.10.0_RC21 release-2.10.0_RC20 release-2.10.0_RC19 release-2.10.0_RC18 release-2.10.0_RC17 release-2.10.0_RC16 release-2.10.0_RC15 release-2.10.0_RC14 release-2.10.0_RC13 release-2.10.0_RC12 release-2.10.0_RC11 release-2.10.0_RC10 release-2.10.0_RC9 release-2.10.0_RC8 release-2.10.0_RC7 release-2.10.0_RC6 release-2.10.0_RC5 release-2.10.0_RC4 release-2.10.0_RC3 release-2.10.0_RC2 release-2.10.0_RC1 release-2.9.0_RC13 release-2.9.0_RC12 release-2.9.0_RC11 release-2.9.0_RC10 release-2.9.0_RC9 release-2.9.0_RC8 release-2.9.0_RC7 release-2.9.0_RC6 release-2.9.0_RC5 release-2.9.0_RC4 release-2.9.0_RC3 release-2.9.0_RC2 release-2.9.0_RC1 release-2.8.0 release-2.8.0_RC34 release-2.8.0_RC33 release-2.8.0_RC32 release-2.8.0_RC31 release-2.8.0_RC30 release-2.8.0_RC29 release-2.8.0_RC28 release-2.8.0_RC27 release-2.8.0_RC26 release-2.8.0_RC25 release-2.8.0_RC24 release-2.8.0_RC23 release-2.8.0_RC22 release-2.8.0_RC21 release-2.8.0_RC20 release-2.8.0_RC19 release-2.8.0_RC18 release-2.8.0_RC17 release-2.8.0_RC16 release-2.8.0_RC15 release-2.8.0_RC14 release-2.8.0_RC13 release-2.8.0_RC12 release-2.8.0_RC11 release-2.8.0_RC10 release-2.8.0_RC9 release-2.8.0_RC8 release-2.8.0_RC7 release-2.8.0_RC6 release-2.8.0_RC5 release-2.8.0_RC4 release-2.8.0_RC3 release-2.8.0_RC2 release-2.8.0_RC1 release-2.8.0-desktopapis-hotfix release-2.7.0 release-2.7.0_RC16 release-2.7.0_RC15 release-2.7.0_RC14 release-2.7.0_RC13 release-2.7.0_RC12 release-2.7.0_RC11 release-2.7.0_RC10 release-2.7.0_RC9 release-2.7.0_RC8 release-2.7.0_RC7 release-2.7.0_RC6 release-2.7.0_RC5 release-2.7.0_RC4 release-2.7.0_RC3 release-2.7.0_RC2 release-2.7.0_RC1 release-2.6.5_RC3 release-2.6.5_RC2 release-2.6.5_RC1 release-2.6.5_Kong10_RC2 release-2.6.0 release-2.6.0_kong9 release-2.6.0_kong_RC1 release-2.6.0_RC25 release-2.6.0_RC24 release-2.6.0_RC23 release-2.6.0_RC22 release-2.6.0_RC21 release-2.6.0_RC20 release-2.6.0_RC19 release-2.6.0_RC18 release-2.6.0_RC17 release-2.6.0_RC16 release-2.6.0_RC15 release-2.6.0_RC14 release-2.6.0_RC13 release-2.6.0_RC12 release-2.6.0_RC11 release-2.6.0_RC10 release-2.6.0_RC9 release-2.6.0_RC8 release-2.6.0_RC7 release-2.6.0_RC6 release-2.6.0_RC5 release-2.6.0_RC4 release-2.6.0_RC3 release-2.6.0_RC2 release-2.6.0_RC1 release-2.6.0-k8s_9467d13 release-2.5.0_RC10 release-2.5.0_RC9 release-2.5.0_RC9_portalfix release-2.5.0_RC8 release-2.5.0_RC7 portal-fix player-var master_e26ae85 loadtest-release-2.10.0_nginx_prometheus keycloak-3.2.0 keycloak-3.2.0_RC1 keycloak7_RC1 fix-tag-2.4.0 dock-0.0.3_RC7 dock-0.0.3_RC6 dock-0.0.3_RC5 dock-0.0.3_RC4 dock-0.0.3_RC3 dock-0.0.3_RC2 dock-0.0.3_RC1 dock-0.0.3-before-delete dock-0.0.2_RC13 dock-0.0.2_RC12 dock-0.0.2_RC11 dock-0.0.2_RC10 dock-0.0.2_RC9 dock-0.0.2_RC8 dock-0.0.2_RC7 dock-0.0.2_RC6 dock-0.0.2_RC5 dock-0.0.2_RC4 dock-0.0.2_RC3 dock-0.0.2_RC2 dock-0.0.2_RC1 SMYALTAMASH-patch-1
No related merge requests found
Showing with 87 additions and 27 deletions
+87 -27
......@@ -5,6 +5,7 @@ function getQueryStringValue (key) {
window.onload = function(){
var mergeaccountprocess = (new URLSearchParams(window.location.search)).get('mergeaccountprocess');
var version = (new URLSearchParams(window.location.search)).get('version');
var isForgetPasswordAllow = getValueFromSession('version');
var renderingType = 'queryParams';
if (!mergeaccountprocess) {
mergeaccountprocess = localStorage.getItem('mergeaccountprocess');
......@@ -26,7 +27,7 @@ window.onload = function(){
addVersionToURL(version);
var error_message = (new URLSearchParams(window.location.search)).get('error_message');
var success_message = (new URLSearchParams(window.location.search)).get('success_message');
var version = (new URLSearchParams(window.location.search)).get('version');
if(error_message){
var error_msg = document.getElementById('error-msg');
error_msg.className = error_msg.className.replace("hide","");
......@@ -38,13 +39,23 @@ window.onload = function(){
}
if (version >= 4) {
var forgotElement = document.getElementById("fgtPortalFlow");
forgotElement.className = forgotElement.className.replace("hide","");
if(forgotElement){
forgotElement.className = forgotElement.className.replace("hide","");
}
} else {
var forgotElement = document.getElementById("fgtKeycloakFlow");
forgotElement.className = forgotElement.className.replace("hide","");
forgotElement.href = forgotElement.href + '&version=' + version ;
if(forgotElement){
forgotElement.className = forgotElement.className.replace("hide","");
forgotElement.href = forgotElement.href + '&version=' + version ;
}
}
if(!version && isForgetPasswordAllow >=4 ){
hideElement("fgtKeycloakFlow");
var forgotElement = document.getElementById("fgtPortalFlow");
if(forgotElement){
forgotElement.className = forgotElement.className.replace("hide","");
}
}
if (mergeaccountprocess === '1') {
hideElement("kc-registration");
hideElement("stateButton");
......@@ -75,12 +86,7 @@ window.onload = function(){
mergeAccountMessage.className = mergeAccountMessage.className.replace("hide", "");
}
}
var response_type = (new URLSearchParams(window.location.search)).get('response_type');
if ((new URLSearchParams(window.location.search)).get('automerge') !== '1' && response_type === 'code') {
localStorage.clear();
}
var autoMerge = getValue('automerge');
var autoMerge = getValueFromSession('automerge');
if (autoMerge === '1') {
decoratePage('autoMerge');
storeValueForMigration();
......@@ -88,14 +94,29 @@ window.onload = function(){
};
var storeValueForMigration = function () {
// storing values in localstorage for future references
localStorage.setItem('automerge', getValue('automerge'));
localStorage.setItem('goBackUrl', getValue('goBackUrl'));
localStorage.setItem('identifierValue', getValue('identifierValue'));
localStorage.setItem('identifierType', getValue('identifierType'));
localStorage.setItem('userId', getValue('userId'));
// storing values in sessionStorage for future references
sessionStorage.setItem('automerge', getValueFromSession('automerge'));
sessionStorage.setItem('goBackUrl', getValueFromSession('goBackUrl'));
sessionStorage.setItem('identifierValue', getValueFromSession('identifierValue'));
sessionStorage.setItem('identifierType', getValueFromSession('identifierType'));
sessionStorage.setItem('userId', getValueFromSession('userId'));
};
var getValueFromSession = function (valueId) {
var value = (new URLSearchParams(window.location.search)).get(valueId);
if (value) {
sessionStorage.setItem(valueId, value);
sessionStorage.setItem('renderingType', 'queryParams');
return value
} else {
value = sessionStorage.getItem(valueId);
if (value) {
sessionStorage.setItem('renderingType', 'sessionStorage');
}
return value
}
};
var getValue = function (valueId) {
var value = (new URLSearchParams(window.location.search)).get(valueId);
if (value) {
......@@ -113,13 +134,17 @@ var getValue = function (valueId) {
var decoratePage = function (pageType) {
if (pageType === 'autoMerge') {
var identifierValue = getValue('identifierValue');
var goBackUrl = getValue('goBackUrl');
var identifierValue = getValueFromSession('identifierValue');
var goBackUrl = getValueFromSession('goBackUrl');
var signIn = document.getElementById("signIn");
if (signIn) {
signIn.innerText = 'Merge Account';
signIn.classList.add('fs-22');
}
var loginButton = document.getElementById("login");
if (loginButton) {
loginButton.innerText = 'Next';
}
setElementValue('username', identifierValue);
var elementsToHide = ['kc-registration', 'stateButton', 'fgtKeycloakFlow', 'fgtPortalFlow',
......@@ -131,11 +156,11 @@ var decoratePage = function (pageType) {
if (goBackElement) {
goBackElement.href = goBackUrl;
}
if (localStorage.getItem('renderingType') === 'localStorage') {
if (sessionStorage.getItem('renderingType') === 'sessionStorage') {
unHideElement('selfSingUp');
var errorElement = document.getElementById('error-summary');
if (errorElement) {
if (errorElement.innerText === 'Invalid email ID/Mobile number or password. Please try again with valid credentials') {
if (errorElement.innerText === 'Invalid email Address/Mobile number or password. Please try again with valid credentials') {
unHideElement('inCorrectPasswordError');
handlePasswordFailure();
}
......@@ -149,12 +174,12 @@ var decoratePage = function (pageType) {
};
var handlePasswordFailure = function () {
var passwordFailCount = Number(localStorage.getItem('passwordFailCount') || 0);
var passwordFailCount = Number(sessionStorage.getItem('passwordFailCount') || 0);
passwordFailCount = passwordFailCount + 1;
localStorage.setItem('passwordFailCount', passwordFailCount);
sessionStorage.setItem('passwordFailCount', passwordFailCount);
if (passwordFailCount >= 2) {
const url = '/sign-in/sso/auth?status=error' + '&identifierType=' + getValue('identifierType');
const query = '&userId=' + getValue('userId') + '&identifierValue=' + getValue('identifierValue');
const url = '/sign-in/sso/auth?status=error' + '&identifierType=' + getValueFromSession('identifierType');
const query = '&userId=' + getValueFromSession('userId') + '&identifierValue=' + getValueFromSession('identifierValue');
window.location.href = window.location.protocol + '//' + window.location.host + url + query;
}
};
......@@ -199,7 +224,7 @@ var makeDivUnclickable = function() {
};
var inputBoxFocusIn = function(currentElement){
var autoMerge = getValue('automerge');
var autoMerge = getValueFromSession('automerge');
if (autoMerge === '1') {
return;
}
......@@ -211,7 +236,7 @@ var inputBoxFocusIn = function(currentElement){
}
};
var inputBoxFocusOut = function (currentElement) {
var autoMerge = getValue('automerge');
var autoMerge = getValueFromSession('automerge');
if (autoMerge === '1') {
return;
}
......@@ -276,6 +301,41 @@ var navigate = function(type) {
}
}
}
var initialize = () => {
getValueFromSession('redirect_uri');
if (!sessionStorage.getItem('session_url')) {
sessionStorage.setItem('session_url', window.location.href);
}
};
initialize();
var forgetPassword = (redirectUrlPath) => {
const curUrlObj = window.location;
var redirect_uri = getValueFromSession('redirect_uri');
var client_id = (new URLSearchParams(curUrlObj.search)).get('client_id');
const sessionUrl = sessionStorage.getItem('session_url');
if (sessionUrl) {
const sessionUrlObj = new URL(sessionUrl);
const updatedQuery = sessionUrlObj.search + '&error_callback=' + sessionUrlObj.href.split('?')[0];
if (redirect_uri) {
const redirect_uriLocation = new URL(redirect_uri);
if(client_id === 'android'){
window.location.href = sessionUrlObj.protocol + '//' + sessionUrlObj.host + redirectUrlPath + updatedQuery;
}
else{
window.location.href = redirect_uriLocation.protocol + '//' + redirect_uriLocation.host +
redirectUrlPath + updatedQuery;
}
} else {
redirectToLib();
}
} else {
redirectToLib();
}
}
var redirect = (redirectUrlPath) => {
console.log('redirect', redirectUrlPath)
const curUrlObj = window.location;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment