@truedat/auth 4.31.8 → 4.33.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [Unreleased]
+
+### Added
+
+- [TD-4228] Include optional `external_id` for users
+
 ## [4.30.3] 2021-10-07
 
 ### Added

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/auth",
-  "version": "4.31.8",
+  "version": "4.33.1",
   "description": "Truedat Web Auth",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -34,7 +34,7 @@
     "@testing-library/jest-dom": "^5.14.1",
     "@testing-library/react": "^12.0.0",
     "@testing-library/user-event": "^13.2.1",
-    "@truedat/test": "4.31.8",
+    "@truedat/test": "4.33.1",
     "babel-jest": "^27.0.6",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -82,7 +82,7 @@
     ]
   },
   "dependencies": {
-    "@truedat/core": "4.31.8",
+    "@truedat/core": "4.33.1",
     "auth0-js": "^9.12.2",
     "immutable": "^4.0.0-rc.12",
     "jwt-decode": "^2.2.0",
@@ -104,5 +104,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 0.88.2 < 2.1"
   },
-  "gitHead": "5b75752ba88bfa44f897de86b9a3f84ee0d94f0c"
+  "gitHead": "0fda4a132dfb5e386ad02d6e6a2ac3cfa58bc1ba"
 }

package/src/messages/en.js

@@ -160,12 +160,14 @@ export default {
   "user.actions.edit_password": "Change password",
   "user.form.check_something": "Form validations failed...",
   "user.form.email": "Email",
+  "user.form.external_id": "External ID",
   "user.form.full_name": "Full Name",
   "user.form.groups": "Groups",
   "user.form.password": "Password",
   "user.form.password_confirmation": "Password confirmation",
   "user.form.password_confirmation.invalid": "Value does not match password",
   "user.form.placeholder.email": "jane.doe@truedat.net",
+  "user.form.placeholder.external_id": "jane.doe (optional)",
   "user.form.placeholder.full_name": "Jane Doe",
   "user.form.placeholder.groups": "Select groups…",
   "user.form.placeholder.user_name": "jane01",

package/src/messages/es.js

@@ -161,12 +161,14 @@ export default {
   "user.actions.edit_password": "Cambiar contraseña",
   "user.form.check_something": "Existen errores en el formulario",
   "user.form.email": "Email",
+  "user.form.external_id": "Id externo",
   "user.form.full_name": "Nombre completo",
   "user.form.groups": "Grupos",
   "user.form.password": "Contraseña",
   "user.form.password_confirmation": "Confirmar contraseña",
   "user.form.password_confirmation.invalid": "El valor introducido no coincide con la contraseña",
   "user.form.placeholder.email": "elena.leon@truedat.net",
+  "user.form.placeholder.external_id": "elena.leon",
   "user.form.placeholder.full_name": "Elena León",
   "user.form.placeholder.groups": "Seleccionar grupos…",
   "user.form.placeholder.user_name": "elena01",

package/src/users/components/UserForm.js

@@ -117,6 +117,7 @@ export const UserForm = ({ isSubmitting, onSubmit, user, groups }) => {
     mode: "all",
     defaultValues: {
       user_name: "",
+      external_id: "",
       email: "",
       full_name: "",
       role: "user",
@@ -157,6 +158,26 @@ export const UserForm = ({ isSubmitting, onSubmit, user, groups }) => {
           />
         )}
       />
+      <Controller
+        control={control}
+        name="external_id"
+        render={({ onBlur, onChange, value }) => (
+          <Form.Input
+            id="external_id"
+            autoComplete="off"
+            label={{
+              children: formatMessage({ id: "user.form.external_id" }),
+              htmlFor: "external_id",
+            }}
+            onBlur={onBlur}
+            onChange={(_e, { value }) => onChange(value)}
+            placeholder={formatMessage({
+              id: "user.form.placeholder.external_id",
+            })}
+            value={value || ""}
+          />
+        )}
+      />
       <Controller
         control={control}
         name="email"

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

@@ -12,12 +12,14 @@ const renderOpts = {
       "form.validation.required": "{prop} required",
       "navigation.members.users": "Users",
       "user.form.email": "Email address",
+      "user.form.external_id": "External ID",
       "user.form.full_name": "Full name",
       "user.form.groups": "Groups",
       "user.form.password": "password",
       "user.form.user_name": "Username",
       "user.form.password_confirmation": "confirm",
       "user.form.placeholder.email": "pperez@example.com",
+      "user.form.placeholder.external_id": "pperez",
       "user.form.placeholder.full_name": "Pepe Perez",
       "user.form.placeholder.user_name": "pperez",
       "user.form.placeholder.groups": "Madrid DG",
@@ -26,12 +28,12 @@ const renderOpts = {
       "user.type.service": "service",
       "user.type.user": "user",
       "users.actions.create": "create",
-      "users.actions.edit": "edit"
-    }
+      "users.actions.edit": "edit",
+    },
   },
   state: {
-    user: { id: 123, user_name: "fred", full_name: "fredrik foobar" }
-  }
+    user: { id: 123, user_name: "fred", full_name: "fredrik foobar" },
+  },
 };
 
 describe("<EditUser />", () => {

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

@@ -12,21 +12,23 @@ const renderOpts = {
       "form.validation.required": "{prop} required",
       "users.actions.create_admin_account": "Configure Admin Account",
       "user.form.email": "Email address",
+      "user.form.external_id": "External ID",
       "user.form.full_name": "Full name",
       "user.form.groups": "Groups",
       "user.form.password": "password",
       "user.form.user_name": "Username",
       "user.form.password_confirmation": "confirm",
       "user.form.placeholder.email": "pperez@example.com",
+      "user.form.placeholder.external_id": "pperez",
       "user.form.placeholder.full_name": "Pepe Perez",
       "user.form.placeholder.user_name": "pperez",
       "user.form.placeholder.groups": "Madrid DG",
       "user.form.role": "role",
       "user.type.admin": "admin",
       "user.type.service": "service",
-      "user.type.user": "user"
-    }
-  }
+      "user.type.user": "user",
+    },
+  },
 };
 
 describe("<InitialUser />", () => {

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

@@ -12,12 +12,14 @@ const renderOpts = {
       "form.validation.required": "{prop} required",
       "navigation.members.users": "Users",
       "user.form.email": "Email address",
+      "user.form.external_id": "External ID",
       "user.form.full_name": "Full name",
       "user.form.groups": "Groups",
       "user.form.password": "password",
       "user.form.user_name": "Username",
       "user.form.password_confirmation": "confirm",
       "user.form.placeholder.email": "pperez@example.com",
+      "user.form.placeholder.external_id": "pperez",
       "user.form.placeholder.full_name": "Pepe Perez",
       "user.form.placeholder.user_name": "pperez",
       "user.form.placeholder.groups": "Madrid DG",
@@ -25,9 +27,9 @@ const renderOpts = {
       "user.type.admin": "admin",
       "user.type.service": "service",
       "user.type.user": "user",
-      "users.actions.create": "create"
-    }
-  }
+      "users.actions.create": "create",
+    },
+  },
 };
 
 describe("<NewUser />", () => {

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

@@ -13,6 +13,7 @@ const renderOpts = {
       "form.validation.required": "{prop} required",
       "navigation.members.users": "Users",
       "user.form.email": "Email address",
+      "user.form.external_id": "External ID",
       "user.form.full_name": "Full name",
       "user.form.groups": "Groups",
       "user.form.password": "password",
@@ -20,6 +21,7 @@ const renderOpts = {
       "user.form.password_confirmation": "confirm",
       "user.form.password_confirmation.invalid": "Does not match",
       "user.form.placeholder.email": "pperez@example.com",
+      "user.form.placeholder.external_id": "pperez",
       "user.form.placeholder.full_name": "Pepe Perez",
       "user.form.placeholder.user_name": "pperez",
       "user.form.placeholder.groups": "Madrid DG",
@@ -28,12 +30,12 @@ const renderOpts = {
       "user.type.service": "service",
       "user.type.user": "user",
       "users.actions.create": "create",
-      "users.actions.edit": "edit"
-    }
+      "users.actions.edit": "edit",
+    },
   },
   state: {
-    user: { id: 123, user_name: "fred", full_name: "fredrik foobar" }
-  }
+    user: { id: 123, user_name: "fred", full_name: "fredrik foobar" },
+  },
 };
 
 describe("<UserForm />", () => {
@@ -45,7 +47,7 @@ describe("<UserForm />", () => {
   it("calls the onSubmit function when submitted", async () => {
     const onSubmit = jest.fn();
     const { getByRole, findByRole, findByText } = render(
-      <UserForm onSubmit={props => onSubmit(props)} />,
+      <UserForm onSubmit={(props) => onSubmit(props)} />,
       renderOpts
     );
 
@@ -75,12 +77,13 @@ describe("<UserForm />", () => {
     await waitFor(() =>
       expect(onSubmit).toHaveBeenCalledWith({
         email: "",
+        external_id: "",
         full_name: "Fred",
         groups: [],
         password: "abc123456",
         rep_password: "abc123456",
         role: "admin",
-        user_name: "fred"
+        user_name: "fred",
       })
     );
   });

package/src/users/components/__tests__/__snapshots__/EditUser.spec.js.snap

@@ -61,6 +61,26 @@ exports[`<EditUser /> matches the latest snapshot 1`] = `
           />
         </div>
       </div>
+      <div
+        class="field"
+      >
+        <label
+          for="external_id"
+        >
+          External ID
+        </label>
+        <div
+          class="ui input"
+        >
+          <input
+            autocomplete="off"
+            id="external_id"
+            placeholder="pperez"
+            type="text"
+            value=""
+          />
+        </div>
+      </div>
       <div
         class="field"
       >

package/src/users/components/__tests__/__snapshots__/InitialUser.spec.js.snap

@@ -42,6 +42,26 @@ exports[`<InitialUser /> matches the latest snapshot 1`] = `
           />
         </div>
       </div>
+      <div
+        class="field"
+      >
+        <label
+          for="external_id"
+        >
+          External ID
+        </label>
+        <div
+          class="ui input"
+        >
+          <input
+            autocomplete="off"
+            id="external_id"
+            placeholder="pperez"
+            type="text"
+            value=""
+          />
+        </div>
+      </div>
       <div
         class="field"
       >

package/src/users/components/__tests__/__snapshots__/NewUser.spec.js.snap

@@ -61,6 +61,26 @@ exports[`<NewUser /> matches the latest snapshot 1`] = `
           />
         </div>
       </div>
+      <div
+        class="field"
+      >
+        <label
+          for="external_id"
+        >
+          External ID
+        </label>
+        <div
+          class="ui input"
+        >
+          <input
+            autocomplete="off"
+            id="external_id"
+            placeholder="pperez"
+            type="text"
+            value=""
+          />
+        </div>
+      </div>
       <div
         class="field"
       >

package/src/users/components/__tests__/__snapshots__/UserForm.spec.js.snap

@@ -26,6 +26,26 @@ exports[`<UserForm /> matches the latest snapshot 1`] = `
         />
       </div>
     </div>
+    <div
+      class="field"
+    >
+      <label
+        for="external_id"
+      >
+        External ID
+      </label>
+      <div
+        class="ui input"
+      >
+        <input
+          autocomplete="off"
+          id="external_id"
+          placeholder="pperez"
+          type="text"
+          value=""
+        />
+      </div>
+    </div>
     <div
       class="field"
     >

package/src/users/reducers/user.js

@@ -4,7 +4,7 @@ import {
   fetchUser,
   updateUser,
   createUser,
-  updatePassword
+  updatePassword,
 } from "../routines";
 
 const initialState = {};
@@ -12,11 +12,12 @@ const initialState = {};
 const pickFields = _.pick([
   "id",
   "user_name",
+  "external_id",
   "role",
   "groups",
   "full_name",
   "email",
-  "acls"
+  "acls",
 ]);
 
 const user = (state = initialState, { type, payload }) => {