@@ -114,13 +114,13 @@ export default function FullPortal() {
114114 }
115115
116116 function doRedirectDone ( ) {
117- const redirectUrl : any = sessionStorage . getItem ( 'url' ) ;
118- navigate ( redirectUrl ) ;
119- sessionStorage . removeItem ( 'url' ) ;
120-
121- const locale = sessionStorage . getItem ( 'rsdk_locale' ) || undefined ;
117+ navigate ( window . location . pathname ) ;
118+ let localeOverride : any = sessionStorage . getItem ( 'rsdk_locale' ) ;
119+ if ( ! localeOverride ) {
120+ localeOverride = undefined ;
121+ }
122122 // appName and mainRedirect params have to be same as earlier invocation
123- loginIfNecessary ( { appName : 'portal' , mainRedirect : true , locale } ) ;
123+ loginIfNecessary ( { appName : 'portal' , mainRedirect : true , locale : localeOverride } ) ;
124124 }
125125
126126 // One time (initialization)
@@ -129,20 +129,12 @@ export default function FullPortal() {
129129
130130 const locale = sessionStorage . getItem ( 'rsdk_locale' ) || undefined ;
131131
132- const isLoggedIn = sessionStorage . getItem ( 'isLoggedIn' ) ;
133- const redirected = sessionStorage . getItem ( 'redirected' ) ;
134- if ( isLoggedIn !== 'true' && redirected !== 'true' ) {
135- sessionStorage . setItem ( 'url' , window . location . pathname ) ;
136- navigate ( '/portal' ) ;
137- }
138- sessionStorage . setItem ( 'redirected' , 'true' ) ;
139132 // Login if needed, doing an initial main window redirect
140133 loginIfNecessary ( {
141134 appName : 'portal' ,
142135 mainRedirect : true ,
143136 redirectDoneCB : doRedirectDone ,
144137 locale
145- // semanticUrls: true
146138 } ) ;
147139 } , [ ] ) ;
148140
0 commit comments