Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Fix login redirects when metabot is enabled (#73717)

Nick Fitzpatrickf062dc54290e
diff --git a/frontend/src/metabase/metabot/hooks/use-user-metabot-permissions.ts b/frontend/src/metabase/metabot/hooks/use-user-metabot-permissions.ts
index 855c1c646da..0c210ea7d0a 100644
--- a/frontend/src/metabase/metabot/hooks/use-user-metabot-permissions.ts
+++ b/frontend/src/metabase/metabot/hooks/use-user-metabot-permissions.ts
@@ -1,6 +1,8 @@
import { useMemo } from "react";
import { useGetUserMetabotPermissionsQuery } from "metabase/api";
+import { useSelector } from "metabase/redux";
+import { getUser } from "metabase/selectors/user";
import { useMetabotEnabledEmbeddingAware } from "./use-metabot-embedding-aware-enabled";
@@ -9,9 +11,10 @@ import { useMetabotEnabledEmbeddingAware } from "./use-metabot-embedding-aware-e
* Returns all false while loading or on error. */
export const useUserMetabotPermissions = () => {
const isMetabotEnabled = useMetabotEnabledEmbeddingAware();
+ const isAuthenticated = !!useSelector(getUser);
const { data, isLoading, isError } = useGetUserMetabotPermissionsQuery(
undefined,
- { skip: !isMetabotEnabled },
+ { skip: !isMetabotEnabled || !isAuthenticated },
);
const perms = data?.permissions;
diff --git a/frontend/src/metabase/metabot/hooks/use-user-metabot-permissions.unit.spec.tsx b/frontend/src/metabase/metabot/hooks/use-user-metabot-permissions.unit.spec.tsx
index f69fb67b50c..fa9d598a17c 100644
--- a/frontend/src/metabase/metabot/hooks/use-user-metabot-permissions.unit.spec.tsx
+++ b/frontend/src/metabase/metabot/hooks/use-user-metabot-permissions.unit.spec.tsx
@@ -19,10 +19,12 @@ function TestComponent() {
function setup({
isMetabotEnabled = true,
+ isAuthenticated = true,
apiResponse,
apiStatus = 200,
}: {
isMetabotEnabled?: boolean;
+ isAuthenticated?: boolean;
apiResponse?: UserMetabotPermissionsResponse;
apiStatus?: number;
} = {}) {
@@ -43,7 +45,10 @@ function setup({
setupEnterprisePlugins();
renderWithProviders(<TestComponent />, {
- storeInitialState: createMockState({ settings }),
+ storeInitialState: createMockState({
+ settings,
+ ...(isAuthenticated ? {} : { currentUser: null }),
+ }),
});
}
@@ -77,6 +82,17 @@ describe("useUserMetabotPermissions", () => {
expect(perms.canUseOtherTools).toBe(false);
});
+ it("does not call the API when the user is unauthenticated (UXW-3939)", async () => {
+ setup({ isAuthenticated: false });
+ const perms = await getPerms();
+ expect(perms.canUseMetabot).toBe(false);
+ expect(
+ fetchMock.callHistory.calls(
+ "path:/api/metabot/permissions/user-permissions",
+ ),
+ ).toHaveLength(0);
+ });
+
it("returns all false when the API returns an error", async () => {
setup({ apiStatus: 500 });
await waitFor(() => {
diff --git a/frontend/src/metabase/route-guards.unit.spec.tsx b/frontend/src/metabase/route-guards.unit.spec.tsx
index 4635bd2e339..209ff803248 100644
--- a/frontend/src/metabase/route-guards.unit.spec.tsx
+++ b/frontend/src/metabase/route-guards.unit.spec.tsx
@@ -1,12 +1,17 @@
import { type Context, createContext } from "react";
+import { Route } from "react-router";
import { routerActions } from "react-router-redux";
import { connectedReduxRedirect } from "redux-auth-wrapper/history3/redirect";
-import { renderWithProviders, screen } from "__support__/ui";
+import { renderWithProviders, screen, waitFor } from "__support__/ui";
import { metabaseReduxContext } from "metabase/redux/context";
import { createMockState } from "metabase/redux/store/mocks";
-import { isBackendOnlyPath } from "./route-guards";
+import {
+ IsAuthenticated,
+ IsNotAuthenticated,
+ isBackendOnlyPath,
+} from "./route-guards";
describe("route-guards", () => {
describe("patched redux-auth-wrapper", () => {
@@ -65,6 +70,47 @@ describe("route-guards", () => {
});
});
+ describe("redirect-after-login flow (UXW-3939)", () => {
+ it("UserIsAuthenticated should preserve original path as ?redirect= when sending logged-out user to /auth/login", async () => {
+ const settings = {
+ "has-user-setup": true,
+ } as any;
+ const state = createMockState({
+ currentUser: undefined,
+ settings: { values: settings } as any,
+ });
+
+ const Dashboard = () => <div>protected dashboard</div>;
+ const LoginPage = () => <div>login page</div>;
+
+ const { history } = renderWithProviders(
+ <>
+ <Route component={IsAuthenticated}>
+ <Route path="/dashboard/:slug" component={Dashboard} />
+ </Route>
+ <Route component={IsNotAuthenticated}>
+ <Route path="/auth/login" component={LoginPage} />
+ </Route>
+ </>,
+ {
+ storeInitialState: state,
+ withRouter: true,
+ initialRoute: "/dashboard/123",
+ },
+ );
+
+ await waitFor(() => {
+ expect(history?.getCurrentLocation().pathname).toBe("/auth/login");
+ });
+
+ const location = history!.getCurrentLocation();
+ expect(location.query).toEqual(
+ expect.objectContaining({ redirect: "/dashboard/123" }),
+ );
+ expect(location.search).toContain("redirect");
+ });
+ });
+
describe("isBackendOnlyPath", () => {
it("should return true for /oauth/ paths", () => {
expect(isBackendOnlyPath("/oauth/authorize")).toBe(true);