@@ -246,39 +246,43 @@ export function handleResponse(
246246 }
247247}
248248
249- export function authorize (
249+ export function returnRedirectUrlForSocialLogin (
250250 serverSlice : RootState [ 'node' ] [ 'server' ] ,
251251 collector : IdpCollector ,
252252 logger : ReturnType < typeof loggerFn > ,
253- ) : InternalErrorResponse | void {
253+ ) : InternalErrorResponse | string {
254254 if ( serverSlice && '_links' in serverSlice ) {
255255 const continueUrl = serverSlice . _links ?. [ 'continue' ] ?. href ?? null ;
256256 if ( continueUrl ) {
257257 window . localStorage . setItem ( 'continueUrl' , continueUrl ) ;
258258 if ( collector . output . url ) {
259- window . location . assign ( collector . output . url ) ;
259+ return collector . output . url ;
260+ } else {
261+ logger . error ( 'No url found in collector, social login needs a url in the collector' ) ;
262+ return {
263+ error : {
264+ message :
265+ 'No url found in collector, social login needs a url in the collector to navigate to' ,
266+ type : 'network_error' ,
267+ } ,
268+ type : 'internal_error' ,
269+ } ;
260270 }
261- } else {
262- logger . error ( 'No url found in collector, social login needs a url in the collector' ) ;
263- return {
264- error : {
265- message :
266- 'No url found in collector, social login needs a url in the collector to navigate to' ,
267- type : 'network_error' ,
268- } ,
269- type : 'internal_error' ,
270- } ;
271271 }
272- logger . error (
273- 'No Continue Url found, social login needs a continue url to be saved in localStorage' ,
274- ) ;
275- return {
276- error : {
277- message :
278- 'No Continue Url found, social login needs a continue url to be saved in localStorage' ,
279- type : 'network_error' ,
280- } ,
281- type : 'internal_error' ,
282- } ;
283272 }
273+ /**
274+ * If we have no continue url
275+ * we have to return an error
276+ **/
277+ logger . error (
278+ 'No Continue Url found, social login needs a continue url to be saved in localStorage' ,
279+ ) ;
280+ return {
281+ error : {
282+ message :
283+ 'No Continue Url found, social login needs a continue url to be saved in localStorage' ,
284+ type : 'network_error' ,
285+ } ,
286+ type : 'internal_error' ,
287+ } ;
284288}
0 commit comments