@@ -116,13 +116,13 @@ export default function FullPortal() {
116116 }
117117
118118 function doRedirectDone ( ) {
119- const redirectUrl : any = sessionStorage . getItem ( 'url' ) ;
120- navigate ( redirectUrl ) ;
121- sessionStorage . removeItem ( 'url' ) ;
122-
123- const locale = sessionStorage . getItem ( 'rsdk_locale' ) || undefined ;
119+ navigate ( window . location . pathname ) ;
120+ let localeOverride : any = sessionStorage . getItem ( 'rsdk_locale' ) ;
121+ if ( ! localeOverride ) {
122+ localeOverride = undefined ;
123+ }
124124 // appName and mainRedirect params have to be same as earlier invocation
125- loginIfNecessary ( { appName : 'portal' , mainRedirect : true , locale } ) ;
125+ loginIfNecessary ( { appName : 'portal' , mainRedirect : true , locale : localeOverride } ) ;
126126 }
127127
128128 // One time (initialization)
@@ -131,20 +131,12 @@ export default function FullPortal() {
131131
132132 const locale = sessionStorage . getItem ( 'rsdk_locale' ) || undefined ;
133133
134- const isLoggedIn = sessionStorage . getItem ( 'isLoggedIn' ) ;
135- const redirected = sessionStorage . getItem ( 'redirected' ) ;
136- if ( isLoggedIn !== 'true' && redirected !== 'true' ) {
137- sessionStorage . setItem ( 'url' , window . location . pathname ) ;
138- navigate ( '/portal' ) ;
139- }
140- sessionStorage . setItem ( 'redirected' , 'true' ) ;
141134 // Login if needed, doing an initial main window redirect
142135 loginIfNecessary ( {
143136 appName : 'portal' ,
144137 mainRedirect : true ,
145138 redirectDoneCB : doRedirectDone ,
146139 locale
147- // semanticUrls: true //. enable this line for semantic urls
148140 } ) ;
149141 } , [ ] ) ;
150142
0 commit comments