Merge pull request #3941 from shesha-io/f/login-redirect-fix

fix: fixed handling of returnUrl after login

Author: IvanIlyichev

shesha-reactjs/src/providers/auth/authenticator.ts

@@ -230,6 +230,9 @@ export class Authenticator implements IAuthenticator {
       const userProfile = await this.#fetchUserInfoHttp();
       this.#loginInfo = userProfile;
 
+      if (!userProfile.user)
+        throw new Error(ERROR_MESSAGES.USER_PROFILE_IS_UNAVAILABLE);
+
       this.#updateState('ready');
 
       const redirectUrl = this.#getRedirectUrl(this.#router.fullPath, userProfile.user);

shesha-reactjs/src/providers/auth/models.ts

@@ -27,6 +27,7 @@ export const ERROR_MESSAGES = {
   GENERIC: 'Oops, something went wrong',
   LOGIN: 'Failed to login',
   USER_PROFILE_LOADING: 'Failed to load user profile',
+  USER_PROFILE_IS_UNAVAILABLE: 'User profile info is unavailable',
 };
 
 export interface IAuthenticator {

shesha-reactjs/src/utils/url.ts

@@ -89,7 +89,10 @@ export function removeURLParameter(url: string, parameter: string): string {
   if (!(parameter in parsed))
     return url;
   delete parsed[parameter];
-  return baseUrl + '?' + qs.stringify(parsed);
+  const newQueryString = qs.stringify(parsed);
+  return isNullOrWhiteSpace(newQueryString)
+    ? baseUrl
+    : baseUrl + '?' + newQueryString;
 }