Skip to content
Merged
Changes from all commits
Commits
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
20 changes: 6 additions & 14 deletions src/samples/FullPortal/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -116,13 +116,13 @@ export default function FullPortal() {
}

function doRedirectDone() {
const redirectUrl: any = sessionStorage.getItem('url');
navigate(redirectUrl);
sessionStorage.removeItem('url');

const locale = sessionStorage.getItem('rsdk_locale') || undefined;
navigate(window.location.pathname);
let localeOverride: any = sessionStorage.getItem('rsdk_locale');
if (!localeOverride) {
localeOverride = undefined;
}
// appName and mainRedirect params have to be same as earlier invocation
loginIfNecessary({ appName: 'portal', mainRedirect: true, locale });
loginIfNecessary({ appName: 'portal', mainRedirect: true, locale: localeOverride });
}

// One time (initialization)
Expand All @@ -131,20 +131,12 @@ export default function FullPortal() {

const locale = sessionStorage.getItem('rsdk_locale') || undefined;

const isLoggedIn = sessionStorage.getItem('isLoggedIn');
const redirected = sessionStorage.getItem('redirected');
if (isLoggedIn !== 'true' && redirected !== 'true') {
sessionStorage.setItem('url', window.location.pathname);
navigate('/portal');
}
sessionStorage.setItem('redirected', 'true');
// Login if needed, doing an initial main window redirect
loginIfNecessary({
appName: 'portal',
mainRedirect: true,
redirectDoneCB: doRedirectDone,
locale
// semanticUrls: true //. enable this line for semantic urls
});
}, []);

Expand Down
Loading