Skip to content

fix: read flag from claims #278

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

Merged
sachin-maheshwari merged 2 commits into from
Jan 6, 2022
Merged

fix: read flag from claims #278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0bc569
fix: read flag from claims
rakibansary Jan 6, 2022
e58f564
Merge branch 'dev' into feat/onboard-wizard
rakibansary Jan 6, 2022
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
4 changes: 2 additions & 2 deletions web-assets/auth0/dev-tenant/rules/onboardingChecklist.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ function (user, context, callback) {

if (data.length === 0) {
// User doesn't have any traits with traitId onboarding_checklist and should be shown the onboarding wizard
user.show_onboarding_wizard = true;
context.idToken[global.AUTH0_CLAIM_NAMESPACE + 'show_onboarding_wizard'] = false;
console.log('rule:onboarding-checklist:Setting show_onboarding_wizard to true', user);
return callback(null, user, context);
}
Expand Down Expand Up @@ -128,7 +128,7 @@ function (user, context, callback) {

// All checks failed - indicating user newly registered and needs to be shown the onboarding wizard
console.log('rule:onboarding-checklist: set show_onboarding_wizard', user);
user.show_onboarding_wizard = true;
context.idToken[global.AUTH0_CLAIM_NAMESPACE + 'show_onboarding_wizard'] = false;
return callback(null, user, context);
} catch (e) {
console.log("rule:onboarding-checklist:Error in fetching onboarding_checklist", e);
Expand Down
103 changes: 58 additions & 45 deletions web-assets/js/setupAuth0WithRedirect.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,60 +263,73 @@ const authSetup = function () {
}

const storeToken = function () {
auth0.getUser().then(function (user) {
auth0.getIdTokenClaims().then(function (claims) {
logger("claims...", claims);
idToken = claims.__raw;
let userActive = false;
auth0.getIdTokenClaims().then(function (claims) {
idToken = claims.__raw;

logger.info('Claims', JSON.stringify(claims));

let showOnboardingWizard = false;
Object.keys(claims).forEach(key => {
logger.info('Checking key', key);
if (key.indexOf('show_onboarding_wizard') !== -1) {
if (claims[key]) {
showOnboardingWizard = true;
}
}
});

logger.info('Show Onboarding Wizard', showOnboardingWizard);

let userActive = false;
Object.keys(claims).findIndex(function (key) {
if (key.includes('active')) {
userActive = claims[key];
return true;
}
return false;
});
if (userActive) {
let tcsso = '';
Object.keys(claims).findIndex(function (key) {
if (key.includes('active')) {
userActive = claims[key];
if (key.includes(tcSSOCookie)) {
tcsso = claims[key];
return true;
}
return false;
});
if (userActive) {
let tcsso = '';
Object.keys(claims).findIndex(function (key) {
if (key.includes(tcSSOCookie)) {
tcsso = claims[key];
return true;
}
return false;
});
logger('Storing token...', true);
try {
const exT = getCookieExpiry(idToken);
if (exT) {
setDomainCookie(tcJWTCookie, idToken, exT);
setDomainCookie(v3JWTCookie, idToken, exT);
setDomainCookie(tcSSOCookie, tcsso, exT);
} else {
setCookie(tcJWTCookie, idToken, cookieExpireIn);
setCookie(v3JWTCookie, idToken, cookieExpireIn);
setCookie(tcSSOCookie, tcsso, cookieExpireIn);
}
} catch (e) {
logger('Error occured in fecthing token expiry time', e.message);
logger('Storing token...', true);
try {
const exT = getCookieExpiry(idToken);
if (exT) {
setDomainCookie(tcJWTCookie, idToken, exT);
setDomainCookie(v3JWTCookie, idToken, exT);
setDomainCookie(tcSSOCookie, tcsso, exT);
} else {
setCookie(tcJWTCookie, idToken, cookieExpireIn);
setCookie(v3JWTCookie, idToken, cookieExpireIn);
setCookie(tcSSOCookie, tcsso, cookieExpireIn);
}
} catch (e) {
logger('Error occured in fecthing token expiry time', e.message);
}

if (user.show_onboarding_wizard) {
redirectToOnboardingWizard();
} else {
// session still active, but app calling login
if (!appUrl && returnAppUrl) {
appUrl = returnAppUrl
}
redirectToApp();
if (showOnboardingWizard) {
logger.info('Take user to onboarding wizard');
redirectToOnboardingWizard();
} else {
// session still active, but app calling login
if (!appUrl && returnAppUrl) {
appUrl = returnAppUrl
}
} else {
logger("User active ? ", userActive);
host = registerSuccessUrl;
logout();
redirectToApp();
}
}).catch(function (e) {
logger("Error in fetching token from auth0: ", e);
});
} else {
logger("User active ? ", userActive);
host = registerSuccessUrl;
logout();
}
}).catch(function (e) {
logger("Error in fetching token from auth0: ", e);
});
};

Expand Down