@truedat/auth 4.39.0 → 4.40.2

package/CHANGELOG.md

@@ -1,10 +1,22 @@
 # Changelog
 
+## [4.40.1] 2022-03-08
+
+### Removed
+
+- [TD-4604] Avoid fetching permissions from `/api/users/me/permissions`
+
+## [4.40.0] 2022-03-07
+
+### Removed
+
+- Removed unused selector `getUserDomains`
+
 ## [4.38.7] 2022-02-22
 
 ### Added
 
-- [TD-4437] Add manage_rule_results permission messages
+- [TD-4437] Add `manage_rule_results` permission messages
 
 ## [4.32.1] 2021-11-15
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/auth",
-  "version": "4.39.0",
+  "version": "4.40.2",
   "description": "Truedat Web Auth",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -84,7 +84,7 @@
     ]
   },
   "dependencies": {
-    "@truedat/core": "4.39.0",
+    "@truedat/core": "4.40.2",
     "auth0-js": "^9.12.2",
     "immutable": "^4.0.0-rc.12",
     "jwt-decode": "^2.2.0",
@@ -106,5 +106,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 0.88.2 < 2.1"
   },
-  "gitHead": "f3d2fe3fcdec546afc22d0a79c4f4f3dfb91ea48"
+  "gitHead": "86aa7e6c6e49c8e3a975f8f4f744c44035324c7f"
 }

package/src/messages/en.js

@@ -55,7 +55,7 @@ export default {
   "permission.create_business_concept_link": "Create Business Concept Links",
   "permission.create_data_structure": "Create Structures",
   "permission.create_domain": "Create Domains",
-  "permission.create_ingest": "Creare Ingests",
+  "permission.create_ingest": "Create Ingests",
   "permission.create_structure_note": "Create note",
   "permission.delete_acl_entry": "Delete Domain Roles",
   "permission.delete_business_concept": "Delete Business Concepts",

package/src/users/api.js

@@ -2,7 +2,6 @@ const API_USER = "/api/users/:id";
 const API_USERS = "/api/users";
 const API_USER_CHANGE_PASSWORD = "/api/password";
 const API_USERS_SEARCH = "/api/users/search";
-const API_USER_DOMAINS = "/api/users/me/permissions?permissions=:permissions";
 const API_INIT = "/api/init";
 const API_CAN_INIT = "/api/init/can";
 
@@ -11,7 +10,6 @@ export {
   API_USERS,
   API_USERS_SEARCH,
   API_USER_CHANGE_PASSWORD,
-  API_USER_DOMAINS,
   API_INIT,
-  API_CAN_INIT
+  API_CAN_INIT,
 };

package/src/users/components/index.js

@@ -12,7 +12,6 @@ import UsersLoader from "./UsersLoader";
 import UsersSearchLoader from "./UsersSearchLoader";
 import UserSelector from "./UserSelector";
 import UserDomainsFilter from "./UserDomainsFilter";
-import UserDomainsLoader from "./UserDomainsLoader";
 import InitialUser from "./InitialUser";
 import CanInitLoader from "./CanInitLoader";
 
@@ -31,7 +30,6 @@ export {
   UsersLoader,
   UsersSearchLoader,
   UserSelector,
-  UserDomainsLoader,
   InitialUser,
-  CanInitLoader
+  CanInitLoader,
 };

package/src/users/reducers/index.js

@@ -2,5 +2,4 @@ export * from "./user";
 export * from "./users";
 export * from "./usersSearch";
 export * from "./userRedirect";
-export * from "./userDomains";
 export * from "./canInit";

package/src/users/routines.js

@@ -7,7 +7,6 @@ export const clearUsersSearch = createRoutine("CLEAR_USERS_SEARCH");
 export const createUser = createRoutine("CREATE_USER");
 export const deleteUser = createRoutine("DELETE_USER");
 export const fetchUser = createRoutine("FETCH_USER");
-export const fetchUserDomains = createRoutine("FETCH_USER_DOMAINS");
 export const fetchUsers = createRoutine("FETCH_USERS");
 export const searchUsers = createRoutine("SEARCH_USERS");
 export const updatePassword = createRoutine("UPDATE_PASSWORD");

package/src/users/sagas/index.js

@@ -3,7 +3,6 @@ import { deleteUserRequestSaga } from "./deleteUser";
 import { fetchUserRequestSaga } from "./fetchUser";
 import { fetchUsersRequestSaga } from "./fetchUsers";
 import { updateUserRequestSaga } from "./updateUser";
-import { fetchUserDomainsRequestSaga } from "./fetchUserDomains";
 import { createInitialUserRequestSaga } from "./createInitialUser";
 import { fetchCanInitRequestSaga } from "./fetchCanInit";
 import { searchUsersRequestSaga } from "./searchUsers";
@@ -14,10 +13,9 @@ export {
   updateUserRequestSaga,
   deleteUserRequestSaga,
   fetchUsersRequestSaga,
-  fetchUserDomainsRequestSaga,
   createInitialUserRequestSaga,
   fetchCanInitRequestSaga,
-  searchUsersRequestSaga
+  searchUsersRequestSaga,
 };
 
 export default [
@@ -26,8 +24,7 @@ export default [
   updateUserRequestSaga(),
   deleteUserRequestSaga(),
   fetchUsersRequestSaga(),
-  fetchUserDomainsRequestSaga(),
   createInitialUserRequestSaga(),
   fetchCanInitRequestSaga(),
-  searchUsersRequestSaga()
+  searchUsersRequestSaga(),
 ];

package/src/users/selectors/index.js

@@ -1,4 +1,3 @@
 export { filterUsers } from "./filterUsers";
 export { getUserAcls } from "./getUserAcls";
 export { getUserGroupAcls } from "./getUserGroupAcls";
-export { getUserDomains } from "./getUserDomains";

package/src/users/components/UserDomainsLoader.js

@@ -1,30 +0,0 @@
-import { useEffect } from "react";
-import PropTypes from "prop-types";
-import { connect } from "react-redux";
-import { clearUserDomains, fetchUserDomains } from "../routines";
-
-export const UserDomainsLoader = ({
-  permissions,
-  fetchUserDomains,
-  clearUserDomains,
-}) => {
-  useEffect(() => {
-    return () => {
-      clearUserDomains();
-    };
-  }, [clearUserDomains]);
-  useEffect(() => {
-    fetchUserDomains({ permissions });
-  }, [permissions, fetchUserDomains]);
-  return null;
-};
-
-UserDomainsLoader.propTypes = {
-  clearUserDomains: PropTypes.func,
-  fetchUserDomains: PropTypes.func,
-  permissions: PropTypes.array,
-};
-
-export default connect(null, { clearUserDomains, fetchUserDomains })(
-  UserDomainsLoader
-);

package/src/users/components/__tests__/UserDomainsLoader.spec.js

@@ -1,32 +0,0 @@
-import React from "react";
-import { mount } from "enzyme";
-import { UserDomainsLoader } from "../UserDomainsLoader";
-
-describe("<UserDomainsLoader />", () => {
-  it("calls fetchUserDomains with permissions when component mounts but not when it unmounts", () => {
-    const props = {
-      clearUserDomains: jest.fn(),
-      fetchUserDomains: jest.fn(),
-      permissions: ["view_dashboard"]
-    };
-    const wrapper = mount(<UserDomainsLoader {...props} />);
-    expect(props.fetchUserDomains.mock.calls[0]).toEqual([
-      { permissions: ["view_dashboard"] }
-    ]);
-    expect(props.fetchUserDomains.mock.calls.length).toBe(1);
-    wrapper.unmount();
-    expect(props.fetchUserDomains.mock.calls.length).toBe(1);
-  });
-
-  it("calls clearUserDomains when component unmounts", () => {
-    const props = {
-      clearUserDomains: jest.fn(),
-      fetchUserDomains: jest.fn(),
-      permissions: ["view_dashboard"]
-    };
-    const wrapper = mount(<UserDomainsLoader {...props} />);
-    expect(props.clearUserDomains.mock.calls.length).toBe(0);
-    wrapper.unmount();
-    expect(props.clearUserDomains.mock.calls.length).toBe(1);
-  });
-});

package/src/users/reducers/__tests__/userDomains.spec.js

@@ -1,66 +0,0 @@
-import { fetchUserDomains, clearUserDomains } from "../../routines";
-import { userDomains, userDomainsLoading } from "..";
-
-const fooState = { foo: "bar" };
-
-describe("reducers: userDomainsLoading", () => {
-  it("should provide the initial state", () => {
-    expect(userDomainsLoading(undefined, {})).toBe(false);
-  });
-
-  it("should be true after receiving the TRIGGER action", () => {
-    expect(userDomainsLoading(false, { type: fetchUserDomains.TRIGGER })).toBe(
-      true
-    );
-  });
-
-  it("should be false after receiving the FULFILL action", () => {
-    expect(userDomainsLoading(true, { type: fetchUserDomains.FULFILL })).toBe(
-      false
-    );
-  });
-
-  it("should ignore unhandled actions", () => {
-    expect(userDomainsLoading(fooState, { type: "FOO" })).toBe(fooState);
-  });
-});
-
-describe("reducers: userDomains", () => {
-  const initialState = [];
-
-  it("should provide the initial state", () => {
-    expect(userDomains(undefined, {})).toEqual(initialState);
-  });
-
-  it("should return initial state on failure", () => {
-    expect(userDomains(undefined, { type: fetchUserDomains.FAILURE })).toEqual(
-      initialState
-    );
-  });
-
-  it("should return initial state on clearUserDomains", () => {
-    expect(userDomains(undefined, { type: clearUserDomains.TRIGGER })).toEqual(
-      initialState
-    );
-  });
-
-  it("should handle the SUCCESS action", () => {
-    const userDomainsData = [
-      { permission: "view_quality_rule", domains: { id: 1, name: "d1" } },
-      { permission: "view_dashboard", domains: { id: 2, name: "d2" } }
-    ];
-
-    const permission_domains = userDomainsData;
-
-    expect(
-      userDomains(fooState, {
-        type: fetchUserDomains.SUCCESS,
-        payload: { permission_domains }
-      })
-    ).toMatchObject(permission_domains);
-  });
-
-  it("should ignore unknown actions", () => {
-    expect(userDomains(fooState, { type: "FOO" })).toBe(fooState);
-  });
-});

package/src/users/reducers/userDomains.js

@@ -1,31 +0,0 @@
-import _ from "lodash/fp";
-import { fetchUserDomains, clearUserDomains } from "../routines";
-
-const initialState = [];
-
-const userDomains = (state = initialState, { type, payload }) => {
-  switch (type) {
-    case fetchUserDomains.SUCCESS:
-      const permissionDomains = _.prop("permission_domains")(payload);
-      return _.isEqual(permissionDomains, state) ? state : permissionDomains;
-    case fetchUserDomains.FAILURE:
-      return initialState;
-    case clearUserDomains.TRIGGER:
-      return initialState;
-    default:
-      return state;
-  }
-};
-
-const userDomainsLoading = (state = false, { type }) => {
-  switch (type) {
-    case fetchUserDomains.TRIGGER:
-      return true;
-    case fetchUserDomains.FULFILL:
-      return false;
-    default:
-      return state;
-  }
-};
-
-export { userDomains, userDomainsLoading };

package/src/users/sagas/__tests__/fetchUserDomains.spec.js

@@ -1,84 +0,0 @@
-import { testSaga } from "redux-saga-test-plan";
-import { apiJson, JSON_OPTS } from "@truedat/core/services/api";
-import {
-  fetchUserDomainsRequestSaga,
-  fetchUserDomainsSaga
-} from "../fetchUserDomains";
-import { fetchUserDomains } from "../../routines";
-
-describe("sagas: fetchUserDomainsRequestSaga", () => {
-  it("should invoke fetchUserDomainsSaga on fetchUserDomains.TRIGGER", () => {
-    expect(() => {
-      testSaga(fetchUserDomainsRequestSaga)
-        .next()
-        .finish()
-        .isDone();
-    }).not.toThrow();
-  });
-
-  it("should throw exception if an unhandled action is received", () => {
-    expect(() => {
-      testSaga(fetchUserDomainsRequestSaga)
-        .next()
-        .takeLatest("FOO", fetchUserDomainsRequestSaga);
-    }).toThrow();
-  });
-});
-
-describe("sagas: fetchUserDomainsSaga", () => {
-  const permissions = ["foo", "bar"];
-  const url = "/api/users/me/permissions?permissions=foo%2Cbar";
-  const data = { foo: "bar" };
-
-  it("should fetch user domains", () => {
-    expect(() => {
-      testSaga(fetchUserDomainsSaga, { payload: { permissions } })
-        .next()
-        .put(fetchUserDomains.request())
-        .next()
-        .call(apiJson, url, JSON_OPTS)
-        .next({ data })
-        .put(fetchUserDomains.success(data))
-        .next()
-        .put(fetchUserDomains.fulfill())
-        .next()
-        .isDone();
-    }).not.toThrow();
-  });
-
-  it("should catch response error", () => {
-    const response = { status: 400, data: "error" };
-    const error = { response };
-    expect(() => {
-      testSaga(fetchUserDomainsSaga, { payload: { permissions } })
-        .next()
-        .put(fetchUserDomains.request())
-        .next()
-        .call(apiJson, url, JSON_OPTS)
-        .throw(error)
-        .put(fetchUserDomains.failure(response))
-        .next()
-        .put(fetchUserDomains.fulfill())
-        .next()
-        .isDone();
-    }).not.toThrow();
-  });
-
-  it("should catch message error", () => {
-    const message = "error";
-    const error = { message };
-    expect(() => {
-      testSaga(fetchUserDomainsSaga, { payload: { permissions } })
-        .next()
-        .put(fetchUserDomains.request())
-        .next()
-        .call(apiJson, url, JSON_OPTS)
-        .throw(error)
-        .put(fetchUserDomains.failure(message))
-        .next()
-        .put(fetchUserDomains.fulfill())
-        .next()
-        .isDone();
-    }).not.toThrow();
-  });
-});

package/src/users/sagas/fetchUserDomains.js

@@ -1,33 +0,0 @@
-import _ from "lodash/fp";
-import { compile } from "path-to-regexp";
-import { call, put, takeLatest } from "redux-saga/effects";
-import { apiJson, JSON_OPTS } from "@truedat/core/services/api";
-import { fetchUserDomains } from "../routines";
-import { API_USER_DOMAINS } from "../api";
-
-export function* fetchUserDomainsSaga({ payload }) {
-  try {
-    const permissions = _.flow(
-      _.propOr([], "permissions"),
-      _.castArray,
-      _.join(",")
-    )(payload);
-    const url = compile(API_USER_DOMAINS)({ permissions });
-    yield put(fetchUserDomains.request());
-    const { data } = yield call(apiJson, url, JSON_OPTS);
-    yield put(fetchUserDomains.success(data));
-  } catch (error) {
-    if (error.response) {
-      const { status, data } = error.response;
-      yield put(fetchUserDomains.failure({ status, data }));
-    } else {
-      yield put(fetchUserDomains.failure(error.message));
-    }
-  } finally {
-    yield put(fetchUserDomains.fulfill());
-  }
-}
-
-export function* fetchUserDomainsRequestSaga() {
-  yield takeLatest(fetchUserDomains.TRIGGER, fetchUserDomainsSaga);
-}

package/src/users/selectors/getUserDomains.js

@@ -1,9 +0,0 @@
-import _ from "lodash/fp";
-import { createSelector } from "reselect";
-
-const getUserPermissionsDomains = ({ userDomains }) => userDomains;
-
-export const getUserDomains = createSelector(
-  getUserPermissionsDomains,
-  _.flow(_.map("domains"), _.flatten, _.uniqBy("id"))
-);