observe redirect param even when logged in (#37750)

enterprise/frontend/src/metabase-enterprise/auth/middleware/session-middleware.js

@@ -28,6 +28,13 @@ export const createSessionMiddleware = (
 
       let wasLoggedIn = getIsLoggedIn();
 
+      // get the redirect url before refreshing the session because after the refresh the url will be reset
+      const redirectUrl = getRedirectUrl();
+
+      if (wasLoggedIn && !!redirectUrl) {
+        store.dispatch(replace(redirectUrl));
+      }
+
       intervalId = setInterval(async () => {
         const isLoggedIn = getIsLoggedIn();
 
@@ -35,8 +42,6 @@ export const createSessionMiddleware = (
           wasLoggedIn = isLoggedIn;
 
           if (isLoggedIn) {
-            // get the redirect url before refreshing the session because after the refresh the url will be reset
-            const redirectUrl = getRedirectUrl();
             await store.dispatch(refreshSession())?.unwrap();
 
             if (redirectUrl !== null) {

enterprise/frontend/src/metabase-enterprise/auth/middleware/session-middleware.unit.spec.js

@@ -116,6 +116,29 @@ describe("createSessionMiddleware", () => {
     });
   });
 
+  describe("logged in redirect", () => {
+    beforeEach(() => {
+      changeJSDOMURL(
+        "https://metabase.com/auth/login?redirect=%2Fquestion%2F1%3Fquery%3D5%23hash",
+      );
+    });
+
+    it("should redirect to the redirectUrl", async () => {
+      Cookie.get = jest
+        .fn()
+        .mockImplementationOnce(() => "alive")
+        .mockImplementationOnce(() => "alive");
+
+      const { handleAction, dispatchMock } = setup();
+
+      handleAction(actionStub);
+      clock.tick(COOKIE_POOLING_TIMEOUT);
+
+      expect(dispatchMock).toHaveBeenCalled();
+      expect(replace).toHaveBeenCalledWith("/question/1?query=5#hash");
+    });
+  });
+
   describe("when not logged in", () => {
     beforeEach(() => {
       changeJSDOMURL(