@@ -52,8 +52,6 @@ function getOriginalUrl(req) {
5252}
5353
5454function registerOauth ( ) {
55- redirectURL = new URL ( ENV . redirectURL )
56-
5755 passport . use (
5856 new OAuth2Strategy (
5957 {
@@ -196,16 +194,23 @@ function registerFakeAuth() {
196194 } )
197195
198196 router . get ( "/" , async ( req , res , next ) => {
197+ const originalUrl = getOriginalUrl ( req )
198+
199+ let originalURL
200+ try {
201+ originalURL = new URL ( originalUrl )
202+ } catch ( err ) {
203+ logger . error ( "Error parsing service URL: " , originalUrl )
204+ }
205+
199206 if ( ! req . isAuthenticated ( ) ) {
200207 req . session . user = {
201- username : "user" ,
208+ username : originalURL . hostname ,
202209 email : "" ,
203210 locale : "" ,
204211 }
205212 }
206213
207- const originalUrl = getOriginalUrl ( req )
208-
209214 const sessionID = uuidv4 ( )
210215
211216 res . cookie ( "session_id" , sessionID , {
@@ -215,7 +220,10 @@ function registerFakeAuth() {
215220 maxAge : 1000 * 60 * 60 ,
216221 } )
217222
218- await WriteToCache ( `service=${ sessionID } ` , originalUrl )
223+ await WriteToCache (
224+ `${ redirectURL ?. origin || "" } /service=${ sessionID } ` ,
225+ originalUrl
226+ )
219227
220228 next ( )
221229 } )
@@ -232,6 +240,12 @@ function registerFakeAuth() {
232240}
233241
234242export function Router ( ) {
243+ try {
244+ redirectURL = new URL ( ENV . redirectURL )
245+ } catch ( err ) {
246+ logger . error ( "Error parsing redirect URL: " , ENV . redirectURL )
247+ }
248+
235249 if ( ENV . useOauth ) {
236250 registerOauth ( )
237251 } else {
0 commit comments