@truedat/auth 7.5.9 → 7.5.10

package/src/sessions/components/__tests__/PrivateRoute.spec.js

@@ -0,0 +1,90 @@
+import React from "react";
+import { render, waitForLoad } from "@truedat/test/render";
+import { LOGIN, UNAUTHORIZED } from "@truedat/core/routes";
+import PrivateRoute from "../PrivateRoute";
+
+jest.mock("react-router", () => ({
+  ...jest.requireActual("react-router"),
+  useLocation: jest.fn().mockReturnValue({ pathname: "/current" }),
+  Navigate: ({ to: { pathname } }) => <div>Navigate to {pathname}</div>,
+}));
+
+describe("<PrivateRoute />", () => {
+  const TestComponent = () => <div>Test Component</div>;
+
+  it("matches the latest snapshot", async () => {
+    const rendered = render(<PrivateRoute component={TestComponent} />, {
+      state: {
+        authentication: {
+          token: "valid-token",
+          entitlements: { some: "permission" },
+        },
+      },
+    });
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("redirects to login when no token", async () => {
+    const rendered = render(<PrivateRoute component={TestComponent} />, {
+      state: {
+        authentication: {
+          token: null,
+          entitlements: {},
+        },
+      },
+    });
+    await waitForLoad(rendered);
+
+    expect(rendered.getByText(`Navigate to ${LOGIN}`)).toBeInTheDocument();
+  });
+
+  it("redirects to unauthorized when token but no permissions", async () => {
+    const rendered = render(<PrivateRoute component={TestComponent} />, {
+      state: {
+        authentication: {
+          token: "valid-token",
+          entitlements: {},
+        },
+      },
+    });
+    await waitForLoad(rendered);
+
+    expect(
+      rendered.getByText(`Navigate to ${UNAUTHORIZED}`)
+    ).toBeInTheDocument();
+  });
+
+  it("renders component when token and permissions exist", async () => {
+    const rendered = render(<PrivateRoute component={TestComponent} />, {
+      state: {
+        authentication: {
+          token: "valid-token",
+          entitlements: { some: "permission" },
+        },
+      },
+    });
+    await waitForLoad(rendered);
+
+    expect(rendered.getByText(/test component/i)).toBeInTheDocument();
+  });
+
+  it("dispatches retrieveToken when token is undefined", async () => {
+    const mockDispatch = jest.fn();
+    const rendered = render(
+      <PrivateRoute component={TestComponent} path="/" />,
+      {
+        state: {
+          authentication: {
+            token: undefined,
+            entitlements: {},
+          },
+        },
+        dispatch: mockDispatch,
+      }
+    );
+    await waitForLoad(rendered);
+
+    expect(mockDispatch).toHaveBeenCalled();
+  });
+});

package/src/sessions/components/__tests__/UnauthorizedRoute.spec.js

@@ -0,0 +1,88 @@
+import React from "react";
+import { render, waitForLoad } from "@truedat/test/render";
+import { LOGIN } from "@truedat/core/routes";
+import UnauthorizedRoute from "../UnauthorizedRoute";
+
+jest.mock("react-router", () => ({
+  ...jest.requireActual("react-router"),
+  useLocation: jest.fn().mockReturnValue({ pathname: "/current" }),
+  Navigate: ({ to: { pathname } }) => <div>Navigate to {pathname}</div>,
+}));
+
+describe("<UnauthorizedRoute />", () => {
+  const TestComponent = () => <div>Test Component</div>;
+
+  it("matches the latest snapshot", async () => {
+    const rendered = render(<UnauthorizedRoute component={TestComponent} />, {
+      state: {
+        authentication: {
+          token: "valid-token",
+          entitlements: {},
+        },
+      },
+    });
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("redirects to login when no token", async () => {
+    const rendered = render(<UnauthorizedRoute component={TestComponent} />, {
+      state: {
+        authentication: {
+          token: null,
+          entitlements: {},
+        },
+      },
+    });
+    await waitForLoad(rendered);
+
+    expect(rendered.getByText(`Navigate to ${LOGIN}`)).toBeInTheDocument();
+  });
+
+  it("redirects to login when token and permissions exist", async () => {
+    const rendered = render(<UnauthorizedRoute component={TestComponent} />, {
+      state: {
+        authentication: {
+          token: "valid-token",
+          entitlements: { some: "permission" },
+        },
+      },
+    });
+    await waitForLoad(rendered);
+
+    expect(rendered.getByText(`Navigate to ${LOGIN}`)).toBeInTheDocument();
+  });
+
+  it("renders component when token exists but no permissions", async () => {
+    const rendered = render(<UnauthorizedRoute component={TestComponent} />, {
+      state: {
+        authentication: {
+          token: "valid-token",
+          entitlements: {},
+        },
+      },
+    });
+    await waitForLoad(rendered);
+
+    expect(rendered.getByText(/test component/i)).toBeInTheDocument();
+  });
+
+  it("dispatches retrieveToken when token is undefined", async () => {
+    const mockDispatch = jest.fn();
+    const rendered = render(
+      <UnauthorizedRoute component={TestComponent} path="/" />,
+      {
+        state: {
+          authentication: {
+            token: undefined,
+            entitlements: {},
+          },
+        },
+        dispatch: mockDispatch,
+      }
+    );
+    await waitForLoad(rendered);
+
+    expect(mockDispatch).toHaveBeenCalled();
+  });
+});

package/src/sessions/components/__tests__/__snapshots__/Auth0LoginButton.spec.js.snap

@@ -1,29 +1,27 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`<Auth0LoginButton /> matches the latest snapshot 1`] = `
-<a
-  className="ui button yellow fluid"
-  onClick={[Function]}
->
-  <i
-    className="user icon"
-  />
-  <MemoizedFormattedMessage
-    id="login.form.actions.auth0"
-  />
-</a>
+exports[`<Auth0LoginButton /> matches the latest snapshot with a default icon 1`] = `
+<div>
+  <a
+    class="ui button yellow fluid"
+  >
+    <i
+      class="sign-in icon"
+    />
+    login.form.actions.auth0
+  </a>
+</div>
 `;
 
-exports[`<Auth0LoginButton /> matches the latest snapshot with a default icon 1`] = `
-<a
-  className="ui button yellow fluid"
-  onClick={[Function]}
->
-  <i
-    className="sign-in icon"
-  />
-  <MemoizedFormattedMessage
-    id="login.form.actions.auth0"
-  />
-</a>
+exports[`<Auth0LoginButton /> matches the latest snapshot with custom icon 1`] = `
+<div>
+  <a
+    class="ui button yellow fluid"
+  >
+    <i
+      class="user icon"
+    />
+    login.form.actions.auth0
+  </a>
+</div>
 `;

package/src/sessions/components/__tests__/__snapshots__/NonceCallback.spec.js.snap

@@ -0,0 +1,18 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<NonceCallback /> matches the latest snapshot 1`] = `
+<div>
+  <div>
+    Navigate to 
+    /
+  </div>
+</div>
+`;
+
+exports[`<NonceCallback /> shows loading when no token or redirect exists 1`] = `
+<div>
+  <div
+    class="ui active loader"
+  />
+</div>
+`;

package/src/sessions/components/__tests__/__snapshots__/OidcLoginButton.spec.js.snap

@@ -1,23 +1,23 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`<OidcLoginButton /> matches the latest snapshot 1`] = `
-<a
-  className="ui secondary button yellow"
-  href="https://auth.oidc.org/authorize?foo=bar"
->
-  <MemoizedFormattedMessage
-    id="login.form.actions.oidc"
-  />
-</a>
+exports[`<OidcLoginButton /> matches the latest snapshot with a default icon 1`] = `
+<div>
+  <a
+    class="ui secondary button yellow"
+    href="https://auth.oidc.org/authorize?foo=bar"
+  >
+    login.form.actions.oidc
+  </a>
+</div>
 `;
 
-exports[`<OidcLoginButton /> matches the latest snapshot with a default icon 1`] = `
-<a
-  className="ui secondary button yellow"
-  href="https://auth.oidc.org/authorize?foo=bar"
->
-  <MemoizedFormattedMessage
-    id="login.form.actions.oidc"
-  />
-</a>
+exports[`<OidcLoginButton /> matches the latest snapshot with custom icon 1`] = `
+<div>
+  <a
+    class="ui secondary button yellow"
+    href="https://auth.oidc.org/authorize?foo=bar"
+  >
+    login.form.actions.oidc
+  </a>
+</div>
 `;

package/src/sessions/components/__tests__/__snapshots__/PrivateRoute.spec.js.snap

@@ -0,0 +1,9 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<PrivateRoute /> matches the latest snapshot 1`] = `
+<div>
+  <div>
+    Test Component
+  </div>
+</div>
+`;

package/src/sessions/components/__tests__/__snapshots__/UnauthorizedRoute.spec.js.snap

@@ -0,0 +1,9 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<UnauthorizedRoute /> matches the latest snapshot 1`] = `
+<div>
+  <div>
+    Test Component
+  </div>
+</div>
+`;

package/src/sessions/components/index.js

@@ -19,5 +19,5 @@ export {
   PrivateRoute,
   SamlCallback,
   ProxyLoginCallback,
-  UnauthorizedRoute
+  UnauthorizedRoute,
 };

package/src/sessions/sagas/__tests__/login.spec.js

@@ -1,4 +1,4 @@
-import jwt_decode from "jwt-decode";
+import { jwtDecode } from "jwt-decode";
 import { takeLatest } from "redux-saga/effects";
 import { testSaga } from "redux-saga-test-plan";
 import {
@@ -59,7 +59,7 @@ describe("sagas: post login", () => {
         .next({ data })
         .call(saveToken, token)
         .next()
-        .call(jwt_decode, token)
+        .call(jwtDecode, token)
         .next({
           amr,
           entitlements,
@@ -136,7 +136,7 @@ describe("sagas: openIdLogin", () => {
         .next({ data })
         .call(saveToken, token)
         .next()
-        .call(jwt_decode, token)
+        .call(jwtDecode, token)
         .next({
           amr,
           entitlements,
@@ -192,7 +192,7 @@ describe("sagas: openIdLogin", () => {
         .next({ data })
         .call(saveToken, token)
         .next()
-        .call(jwt_decode, token)
+        .call(jwtDecode, token)
         .next({
           amr,
           entitlements,

package/src/sessions/sagas/__tests__/refresh.spec.js

@@ -1,4 +1,4 @@
-import jwt_decode from "jwt-decode";
+import { jwtDecode } from "jwt-decode";
 import { testSaga } from "redux-saga-test-plan";
 import { takeLatest } from "redux-saga/effects";
 import { apiJsonPost, JSON_OPTS } from "@truedat/core/services/api";
@@ -65,7 +65,7 @@ describe("sagas: refreshSaga", () => {
         .next({ data })
         .call(saveToken, token)
         .next()
-        .call(jwt_decode, token)
+        .call(jwtDecode, token)
         .next({ amr, entitlements, exp, groups, role, user_name })
         .put(
           refreshSession.success({

package/src/sessions/sagas/__tests__/token.spec.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import jwt_decode from "jwt-decode";
+import { jwtDecode } from "jwt-decode";
 import { testSaga } from "redux-saga-test-plan";
 import { readToken as readTokenFromStorage } from "@truedat/core/services/storage";
 import { tokenRequestSaga, checkExpired, readToken } from "../token";
@@ -36,13 +36,13 @@ describe("sagas: read token", () => {
   const groups = ["business_glossary"];
   const entitlements = ["p"];
 
-  it("should call readTokenFromStorage, jwt_decode and checkExpired", () => {
+  it("should call readTokenFromStorage, jwtDecode and checkExpired", () => {
     expect(() => {
       testSaga(readToken)
         .next()
         .call(readTokenFromStorage)
         .next(token)
-        .call(jwt_decode, token)
+        .call(jwtDecode, token)
         .next({ user_name, entitlements, exp, role, groups })
         .call(checkExpired, exp)
         .next(false)
@@ -68,7 +68,7 @@ describe("sagas: read token", () => {
         .next()
         .call(readTokenFromStorage)
         .next(token)
-        .call(jwt_decode, token)
+        .call(jwtDecode, token)
         .next({ user_name, exp })
         .call(checkExpired, exp)
         .next(true)

package/src/sessions/sagas/login.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import jwt_decode from "jwt-decode";
+import { jwtDecode } from "jwt-decode";
 import { all, call, put, takeLatest } from "redux-saga/effects";
 import {
   apiJsonPost,
@@ -24,7 +24,7 @@ export function* auth0LoginSaga({ payload }) {
     const { token } = data;
     yield call(saveToken, token);
     const { amr, entitlements, exp, groups, role, user_name } = yield call(
-      jwt_decode,
+      jwtDecode,
       token
     );
     yield put(
@@ -59,7 +59,7 @@ export function* openIdLoginSaga({ payload }) {
     const { token } = data;
     yield call(saveToken, token);
     const { amr, entitlements, exp, groups, role, user_name } = yield call(
-      jwt_decode,
+      jwtDecode,
       token
     );
     yield put(
@@ -90,7 +90,7 @@ export function* nonceLoginSaga({ payload }) {
     const { token } = data;
     yield call(saveToken, token);
     const { amr, entitlements, exp, groups, role, user_name } = yield call(
-      jwt_decode,
+      jwtDecode,
       token
     );
     yield put(
@@ -124,7 +124,7 @@ export function* postLoginSaga({ payload }) {
     const { token } = data;
     yield call(saveToken, token);
     const { amr, entitlements, exp, groups, role, user_name } = yield call(
-      jwt_decode,
+      jwtDecode,
       token
     );
     yield put(

package/src/sessions/sagas/refresh.js

@@ -1,4 +1,4 @@
-import jwt_decode from "jwt-decode";
+import { jwtDecode } from "jwt-decode";
 import { all, call, put, takeLatest, delay } from "redux-saga/effects";
 import { apiJsonPost, JSON_OPTS } from "@truedat/core/services/api";
 import { saveToken } from "@truedat/core/services/storage";
@@ -33,7 +33,7 @@ export function* refreshSaga({ payload }) {
     const { token } = data;
     yield call(saveToken, token);
     const { amr, entitlements, exp, groups, role, user_name } = yield call(
-      jwt_decode,
+      jwtDecode,
       token
     );
     yield put(

package/src/sessions/sagas/token.js

@@ -1,4 +1,4 @@
-import jwt_decode from "jwt-decode";
+import { jwtDecode } from "jwt-decode";
 import { call, put, takeLatest } from "redux-saga/effects";
 import { readToken as readTokenFromStorage } from "@truedat/core/services/storage";
 import { retrieveToken } from "../routines";
@@ -16,7 +16,7 @@ export function* readToken() {
   const token = yield call(readTokenFromStorage);
   if (token) {
     const { amr, entitlements, exp, groups, role, user_name } = yield call(
-      jwt_decode,
+      jwtDecode,
       token
     );
     const isExpired = yield call(checkExpired, exp);

package/src/users/components/AdminUserRoutes.js

@@ -1,8 +1,9 @@
 import React from "react";
-import { Route, Switch } from "react-router-dom";
+import { Route, Routes } from "react-router";
 import { Divider, Segment } from "semantic-ui-react";
 import { Unauthorized } from "@truedat/core/components";
 import { useActiveRoute, useAuthorized } from "@truedat/core/hooks";
+import { ProtectedRoute, Loader } from "@truedat/core/router";
 import {
   GROUP,
   GROUP_CREATE,
@@ -31,65 +32,38 @@ import UserPassword from "./UserPassword";
 
 const UsersGroupsLoader = () => (
   <>
-    <Route component={UsersLoader} />
-    <Route component={GroupsLoader} />
+    <UsersLoader />
+    <GroupsLoader />
   </>
 );
 
 const UserRoutes = () => (
-  <Switch>
-    <Route exact path={USERS_NEW} component={NewUser} />
-    <Route
-      exact
-      path={USER}
-      render={() => (
-        <>
-          <UserLoader />
-          <User />
-        </>
-      )}
-    />
-    <Route
-      exact
-      path={USER_EDIT}
-      render={() => (
-        <>
-          <UserLoader />
-          <EditUser />
-        </>
-      )}
-    />
-    <Route exact path={USERS} component={UsersAndGroups} />
-    <Route
-      exact
-      path={USER_EDIT_PASSWORD}
-      render={() => (
-        <>
-          <UserLoader />
-          <UserPassword />
-        </>
-      )}
-    />
-  </Switch>
+  <Routes>
+    <Route index element={<UsersAndGroups />} />
+    <Route path="new" element={<NewUser />} />
+    <Route path=":id" element={<Loader loaders={<UserLoader />} />}>
+      <Route index element={<User />} />
+      <Route path="edit" element={<EditUser />} />
+      <Route path="password" element={<UserPassword />} />
+    </Route>
+  </Routes>
 );
 
 const GroupRoutes = () => (
-  <Switch>
-    <Route exact path={GROUP_CREATE} render={() => <NewGroup />} />
+  <Routes>
+    <Route path={GROUP_CREATE} element={<NewGroup />} />
     <Route
-      exact
       path={GROUP_EDIT}
-      render={() => (
+      element={
         <>
           <GroupLoader />
           <EditGroup />
         </>
-      )}
+      }
     />
     <Route
-      exact
       path={GROUP}
-      render={() => (
+      element={
         <>
           <GroupUserCrumbs action="show" />
           <Segment>
@@ -99,10 +73,11 @@ const GroupRoutes = () => (
             <GroupUsers />
           </Segment>
         </>
-      )}
+      }
     />
-    <Route exact path={GROUPS} render={() => <UsersAndGroups />} />
-  </Switch>
+    <Route path={GROUPS} element={<UsersAndGroups />} />
+    <Route path="*" element={null} />
+  </Routes>
 );
 
 export const AdminUserRoutes = () => {
@@ -113,16 +88,25 @@ export const AdminUserRoutes = () => {
   return (
     <>
       {authorized && active && <UsersGroupsLoader />}
-      <Switch>
+      <Routes>
         <Route
           path={USERS}
-          render={() => (authorized ? <UserRoutes /> : <Unauthorized />)}
+          element={
+            <ProtectedRoute>
+              <UserRoutes />
+            </ProtectedRoute>
+          }
         />
         <Route
           path={GROUPS}
-          render={() => (authorized ? <GroupRoutes /> : <Unauthorized />)}
+          element={
+            <ProtectedRoute>
+              <GroupRoutes />
+            </ProtectedRoute>
+          }
         />
-      </Switch>
+        <Route path="*" element={null} />
+      </Routes>
     </>
   );
 };

package/src/users/components/EditUser.js

@@ -1,5 +1,4 @@
 import _ from "lodash/fp";
-import React from "react";
 import PropTypes from "prop-types";
 import { Header, Container, Segment } from "semantic-ui-react";
 import { connect } from "react-redux";

package/src/users/components/GroupUserCrumbs.js

@@ -1,8 +1,7 @@
-import React from "react";
 import PropTypes from "prop-types";
 import { Breadcrumb } from "semantic-ui-react";
 import { connect } from "react-redux";
-import { Link } from "react-router-dom";
+import { Link } from "react-router";
 import { FormattedMessage } from "react-intl";
 import { GROUPS, linkTo } from "@truedat/core/routes";
 
@@ -13,20 +12,19 @@ export const GroupUserCrumbs = ({ group, groupLoading, action }) => {
       <Breadcrumb.Section as={Link} to={GROUPS} active={false}>
         <FormattedMessage id="groups.crumbs.top" />
       </Breadcrumb.Section>
-
-      {action == "show" && (
+      {action === "show" && (
         <>
           <Breadcrumb.Divider icon="right angle" />
           {group.name}
         </>
       )}
-      {action == "add" && (
+      {action === "add" && (
         <>
           <Breadcrumb.Divider icon="right angle" />
           <Breadcrumb.Section
             as={Link}
             to={linkTo.GROUP({ id: group.id })}
-            active={action == "show"}
+            active={action === "show"}
           >
             {group.name}
           </Breadcrumb.Section>
@@ -40,11 +38,13 @@ export const GroupUserCrumbs = ({ group, groupLoading, action }) => {
 
 GroupUserCrumbs.propTypes = {
   group: PropTypes.object,
-  groupLoading: PropTypes.bool
+  groupLoading: PropTypes.bool,
+  action: PropTypes.string,
 };
 
 const mapStateToProps = ({ group, groupLoading }) => ({
   group,
-  groupLoading
+  groupLoading,
 });
+
 export default connect(mapStateToProps)(GroupUserCrumbs);

package/src/users/components/InitialUser.js

@@ -1,4 +1,3 @@
-import React from "react";
 import PropTypes from "prop-types";
 import { Header, Container, Segment } from "semantic-ui-react";
 import { connect } from "react-redux";