Add new params into 'User' data type

The 'User' data type needs the following variables: - `krbextradata` - `krblastadminunlock` - `krblastfailedauth` - `krblastpwdchange` - `krbloginfailedcount` The Redux files related to the three types of users ('Active', 'Stage', and 'Preserved') needs to be adapted to the new values as well. Signed-off-by: Carla Martinez <carlmart@redhat.com>
freeipa · Dec 14, 2023 · 52b1c09 · 52b1c09
1 parent ae02f50
commit 52b1c09
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 779 deletions.
diff --git a/src/store/Identity/activeUsers-slice.ts b/src/store/Identity/activeUsers-slice.ts
@@ -107,6 +107,11 @@ const activeUsersSlice = createSlice({
         preserved: newUser.preserved,
         dn: newUser.dn,
         sshpubkeyfp: newUser.sshpubkeyfp,
+        krbextradata: newUser.krbextradata,
+        krblastadminunlock: newUser.krblastadminunlock,
+        krblastfailedauth: newUser.krblastfailedauth,
+        krblastpwdchange: newUser.krblastpwdchange,
+        krbloginfailedcount: newUser.krbloginfailedcount,
       });
     },
     removeUser: (state, action: PayloadAction<string>) => {
@@ -219,6 +224,11 @@ const activeUsersSlice = createSlice({
                 preserved: state.usersList[j].preserved,
                 dn: state.usersList[j].dn,
                 sshpubkeyfp: state.usersList[j].sshpubkeyfp,
+                krbextradata: state.usersList[j].krbextradata,
+                krblastadminunlock: state.usersList[j].krblastadminunlock,
+                krblastfailedauth: state.usersList[j].krblastfailedauth,
+                krblastpwdchange: state.usersList[j].krblastpwdchange,
+                krbloginfailedcount: state.usersList[j].krbloginfailedcount,
               };
               // Replace entry
               state.usersList[j] = updatedUser;

diff --git a/src/store/Identity/preservedUsers-slice.ts b/src/store/Identity/preservedUsers-slice.ts
@@ -1,7 +1,5 @@
 import { createSlice, PayloadAction } from "@reduxjs/toolkit";
 import type { RootState } from "src/store/store";
-// User data (JSON file)
-import preservedUsersJson from "./preservedUsers.json";
 // Data types
 import { User } from "src/utils/datatypes/globalDataTypes";
 
@@ -15,7 +13,7 @@ interface ChangeStatusData {
 }
 
 const initialState: PreservedUsersState = {
-  usersList: preservedUsersJson,
+  usersList: [],
 };
 
 const preservedUsersSlice = createSlice({
@@ -109,6 +107,11 @@ const preservedUsersSlice = createSlice({
         preserved: newUser.preserved,
         dn: newUser.dn,
         sshpubkeyfp: newUser.sshpubkeyfp,
+        krbextradata: newUser.krbextradata,
+        krblastadminunlock: newUser.krblastadminunlock,
+        krblastfailedauth: newUser.krblastfailedauth,
+        krblastpwdchange: newUser.krblastpwdchange,
+        krbloginfailedcount: newUser.krbloginfailedcount,
       });
       // Update json file
     },
@@ -222,6 +225,11 @@ const preservedUsersSlice = createSlice({
                 preserved: state.usersList[j].preserved,
                 dn: state.usersList[j].dn,
                 sshpubkeyfp: state.usersList[j].sshpubkeyfp,
+                krbextradata: state.usersList[j].krbextradata,
+                krblastadminunlock: state.usersList[j].krblastadminunlock,
+                krblastfailedauth: state.usersList[j].krblastfailedauth,
+                krblastpwdchange: state.usersList[j].krblastpwdchange,
+                krbloginfailedcount: state.usersList[j].krbloginfailedcount,
               };
               // Replace entry
               state.usersList[j] = updatedUser;