Merge branch 'main' into doc-flex-stable-release

Author: moabu

Diff for: admin-ui/plugins/user-management/components/UserManagement/UserAddPage.js

@@ -62,7 +62,7 @@ function UserAddPage() {
     }
   }
 
-  const submitData = (values) => {
+  const submitData = (values, modifiedFields, message) => {
     let customAttributes = createCustomAttributes(values)
     let submitableValues = {
       userId: values.userId || '',
@@ -72,6 +72,7 @@ function UserAddPage() {
       userPassword: values.userPassword || '',
       givenName: values.givenName || '',
       customAttributes: customAttributes,
+      action_message: message,
     }
     dispatch(createUser(submitableValues))
   }

Diff for: admin-ui/plugins/user-management/components/UserManagement/UserForm.js

@@ -117,7 +117,7 @@ function UserForm({ onSubmitData }) {
 
   const submitForm = (usermessage) => {
     toggle();
-    onSubmitData(formik.values, modifiedFields,usermessage);
+    onSubmitData(formik.values, modifiedFields, usermessage);
   };
   const loading = useSelector((state) => state.userReducer.loading);
   const setSelectedClaimsToState = (data) => {

Diff for: admin-ui/plugins/user-management/components/UserManagement/UserList.js

@@ -68,8 +68,9 @@ function UserList(props) {
   const [userDetails, setUserDetails] = useState(false);
   const [deleteData, setDeleteData] = useState(null);
   const toggle = () => setModal(!modal);
-  const submitForm = () => {
+  const submitForm = (message) => {
     toggle();
+    deleteData.action_message = message;
     handleUserDelete(deleteData);
   };
   const theme = useContext(ThemeContext);

Diff for: admin-ui/plugins/user-management/redux/sagas/UserSaga.js

@@ -53,7 +53,9 @@ export function* createUserSaga({ payload }) {
     yield* triggerWebhook({ payload: { createdFeatureValue: data } });
 
     addAdditionalData(audit, CREATE, API_USERS, payload);
-    audit.message = payload.action?.action_message || ``;
+    audit.message = payload?.action_message || ``;
+  
+    delete payload.userPassword
     yield call(postUserAction, audit);
     return data;
   } catch (e) {
@@ -163,7 +165,7 @@ export function* deleteUserSaga({ payload }) {
     yield* triggerWebhook({ payload: { createdFeatureValue: payload } });
 
     addAdditionalData(audit, DELETION, API_USERS, payload);
-    audit.message = `Deleted user ${payload.inum}`;
+    audit.message = payload.action_message || ``;
     yield call(postUserAction, audit);
     return data;
   } catch (e) {

Diff for: charts/gluu-all-in-one/Chart.yaml

@@ -21,4 +21,4 @@ maintainers:
     email: [email protected]
 description: Gluu Access and Identity Management All-in-One Chart. This chart deploys the selected janssen microservice all in one deployment.
 name: gluu-all-in-one
-version: 1.2.0
+version: 5.2.0

Diff for: charts/gluu-all-in-one/values.yaml

@@ -713,7 +713,7 @@ image:
   # -- Image  to use for deploying.
   repository: ghcr.io/gluufederation/flex/flex-all-in-one
   # -- Image  tag to use for deploying.
-  tag: 1.2.0-1
+  tag: 5.2.0-1
   # -- Image Pull Secrets
   pullSecrets: [ ]
 # -- Service replica number.

Diff for: docker-admin-ui/Dockerfile

@@ -161,7 +161,7 @@ ENV CN_WAIT_MAX_TIME=300 \
 LABEL org.opencontainers.image.url="ghcr.io/gluufederation/flex/admin-ui" \
     org.opencontainers.image.authors="Gluu Inc. <[email protected]>" \
     org.opencontainers.image.vendor="Gluu Federation" \
-    org.opencontainers.image.version="5.2.0" \
+    org.opencontainers.image.version="5.2.0-1" \
     org.opencontainers.image.title="Gluu Flex Admin UI" \
     org.opencontainers.image.description=""
 

Diff for: docker-flex-all-in-one/Dockerfile

@@ -166,7 +166,7 @@ ENV JETTY_BASE=/opt/jans/jetty \
 LABEL org.opencontainers.image.url="ghcr.io/gluufederation/flex/flex-all-in-one" \
     org.opencontainers.image.authors="Gluu Inc. <[email protected]>" \
     org.opencontainers.image.vendor="Gluu Federation" \
-    org.opencontainers.image.version="5.2.0" \
+    org.opencontainers.image.version="5.2.0-1" \
     org.opencontainers.image.title="Gluu Flex All-in-One" \
     org.opencontainers.image.description=""
 

Diff for: docker-flex-monolith/Dockerfile

@@ -92,7 +92,7 @@ ENV CN_HOSTNAME="demoexample.gluu.org" \
 LABEL org.opencontainers.image.url="ghcr.io/gluufederation/flex/monolith" \
     org.opencontainers.image.authors="GluuFederation <[email protected]>" \
     org.opencontainers.image.vendor="GluuFederation" \
-    org.opencontainers.image.version="5.2.0" \
+    org.opencontainers.image.version="5.2.0-1" \
     org.opencontainers.image.title="GluuFederation Flex Monolith Image" \
     org.opencontainers.image.description="Janssen Authorization server + Casa + AdminUI"